diff -Nru projectm-2.2.0~git28bb9/autogen.sh projectm-3.1.0/autogen.sh --- projectm-2.2.0~git28bb9/autogen.sh 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/autogen.sh 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/sh + +autoreconf --install || exit 1 + +echo "Now run ./configure && make" diff -Nru projectm-2.2.0~git28bb9/BUILDING_LINUX.txt projectm-3.1.0/BUILDING_LINUX.txt --- projectm-2.2.0~git28bb9/BUILDING_LINUX.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/BUILDING_LINUX.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -sudo apt-get install cmake libftgl-dev libglew-dev libsdl2-dev cmake-curses-gui curl - - -(SDL2 for raspi) -wget https://www.libsdl.org/tmp/SDL-2.0.4-9901.tar.gz -tar -zxf SDL-2.0.4-9901.tar.gz -cd SDL-2.0.4-9901 -./configure --disable-video-opengl --disable-video-x11 - -cmake . - diff -Nru projectm-2.2.0~git28bb9/BUILDING.md projectm-3.1.0/BUILDING.md --- projectm-2.2.0~git28bb9/BUILDING.md 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/BUILDING.md 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,31 @@ +# How to build projectM from scratch + +There are autoconf and automake files for projectM. It is suggested to read configure.ac and the assorted Makefile.am files. + + +## libprojectM + +libprojectM is the core library. It is made up of three sub-libraries: + +#### Renderer +Made up of everything in src/libprojectM/Renderer. It should project libRenderer + +#### MilkdropPresetFactory / NativePresetFactory +From their respective folders. Native presets are visualizations that are implemented in C++ instead of .milk preset files. They are completely optional. Milkdrop presets are technically optional but the whole thing is basically useless without them. + +If you don't want native presets, and you probably don't, don't bother with them. Ideally there should be a configure option to disable them, probably on by default (at this time this is needed for autoconf: https://github.com/projectM-visualizer/projectm/issues/99). + + + +### Dependencies + +* libglm for matrix math is required, just the headers though. We are considering "vendoring" them. +* A modified version of hlslparser is included in Renderer and used to transpile HLSL shaders to GLSL +* OpenGL 3+ or OpenGLES is required +* libsdl >= 2.0.5 is required for the SDL and emscripten apps. src/projectM-sdl is the current reference application implementation. maybe try getting that to build and run as your testbench. + + +#### Assets +libprojectM can either have a configuration hard-coded or load from a configuration file. It's up to each application to decide how to load the config file. The config file can have paths defined specifying where to load fonts and presets from. + +You will want to install the config file and presets somewhere, and then define that path for the application you're trying to build. diff -Nru projectm-2.2.0~git28bb9/BUILDING_OSX.txt projectm-3.1.0/BUILDING_OSX.txt --- projectm-2.2.0~git28bb9/BUILDING_OSX.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/BUILDING_OSX.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -BUILDING ON OSX FROM SCRATCH -============================ - -1. Get freetype -http://download.savannah.gnu.org/releases/freetype/freetype-2.6.1.tar.bz2 -cp builds/unix/install-sh ./ -LIBTOOLIZE=libtoolize ./configure --prefix=/usr/local && make -j4 && sudo make install - -2. FTGL -http://sourceforge.net/projects/ftgl/ -./configure --prefix=/usr/local && make -j4 && sudo make install - -3. GLEW -git clone https://github.com/nigels-com/glew.git -cd glew/auto -make -cd .. -make -j4 - -4. Cg -http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012.dmg - -5. SDL -download & install SDL: -https://www.libsdl.org/release/SDL2-2.0.3.dmg - -6. SDL + cmake -https://github.com/brendan-w/collector/blob/master/cmake/FindSDL2.cmake -copy FindSDL2.cmake to projectm/src/cmake/FindSDL2.cmake -add the following line to projectm/src/CMakeLists.txt: -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - -7. follow projectm build instructions diff -Nru projectm-2.2.0~git28bb9/CMakeLists.txt projectm-3.1.0/CMakeLists.txt --- projectm-2.2.0~git28bb9/CMakeLists.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -PROJECT(projectM-complete) -cmake_minimum_required(VERSION 2.8.0) - -include(src/cmake/CPack-projectM.cmake) - -add_subdirectory(src) - diff -Nru projectm-2.2.0~git28bb9/configure.ac projectm-3.1.0/configure.ac --- projectm-2.2.0~git28bb9/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/configure.ac 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,196 @@ +AC_INIT([projectM], [3.1.0], [mischa@mvstg.biz], [projectM], [https://github.com/revmischa/projectm]) +AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax]) + +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) +LT_INIT + +# Check if we should disable rpath. +# +# For advanced users: In certain configurations, the rpath attributes +# added by libtool cause problems as rpath will be preferred over +# LD_LIBRARY_PATH. This does not seem to be a problem with +# clang. When using --disable-rpath you will likely need to set +# LD_LIBRARY_PATH if you are using libraries in non-system locations. +# YMMV. +# + +DISABLE_RPATH + +AC_PROG_CXX +AC_LANG(C++) + +AC_CONFIG_MACRO_DIRS([m4 m4/autoconf-archive]) + +dnl emscripten +AC_ARG_ENABLE([emscripten], +AS_HELP_STRING([--enable-emscripten], [Build for web with emscripten]), +[], [enable_emscripten=no]) +AS_IF([test "x$enable_emscripten" = "xyes" || test "x$EMSCRIPTEN" = "xyes"], [ + dnl Set up emscripten + m4_include([m4/emscripten.m4]) + AC_DEFINE([EMSCRIPTEN], [1], [Define EMSCRIPTEN]) + enable_threading=no + enable_gles=yes + enable_sdl=yes +], [ + dnl Running in a normal OS (not emscripten) + AX_CHECK_GL + + # check OS + AC_CANONICAL_HOST + AC_MSG_CHECKING(Freedom) + case $host_os in + darwin*) + # OSX needs CoreFoundation + AC_MSG_RESULT(Apple hoarderware detected) + LIBS="$LIBS -framework CoreFoundation" + ;; + linux*) + # limux needs dl + AC_MSG_RESULT(GNU/LINUX detected) + LIBS="$LIBS -ldl" + ;; + esac +]) + + +AC_CHECK_LIB(c, dlopen, LIBDL="", AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")) + +AC_CHECK_FUNCS_ONCE([aligned_alloc posix_memalign]) + +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_FILES([ + Makefile + src/Makefile + src/libprojectM/Makefile + src/libprojectM/Renderer/Makefile + src/libprojectM/NativePresetFactory/Makefile + src/libprojectM/MilkdropPresetFactory/Makefile + src/libprojectM/libprojectM.pc + src/NativePresets/Makefile + src/projectM-sdl/Makefile + src/projectM-emscripten/Makefile + src/projectM-qt/Makefile + src/projectM-pulseaudio/Makefile +]) + +dnl SDL +AC_ARG_ENABLE([sdl], + AS_HELP_STRING([--enable-sdl], [Build SDL2 app]), + [], [enable_sdl=no]) +AS_IF([test "x$enable_sdl" = "xyes"], [ + m4_include([m4/sdl2.m4]) + SDL_VERSION=2.0.5 + AS_IF([test "$TRAVIS"], [SDL_VERSION=2.0.2]) # travis has old SDL, we don't care + AS_IF([test "EMSCRIPTEN"], [SDL_VERSION=2.0.0]) # emscripten has old SDL, we don't care + AM_PATH_SDL2($SDL_VERSION, :, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])) +]) + +dnl glm +AS_IF([test "x$enable_emscripten" != "xyes"], [ + AC_CHECK_HEADER([glm/glm.hpp],, AC_MSG_ERROR(libglm is required.)) +]) + +dnl Threading +AC_ARG_ENABLE([threading], +AS_HELP_STRING([--enable-threading], [multhreading]), +[], [enable_threading=yes]) +AS_IF([test "x$enable_threading" = "xyes" && ! test "$EMSCRIPTEN"], [ + m4_include([m4/autoconf-archive/ax_pthread.m4]) + AX_PTHREAD([ + AC_DEFINE([USE_THREADS], [1], [Define USE_THREADS]) + LIBS="$LIBS $PTHREAD_LIBS $PTHREAD_CFLAGS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS" + echo "LIBS=$LIBS" + ], [ + AC_MSG_ERROR([pthreads not found]) + ]) +]) + +AC_ARG_ENABLE([gles], + AS_HELP_STRING([--enable-gles], [OpenGL ES support]), + [], [enable_gles=no]) + AS_IF([test "x$enable_gles" = "xyes"], [ + AC_DEFINE([USE_GLES], [1], [Define USE_GLES]) +]) + +dnl from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268 +dnl ptomato https://stackoverflow.com/users/172999/ptomato +AC_SUBST([PACKAGE]) +AC_PROG_SED +AC_CONFIG_FILES([src/libprojectM/config.inp.in]) + +AC_PREFIX_DEFAULT([/usr/local]) + +AC_PROG_MKDIR_P + +AX_CHECK_COMPILE_FLAG([-stdlib=libc++], [ + CXXFLAGS="$CXXFLAGS -stdlib=libc++"]) + +AX_CHECK_COMPILE_FLAG([-std=c++11], [ + CXXFLAGS="$CXXFLAGS -std=c++11"]) + +dnl Qt +AC_ARG_ENABLE([qt], + AS_HELP_STRING([--enable-qt], [Build Qt]), + [], [enable_qt=no]) +AS_IF([test "x$enable_qt" = "xyes"], [ + PKG_CHECK_MODULES(QT, [Qt5Core, Qt5Gui, Qt5Widgets Qt5OpenGL], [], [AC_MSG_ERROR([Qt libraries are required.])]) + qt_CPPFLAGS="`$PKG_CONFIG --cflags-only-I Qt5Core Qt5Gui Qt5Widgets Qt5OpenGL` $CPPFLAGS" + qt_LDFLAGS="`$PKG_CONFIG --libs-only-L Qt5Core Qt5Gui Qt5Widgets Qt5OpenGL` $LDFLAGS" + qt_LIBS="`$PKG_CONFIG --libs-only-l Qt5Core Qt5Gui Qt5Widgets Qt5OpenGL` $LIBS" + + if ! `$PKG_CONFIG --atleast-version=5.0.0 Qt5Core`; then + AC_MSG_ERROR([Qt >= 5.0.0 is required. Try installing qtdeclarative5-dev]) + fi + + AC_CHECK_PROGS(MOC, [moc-qt5 moc]) + AC_CHECK_PROGS(UIC, [uic-qt5 uic]) + AC_CHECK_PROGS(RCC, [rcc-qt5 rcc]) + if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then + AC_MSG_ERROR([Qt utility programs moc, uic, and rcc are required.]) + fi + + PKG_CHECK_MODULES(LIBPULSE, [libpulse], [], [AC_MSG_ERROR([Pulseaudio library libpulse is required.])]) +]) + +AM_CONDITIONAL([ENABLE_SDL], [test "$enable_sdl" = yes]) +AM_CONDITIONAL([ENABLE_QT], [test "$enable_qt" = yes]) +AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "$enable_emscripten" = yes]) + + +my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wmissing-declarations -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits " +my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" ' +my_CFLAGS+='-I$(top_srcdir)/vendor ' +AC_SUBST([my_CFLAGS]) + + + +AC_OUTPUT + +AC_MSG_RESULT([ +projectM v$VERSION +===== + +prefix: ${prefix} +sysconfdir: ${sysconfdir} +libdir: ${libdir} +includedir: ${includedir} + +compiler: ${CC} +cflags: ${CFLAGS} ${my_CFLAGS} +ldflags: ${LDFLAGS} + +- - - + +Applications: +===== + +libprojectM: yes +Threading: ${enable_threading} +SDL: ${enable_sdl} +Qt & Pulseaudio: ${enable_qt} +OpenGLES: ${enable_gles} +Emscripten: ${enable_emscripten} +]) diff -Nru projectm-2.2.0~git28bb9/debian/changelog projectm-3.1.0/debian/changelog --- projectm-2.2.0~git28bb9/debian/changelog 2017-02-21 11:58:05.000000000 +0000 +++ projectm-3.1.0/debian/changelog 2018-10-16 15:06:39.000000000 +0000 @@ -1,9 +1,9 @@ -projectm (2.2.0~git28bb9-3~xenial) xenial; urgency=medium +projectm (3.1.0-4~xenial) xenial; urgency=medium * use https://github.com/projectM-visualizer/projectm as upstream - * add patch to disable use of GLEW + * new upstream release - -- wsnipex Mon, 20 Feb 2017 18:10:44 +0100 + -- wsnipex Fri, 27 Jul 2018 13:10:44 +0100 projectm (2.1.0+dfsg-4) unstable; urgency=medium diff -Nru projectm-2.2.0~git28bb9/debian/control projectm-3.1.0/debian/control --- projectm-2.2.0~git28bb9/debian/control 2017-02-21 11:13:43.000000000 +0000 +++ projectm-3.1.0/debian/control 2018-10-16 14:18:59.000000000 +0000 @@ -1,44 +1,29 @@ Source: projectm Section: sound Priority: optional -Maintainer: Debian Multimedia Maintainers -Uploaders: Matthias Klumpp , - Reinhard Tartler -Vcs-Git: https://anonscm.debian.org/git/pkg-multimedia/projectm.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/projectm.git -Build-Depends: cmake, - debhelper (>= 9.0.0), - g++ (>= 4:5.1.1-20), +Maintainer: wsnipex +Vcs-Git: https://github.com/projectM-visualizer/projectm +Vcs-Browser: https://github.com/projectM-visualizer/projectm +Build-Depends: debhelper (>= 9.0.0), + dh-autoreconf, + autoconf, + libtool, + g++, libfreetype6-dev, - libftgl-dev, libgl1-mesa-dev, - libglew-dev, - libglu-dev, - libice-dev, - libjack-dev, - libpulse-dev, - qtbase5-dev, - libqt5opengl5-dev, - libqt4-opengl-dev, - libqt4-dev, - libqwt-qt5-dev, - libsdl1.2-dev, - libvisual-0.4-dev, - libx11-dev, + libglm-dev, libsdl2-dev Standards-Version: 3.9.8 -Homepage: http://projectm.sf.net +Homepage: https://github.com/projectM-visualizer/projectm -Package: libprojectm2v5 +Package: libprojectm3 Architecture: any Section: libs -Depends: fonts-dejavu-core, - projectm-data, +Replaces: libprojectm2v5 (<< 3.0.0) +Breaks: libprojectm2v5 (<< 3.0.0) +Depends: projectm-data, ${misc:Depends}, ${shlibs:Depends} -Breaks: libprojectm2 -Replaces: libprojectm-data (<< 2.0.1), - libprojectm2 Description: Advanced Milkdrop-compatible music visualization library libprojectm is an iterative music visualization library which uses OpenGL for hardware acceleration. It is compatible with Milkdrop @@ -50,7 +35,7 @@ Package: libprojectm-dev Section: libdevel Architecture: any -Depends: libprojectm2v5 (= ${binary:Version}), +Depends: libprojectm3 (= ${binary:Version}), ${misc:Depends} Description: Advanced Milkdrop-compatible music visualization library - dev libprojectm is an iterative music visualization library which uses @@ -62,8 +47,8 @@ Package: projectm-data Architecture: all Section: libs -Replaces: libprojectm-data (<< 2.0.1) -Breaks: libprojectm-data (<< 2.0.1) +Replaces: libprojectm-data (<< 3.0.0) +Breaks: libprojectm-data (<< 3.0.0) Depends: ${misc:Depends} Description: Advanced Milkdrop-compatible music visualization library - data libprojectm is an iterative music visualization library which uses @@ -73,65 +58,3 @@ This package contains the presets which are distributed with projectM. -Package: libvisual-projectm -Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends} -Description: libvisual module for projectM - projectM is an iterative music visualization library which uses - OpenGL for hardware acceleration. It is compatible with Milkdrop - presets. - . - This package contains a module for libvisual enabling support for - projectM. - -Package: libprojectm-qt1v5 -Architecture: any -Section: libs -Depends: ${misc:Depends}, - ${shlibs:Depends} -Breaks: libprojectm-qt1 -Replaces: libprojectm-qt1 -Description: projectM Qt4 bindings - projectM is an iterative music visualization library which uses - OpenGL for hardware acceleration. It is compatible with Milkdrop - presets. - . - This package contains Qt4 interfaces to projectM. - -Package: libprojectm-qt-dev -Section: libdevel -Architecture: any -Depends: libprojectm-qt1v5 (= ${binary:Version}), - libqt4-opengl-dev, - ${misc:Depends} -Description: projectM Qt4 (development files) - projectM is an iterative music visualization library which uses - OpenGL for hardware acceleration. It is compatible with Milkdrop - presets. - . - This package contains the development files for the Qt4 bindings of projectM - -Package: projectm-jack -Architecture: any -Depends: jackd, - ${misc:Depends}, - ${shlibs:Depends} -Description: projectM JackAudio module - projectM is an iterative music visualization library which uses - OpenGL for hardware acceleration. It is compatible with Milkdrop - presets. - . - This package contains an application to visualize JackAudio streams. - -Package: projectm-pulseaudio -Architecture: any -Depends: pulseaudio, - ${misc:Depends}, - ${shlibs:Depends} -Description: projectM PulseAudio module - projectM is an iterative music visualization library which uses - OpenGL for hardware acceleration. It is compatible with Milkdrop - presets. - . - This package contains an application to visualize PulseAudio streams. diff -Nru projectm-2.2.0~git28bb9/debian/docs projectm-3.1.0/debian/docs --- projectm-2.2.0~git28bb9/debian/docs 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -FAQ.txt diff -Nru projectm-2.2.0~git28bb9/debian/gbp.conf projectm-3.1.0/debian/gbp.conf --- projectm-2.2.0~git28bb9/debian/gbp.conf 2016-07-28 21:13:30.000000000 +0000 +++ projectm-3.1.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -[DEFAULT] -pristine-tar = True - -[buildpackage] -sign-tags = True diff -Nru projectm-2.2.0~git28bb9/debian/libprojectm2v5.install projectm-3.1.0/debian/libprojectm2v5.install --- projectm-2.2.0~git28bb9/debian/libprojectm2v5.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/libprojectm2v5.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/libprojectM.so.* -usr/share/projectM/config.inp diff -Nru projectm-2.2.0~git28bb9/debian/libprojectm3.install projectm-3.1.0/debian/libprojectm3.install --- projectm-2.2.0~git28bb9/debian/libprojectm3.install 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/debian/libprojectm3.install 2018-10-10 10:38:15.000000000 +0000 @@ -0,0 +1,5 @@ +usr/lib/*/libprojectM.so.* +usr/lib/*/libprojectM.a +usr/share/projectM/config.inp +usr/share/projectM/presets/*.so +usr/share/projectM/presets/*.a diff -Nru projectm-2.2.0~git28bb9/debian/libprojectm-dev.install projectm-3.1.0/debian/libprojectm-dev.install --- projectm-2.2.0~git28bb9/debian/libprojectm-dev.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/libprojectm-dev.install 2018-10-10 10:05:43.000000000 +0000 @@ -1,3 +1,3 @@ usr/include/libprojectM -usr/lib/libprojectM.so -usr/lib/pkgconfig/libprojectM.pc +usr/lib/*/libprojectM.so +usr/lib/*/pkgconfig/libprojectM.pc diff -Nru projectm-2.2.0~git28bb9/debian/libprojectm-qt1v5.install projectm-3.1.0/debian/libprojectm-qt1v5.install --- projectm-2.2.0~git28bb9/debian/libprojectm-qt1v5.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/libprojectm-qt1v5.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/libprojectM-qt.so.* diff -Nru projectm-2.2.0~git28bb9/debian/libprojectm-qt-dev.install projectm-3.1.0/debian/libprojectm-qt-dev.install --- projectm-2.2.0~git28bb9/debian/libprojectm-qt-dev.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/libprojectm-qt-dev.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -usr/include/libprojectM-qt -usr/lib/libprojectM-qt.so -usr/lib/pkgconfig/libprojectM-qt.pc diff -Nru projectm-2.2.0~git28bb9/debian/libvisual-projectm.install projectm-3.1.0/debian/libvisual-projectm.install --- projectm-2.2.0~git28bb9/debian/libvisual-projectm.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/libvisual-projectm.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/libvisual-0.4 diff -Nru projectm-2.2.0~git28bb9/debian/manpages/projectM-jack.1 projectm-3.1.0/debian/manpages/projectM-jack.1 --- projectm-2.2.0~git28bb9/debian/manpages/projectM-jack.1 2012-05-21 12:24:53.000000000 +0000 +++ projectm-3.1.0/debian/manpages/projectM-jack.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -.TH projectM-Jack 1 "June 24, 2010" -.SH NAME -projectM-jack \- ProjectM module for JackAudio -.SH DESCRIPTION -This manual page documents the -.B projectM-jack -command. -.PP -.B projectM-jack -provides direct visualisation of a JackAudio stream using -the projectM audio visualisation tool. -.B projectM-jack -offers a stereo-input-channel to connect Jack devices with. -.PP -.B projectM-jack -can be run from the -.B Applications -menu after it was installed. -.SH AUTHOR -projectM-Jack was written by the projectM-Team. -.PP -This manual page was written by Matthias Klumpp , -for the Debian project (and may be used by others). diff -Nru projectm-2.2.0~git28bb9/debian/manpages/projectM-pulseaudio.1 projectm-3.1.0/debian/manpages/projectM-pulseaudio.1 --- projectm-2.2.0~git28bb9/debian/manpages/projectM-pulseaudio.1 2012-05-21 12:24:53.000000000 +0000 +++ projectm-3.1.0/debian/manpages/projectM-pulseaudio.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -.TH projectM-PulseAudio 1 "June 24, 2010" -.SH NAME -projectM-pulseaudio \- ProjectM module for PulseAudio -.SH DESCRIPTION -This manual page documents the -.B projectM-pulseaudio -command. -.PP -.B projectM-pulseaudio -provides direct visualisation of PulseAudio streams using -the projectM audio visualisation library. -.PP -.B projectM-pulseaudio -can be run from the -.B Applications -menu after it was installed. -.SH AUTHOR -projectM-PulseAudio was written by Carmelo Piccione . -.PP -This manual page was written by Matthias Klumpp , -for the Debian project (and may be used by others). diff -Nru projectm-2.2.0~git28bb9/debian/patches/0001-hacky-removal-of-glew-pm-git.patch projectm-3.1.0/debian/patches/0001-hacky-removal-of-glew-pm-git.patch --- projectm-2.2.0~git28bb9/debian/patches/0001-hacky-removal-of-glew-pm-git.patch 2017-02-20 17:02:14.000000000 +0000 +++ projectm-3.1.0/debian/patches/0001-hacky-removal-of-glew-pm-git.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -From 973d84cd77a820a826198283c8a24f43b4fcf19a Mon Sep 17 00:00:00 2001 -From: Arne Morten Kvarving -Date: Tue, 14 Feb 2017 07:34:24 +0100 -Subject: [PATCH] hacky removal of glew - pm git - ---- - src/libprojectM/CMakeLists.txt | 6 +++--- - src/libprojectM/Renderer/CMakeLists.txt | 2 +- - src/libprojectM/Renderer/FBO.cpp | 4 ++-- - src/libprojectM/Renderer/FBO.hpp | 5 ++++- - 4 files changed, 10 insertions(+), 7 deletions(-) - -diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt -index b9c5705..ecb1434 100644 ---- a/src/libprojectM/CMakeLists.txt -+++ b/src/libprojectM/CMakeLists.txt -@@ -56,8 +56,8 @@ ADD_DEFINITIONS(-DUSE_NATIVE_GLEW) - SET(GLEW_SOURCES glew.h glew.c) - SET(GLEW_LIBRARY "") - else(USE_INCLUDED_GLEW) -- set (GLEW_SOURCES "") -- find_package (GLEW) -+ #set (GLEW_SOURCES "") -+ #find_package (GLEW) - endif(USE_INCLUDED_GLEW) - - SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp -@@ -228,7 +228,7 @@ SET(projectM_LIBRARIES_TO_LINK - ${IMAGE_LINK_TARGETS} - ${CG_LINK_TARGETS} - ${PRESET_FACTORY_LINK_TARGETS} -- ${GLEW_LIBRARY} -+ #${GLEW_LIBRARY} - ${FTGL_LINK_TARGETS} - ${MATH_LIBRARIES} - ${COREFOUNDATION_LIBRARIES} -diff --git a/src/libprojectM/Renderer/CMakeLists.txt b/src/libprojectM/Renderer/CMakeLists.txt -index 2549c3f..f1e5002 100644 ---- a/src/libprojectM/Renderer/CMakeLists.txt -+++ b/src/libprojectM/Renderer/CMakeLists.txt -@@ -53,7 +53,7 @@ INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${projectM_SOURCE_DIR}/Renderer) - - ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) - TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES} -- ${GLEW_LINK_TARGETS} -+ #${GLEW_LINK_TARGETS} - ${FTGL_LINK_TARGETS} - ${OPENGL_LIBRARIES} - ${IMAGE_LINK_TARGETS} -diff --git a/src/libprojectM/Renderer/FBO.cpp b/src/libprojectM/Renderer/FBO.cpp -index 64a0977..d5aa2b9 100755 ---- a/src/libprojectM/Renderer/FBO.cpp -+++ b/src/libprojectM/Renderer/FBO.cpp -@@ -94,10 +94,10 @@ RenderTarget::RenderTarget(int texsize, int width, int height) : useFBO(false) { - this->texsize = texsize; - - #ifdef USE_FBO -- glewInit(); -+ //glewInit(); - // Forceably disable FBO if user requested it but the video card / driver lacks - // the appropraite frame buffer extension. -- if (useFBO = glewIsSupported("GL_EXT_framebuffer_object")) -+ if (useFBO = 1)//glewIsSupported("GL_EXT_framebuffer_object")) - { - - GLuint fb, depth_rb, rgba_tex, other_tex; -diff --git a/src/libprojectM/Renderer/FBO.hpp b/src/libprojectM/Renderer/FBO.hpp -index 8182412..b7fa80a 100755 ---- a/src/libprojectM/Renderer/FBO.hpp -+++ b/src/libprojectM/Renderer/FBO.hpp -@@ -37,7 +37,10 @@ - #ifdef USE_INCLUDED_GLEW - #include "glew.h" - #else --#include -+//#include -+#define GL_GLEXT_PROTOTYPES -+#include -+#include - #endif - #endif - --- -2.7.4 - diff -Nru projectm-2.2.0~git28bb9/debian/patches/001-fix-library-version.patch projectm-3.1.0/debian/patches/001-fix-library-version.patch --- projectm-2.2.0~git28bb9/debian/patches/001-fix-library-version.patch 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/debian/patches/001-fix-library-version.patch 2018-10-16 14:21:37.000000000 +0000 @@ -0,0 +1,23 @@ +Description: fix lib version + Fix library version being 2.0.0 while we are at version 3.1.0 + . + projectm (3.1.0~bionic) bionic; urgency=medium + . + * use https://github.com/projectM-visualizer/projectm as upstream + * new upstream release +Author: wsnipex + +--- +Last-Update: 2018-10-10 + +--- projectm-3.1.0~bionic.orig/src/libprojectM/Makefile.am ++++ projectm-3.1.0~bionic/src/libprojectM/Makefile.am +@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ + lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library + + # link flags +-libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 2:0:0 ++libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 3:0:0 + + # link libRenderer, MilkdropPresetFactory, NativePresetFactory, and libprojectM sources + libprojectM_la_LIBADD = \ diff -Nru projectm-2.2.0~git28bb9/debian/patches/01_fix-gcc6-build.patch projectm-3.1.0/debian/patches/01_fix-gcc6-build.patch --- projectm-2.2.0~git28bb9/debian/patches/01_fix-gcc6-build.patch 2016-07-28 21:15:13.000000000 +0000 +++ projectm-3.1.0/debian/patches/01_fix-gcc6-build.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -commit 92226e25192a69839b9ae3b66ea7173732c639b3 -Author: Hodorgasm -Date: Thu May 12 19:25:46 2016 -0400 - - GCC-6 only makes 'isnan' available in 'std' namespace, and iostream classes are no longer implicitly convertible to void* so use the equivalent '(fs.fail())' instead of '(fs == NULL)' - ---- a/src/libprojectM/Common.hpp -+++ b/src/libprojectM/Common.hpp -@@ -63,8 +63,7 @@ - - #ifdef LINUX - #include --#define projectM_isnan isnan -- -+#define projectM_isnan std::isnan - #endif - - #ifdef WIN32 ---- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp -+++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp -@@ -1406,7 +1406,7 @@ - PerFrameEqn * per_frame_eqn; - GenExpr * gen_expr; - -- if (fs == NULL) -+ if (fs.fail()) - return NULL; - if (param_string == NULL) - return NULL; -@@ -1561,7 +1561,7 @@ - - if (preset == NULL) - return NULL; -- if (fs == NULL) -+ if (fs.fail()) - return NULL; - - if ((token = parseToken(fs, name)) != tEq) -@@ -1875,7 +1875,7 @@ - /* Null argument checks */ - if (preset == NULL) - return PROJECTM_FAILURE; -- if (fs == NULL) -+ if (fs.fail()) - return PROJECTM_FAILURE; - if (token == NULL) - return PROJECTM_FAILURE; -@@ -2166,7 +2166,7 @@ - - if (token == NULL) - return PROJECTM_FAILURE; -- if (fs == NULL) -+ if (fs.fail()) - return PROJECTM_FAILURE; - if (preset == NULL) - return PROJECTM_FAILURE; -@@ -2348,7 +2348,7 @@ - if (token == NULL) - - return PROJECTM_FAILURE; -- if (fs == NULL) -+ if (fs.fail()) - return PROJECTM_FAILURE; - if (preset == NULL) - return PROJECTM_FAILURE; diff -Nru projectm-2.2.0~git28bb9/debian/patches/fix_pulse_link.patch projectm-3.1.0/debian/patches/fix_pulse_link.patch --- projectm-2.2.0~git28bb9/debian/patches/fix_pulse_link.patch 2017-02-21 09:48:29.000000000 +0000 +++ projectm-3.1.0/debian/patches/fix_pulse_link.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -diff --git a/src/projectM-pulseaudio/CMakeLists.txt b/src/projectM-pulseaudio/CMakeLists.txt -index 20b5850..a52f76c 100644 ---- a/src/projectM-pulseaudio/CMakeLists.txt -+++ b/src/projectM-pulseaudio/CMakeLists.txt -@@ -1,6 +1,6 @@ - PROJECT(projectM-pulseaudio) - --cmake_minimum_required(VERSION 2.4.0) -+cmake_minimum_required(VERSION 3.0) - - Include(cmake/CPack-projectM.cmake) - -@@ -105,16 +105,16 @@ INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} - ${CMAKE_BINARY_DIR}/projectM-pulseaudio - ) - --LINK_DIRECTORIES(${PROJECTM_LINK}) -+LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/libprojectM) - - if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) - --#find_library(PROJECTM_LIBRARY NAMES libprojectM projectm PATHS ../libprojectM) - ADD_EXECUTABLE(projectM-pulseaudio ${projectM_pulseaudio_SRCS} ${projectM_pulseaudio_MOC_SRCS} ${projectM_pulseaudio_UIS_H}) - --TARGET_LINK_LIBRARIES(projectM-pulseaudio projectM-qt projectM pulse ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5Core_LIBRARIES} ${GLEW_LIBRARY} ${FTGL_LIBRARIES} $) -+TARGET_LINK_LIBRARIES(projectM-pulseaudio projectM-qt ${PROJECTM_LIBRARY} pulse ${PROJECTM_LIBRARY} ${LINK_LIBS}) - - INSTALL(TARGETS projectM-pulseaudio DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) - install(FILES "projectM-pulseaudio.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) -diff --git a/src/projectM-qt/CMakeLists.txt b/src/projectM-qt/CMakeLists.txt -index 4b4fd12..7791c61 100644 ---- a/src/projectM-qt/CMakeLists.txt -+++ b/src/projectM-qt/CMakeLists.txt -@@ -1,6 +1,6 @@ - - project(projectM-qt) # the name of your project --cmake_minimum_required(VERSION 2.4.0) -+cmake_minimum_required(VERSION 3.0.0) - cmake_policy(SET CMP0005 OLD) - - include(cmake/CPack-projectM.cmake) -@@ -128,7 +128,7 @@ LINK_DIRECTORIES(${PROJECTM_LINK}) - include_directories(${PROJECTM_INCLUDE} ${Qt5Widgets_INCLUDE_DIR} ${Qt5OpenGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR}) - - # link the "qprojectM" target against the Qt libraries. which libraries exactly, is defined by the "include(${QT_USE_FILE})" line above, which sets up this variable. --target_link_libraries(projectM-qt projectM GLEW GL ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES}) -+target_link_libraries(projectM-qt projectM GLEW GL ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES} $) - - install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt) - install(TARGETS projectM-qt DESTINATION lib) diff -Nru projectm-2.2.0~git28bb9/debian/patches/series projectm-3.1.0/debian/patches/series --- projectm-2.2.0~git28bb9/debian/patches/series 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/debian/patches/series 2018-10-16 14:21:21.000000000 +0000 @@ -1,2 +1 @@ -0001-hacky-removal-of-glew-pm-git.patch -fix_pulse_link.patch +001-fix-library-version.patch diff -Nru projectm-2.2.0~git28bb9/debian/projectm-data.install projectm-3.1.0/debian/projectm-data.install --- projectm-2.2.0~git28bb9/debian/projectm-data.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/projectm-data.install 2018-10-10 10:35:29.000000000 +0000 @@ -1,3 +1,4 @@ -usr/share/pixmaps/prjm16-transparent.svg -usr/share/projectM/presets/ -usr/share/projectM/shaders/ +usr/share/projectM/presets/*.milk +usr/share/projectM/presets/*.jpg +usr/share/projectM/presets/*.tga +usr/share/projectM/fonts/ diff -Nru projectm-2.2.0~git28bb9/debian/projectm-jack.install projectm-3.1.0/debian/projectm-jack.install --- projectm-2.2.0~git28bb9/debian/projectm-jack.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/projectm-jack.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin/projectM-jack -usr/share/applications/projectM-jack.desktop diff -Nru projectm-2.2.0~git28bb9/debian/projectm-jack.manpages projectm-3.1.0/debian/projectm-jack.manpages --- projectm-2.2.0~git28bb9/debian/projectm-jack.manpages 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/projectm-jack.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/manpages/projectM-jack.1 diff -Nru projectm-2.2.0~git28bb9/debian/projectm-pulseaudio.install projectm-3.1.0/debian/projectm-pulseaudio.install --- projectm-2.2.0~git28bb9/debian/projectm-pulseaudio.install 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/projectm-pulseaudio.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin/projectM-pulseaudio -usr/share/applications/projectM-pulseaudio.desktop diff -Nru projectm-2.2.0~git28bb9/debian/projectm-pulseaudio.manpages projectm-3.1.0/debian/projectm-pulseaudio.manpages --- projectm-2.2.0~git28bb9/debian/projectm-pulseaudio.manpages 2016-07-12 12:44:10.000000000 +0000 +++ projectm-3.1.0/debian/projectm-pulseaudio.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/manpages/projectM-pulseaudio.1 diff -Nru projectm-2.2.0~git28bb9/debian/README.Debian projectm-3.1.0/debian/README.Debian --- projectm-2.2.0~git28bb9/debian/README.Debian 2012-05-21 12:24:53.000000000 +0000 +++ projectm-3.1.0/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -The Debian Package projectm ----------------------------- - - Removed components in the DFSG Debian version of this package: - src/WinLibs - src/macos - src/win32 - src/projectM-sdlvis/a.out - - Important notes: - The binary "projectM-pulseaudio" of the package "projectm-pulseaudio" - crashes with a SIGSEGV on some machines while attempting - to add PCM data from PulseAudio. - Upstream is notifies about this bug and is working on a fix. - - -- Matthias Klumpp Mon, 28 Jun 2010 14:22:30 +0100 diff -Nru projectm-2.2.0~git28bb9/debian/rules projectm-3.1.0/debian/rules --- projectm-2.2.0~git28bb9/debian/rules 2017-02-21 10:08:57.000000000 +0000 +++ projectm-3.1.0/debian/rules 2018-10-10 09:59:02.000000000 +0000 @@ -1,31 +1,15 @@ #!/usr/bin/make -f -# Use this variable to pass configure options for projectM to cmake -PROJECTM_CMAKE_FLAGS = \ - -DprojectM_FONT_TITLE="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf" \ - -DprojectM_FONT_MENU="/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf" \ - -DINCLUDE-PROJECTM-EMSCRIPTEN=OFF \ - -DINCLUDE-PROJECTM-TEST=OFF -DBUILD_PROJECTM_STATIC=OFF -DINCLUDE-PROJECTM-JACK=ON -DINCLUDE-PROJECTM-QT=ON \ - -DINCLUDE-PROJECTM-PULSEAUDIO=ON -DINCLUDE-PROJECTM-LIBVISUAL=ON -DBUILD_PROJECTM_JACK_STATIC=OFF \ - -DBUILD_PROJECTM_PULSE_STATIC=OFF -DBUILD_PROJECTM_QT_STATIC=OFF -DINCLUDE-NATIVE-SAMPLES=ON -DDISABLE_NATIVE_PRESETS=OFF - -# Define install target dir -INSTALLDIR = $(CURDIR)/debian/tmp - -# ProjectM source and build dir -SRCDIR = $(CURDIR)/src -BUILDDIR = $(SRCDIR)/build - %: - dh $@ --parallel --list-missing --sourcedirectory=$(SRCDIR) --builddirectory=$(BUILDDIR) + dh $@ --parallel --with autoreconf -override_dh_auto_clean: - dh_auto_clean - # Make sure builddir is gone - rm -rf $(BUILDDIR) +#override_dh_auto_clean: +# dh_auto_clean +# # Make sure builddir is gone +# rm -rf $(BUILDDIR) override_dh_auto_configure: - dh_auto_configure -- $(PROJECTM_CMAKE_FLAGS) + dh_auto_configure -- --enable-threading --enable-sdl2 -override_dh_auto_install: - dh_auto_install --destdir=$(INSTALLDIR) +#override_dh_auto_install: +# dh_auto_install --destdir=$(INSTALLDIR) diff -Nru projectm-2.2.0~git28bb9/debian/source/options projectm-3.1.0/debian/source/options --- projectm-2.2.0~git28bb9/debian/source/options 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/debian/source/options 2018-10-16 14:41:39.000000000 +0000 @@ -0,0 +1 @@ +--tar-ignore = .git diff -Nru projectm-2.2.0~git28bb9/debian/strip-source.sh projectm-3.1.0/debian/strip-source.sh --- projectm-2.2.0~git28bb9/debian/strip-source.sh 2012-05-21 16:55:46.000000000 +0000 +++ projectm-3.1.0/debian/strip-source.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -#!/bin/sh -# -# Script to make an existing projectM source tarball DFSG-compliant -# -# Copyright (C) 2010 Matthias Klumpp -# based on script by Reinhard Tartler -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -set -eu - -usage() { - cat >&2 <&2 -} - -error () { - echo "$1" >&2 - exit 1; -} - -set +e -PARAMS=`getopt ht:v: "$@"` -if test $? -ne 0; then usage; exit 1; fi; -set -e - -eval set -- "$PARAMS" - -DEBUG=false -USVERSION=2.1.0 -TARBALL="" - -while test $# -gt 0 -do - case $1 in - -h) usage; exit 1 ;; - -t) ORIGTAR=$2; shift ;; - -v) USVERSION=$2; shift ;; - -o) TARBALL=$2; shift ;; - --) shift ; break ;; - *) echo "Internal error!" ; exit 1 ;; - esac - shift -done - -# sanity checks now -dh_testdir - -if [ -z $ORIGTAR ]; then - error "you need to specify the original upstream tarball!" -fi - -PACKAGENAME=projectm -if [ "$TARBALL" = "" ]; then - TARBALL="./${PACKAGENAME}_${USVERSION}+dfsg.orig.tar.gz" -fi - -TMPDIR=`mktemp -d` -trap 'rm -rf ${TMPDIR}' EXIT - -mkdir ${TMPDIR}/${PACKAGENAME} -ODIR=`pwd` -cd ${TMPDIR}/${PACKAGENAME} - -tar xzf ${ORIGTAR} -cd projectM-complete-${USVERSION}-Source - -rm -rf ./src/WinLibs -rm -rf ./src/macos -rm -rf ./src/win32 -rm -f ./INSTALL-iTunes-macos.txt -rm -rf ./playlists -rm -rf ./src/projectM-iTunes-VizKit -rm -rf ./src/projectM-iTunes -rm -rf ./src/projectM-moviegen -rm -rf ./src/projectM-screensaver -rm -rf ./src/projectM-wmp -find . -type d -name CVS -exec rm -rf {} + -find . -type d -name *~ -exec rm {} + - -cd ${ODIR} -tar czf ${TARBALL} -C ${TMPDIR}/${PACKAGENAME} projectM-complete-${USVERSION}-Source diff -Nru projectm-2.2.0~git28bb9/debian/watch projectm-3.1.0/debian/watch --- projectm-2.2.0~git28bb9/debian/watch 2012-05-23 10:59:53.000000000 +0000 +++ projectm-3.1.0/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -version=3 - -opts=dversionmangle=s/\+dfsg// \ -http://sf.net/projectm/projectM-(\d+(?:\.\d+)+)-Source\.tar\.gz diff -Nru projectm-2.2.0~git28bb9/docs/projectM.dox projectm-3.1.0/docs/projectM.dox --- projectm-2.2.0~git28bb9/docs/projectM.dox 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/docs/projectM.dox 1970-01-01 00:00:00.000000000 +0000 @@ -1,1218 +0,0 @@ -# Doxyfile 1.4.2 - -# This file describes the settings to be used by the documentation system -# doxygen (www.doxygen.org) for a project -# -# All text after a hash (#) is considered a comment and will be ignored -# The format is: -# TAG = value [value, ...] -# For lists items can also be appended using: -# TAG += value [value, ...] -# Values that contain spaces should be placed between quotes (" ") - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- - -# The PROJECT_NAME tag is a single word (or a sequence of words surrounded -# by quotes) that should identify the project. - -PROJECT_NAME = projectM - -# The PROJECT_NUMBER tag can be used to enter a project or revision number. -# This could be handy for archiving the generated documentation or -# if some version control system is used. - -PROJECT_NUMBER = - -# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) -# base path where the generated documentation will be put. -# If a relative path is entered, it will be relative to the location -# where doxygen was started. If left blank the current directory will be used. - -OUTPUT_DIRECTORY = c:/tmp/projectM-1.00/src/doxygen/ - -# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create -# 4096 sub-directories (in 2 levels) under the output directory of each output -# format and will distribute the generated files over these directories. -# Enabling this option can be useful when feeding doxygen a huge amount of -# source files, where putting all generated files in the same directory would -# otherwise cause performance problems for the file system. - -CREATE_SUBDIRS = NO - -# The OUTPUT_LANGUAGE tag is used to specify the language in which all -# documentation generated by doxygen is written. Doxygen will use this -# information to generate all constant output in the proper language. -# The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, -# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, -# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, -# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, -# Swedish, and Ukrainian. - -OUTPUT_LANGUAGE = English - -# This tag can be used to specify the encoding used in the generated output. -# The encoding is not always determined by the language that is chosen, -# but also whether or not the output is meant for Windows or non-Windows users. -# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES -# forces the Windows encoding (this is the default for the Windows binary), -# whereas setting the tag to NO uses a Unix-style encoding (the default for -# all platforms other than Windows). - -USE_WINDOWS_ENCODING = YES - -# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will -# include brief member descriptions after the members that are listed in -# the file and class documentation (similar to JavaDoc). -# Set to NO to disable this. - -BRIEF_MEMBER_DESC = YES - -# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. -# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the -# brief descriptions will be completely suppressed. - -REPEAT_BRIEF = YES - -# This tag implements a quasi-intelligent brief description abbreviator -# that is used to form the text in various listings. Each string -# in this list, if found as the leading text of the brief description, will be -# stripped from the text and the result after processing the whole list, is -# used as the annotated text. Otherwise, the brief description is used as-is. -# If left blank, the following values are used ("$name" is automatically -# replaced with the name of the entity): "The $name class" "The $name widget" -# "The $name file" "is" "provides" "specifies" "contains" -# "represents" "a" "an" "the" - -ABBREVIATE_BRIEF = - -# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then -# Doxygen will generate a detailed section even if there is only a brief -# description. - -ALWAYS_DETAILED_SEC = NO - -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all -# inherited members of a class in the documentation of that class as if those -# members were ordinary class members. Constructors, destructors and assignment -# operators of the base classes will not be shown. - -INLINE_INHERITED_MEMB = NO - -# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full -# path before files name in the file list and in the header files. If set -# to NO the shortest path that makes the file name unique will be used. - -FULL_PATH_NAMES = NO - -# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag -# can be used to strip a user-defined part of the path. Stripping is -# only done if one of the specified strings matches the left-hand part of -# the path. The tag can be used to show relative paths in the file list. -# If left blank the directory from which doxygen is run is used as the -# path to strip. - -STRIP_FROM_PATH = - -# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of -# the path mentioned in the documentation of a class, which tells -# the reader which header file to include in order to use a class. -# If left blank only the name of the header file containing the class -# definition is used. Otherwise one should specify the include paths that -# are normally passed to the compiler using the -I flag. - -STRIP_FROM_INC_PATH = - -# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter -# (but less readable) file names. This can be useful is your file systems -# doesn't support long names like on DOS, Mac, or CD-ROM. - -SHORT_NAMES = NO - -# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen -# will interpret the first line (until the first dot) of a JavaDoc-style -# comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an -# explicit @brief command for a brief description. - -JAVADOC_AUTOBRIEF = NO - -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed -# description. Set this tag to YES if you prefer the old behaviour instead. - -MULTILINE_CPP_IS_BRIEF = NO - -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - -# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented -# member inherits the documentation from any documented member that it -# re-implements. - -INHERIT_DOCS = YES - -# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC -# tag is set to YES, then doxygen will reuse the documentation of the first -# member in the group (if any) for the other members of the group. By default -# all members of a group must be documented explicitly. - -DISTRIBUTE_GROUP_DOC = NO - -# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce -# a new page for each member. If set to NO, the documentation of a member will -# be part of the file/class/namespace that contains it. - -SEPARATE_MEMBER_PAGES = NO - -# The TAB_SIZE tag can be used to set the number of spaces in a tab. -# Doxygen uses this value to replace tabs by spaces in code fragments. - -TAB_SIZE = 8 - -# This tag can be used to specify a number of aliases that acts -# as commands in the documentation. An alias has the form "name=value". -# For example adding "sideeffect=\par Side Effects:\n" will allow you to -# put the command \sideeffect (or @sideeffect) in the documentation, which -# will result in a user-defined paragraph with heading "Side Effects:". -# You can put \n's in the value part of an alias to insert newlines. - -ALIASES = - -# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C -# sources only. Doxygen will then generate output that is more tailored for C. -# For instance, some of the names that are used will be different. The list -# of all members will be omitted, etc. - -OPTIMIZE_OUTPUT_FOR_C = NO - -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. - -OPTIMIZE_OUTPUT_JAVA = NO - -# Set the SUBGROUPING tag to YES (the default) to allow class member groups of -# the same type (for instance a group of public functions) to be put as a -# subgroup of that type (e.g. under the Public Functions section). Set it to -# NO to prevent subgrouping. Alternatively, this can be done per class using -# the \nosubgrouping command. - -SUBGROUPING = YES - -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- - -# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in -# documentation are documented, even if no documentation was available. -# Private class members and static file members will be hidden unless -# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES - -EXTRACT_ALL = YES - -# If the EXTRACT_PRIVATE tag is set to YES all private members of a class -# will be included in the documentation. - -EXTRACT_PRIVATE = YES - -# If the EXTRACT_STATIC tag is set to YES all static members of a file -# will be included in the documentation. - -EXTRACT_STATIC = YES - -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. -# If set to NO only classes defined in header files are included. - -EXTRACT_LOCAL_CLASSES = YES - -# This flag is only useful for Objective-C code. When set to YES local -# methods, which are defined in the implementation section but not in -# the interface are included in the documentation. -# If set to NO (the default) only methods in the interface are included. - -EXTRACT_LOCAL_METHODS = NO - -# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all -# undocumented members of documented classes, files or namespaces. -# If set to NO (the default) these members will be included in the -# various overviews, but no documentation section is generated. -# This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_MEMBERS = NO - -# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all -# undocumented classes that are normally visible in the class hierarchy. -# If set to NO (the default) these classes will be included in the various -# overviews. This option has no effect if EXTRACT_ALL is enabled. - -HIDE_UNDOC_CLASSES = NO - -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the -# documentation. - -HIDE_FRIEND_COMPOUNDS = NO - -# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any -# documentation blocks found inside the body of a function. -# If set to NO (the default) these blocks will be appended to the -# function's detailed documentation block. - -HIDE_IN_BODY_DOCS = NO - -# The INTERNAL_DOCS tag determines if documentation -# that is typed after a \internal command is included. If the tag is set -# to NO (the default) then the documentation will be excluded. -# Set it to YES to include the internal documentation. - -INTERNAL_DOCS = NO - -# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate -# file names in lower-case letters. If set to YES upper-case letters are also -# allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows -# and Mac users are advised to set this option to NO. - -CASE_SENSE_NAMES = YES - -# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen -# will show members with their full class and namespace scopes in the -# documentation. If set to YES the scope will be hidden. - -HIDE_SCOPE_NAMES = NO - -# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen -# will put a list of the files that are included by a file in the documentation -# of that file. - -SHOW_INCLUDE_FILES = YES - -# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] -# is inserted in the documentation for inline members. - -INLINE_INFO = YES - -# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen -# will sort the (detailed) documentation of file and class members -# alphabetically by member name. If set to NO the members will appear in -# declaration order. - -SORT_MEMBER_DOCS = YES - -# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the -# brief documentation of file, namespace and class members alphabetically -# by member name. If set to NO (the default) the members will appear in -# declaration order. - -SORT_BRIEF_DOCS = NO - -# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be -# sorted by fully-qualified names, including namespaces. If set to -# NO (the default), the class list will be sorted only by class name, -# not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. -# Note: This option applies only to the class list, not to the -# alphabetical list. - -SORT_BY_SCOPE_NAME = NO - -# The GENERATE_TODOLIST tag can be used to enable (YES) or -# disable (NO) the todo list. This list is created by putting \todo -# commands in the documentation. - -GENERATE_TODOLIST = YES - -# The GENERATE_TESTLIST tag can be used to enable (YES) or -# disable (NO) the test list. This list is created by putting \test -# commands in the documentation. - -GENERATE_TESTLIST = YES - -# The GENERATE_BUGLIST tag can be used to enable (YES) or -# disable (NO) the bug list. This list is created by putting \bug -# commands in the documentation. - -GENERATE_BUGLIST = YES - -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting -# \deprecated commands in the documentation. - -GENERATE_DEPRECATEDLIST= YES - -# The ENABLED_SECTIONS tag can be used to enable conditional -# documentation sections, marked by \if sectionname ... \endif. - -ENABLED_SECTIONS = - -# The MAX_INITIALIZER_LINES tag determines the maximum number of lines -# the initial value of a variable or define consists of for it to appear in -# the documentation. If the initializer consists of more lines than specified -# here it will be hidden. Use a value of 0 to hide initializers completely. -# The appearance of the initializer of individual variables and defines in the -# documentation can be controlled using \showinitializer or \hideinitializer -# command in the documentation regardless of this setting. - -MAX_INITIALIZER_LINES = 30 - -# Set the SHOW_USED_FILES tag to NO to disable the list of files generated -# at the bottom of the documentation of classes and structs. If set to YES the -# list will mention the files that were used to generate the documentation. - -SHOW_USED_FILES = YES - -# If the sources in your project are distributed over multiple directories -# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy -# in the documentation. - -SHOW_DIRECTORIES = YES - -# The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via -# popen()) the command , where is the value of -# the FILE_VERSION_FILTER tag, and is the name of an input file -# provided by doxygen. Whatever the progam writes to standard output -# is used as the file version. See the manual for examples. - -FILE_VERSION_FILTER = - -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- - -# The QUIET tag can be used to turn on/off the messages that are generated -# by doxygen. Possible values are YES and NO. If left blank NO is used. - -QUIET = NO - -# The WARNINGS tag can be used to turn on/off the warning messages that are -# generated by doxygen. Possible values are YES and NO. If left blank -# NO is used. - -WARNINGS = YES - -# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings -# for undocumented members. If EXTRACT_ALL is set to YES then this flag will -# automatically be disabled. - -WARN_IF_UNDOCUMENTED = YES - -# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for -# potential errors in the documentation, such as not documenting some -# parameters in a documented function, or documenting parameters that -# don't exist or using markup commands wrongly. - -WARN_IF_DOC_ERROR = YES - -# This WARN_NO_PARAMDOC option can be abled to get warnings for -# functions that are documented, but have no documentation for their parameters -# or return value. If set to NO (the default) doxygen will only warn about -# wrong or incomplete parameter documentation, but not about the absence of -# documentation. - -WARN_NO_PARAMDOC = NO - -# The WARN_FORMAT tag determines the format of the warning messages that -# doxygen can produce. The string should contain the $file, $line, and $text -# tags, which will be replaced by the file and line number from which the -# warning originated and the warning text. Optionally the format may contain -# $version, which will be replaced by the version of the file (if it could -# be obtained via FILE_VERSION_FILTER) - -WARN_FORMAT = "$file:$line: $text" - -# The WARN_LOGFILE tag can be used to specify a file to which warning -# and error messages should be written. If left blank the output is written -# to stderr. - -WARN_LOGFILE = - -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- - -# The INPUT tag can be used to specify the files and/or directories that contain -# documented source files. You may enter file names like "myfile.cpp" or -# directories like "/usr/src/myproject". Separate the files or directories -# with spaces. - -INPUT = c:/tmp/projectM-1.00/src/libprojectM/ - -# If the value of the INPUT tag contains directories, you can use the -# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank the following patterns are tested: -# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm - -FILE_PATTERNS = - -# The RECURSIVE tag can be used to turn specify whether or not subdirectories -# should be searched for input files as well. Possible values are YES and NO. -# If left blank NO is used. - -RECURSIVE = NO - -# The EXCLUDE tag can be used to specify files and/or directories that should -# excluded from the INPUT source files. This way you can easily exclude a -# subdirectory from a directory tree whose root is specified with the INPUT tag. - -EXCLUDE = - -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or -# directories that are symbolic links (a Unix filesystem feature) are excluded -# from the input. - -EXCLUDE_SYMLINKS = NO - -# If the value of the INPUT tag contains directories, you can use the -# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude -# certain files from those directories. - -EXCLUDE_PATTERNS = - -# The EXAMPLE_PATH tag can be used to specify one or more files or -# directories that contain example code fragments that are included (see -# the \include command). - -EXAMPLE_PATH = - -# If the value of the EXAMPLE_PATH tag contains directories, you can use the -# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp -# and *.h) to filter out the source-files in the directories. If left -# blank all files are included. - -EXAMPLE_PATTERNS = - -# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be -# searched for input files to be used with the \include or \dontinclude -# commands irrespective of the value of the RECURSIVE tag. -# Possible values are YES and NO. If left blank NO is used. - -EXAMPLE_RECURSIVE = NO - -# The IMAGE_PATH tag can be used to specify one or more files or -# directories that contain image that are included in the documentation (see -# the \image command). - -IMAGE_PATH = - -# The INPUT_FILTER tag can be used to specify a program that doxygen should -# invoke to filter for each input file. Doxygen will invoke the filter program -# by executing (via popen()) the command , where -# is the value of the INPUT_FILTER tag, and is the name of an -# input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be -# ignored. - -INPUT_FILTER = - -# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: -# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further -# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER -# is applied to all files. - -FILTER_PATTERNS = - -# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using -# INPUT_FILTER) will be used to filter the input files when producing source -# files to browse (i.e. when SOURCE_BROWSER is set to YES). - -FILTER_SOURCE_FILES = NO - -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- - -# If the SOURCE_BROWSER tag is set to YES then a list of source files will -# be generated. Documented entities will be cross-referenced with these sources. -# Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. - -SOURCE_BROWSER = NO - -# Setting the INLINE_SOURCES tag to YES will include the body -# of functions and classes directly in the documentation. - -INLINE_SOURCES = NO - -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - -# If the REFERENCED_BY_RELATION tag is set to YES (the default) -# then for each documented function all documented -# functions referencing it will be listed. - -REFERENCED_BY_RELATION = YES - -# If the REFERENCES_RELATION tag is set to YES (the default) -# then for each documented function all documented entities -# called/used by that function will be listed. - -REFERENCES_RELATION = YES - -# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen -# will generate a verbatim copy of the header file for each class for -# which an include is specified. Set to NO to disable this. - -VERBATIM_HEADERS = YES - -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- - -# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index -# of all compounds will be generated. Enable this if the project -# contains a lot of classes, structs, unions or interfaces. - -ALPHABETICAL_INDEX = NO - -# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then -# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns -# in which this list will be split (can be a number in the range [1..20]) - -COLS_IN_ALPHA_INDEX = 5 - -# In case all classes in a project start with a common prefix, all -# classes will be put under the same header in the alphabetical index. -# The IGNORE_PREFIX tag can be used to specify one or more prefixes that -# should be ignored while generating the index headers. - -IGNORE_PREFIX = - -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- - -# If the GENERATE_HTML tag is set to YES (the default) Doxygen will -# generate HTML output. - -GENERATE_HTML = YES - -# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `html' will be used as the default path. - -HTML_OUTPUT = html - -# The HTML_FILE_EXTENSION tag can be used to specify the file extension for -# each generated HTML page (for example: .htm,.php,.asp). If it is left blank -# doxygen will generate files with .html extension. - -HTML_FILE_EXTENSION = .html - -# The HTML_HEADER tag can be used to specify a personal HTML header for -# each generated HTML page. If it is left blank doxygen will generate a -# standard header. - -HTML_HEADER = - -# The HTML_FOOTER tag can be used to specify a personal HTML footer for -# each generated HTML page. If it is left blank doxygen will generate a -# standard footer. - -HTML_FOOTER = - -# The HTML_STYLESHEET tag can be used to specify a user-defined cascading -# style sheet that is used by each HTML page. It can be used to -# fine-tune the look of the HTML output. If the tag is left blank doxygen -# will generate a default style sheet. Note that doxygen will try to copy -# the style sheet file to the HTML output directory, so don't put your own -# stylesheet in the HTML output directory as well, or it will be erased! - -HTML_STYLESHEET = - -# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, -# files or namespaces will be aligned in HTML using tables. If set to -# NO a bullet list will be used. - -HTML_ALIGN_MEMBERS = YES - -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be -# written to the html output directory. - -CHM_FILE = - -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run -# the HTML help compiler on the generated index.hhp. - -HHC_LOCATION = - -# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag -# controls if a separate .chi index file is generated (YES) or that -# it should be included in the master .chm file (NO). - -GENERATE_CHI = NO - -# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag -# controls whether a binary table of contents is generated (YES) or a -# normal table of contents (NO) in the .chm file. - -BINARY_TOC = NO - -# The TOC_EXPAND flag can be set to YES to add extra items for group members -# to the contents of the HTML help documentation and to the tree view. - -TOC_EXPAND = NO - -# The DISABLE_INDEX tag can be used to turn on/off the condensed index at -# top of each HTML page. The value NO (the default) enables the index and -# the value YES disables it. - -DISABLE_INDEX = NO - -# This tag can be used to set the number of enum values (range [1..20]) -# that doxygen will group on one line in the generated HTML documentation. - -ENUM_VALUES_PER_LINE = 4 - -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that -# is generated for HTML Help). For this to work a browser that supports -# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, -# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. - -GENERATE_TREEVIEW = NO - -# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be -# used to set the initial width (in pixels) of the frame in which the tree -# is shown. - -TREEVIEW_WIDTH = 250 - -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- - -# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will -# generate Latex output. - -GENERATE_LATEX = NO - -# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `latex' will be used as the default path. - -LATEX_OUTPUT = latex - -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be -# invoked. If left blank `latex' will be used as the default command name. - -LATEX_CMD_NAME = latex - -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the -# default command name. - -MAKEINDEX_CMD_NAME = makeindex - -# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact -# LaTeX documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_LATEX = NO - -# The PAPER_TYPE tag can be used to set the paper type that is used -# by the printer. Possible values are: a4, a4wide, letter, legal and -# executive. If left blank a4wide will be used. - -PAPER_TYPE = a4wide - -# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX -# packages that should be included in the LaTeX output. - -EXTRA_PACKAGES = - -# The LATEX_HEADER tag can be used to specify a personal LaTeX header for -# the generated latex document. The header should contain everything until -# the first chapter. If it is left blank doxygen will generate a -# standard header. Notice: only use this tag if you know what you are doing! - -LATEX_HEADER = - -# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated -# is prepared for conversion to pdf (using ps2pdf). The pdf file will -# contain links (just like the HTML output) instead of page references -# This makes the output suitable for online browsing using a pdf viewer. - -PDF_HYPERLINKS = NO - -# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of -# plain latex in the generated Makefile. Set this option to YES to get a -# higher quality PDF documentation. - -USE_PDFLATEX = NO - -# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. -# command to the generated LaTeX files. This will instruct LaTeX to keep -# running if errors occur, instead of asking the user for help. -# This option is also used when generating formulas in HTML. - -LATEX_BATCHMODE = NO - -# If LATEX_HIDE_INDICES is set to YES then doxygen will not -# include the index chapters (such as File Index, Compound Index, etc.) -# in the output. - -LATEX_HIDE_INDICES = NO - -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- - -# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output -# The RTF output is optimized for Word 97 and may not look very pretty with -# other RTF readers or editors. - -GENERATE_RTF = NO - -# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `rtf' will be used as the default path. - -RTF_OUTPUT = rtf - -# If the COMPACT_RTF tag is set to YES Doxygen generates more compact -# RTF documents. This may be useful for small projects and may help to -# save some trees in general. - -COMPACT_RTF = NO - -# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated -# will contain hyperlink fields. The RTF file will -# contain links (just like the HTML output) instead of page references. -# This makes the output suitable for online browsing using WORD or other -# programs which support those fields. -# Note: wordpad (write) and others do not support links. - -RTF_HYPERLINKS = NO - -# Load stylesheet definitions from file. Syntax is similar to doxygen's -# config file, i.e. a series of assignments. You only have to provide -# replacements, missing definitions are set to their default value. - -RTF_STYLESHEET_FILE = - -# Set optional variables used in the generation of an rtf document. -# Syntax is similar to doxygen's config file. - -RTF_EXTENSIONS_FILE = - -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- - -# If the GENERATE_MAN tag is set to YES (the default) Doxygen will -# generate man pages - -GENERATE_MAN = NO - -# The MAN_OUTPUT tag is used to specify where the man pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `man' will be used as the default path. - -MAN_OUTPUT = man - -# The MAN_EXTENSION tag determines the extension that is added to -# the generated man pages (default is the subroutine's section .3) - -MAN_EXTENSION = .3 - -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command -# would be unable to find the correct page. The default is NO. - -MAN_LINKS = NO - -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- - -# If the GENERATE_XML tag is set to YES Doxygen will -# generate an XML file that captures the structure of -# the code including all documentation. - -GENERATE_XML = NO - -# The XML_OUTPUT tag is used to specify where the XML pages will be put. -# If a relative path is entered the value of OUTPUT_DIRECTORY will be -# put in front of it. If left blank `xml' will be used as the default path. - -XML_OUTPUT = xml - -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - -# If the XML_PROGRAMLISTING tag is set to YES Doxygen will -# dump the program listings (including syntax highlighting -# and cross-referencing information) to the XML output. Note that -# enabling this will significantly increase the size of the XML output. - -XML_PROGRAMLISTING = YES - -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- - -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental -# and incomplete at the moment. - -GENERATE_AUTOGEN_DEF = NO - -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- - -# If the GENERATE_PERLMOD tag is set to YES Doxygen will -# generate a Perl module file that captures the structure of -# the code including all documentation. Note that this -# feature is still experimental and incomplete at the -# moment. - -GENERATE_PERLMOD = NO - -# If the PERLMOD_LATEX tag is set to YES Doxygen will generate -# the necessary Makefile rules, Perl scripts and LaTeX code to be able -# to generate PDF and DVI output from the Perl module output. - -PERLMOD_LATEX = NO - -# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this -# tag is set to NO the size of the Perl module output will be much smaller -# and Perl will parse it just the same. - -PERLMOD_PRETTY = YES - -# The names of the make variables in the generated doxyrules.make file -# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. -# This is useful so different doxyrules.make files included by the same -# Makefile don't overwrite each other's variables. - -PERLMOD_MAKEVAR_PREFIX = - -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- - -# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will -# evaluate all C-preprocessor directives found in the sources and include -# files. - -ENABLE_PREPROCESSING = YES - -# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro -# names in the source code. If set to NO (the default) only conditional -# compilation will be performed. Macro expansion can be done in a controlled -# way by setting EXPAND_ONLY_PREDEF to YES. - -MACRO_EXPANSION = NO - -# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES -# then the macro expansion is limited to the macros specified with the -# PREDEFINED and EXPAND_AS_PREDEFINED tags. - -EXPAND_ONLY_PREDEF = NO - -# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files -# in the INCLUDE_PATH (see below) will be search if a #include is found. - -SEARCH_INCLUDES = YES - -# The INCLUDE_PATH tag can be used to specify one or more directories that -# contain include files that are not input files but should be processed by -# the preprocessor. - -INCLUDE_PATH = - -# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard -# patterns (like *.h and *.hpp) to filter out the header-files in the -# directories. If left blank, the patterns specified with FILE_PATTERNS will -# be used. - -INCLUDE_FILE_PATTERNS = - -# The PREDEFINED tag can be used to specify one or more macro names that -# are defined before the preprocessor is started (similar to the -D option of -# gcc). The argument of the tag is a list of macros of the form: name -# or name=definition (no spaces). If the definition and the = are -# omitted =1 is assumed. To prevent a macro definition from being -# undefined via #undef or recursively expanded use the := operator -# instead of the = operator. - -PREDEFINED = - -# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then -# this tag can be used to specify a list of macro names that should be expanded. -# The macro definition that is found in the sources will be used. -# Use the PREDEFINED tag if you want to use a different macro definition. - -EXPAND_AS_DEFINED = - -# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then -# doxygen's preprocessor will remove all function-like macros that are alone -# on a line, have an all uppercase name, and do not end with a semicolon. Such -# function macros are typically used for boiler-plate code, and will confuse -# the parser if not removed. - -SKIP_FUNCTION_MACROS = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- - -# The TAGFILES option can be used to specify one or more tagfiles. -# Optionally an initial location of the external documentation -# can be added for each tagfile. The format of a tag file without -# this location is as follows: -# TAGFILES = file1 file2 ... -# Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... -# where "loc1" and "loc2" can be relative or absolute paths or -# URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) -# If a tag file is not located in the directory in which doxygen -# is run, you must also specify the path to the tagfile here. - -TAGFILES = - -# When a file name is specified after GENERATE_TAGFILE, doxygen will create -# a tag file that is based on the input files it reads. - -GENERATE_TAGFILE = - -# If the ALLEXTERNALS tag is set to YES all external classes will be listed -# in the class index. If set to NO only the inherited external classes -# will be listed. - -ALLEXTERNALS = NO - -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will -# be listed. - -EXTERNAL_GROUPS = YES - -# The PERL_PATH should be the absolute path and name of the perl script -# interpreter (i.e. the result of `which perl'). - -PERL_PATH = /usr/bin/perl - -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- - -# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will -# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base -# or super classes. Setting the tag to NO turns the diagrams off. Note that -# this option is superseded by the HAVE_DOT option below. This is only a -# fallback. It is recommended to install and use dot, since it yields more -# powerful graphs. - -CLASS_DIAGRAMS = YES - -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented -# or is not a class. - -HIDE_UNDOC_RELATIONS = YES - -# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is -# available from the path. This tool is part of Graphviz, a graph visualization -# toolkit from AT&T and Lucent Bell Labs. The other options in this section -# have no effect if this option is set to NO (the default) - -HAVE_DOT = YES - -# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect inheritance relations. Setting this tag to YES will force the -# the CLASS_DIAGRAMS tag to NO. - -CLASS_GRAPH = YES - -# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for each documented class showing the direct and -# indirect implementation dependencies (inheritance, containment, and -# class references variables) of the class with other documented classes. - -COLLABORATION_GRAPH = YES - -# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen -# will generate a graph for groups, showing the direct groups dependencies - -GROUP_GRAPHS = YES - -# If the UML_LOOK tag is set to YES doxygen will generate inheritance and -# collaboration diagrams in a style similar to the OMG's Unified Modeling -# Language. - -UML_LOOK = NO - -# If set to YES, the inheritance and collaboration graphs will show the -# relations between templates and their instances. - -TEMPLATE_RELATIONS = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT -# tags are set to YES then doxygen will generate a graph for each documented -# file showing the direct and indirect include dependencies of the file with -# other documented files. - -INCLUDE_GRAPH = YES - -# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and -# HAVE_DOT tags are set to YES then doxygen will generate a graph for each -# documented header file showing the documented files that directly or -# indirectly include this file. - -INCLUDED_BY_GRAPH = YES - -# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. - -CALL_GRAPH = NO - -# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen -# will graphical hierarchy of all classes instead of a textual one. - -GRAPHICAL_HIERARCHY = YES - -# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES -# then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include -# relations between the files in the directories. - -DIRECTORY_GRAPH = YES - -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif -# If left blank png will be used. - -DOT_IMAGE_FORMAT = png - -# The tag DOT_PATH can be used to specify the path where the dot tool can be -# found. If left blank, it is assumed the dot tool can be found in the path. - -DOT_PATH = - -# The DOTFILE_DIRS tag can be used to specify one or more directories that -# contain dot files that are included in the documentation (see the -# \dotfile command). - -DOTFILE_DIRS = - -# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_WIDTH = 1024 - -# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height -# (in pixels) of the graphs generated by dot. If a graph becomes larger than -# this value, doxygen will try to truncate the graph, so that it fits within -# the specified constraint. Beware that most browsers cannot cope with very -# large images. - -MAX_DOT_GRAPH_HEIGHT = 1024 - -# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the -# graphs generated by dot. A depth value of 3 means that only nodes reachable -# from the root by following a path via at most 3 edges will be shown. Nodes -# that lay further from the root node will be omitted. Note that setting this -# option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that a graph may be further truncated if the graph's -# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH -# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), -# the graph is not depth-constrained. - -MAX_DOT_GRAPH_DEPTH = 0 - -# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). - -DOT_TRANSPARENT = NO - -# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output -# files in one run (i.e. multiple -o and -T options on the command line). This -# makes dot run faster, but since only newer versions of dot (>1.8.10) -# support this, this feature is disabled by default. - -DOT_MULTI_TARGETS = NO - -# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will -# generate a legend page explaining the meaning of the various boxes and -# arrows in the dot generated graphs. - -GENERATE_LEGEND = YES - -# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will -# remove the intermediate dot files that are used to generate -# the various graphs. - -DOT_CLEANUP = YES - -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- - -# The SEARCHENGINE tag specifies whether or not a search engine should be -# used. If set to NO the values of all tags below this one will be ignored. - -SEARCHENGINE = NO diff -Nru projectm-2.2.0~git28bb9/FAQ.txt projectm-3.1.0/FAQ.txt --- projectm-2.2.0~git28bb9/FAQ.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/FAQ.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ - -projectM -- Milkdrop-esque visualisation SDK -Copyright (C)2003-2007 projectM Team - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -See 'LICENSE.txt' included within this release - ---------------------------------------------------- - projectM v.0.94.20 FAQ - ------------------ - written by Peter Sperl and Carmelo Piccione ---------------------------------------------------- - -Q1: What is projectM? -Q2: What? This preset doesn't look like it does on Milkdrop. -Q3: Where can I get more presets? -Q4: What are the system requirements? -Q5: Why is projectM so slow!!! -Q6: How can I increase the rendering quality to make projectM look better? -Q7: How can I configure projectM? (where's the config file?) -Q8: Where are the presets? - -Q1: What is projectM? --------------------- -A: projectM makes pretty pictures from music in realtime. - Specifically it uses iterative image-based rendering techniques which - are hardware accelerated via OpenGL. projectM was developed with - cross-platform support in mind, using SDL and OpenGL. The only port - right now is Linux/XMMS, but it should be easy to plug-in to other - music players on other platforms (even windows and Mac OS X). - - projectM aims for compatability with MilkDrop's latest release (1.04b at - this time), but we have always intended to surpass it. This program was - inspired by Ryan Geiss' wonderful program MilkDrop. www.geisswerks.com - -Q2: What? This preset doesn't look like it does on Milkdrop. ------------------------------------------------------------ -A: We know. Some of the simple waveforms (1,2,3,4,5) are not even close to - correct. They are similiar, but not exactly the same. Also, the solarize, - brighten, and darken filters aren't done yet either. - - Sometimes things just don't look right because we might, for example, draw - shapes a tiny bit too big or small. Small errors propagate and become HUGE - after a few manipulations. But who knows because it takes forever to tweak - things like this. - -Q3: Where can I get more presets? --------------------------------- -A: www.milkdrop.co.uk is a great place to start. However, all their - presets are packaged in self-unzipping .exe's for win32. I - extracted them with wine and it worked wonderfully. - - Check out the milkdrop forums at www.winamp.com to find new presets - daily. The URL is below - - http://forums.winamp.com/forumdisplay.php?forumid=81 - -Q4: What are the system requirements? ------------------------------------- -A: To run projectM you need a Linux system w/a sound card and a video card - with OpenGL hardware acceleration. We find that projectM runs MUCH better - with the 2.6 series kernel and ALSA sound. - - What does that mean? Well... - - projectM has only been tested prior to me writing this on 4 computers. - - All those computers used some form of Redhat (8,9, & Fedora 1), - although this should make no differance if you run a differant distro. - - Also, all of them used Nvidia (Geforce 3 Ti200, Geforce 4 MX440 & Ti4200) - - WE STRONGLY RECCOMEND THE USE OF ALSA AND THE 2.6 SERIES KERNEL - -Q5: Why is projectM so slow!!! ------------------------------ -A: If projectM is slow for you all the time, and not just on a select few - presets, you can try lowering the rendering quality, and this will speed - things up A LOT. To do this, lower the texsize and gridsize (gx,gy) in - /etc/projectM/config - - Texsize controls the size of the rendered image. If you think your video - card is too slow or doesn't have enough memory, then change this. A middle - value for texsize is 512. 1024 is nice looking, and 256 is for VERY slow - computers. - - If your processor is the bottleneck, then lower gx and gy. gx and gy - control the size of the interpolated per-pixel mesh. 24/18 is a low-middle - value. I run at 48/32 some times on my Athlon 64 3200, and I could - probably go higher, although some presets slow down for me at this VERY - high setting. - - Certain presets can be processor hogs and slow the framerate down to - almost 0. In this situation my best advice is not to use those presets. - All the presets that come with projectM should be slim enough to run on - nearly all machines capable of running projectM in the first place. - -Q6:How can I increase the rendering quality to make projectM look better? -------------------------------------------------------------------------- -A: Read Q5 and do the opposite! - -Q7: How can I configure projectM? (where's the config file?) ------------------------------------------------------------- -A: /etc/projectM/config - -Q8: Where are the presets? --------------------------- -A: /usr/share/projectM/presets diff -Nru projectm-2.2.0~git28bb9/fonts/CMakeLists.txt projectm-3.1.0/fonts/CMakeLists.txt --- projectm-2.2.0~git28bb9/fonts/CMakeLists.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/fonts/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(fonts) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru projectm-2.2.0~git28bb9/.gitignore projectm-3.1.0/.gitignore --- projectm-2.2.0~git28bb9/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/.gitignore 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,40 @@ +src/projectM-sdl/SDLprojectM.xcodeproj/xcshareddata +xcuserdata +src/libprojectM/config.inp +src/libprojectM/config.inp.b +src/libprojectM/config.inp.in +src/projectM-emscripten/build/presets +src/libprojectM/libprojectM.xcodeproj/xcshareddata +presets/custom +project.xcworkspace +*.o +*.lo +*.la +*.a +projectM-*.tar.gz +.deps/ +.libs/ +Makefile +Makefile.in +/aclocal.m4 +/autom4te.cache +/build-aux +/config.* +/configure +/libtool +/stamp-h1 +.dirstamp +/src/libprojectM/config.h +ar-lib +compile +depcomp +install-sh +ltmain.sh +missing +m4/libtool.m4 +m4/ltoptions.m4 +m4/ltsugar.m4 +m4/ltversion.m4 +m4/lt~obsolete.m4 +/t +/src/libprojectM/libprojectM.pc diff -Nru projectm-2.2.0~git28bb9/INSTALL-iTunes-macos.txt projectm-3.1.0/INSTALL-iTunes-macos.txt --- projectm-2.2.0~git28bb9/INSTALL-iTunes-macos.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/INSTALL-iTunes-macos.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Press "r" to change to a random preset. -Press "h" to bring up a help menu. -The projectM-iTunes directory contains an XCode 5 project that emits an installer bundle. Use that to install it. - -Binaries are available at: https://github.com/revmischa/projectm/releases diff -Nru projectm-2.2.0~git28bb9/INSTALL-xmms.txt projectm-3.1.0/INSTALL-xmms.txt --- projectm-2.2.0~git28bb9/INSTALL-xmms.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/INSTALL-xmms.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,229 +0,0 @@ -Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. - - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - - These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_absolute_header.m4 projectm-3.1.0/m4/autoconf-archive/ax_absolute_header.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_absolute_header.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_absolute_header.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_absolute_header.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ABSOLUTE_HEADER(HEADER1 HEADER2 ...) +# +# DESCRIPTION +# +# Find the absolute name of a header file, assuming the header exists. If +# the header were sys/inttypes.h, this macro would define +# ABSOLUTE_SYS_INTTYPES_H to the `""' quoted absolute name of +# sys/inttypes.h in config.h (e.g. `#define ABSOLUTE_SYS_INTTYPES_H +# "///usr/include/sys/inttypes.h"'). The three "///" are to pacify Sun C +# 5.8, which otherwise would say "warning: #include of /usr/include/... +# may be non-portable". Use `""', not `<>', so that the /// cannot be +# confused with a C99 comment. +# +# LICENSE +# +# Copyright (c) 2009 Derek Price +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Derek Price. +dnl Modified by Rhys Ulerich to use AC_CHECK_HEADERS instead of _ONCE + +AU_ALIAS([GL_TRILINOS_ABSOLUTE_HEADER], [AX_ABSOLUTE_HEADER]) +AC_DEFUN([AX_ABSOLUTE_HEADER], +[AC_LANG_PREPROC_REQUIRE()dnl +AC_FOREACH([gl_HEADER_NAME], [$1], + [AS_VAR_PUSHDEF([gl_absolute_header], + [gl_cv_absolute_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl + AC_CACHE_CHECK([absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>], + m4_quote(m4_defn([gl_absolute_header])), + [AS_VAR_PUSHDEF([ac_header_exists], + [ac_cv_header_]m4_quote(m4_defn([gl_HEADER_NAME])))dnl + AC_CHECK_HEADERS(m4_quote(m4_defn([gl_HEADER_NAME])))dnl + if test AS_VAR_GET(ac_header_exists) = yes; then + AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]])]) +dnl eval is necessary to expand ac_cpp. +dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell. + AS_VAR_SET(gl_absolute_header, +[`(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | +sed -n '\#/]m4_quote(m4_defn([gl_HEADER_NAME]))[#{ + s#.*"\(.*/]m4_quote(m4_defn([gl_HEADER_NAME]))[\)".*#\1# + s#^/[^/]#//&# + p + q +}'`]) + fi + AS_VAR_POPDEF([ac_header_exists])dnl + ])dnl + AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_quote(m4_defn([gl_HEADER_NAME]))), + ["AS_VAR_GET(gl_absolute_header)"], + [Define this to an absolute name of <]m4_quote(m4_defn([gl_HEADER_NAME]))[>.]) + AS_VAR_POPDEF([gl_absolute_header])dnl +])dnl +])# AX_ABSOLUTE_HEADER diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ac_append_to_file.m4 projectm-3.1.0/m4/autoconf-archive/ax_ac_append_to_file.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ac_append_to_file.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ac_append_to_file.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,32 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ac_append_to_file.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AC_APPEND_TO_FILE([FILE],[DATA]) +# +# DESCRIPTION +# +# Appends the specified data to the specified Autoconf is run. If you want +# to append to a file when configure is run use AX_APPEND_TO_FILE instead. +# +# LICENSE +# +# Copyright (c) 2009 Allan Caffee +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_AC_APPEND_TO_FILE],[ +AC_REQUIRE([AX_FILE_ESCAPES]) +m4_esyscmd( +AX_FILE_ESCAPES +[ +printf "$2" >> "$1" +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ac_print_to_file.m4 projectm-3.1.0/m4/autoconf-archive/ax_ac_print_to_file.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ac_print_to_file.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ac_print_to_file.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,32 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ac_print_to_file.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AC_PRINT_TO_FILE([FILE],[DATA]) +# +# DESCRIPTION +# +# Writes the specified data to the specified file when Autoconf is run. If +# you want to print to a file when configure is run use AX_PRINT_TO_FILE +# instead. +# +# LICENSE +# +# Copyright (c) 2009 Allan Caffee +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_AC_PRINT_TO_FILE],[ +m4_esyscmd( +AC_REQUIRE([AX_FILE_ESCAPES]) +[ +printf "$2" > "$1" +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_am_macro.m4 projectm-3.1.0/m4/autoconf-archive/ax_add_am_macro.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_am_macro.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_add_am_macro.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,29 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ADD_AM_MACRO([RULE]) +# +# DESCRIPTION +# +# Adds the specified rule to $AMINCLUDE. This macro will only work +# properly with implementations of Make which allow include statements. +# See also AX_ADD_AM_MACRO_STATIC. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_ADD_AM_MACRO],[ + AC_REQUIRE([AX_AM_MACROS]) + AX_APPEND_TO_FILE([$AMINCLUDE],[$1]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_am_macro_static.m4 projectm-3.1.0/m4/autoconf-archive/ax_add_am_macro_static.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_am_macro_static.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_add_am_macro_static.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,28 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro_static.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ADD_AM_MACRO_STATIC([RULE]) +# +# DESCRIPTION +# +# Adds the specified rule to $AMINCLUDE. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# Copyright (c) 2009 Allan Caffee +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_ADD_AM_MACRO_STATIC],[ + AC_REQUIRE([AX_AM_MACROS_STATIC]) + AX_AC_APPEND_TO_FILE(AMINCLUDE_STATIC,[$1]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_am_trilinos_makefile_export.m4 projectm-3.1.0/m4/autoconf-archive/ax_add_am_trilinos_makefile_export.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_am_trilinos_makefile_export.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_add_am_trilinos_makefile_export.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_add_am_trilinos_makefile_export.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT(EXPORT_SUFFIX [, ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks if a file named appears in the +# $TRILINOS_INCLUDE directory. If so, adds an include for it using the +# AX_AM_MACROS framework. +# +# If ACTION-IF-NOT-FOUND is not provided, configure fails. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT],[ +AC_REQUIRE([AX_TRILINOS_BASE]) +AC_REQUIRE([AX_AM_MACROS]) + +AC_CACHE_CHECK( + [for file ${TRILINOS_INCLUDE}/Makefile.export.$1], + [ax_cv_add_am_trilinos_makefile_export_]translit($1,[. ],[_])[_exists], + [[ax_cv_add_am_trilinos_makefile_export_]translit($1,[. ],[_])[_exists]=no + test -f "${TRILINOS_INCLUDE}/Makefile.export.$1" && dnl + [ax_cv_add_am_trilinos_makefile_export_]translit($1,[. ],[_])[_exists]=yes]) + +if test "${[ax_cv_add_am_trilinos_makefile_export_]translit($1,[. ],[_])[_exists]}" = "yes" +then +AX_ADD_AM_MACRO([ +include ${TRILINOS_INCLUDE}/Makefile.export.$1 +]) +else + ifelse([$2],,AC_MSG_ERROR([Could not find ${TRILINOS_INCLUDE}/Makefile.export.$1. Was Trilinos compiled with --enable-export-makefiles?]),[ + AC_MSG_WARN([Could not find ${TRILINOS_INCLUDE}/Makefile.export.$1. Was Trilinos compiled with --enable-export-makefiles?]) + $2]) +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_fortify_source.m4 projectm-3.1.0/m4/autoconf-archive/ax_add_fortify_source.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_fortify_source.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_add_fortify_source.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,53 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_add_fortify_source.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ADD_FORTIFY_SOURCE +# +# DESCRIPTION +# +# Check whether -D_FORTIFY_SOURCE=2 can be added to CPPFLAGS without macro +# redefinition warnings. Some distributions (such as Gentoo Linux) enable +# _FORTIFY_SOURCE globally in their compilers, leading to unnecessary +# warnings in the form of +# +# :0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] +# : note: this is the location of the previous definition +# +# which is a problem if -Werror is enabled. This macro checks whether +# _FORTIFY_SOURCE is already defined, and if not, adds -D_FORTIFY_SOURCE=2 +# to CPPFLAGS. +# +# LICENSE +# +# Copyright (c) 2017 David Seifert +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_ADD_FORTIFY_SOURCE],[ + AC_MSG_CHECKING([whether to add -D_FORTIFY_SOURCE=2 to CPPFLAGS]) + AC_LINK_IFELSE([ + AC_LANG_SOURCE( + [[ + int main() { + #ifndef _FORTIFY_SOURCE + return 0; + #else + this_is_an_error; + #endif + } + ]] + )], [ + AC_MSG_RESULT([yes]) + CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + ], [ + AC_MSG_RESULT([no]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_recursive_am_macro.m4 projectm-3.1.0/m4/autoconf-archive/ax_add_recursive_am_macro.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_recursive_am_macro.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_add_recursive_am_macro.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_add_recursive_am_macro.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_ADD_RECURSIVE_AM_MACRO([TARGET],[RULE]) +# +# DESCRIPTION +# +# Adds the specified rule to $AMINCLUDE along with a TARGET-recursive rule +# that will call TARGET for the current directory and TARGET-am +# recursively for each subdirectory. See also +# AX_ADD_RECURSIVE_AM_MACRO_STATIC. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_ADD_RECURSIVE_AM_MACRO],[ + AX_ADD_AM_MACRO([ +$1-recursive: + @set fnord ${AX_DOLLAR}${AX_DOLLAR}MAKEFLAGS; amf=${AX_DOLLAR}${AX_DOLLAR}2; \\ + dot_seen=no; \\ + list='${AX_DOLLAR}(SUBDIRS)'; for subdir in ${AX_DOLLAR}${AX_DOLLAR}list; do \\ + echo \"Making $1 in ${AX_DOLLAR}${AX_DOLLAR}subdir\"; \\ + if test \"${AX_DOLLAR}${AX_DOLLAR}subdir\" = \".\"; then \\ + dot_seen=yes; \\ + local_target=\"$1-am\"; \\ + else \\ + local_target=\"$1\"; \\ + fi; \\ + (cd ${AX_DOLLAR}${AX_DOLLAR}subdir && ${AX_DOLLAR}(MAKE) ${AX_DOLLAR}(AM_MAKEFLAGS) ${AX_DOLLAR}${AX_DOLLAR}local_target) \\ + || case \"${AX_DOLLAR}${AX_DOLLAR}amf\" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\ + done; \\ + if test \"${AX_DOLLAR}${AX_DOLLAR}dot_seen\" = \"no\"; then \\ + ${AX_DOLLAR}(MAKE) ${AX_DOLLAR}(AM_MAKEFLAGS) \"$1-am\" || exit 1; \\ + fi; test -z \"${AX_DOLLAR}${AX_DOLLAR}fail\" + +$2 +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_recursive_am_macro_static.m4 projectm-3.1.0/m4/autoconf-archive/ax_add_recursive_am_macro_static.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_add_recursive_am_macro_static.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_add_recursive_am_macro_static.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# ===================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_add_recursive_am_macro_static.html +# ===================================================================================== +# +# SYNOPSIS +# +# AX_ADD_RECURSIVE_AM_MACRO_STATIC([TARGET],[RULE]) +# +# DESCRIPTION +# +# Adds the specified rule to AMINCLUDE_STATIC along with a +# TARGET-recursive rule that will call TARGET for the current directory +# and TARGET-am recursively for each subdirectory. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# Copyright (c) 2009 Allan Caffee +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_ADD_RECURSIVE_AM_MACRO_STATIC],[ + AX_ADD_AM_MACRO_STATIC([ +$1-recursive: + @set fnord ${AX_DOLLAR}${AX_DOLLAR}MAKEFLAGS; amf=${AX_DOLLAR}${AX_DOLLAR}2; \\ + dot_seen=no; \\ + list='${AX_DOLLAR}(SUBDIRS)'; for subdir in ${AX_DOLLAR}${AX_DOLLAR}list; do \\ + echo \"Making $1 in ${AX_DOLLAR}${AX_DOLLAR}subdir\"; \\ + if test \"${AX_DOLLAR}${AX_DOLLAR}subdir\" = \".\"; then \\ + dot_seen=yes; \\ + local_target=\"$1-am\"; \\ + else \\ + local_target=\"$1\"; \\ + fi; \\ + (cd ${AX_DOLLAR}${AX_DOLLAR}subdir && ${AX_DOLLAR}(MAKE) ${AX_DOLLAR}(AM_MAKEFLAGS) ${AX_DOLLAR}${AX_DOLLAR}local_target) \\ + || case \"${AX_DOLLAR}${AX_DOLLAR}amf\" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \\ + done; \\ + if test \"${AX_DOLLAR}${AX_DOLLAR}dot_seen\" = \"no\"; then \\ + ${AX_DOLLAR}(MAKE) ${AX_DOLLAR}(AM_MAKEFLAGS) \"$1-am\" || exit 1; \\ + fi; test -z \"${AX_DOLLAR}${AX_DOLLAR}fail\" + +$2 +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_afs.m4 projectm-3.1.0/m4/autoconf-archive/ax_afs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_afs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_afs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,120 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_afs.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AFS +# +# DESCRIPTION +# +# This sets up the proper includes and libs needed for building programs +# that link with AFS. It adds a --with-afsdir option that lets you specify +# where the AFS includes and libs are (defaulting to /usr/afsws). +# +# It also adds the -I and -L options to CPPFLAGS and LDFLAGS +# +# It creates an AC_SUBST(AFSWS) that contains the directory being used. +# +# It checks for -lBSD, -lsocket and -lnsl since AFS needs those if they +# exist. It also adds -R/usr/ucblib -L/usr/ucblib -lucb if on Solaris. +# +# It sets VICE_ETC_PATH to be the directory where /usr/vice/etc lives, +# since AFS 3.4 uses a different define than AFS 3.5 does for that path. +# +# Finally, it defines AFS_int32 to be the in32 type needed. In older +# versions of afs it was 'int32', and in newer versions it's 'afs_int32'. +# +# LICENSE +# +# Copyright (c) 2008 Scott Grosch +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([SG_AFS], [AX_AFS]) +AC_DEFUN([AX_AFS], +[AC_ARG_WITH(afsdir, AS_HELP_STRING([--with-afsdir=DIR], + [Directory holding AFS includes/libs]), + ax_cv_with_afsdir=$withval) + AC_CACHE_CHECK([for location of AFS directory], + ax_cv_with_afsdir, ax_cv_with_afsdir=/usr/afsws) + +CPPFLAGS="-I${ax_cv_with_afsdir}/include $CPPFLAGS" +LDFLAGS="-L${ax_cv_with_afsdir}/lib -L${ax_cv_with_afsdir}/lib/afs $LDFLAGS" + +dnl Once we specify a directory, we try to link a test program. If the link +dnl works, we store the value of the directory in a cache variable. If not, +dnl we put _FAILED_ in the cache value. In this way we don't try to link +dnl the test program if our afsdir value was cached, as we know it works. +AC_MAX_CHECKING([whether the specified AFS dir looks valid]) +if test "x${ax_cv_afsdir_link_works:-set}" != "x$ax_cv_with_afsdir"; then + save_LIBS="$LIBS" + LIBS="$save_LIBS -lcmd" + AC_TRY_LINK([#include ], + [cmd_CreateAlias((struct cmd_syndesc *)0, "foo")], + ax_cv_afsdir_link_works=$ax_cv_with_afsdir, + ax_cv_afsdir_link_works=_FAILED_) + LIBS="$save_LIBS" + wasCached="" +else + wasCached="(cached)" +fi +if test "x$ax_cv_afsdir_link_works" = "x$ax_cv_with_afsdir"; then + AC_MAX_RESULT([${wasCached} yes]) +else + AC_MAX_RESULT([no]) + AC_MAX_ERROR([Unable to link test program....bad AFS dir specified?]) +fi + +dnl Much easier to use in XXX.in files +AFSWS=$ax_cv_with_afsdir +AC_SUBST(AFSWS) + +dnl Linking against AFS always needs these +AC_CHECK_LIB(BSD, signal) +AC_CHECK_LIB(socket, getservbyname) +AC_CHECK_LIB(nsl, gethostbyname) + +dnl On Solaris is just always needs the -lucb library from the compatibility +dnl area. I can't think of any other way to do this than just hardcode it. +AC_CANONICAL_HOST +case "$host" in +*-*-solaris*) + LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS" + LIBS="-lucb $LIBS" + ;; +esac + +dnl And it always needs these libs added +LIBS="$LIBS -lacl -lvolser -lvldb -lprot -lkauth -lauth -lrxkad -lubik ${ax_cv_with_afsdir}/lib/afs/vlib.a -ldir ${ax_cv_with_afsdir}/lib/afs/util.a -lsys -lafsint -lrx -lsys -ldes -lcom_err -llwp -lcmd -laudit" + +dnl This really should be AC_CHECK_LIB() but that always fails for some reason +if test -f "${ax_cv_with_afsdir}/lib/afs/libaudit.a"; then + LIBS="$LIBS -laudit" +fi + +dnl If dirpath.h exists and has the value, use that. Otherwise don't +AC_CHECK_HEADERS(afs/dirpath.h, + [AC_DEFINE(VICE_ETC_PATH, AFSDIR_CLIENT_ETC_DIRPATH)], + [AC_DEFINE(VICE_ETC_PATH, AFSCONF_CLIENTNAME)]) + +dnl Find out if we should use afs_int32 or int32. They changed the +dnl type across AFS versions. +AC_CACHE_CHECK([for AFS int32 type], ac_cv_type_int32, +[AC_EGREP_CPP(dnl +changequote(<<,>>)dnl +<<(^|[^a-zA-Z_0-9])afs_int32[^a-zA-Z_0-9]>>dnl +changequote([,]), [#include +], ac_cv_type_int32=afs_int32, ac_cv_type_int32=int32)]) +AC_DEFINE_UNQUOTED(AFS_int32, $ac_cv_type_int32) + +AH_TEMPLATE([VICE_ETC_PATH], +[Define this to be the define used in the AFS header for /usr/vice/etc]) + +AH_TEMPLATE([AFS_int32], [Define this to be the type AFS uses for int32]) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_jobserver.m4 projectm-3.1.0/m4/autoconf-archive/ax_am_jobserver.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_jobserver.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_am_jobserver.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,55 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_am_jobserver.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AM_JOBSERVER([default_value]) +# +# DESCRIPTION +# +# Enables the use of make's jobserver for the purpose of parallel building +# by passing the -j option to make. +# +# The option --enable-jobserver is added to configure which can accept a +# yes, no, or an integer. The integer is the number of separate jobs to +# allow. If 'yes' is given, then the is assumed to be one more than the +# number of CPUs (determined through AX_COUNT_CPUS). If the value of no is +# given, then the jobserver is disabled. The default value is given by the +# first argument of the macro, or 'yes' if the argument is omitted. +# +# This macro makes use of AX_AM_MACROS, so you must add the following line +# +# @INC_AMINCLUDE@ +# +# to your Makefile.am files. +# +# LICENSE +# +# Copyright (c) 2008 Michael Paul Bailey +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_AM_JOBSERVER], [ + AC_REQUIRE([AX_COUNT_CPUS]) + AC_REQUIRE([AX_AM_MACROS]) + AC_ARG_ENABLE( jobserver, + [ --enable-jobserver@<:@=no/yes/@%:@@:>@ default=m4_ifval([$1],[$1],[yes]) + Enable up to @%:@ make jobs + yes: enable one more than CPU count + ],, [enable_jobserver=m4_ifval([$1],[$1],[yes])]) + if test "x$enable_jobserver" = "xyes"; then + enable_jobserver=$CPU_COUNT + ((enable_jobserver++)) + fi + m4_pattern_allow(AM_MAKEFLAGS) + if test "x$enable_jobserver" != "xno"; then + AC_MSG_NOTICE([added jobserver support to make for $enable_jobserver jobs]) + AX_ADD_AM_MACRO( AM_MAKEFLAGS += -j$enable_jobserver ) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_macros.m4 projectm-3.1.0/m4/autoconf-archive/ax_am_macros.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_macros.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_am_macros.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_am_macros.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AM_MACROS +# +# DESCRIPTION +# +# Adds support for macros that create Make rules. You must manually add +# the following line +# +# @INC_AMINCLUDE@ +# +# to your Makefile.in (or Makefile.am if you use Automake) files. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_AM_MACROS], +[ +AC_MSG_NOTICE([adding automake macro support]) +AMINCLUDE="aminclude.am" +AC_SUBST(AMINCLUDE) +AC_MSG_NOTICE([creating $AMINCLUDE]) +AMINCLUDE_TIME=`date` +AX_PRINT_TO_FILE([$AMINCLUDE],[[ +# generated automatically by configure from AX_AUTOMAKE_MACROS +# on $AMINCLUDE_TIME + +]]) + +INC_AMINCLUDE="include \$(top_builddir)/$AMINCLUDE" +AC_SUBST(INC_AMINCLUDE) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_macros_static.m4 projectm-3.1.0/m4/autoconf-archive/ax_am_macros_static.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_macros_static.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_am_macros_static.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_am_macros_static.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AM_MACROS_STATIC +# +# DESCRIPTION +# +# Adds support for macros that create Automake rules. You must manually +# add the following line +# +# include $(top_srcdir)/aminclude_static.am +# +# to your Makefile.am files. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# Copyright (c) 2009 Allan Caffee +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am]) + +AC_DEFUN([AX_AM_MACROS_STATIC], +[ +AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[ +# ]AMINCLUDE_STATIC[ generated automatically by Autoconf +# from AX_AM_MACROS_STATIC on ]m4_esyscmd([date])[ +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_override_var.m4 projectm-3.1.0/m4/autoconf-archive/ax_am_override_var.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_am_override_var.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_am_override_var.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,155 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_am_override_var.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AM_OVERRIDE_VAR([varname1 varname ... ]) +# AX_AM_OVERRIDE_FINALIZE +# +# DESCRIPTION +# +# This autoconf macro generalizes the approach given in +# which +# moves user specified values for variable 'varname' given at configure +# time into the corresponding AM_${varname} variable and clears out +# 'varname', allowing further manipulation by the configure script so that +# target specific variables can be given specialized versions. 'varname +# may still be specified on the make command line and will be appended as +# usual. +# +# As an example usage, consider a project which might benefit from +# different compiler flags for different components. Typically this is +# done via target specific flags, e.g. +# +# libgtest_la_CXXFLAGS = \ +# -I $(top_srcdir)/tests \ +# -I $(top_builddir)/tests \ +# $(GTEST_CXXFLAGS) +# +# automake will automatically append $(CXXFLAGS) -- provided by the user +# -- to the build rule for libgtest_la. That might be problematic, as +# CXXFLAGS may contain compiler options which are inappropriate for +# libgtest_la. +# +# The approach laid out in the referenced mailing list message is to +# supply a base value for a variable during _configure_ time, during which +# it is possible to amend it for specific targets. The user may +# subsequently specify a value for the variable during _build_ time, which +# make will apply (via the standard automake rules) to all appropriate +# targets. +# +# For example, +# +# AX_AM_OVERRIDE_VAR([CXXFLAGS]) +# +# will store the value of CXXFLAGS specified at configure time into the +# AM_CXXFLAGS variable, AC_SUBST it, and clear CXXFLAGS. configure may +# then create a target specific set of flags based upon AM_CXXFLAGS, e.g. +# +# # googletest uses variadic macros, which g++ -pedantic-errors +# # is very unhappy about +# AC_SUBST([GTEST_CXXFLAGS], +# [`AS_ECHO_N(["$AM_CXXFLAGS"]) \ +# | sed s/-pedantic-errors/-pedantic/` +# ] +# ) +# +# which would be used in a Makefile.am as above. Since CXXFLAGS is +# cleared, the configure time value will not affect the build for +# libgtest_la. +# +# Prior to _any other command_ which may set ${varname}, call +# +# AX_AM_OVERRIDE_VAR([varname]) +# +# This will preserve the value (if any) passed to configure in +# AM_${varname} and AC_SUBST([AM_${varname}). You may pass a space +# separated list of variable names, or may call AX_AM_OVERRIDE_VAR +# multiple times for the same effect. +# +# If any subsequent configure commands set ${varname} and you wish to +# capture the resultant value into AM_${varname} in the case where +# ${varname} was _not_ provided at configure time, call +# +# AX_AM_OVERRIDE_FINALIZE +# +# after _all_ commands which might affect any of the variables specified +# in calls to AX_AM_OVERRIDE_VAR. This need be done only once, but +# repeated calls will not cause harm. +# +# There is a bit of trickery required to allow further manipulation of the +# AM_${varname} in a Makefile.am file. If AM_CFLAGS is used as is in a +# Makefile.am, e.g. +# +# libfoo_la_CFLAGS = $(AM_CFLAGS) +# +# then automake will emit code in Makefile.in which sets AM_CFLAGS from +# the configure'd value. +# +# If however, AM_CFLAGS is manipulated (i.e. appended to), you will have +# to explicitly arrange for the configure'd value to be substituted: +# +# AM_CFLAGS = @AM_CFLAGS@ +# AM_CFLAGS += -lfoo +# +# or else automake will complain about using += before =. +# +# LICENSE +# +# Copyright (c) 2013 Smithsonian Astrophysical Observatory +# Copyright (c) 2013 Diab Jerius +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([_AX_AM_OVERRIDE_INITIALIZE], +[ + m4_define([_mst_am_override_vars],[]) +]) + + +# _AX_AM_OVERRIDE_VAR(varname) +AC_DEFUN([_AX_AM_OVERRIDE_VAR], +[ + m4_define([_mst_am_override_vars], m4_defn([_mst_am_override_vars]) $1 ) + _mst_am_override_$1_set=false + + AS_IF( [test "${$1+set}" = set], + [AC_SUBST([AM_$1],["$$1"]) + $1= + _mst_am_override_$1_set=: + ] + ) +]) # _AX_AM_OVERRIDE_VAR + +# _AX_AM_OVERRIDE_FINALIZE(varname) +AC_DEFUN([_AX_AM_OVERRIDE_FINALIZE], +[ + AS_IF([$_mst_am_override_$1_set = :], + [], + [AC_SUBST([AM_$1],["$$1"]) + $1= + _mst_am_override_$1_set= + ] + ) + AC_SUBST($1) +]) # _AX_AM_OVERRIDE_FINALIZE + +AC_DEFUN([AX_AM_OVERRIDE_VAR], +[ + AC_REQUIRE([_AX_AM_OVERRIDE_INITIALIZE]) + m4_map_args_w([$1],[_AX_AM_OVERRIDE_VAR(],[)]) +])# AX_OVERRIDE_VAR + + +# AX_AM_OVERRIDE_FINALIZE +AC_DEFUN([AX_AM_OVERRIDE_FINALIZE], +[ + AC_REQUIRE([_AX_AM_OVERRIDE_INITIALIZE]) + m4_map_args_w(_mst_am_override_vars,[_AX_AM_OVERRIDE_FINALIZE(],[)]) +]) # AX_AM_OVERRIDE_FINALIZE diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_compile_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_append_compile_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_compile_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_append_compile_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,67 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the compiler works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. During the check the flag is always added to the +# current language's flags. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and +# AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with +# AX_APPEND_LINK_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AC_DEFUN([AX_APPEND_COMPILE_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4]) +done +])dnl AX_APPEND_COMPILE_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_flag.m4 projectm-3.1.0/m4/autoconf-archive/ax_append_flag.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_append_flag.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_append_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE]) +# +# DESCRIPTION +# +# FLAG is appended to the FLAGS-VARIABLE shell variable, with a space +# added in between. +# +# If FLAGS-VARIABLE is not specified, the current language's flags (e.g. +# CFLAGS) is used. FLAGS-VARIABLE is not changed if it already contains +# FLAG. If FLAGS-VARIABLE is unset in the shell, it is set to exactly +# FLAG. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AC_DEFUN([AX_APPEND_FLAG], +[dnl +AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF +AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])]) +AS_VAR_SET_IF(FLAGS,[ + AS_CASE([" AS_VAR_GET(FLAGS) "], + [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])], + [ + AS_VAR_APPEND(FLAGS,[" $1"]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) + ], + [ + AS_VAR_SET(FLAGS,[$1]) + AC_RUN_LOG([: FLAGS="$FLAGS"]) + ]) +AS_VAR_POPDEF([FLAGS])dnl +])dnl AX_APPEND_FLAG diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_link_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_append_link_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_link_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_append_link_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,65 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# For every FLAG1, FLAG2 it is checked whether the linker works with the +# flag. If it does, the flag is added FLAGS-VARIABLE +# +# If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is +# used. During the check the flag is always added to the linker's flags. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG. +# Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS. +# +# LICENSE +# +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AC_DEFUN([AX_APPEND_LINK_FLAGS], +[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +for flag in $1; do + AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4]) +done +])dnl AX_APPEND_LINK_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_to_file.m4 projectm-3.1.0/m4/autoconf-archive/ax_append_to_file.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_append_to_file.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_append_to_file.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,27 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_append_to_file.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_APPEND_TO_FILE([FILE],[DATA]) +# +# DESCRIPTION +# +# Appends the specified data to the specified file. +# +# LICENSE +# +# Copyright (c) 2008 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_APPEND_TO_FILE],[ +AC_REQUIRE([AX_FILE_ESCAPES]) +printf "$2" >> "$1" +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_arg_with_path_style.m4 projectm-3.1.0/m4/autoconf-archive/ax_arg_with_path_style.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_arg_with_path_style.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_arg_with_path_style.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,185 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_arg_with_path_style.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ARG_WITH_PATH_STYLE +# +# DESCRIPTION +# +# _AC_DEFINE(PATH_STYLE) describing the filesys interface. The value is +# numeric, where the basetype is encoded as 16 = dos/win, 32 = unix, 64 = +# url/www, 0 = other +# +# some extra semantics are described in other bits of the value, +# especially +# +# 1024 accepts "/" as a dir separator +# 2048 accepts ";" as a path separator +# 4096 accepts "," as a path separator +# +# the macro provides a configure' --with-path-style option that can be +# used with descriptive arg names. If not explicitly given, the $target_os +# will be checked to provide a sane default. Additional (lower) bits can +# be used by the user for some additional magic, higher bits are reserved +# for this macro. +# +# the mnemonic "strict" or "also" is used to instruct the code that +# additional separators shall be accepted but converted to the separator +# of the underlying pathstyle system. (or-512) +# +# example: --with-path-style=win,slash +# to make it accept ";" as pathsep, and +# both "/" and "\" as dirseps. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_ARG_WITH_PATH_STYLE], [AX_ARG_WITH_PATH_STYLE]) +AC_DEFUN([AX_ARG_WITH_PATH_STYLE], +[ + AC_ARG_WITH(path-style, +[ --with-path-style=[dos,unix,url,also,slash,comma], +[ac_with_path_style="$withval"], +[dnl + case "$target_os" in + *djgpp | *mingw32* | *emx*) ac_with_path_style="dos" ;; + *) case `eval echo $exec_prefix` in + *:*) ac_with_path_style="url" ;; + *) ac_with_path_style="posix" ;; + esac + ;; + esac +]) + ac_with_path_style__unx="0" + ac_with_path_style__dos="0" + ac_with_path_style__win="0" + ac_with_path_style__mac="0" + ac_with_path_style__def="0" + ac_with_path_style__use="0" + ac_with_path_style__slash="0" + ac_with_path_style__semic="0" + ac_with_path_style__comma="0" + ac_with_path_style__level="0" + + case ",$ac_with_path_style," in + *,unx,*|*,unix,*|*,bsd,*|*,posix,*) : + ac_with_path_style__unx="32" ;; + *) ac_with_path_style__unx="0" ;; + esac + case ",$ac_with_path_style," in + *,dos,*|*,win,*|*,windows,*) : + ac_with_path_style__dos="16" ;; + *) ac_with_path_style__dos="0" ;; + esac + case ",$ac_with_path_style," in + *,web,*|*,url,*|*,www,*) : + ac_with_path_style__url="64" ;; + *) ac_with_path_style__url="0" ;; + esac + case ",$ac_with_path_style," in + *,mac,*|*,macintosh,*|*,apple,*) : + ac_with_path_style__mac="128" ;; + *) ac_with_path_style__mac="0" ;; + esac + case ",$ac_with_path_style," in + *,def,*|*,define,*|*,special,*) : + ac_with_path_style__def="256" ;; + *) ac_with_path_style__def="0" ;; + esac + case ",$ac_with_path_style," in + *,also,*|*,strict,*|*,accept,*|*,convert,*) : + ac_with_path_style__use="512" ;; + *) ac_with_path_style__use="0" ;; + esac + case ",$ac_with_path_style," in + *,sl,*|*,slash,*|*,forwslash,*|*,slashsep,*) : + ac_with_path_style__slash="1024" ;; + *) ac_with_path_style__slash="0" ;; + esac + case ",$ac_with_path_style," in + *,sc,*|*,semi,*|*,semisep,*|*,semicolon,*|*,semicolonsep,*) : + ac_with_path_style__semic="2048" ;; + *) ac_with_path_style__semic="0" ;; + esac + case ",$ac_with_path_style," in + *,cm,*|*,comma,*|*,commasep,*) : + ac_with_path_style__comma="4096" ;; + *) ac_with_path_style__comma="0" ;; + esac + + if test "$ac_with_path_style__unx" != "0" ; then + ac_with_path_style__slash="1024" + fi + if test "$ac_with_path_style__dos" != "0" ; then + ac_with_path_style__semic="2048" + fi + if test "$ac_with_path_style__url" != "0" ; then + ac_with_path_style__slash="1024" + ac_with_path_style__semic="2048" + fi + + case ",$ac_with_path_style," in + *,7,*|*,all,*|*,muchmore,*) + ac_with_path_style__level="7" ;; + *,6,*|*,extra,*|*,manymore,*) + ac_with_path_style__level="6" ;; + *,5,*|*,much,*) + ac_with_path_style__level="5" ;; + *,4,*|*,many,*) + ac_with_path_style__level="4" ;; + *,3,*|*,plus,*|*,somemore,*) + ac_with_path_style__level="3" ;; + *,2,*|*,more,*) + ac_with_path_style__level="2" ;; + *,1,*|*,some,*) + ac_with_path_style__level="1" ;; + *) + ac_with_path_style__level="0" ;; + esac + + PATH_STYLE=`expr \ + $ac_with_path_style__unx '+' \ + $ac_with_path_style__dos '+' \ + $ac_with_path_style__win '+' \ + $ac_with_path_style__mac '+' \ + $ac_with_path_style__def '+' \ + $ac_with_path_style__use '+' \ + $ac_with_path_style__slash '+' \ + $ac_with_path_style__semic '+' \ + $ac_with_path_style__comma '+' \ + $ac_with_path_style__level ` + + AC_DEFINE_UNQUOTED(PATH_STYLE,$PATH_STYLE, + [ the OS pathstyle, 16=dos 32=unx 64=url 1024=slash 2048=semic 4096=comma ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_asm_inline.m4 projectm-3.1.0/m4/autoconf-archive/ax_asm_inline.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_asm_inline.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_asm_inline.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,57 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_asm_inline.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ASM_INLINE() +# +# DESCRIPTION +# +# Tests for C compiler support of inline assembly instructions. If inline +# assembly is supported, this macro #defines ASM_INLINE to be the +# appropriate keyword. +# +# LICENSE +# +# Copyright (c) 2008 Alan Woodland +# Copyright (c) 2009 Rhys Ulerich +# Copyright (c) 2017 Reini Urban +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_ASM_INLINE], [ + AC_LANG_PUSH([C]) + AC_MSG_CHECKING(for inline assembly style) + AC_CACHE_VAL(ac_cv_asm_inline, [ + ax_asm_inline_keywords="__asm__ __asm none" + for ax_asm_inline_keyword in $ax_asm_inline_keywords; do + case $ax_asm_inline_keyword in + none) ac_cv_asm_inline=none ; break ;; + *) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [#include + static void + foo(void) { + ] $ax_asm_inline_keyword [(""); + exit(1); + }], + [])], + [ac_cv_asm_inline=$ax_asm_inline_keyword ; break], + ac_cv_asm_inline=none + ) + esac + done +]) + + if test "$ac_cv_asm_inline" != "none"; then + AC_DEFINE_UNQUOTED([ASM_INLINE], $ac_cv_asm_inline, [If the compiler supports inline assembly define it to that keyword here]) + fi + AC_MSG_RESULT($ac_cv_asm_inline) + AC_LANG_POP([C]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_at_check_pattern.m4 projectm-3.1.0/m4/autoconf-archive/ax_at_check_pattern.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_at_check_pattern.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_at_check_pattern.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,130 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_at_check_pattern.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_AT_CHECK_PATTERN(COMMANDS, [STATUS], [STDOUT-RE], [STDERR-RE], [RUN-IF-FAIL], [RUN-IF-PASS]) +# AX_AT_DIFF_PATTERN(PATTERN-FILE, TEST-FILE, [STATUS=0], [DIFFERENCES]) +# +# DESCRIPTION +# +# AX_AT_CHECK_PATTERN() executes a test similar to AT_CHECK(), except that +# stdout and stderr are awk regular expressions (REs). +# +# NOTE: as autoconf uses [] for quoting, the use of [brackets] in the RE +# arguments STDOUT-RE and STDERR-RE can be awkward and require careful +# extra quoting, or quadrigraphs '@<:@' (for '[') and '@:>@' (for ']'). +# +# awk is invoked via $AWK, which defaults to "awk" if unset or empty. +# +# Implemented using AT_CHECK() with a custom value for $at_diff that +# invokes diff with an awk post-processor. +# +# AX_AT_DIFF_PATTERN() checks that the PATTERN-FILE applies to TEST-FILE. +# If there are differences, STATUS will be 1 and they should be +# DIFFERENCES. +# +# LICENSE +# +# Copyright (c) 2013-2014 Luke Mewburn +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +m4_defun([_AX_AT_CHECK_PATTERN_PREPARE], [dnl +dnl Can't use AC_PROG_AWK() in autotest. +AS_VAR_IF([AWK], [], [AWK=awk]) + +AS_REQUIRE_SHELL_FN([ax_at_diff_pattern], + [AS_FUNCTION_DESCRIBE([ax_at_diff_pattern], [PATTERN OUTPUT], + [Diff PATTERN OUTPUT and elide change lines where the RE pattern matches])], +[diff "$[]1" "$[]2" | $AWK ' +BEGIN { exitval=0 } + +function mismatch() +{ + print mode + for (i = 0; i < lc; i++) { + print ll[[i]] + } + print "---" + for (i = 0; i < rc; i++) { + print rl[[i]] + } + mode="" + exitval=1 +} + +$[]1 ~ /^[[0-9]]+(,[[0-9]]+)?[[ad]][[0-9]]+(,[[0-9]]+)?$/ { + print + mode="" + exitval=1 + next +} + +$[]1 ~ /^[[0-9]]+(,[[0-9]]+)?[[c]][[0-9]]+(,[[0-9]]+)?$/ { + mode=$[]1 + lc=0 + rc=0 + next +} + +mode == "" { + print $[]0 + next +} + +$[]1 == "<" { + ll[[lc]] = $[]0 + lc = lc + 1 + next +} + +$[]1 == "---" { + next +} + +$[]1 == ">" { + rl[[rc]] = $[]0 + rc = rc + 1 + if (rc > lc) { + mismatch() + next + } + pat = "^" substr(ll[[rc-1]], 2) "$" + str = substr($[]0, 2) + if (str !~ pat) { + mismatch() + } + next +} +{ + print "UNEXPECTED LINE: " $[]0 + exit 10 +} + +END { exit exitval } +'])dnl ax_at_diff_pattern +])dnl _AX_AT_CHECK_PATTERN_PREPARE + + +m4_defun([AX_AT_CHECK_PATTERN], [dnl +AS_REQUIRE([_AX_AT_CHECK_PATTERN_PREPARE]) +_ax_at_check_pattern_prepare_original_at_diff="$at_diff" +at_diff='ax_at_diff_pattern' +AT_CHECK($1, $2, $3, $4, + [at_diff="$_ax_at_check_pattern_prepare_original_at_diff";]$5, + [at_diff="$_ax_at_check_pattern_prepare_original_at_diff";]$6) + +])dnl AX_AT_CHECK_PATTERN + + +m4_defun([AX_AT_DIFF_PATTERN], [dnl +AS_REQUIRE([_AX_AT_CHECK_PATTERN_PREPARE]) +AT_CHECK([ax_at_diff_pattern $1 $2], [$3], [$4]) +])dnl AX_AT_CHECK_PATTERN diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_auto_include_headers.m4 projectm-3.1.0/m4/autoconf-archive/ax_auto_include_headers.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_auto_include_headers.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_auto_include_headers.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,63 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_auto_include_headers.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_AUTO_INCLUDE_HEADERS(INCLUDE-FILE ...) +# +# DESCRIPTION +# +# Given a space-separated list of INCLUDE-FILEs, AX_AUTO_INCLUDE_HEADERS +# will output a conditional #include for each INCLUDE-FILE. The following +# example demonstrates how AX_AUTO_INCLUDE_HEADERS's might be used in a +# configure.ac script: +# +# AH_BOTTOM([ +# AX_AUTO_INCLUDE_HEADERS([sys/resource.h invent.h sys/sysinfo.h])dnl +# ]) +# +# The preceding invocation instructs autoheader to put the following code +# at the bottom of the config.h file: +# +# #ifdef HAVE_SYS_RESOURCE_H +# # include +# #endif +# #ifdef HAVE_INVENT_H +# # include +# #endif +# #ifdef HAVE_SYS_SYSINFO_H +# # include +# #endif +# +# Note that AX_AUTO_INCLUDE_HEADERS merely outputs #ifdef/#include/#endif +# blocks. The configure.ac script still needs to invoke AC_CHECK_HEADERS +# to #define the various HAVE_*_H preprocessor macros. +# +# Here's an easy way to get from config.h a complete list of header files +# who existence is tested by the configure script: +# +# cat config.h | perl -ane '/ HAVE_\S+_H / && do {$_=$F[$#F-1]; s/^HAVE_//; s/_H/.h/; s|_|/|g; tr/A-Z/a-z/; print "$_ "}' +# +# You can then manually edit the resulting list and incorporate it into +# one or more calls to AX_AUTO_INCLUDE_HEADERS. +# +# LICENSE +# +# Copyright (c) 2008 Scott Pakin +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_AUTO_INCLUDE_HEADERS], [dnl +AC_FOREACH([AX_Header], [$1], [dnl +m4_pushdef([AX_IfDef], AS_TR_CPP(HAVE_[]AX_Header))dnl +[#]ifdef AX_IfDef +[#] include +[#]endif +m4_popdef([AX_IfDef])dnl +])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_berkeley_db_cxx.m4 projectm-3.1.0/m4/autoconf-archive/ax_berkeley_db_cxx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_berkeley_db_cxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_berkeley_db_cxx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,152 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_berkeley_db_cxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BERKELEY_DB_CXX([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to find Berkeley DB C++ support. It honors +# MINIMUM-VERSION if given. +# +# If libdb_cxx is found, DB_CXX_HEADER and DB_CXX_LIBS variables are set +# and ACTION-IF-FOUND shell code is executed if specified. DB_CXX_HEADER +# is set to location of db.h header in quotes (e.g. "db3/db_cxx.h") and +# AC_DEFINE_UNQUOTED is called on it, so that you can type +# +# #include DB_CXX_HEADER +# +# in your C/C++ code. DB_CXX_LIBS is set to linker flags needed to link +# against the library (e.g. -ldb3.1_cxx) and AC_SUBST is called on it. +# +# when specified user-selected spot (via --with-libdb) also sets +# +# DB_CXX_CPPFLAGS to the include directives required +# DB_CXX_LDFLAGS to the -L flags required +# +# LICENSE +# +# Copyright (c) 2008 Vaclav Slavik +# Copyright (c) 2011 Stephan Suerken +# Copyright (c) 2014 Kirill A. Korinskiy +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_DEFUN([AX_BERKELEY_DB_CXX], +[ + AC_LANG_ASSERT(C++) + + old_LIBS="$LIBS" + old_LDFLAGS="$LDFLAGS" + old_CPPFLAGS="$CPPFLAGS" + + libdbdir="" + AC_ARG_WITH(libdb, + AS_HELP_STRING([--with-libdb=DIR], + [root of the Berkeley DB directory]), + [ + case "$withval" in + "" | y | ye | yes | n | no) + AC_MSG_ERROR([Invalid --with-libdb value]) + ;; + *) libdbdir="$withval" + ;; + esac + ], []) + + minversion=ifelse([$1], ,,$1) + + DB_CXX_HEADER="" + DB_CXX_LIBS="" + DB_CXX_LDFLAGS="" + DB_CXX_CPPFLAGS="" + + if test -z $minversion ; then + minvermajor=0 + minverminor=0 + minverpatch=0 + AC_MSG_CHECKING([for Berkeley DB (C++)]) + else + minvermajor=`echo $minversion | cut -d. -f1` + minverminor=`echo $minversion | cut -d. -f2 -s` + minverpatch=`echo $minversion | cut -d. -f3 -s` + if test -z "$minvermajor"; then minvermajor=0; fi + if test -z "$minverminor"; then minverminor=0; fi + if test -z "$minverpatch"; then minverpatch=0; fi + AC_MSG_CHECKING([for Berkeley DB (C++) >= $minvermajor.$minverminor.$minverpatch]) + fi + + if test x$libdbdir != x""; then + DB_CXX_CPPFLAGS="-I${libdbdir}/include" + DB_CXX_LDFLAGS="-L${libdbdir}/lib" + LDFLAGS="$DB_CXX_LDFLAGS $old_LDFLAGS" + CPPFLAGS="$DB_CXX_CPPFLAGS $old_CPPFLAGS" + fi + + for major in 4; do + for minor in 0 1 2 3 4 5 6 7 8 9; do + for version in "${major}.${minor}" "${major}${minor}"; do + + try_libs="-ldb_cxx-${version}%-ldb-${version} -ldb${version}_cxx%-ldb${version}" + try_headers="db${major}.${minor}/db_cxx.h db${major}${minor}/db_cxx.h db${major}/db_cxx.h" + for db_cxx_hdr in $try_headers ; do + for db_cxx_lib in $try_libs; do + db_cxx_lib="$libdbdir `echo "$db_cxx_lib" | sed 's/%/ /g'`" + LIBS="$old_LIBS $db_cxx_lib" + #echo "Trying <$db_cxx_lib> <$db_cxx_hdr>" + if test -z $DB_CXX_HEADER ; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [ + #include <${db_cxx_hdr}> + ], + [ + #if !((DB_VERSION_MAJOR > (${minvermajor}) || \ + (DB_VERSION_MAJOR == (${minvermajor}) && \ + DB_VERSION_MINOR > (${minverminor})) || \ + (DB_VERSION_MAJOR == (${minvermajor}) && \ + DB_VERSION_MINOR == (${minverminor}) && \ + DB_VERSION_PATCH >= (${minverpatch})))) + #error "too old version" + #endif + + DB *db; + db_create(&db, NULL, 0); + ])], + [ + AC_MSG_RESULT([header $db_cxx_hdr, library $db_cxx_lib]) + DB_CXX_HEADER="$db_cxx_hdr" + DB_CXX_LIBS="$db_cxx_lib" + ], + ) + fi + done + done + done + done + done + + LIBS="$old_LIBS" + LDFLAGS="$old_LDFLAGS" + CPPFLAGS="$old_CPPFLAGS" + + if test -z $DB_CXX_HEADER ; then + AC_MSG_RESULT([not found]) + DB_CXX_LDFLAGS="" + DB_CXX_CPPFLAGS="" + ifelse([$3], , :, [$3]) + else + AC_DEFINE_UNQUOTED(DB_CXX_HEADER, ["$DB_CXX_HEADER"], ["Berkeley DB C++ Header File"]) + AC_SUBST(DB_CXX_LIBS) + AC_SUBST(DB_CXX_LDFLAGS) + AC_SUBST(DB_CXX_CPPFLAGS) + ifelse([$2], , :, [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_berkeley_db.m4 projectm-3.1.0/m4/autoconf-archive/ax_berkeley_db.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_berkeley_db.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_berkeley_db.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,148 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_berkeley_db.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BERKELEY_DB([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to find Berkeley DB. It honors MINIMUM-VERSION if +# given. +# +# If libdb is found, DB_HEADER and DB_LIBS variables are set and +# ACTION-IF-FOUND shell code is executed if specified. DB_HEADER is set to +# location of db.h header in quotes (e.g. "db3/db.h") and +# AC_DEFINE_UNQUOTED is called on it, so that you can type +# +# #include DB_HEADER +# +# in your C/C++ code. DB_LIBS is set to linker flags needed to link +# against the library (e.g. -ldb3.1) and AC_SUBST is called on it. +# +# when specified user-selected spot (via --with-libdb) also sets +# +# DB_CPPFLAGS to the include directives required +# DB_LDFLAGS to the -L flags required +# +# LICENSE +# +# Copyright (c) 2008 Vaclav Slavik +# Copyright (c) 2014 Kirill A. Korinskiy +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_BERKELEY_DB], +[ + old_LIBS="$LIBS" + old_LDFLAGS="$LDFLAGS" + old_CFLAGS="$CFLAGS" + + libdbdir="" + AC_ARG_WITH(libdb, + AS_HELP_STRING([--with-libdb=DIR], + [root of the Berkeley DB directory]), + [ + case "$withval" in + "" | y | ye | yes | n | no) + AC_MSG_ERROR([Invalid --with-libdb value]) + ;; + *) libdbdir="$withval" + ;; + esac + ], []) + + minversion=ifelse([$1], ,,$1) + + DB_HEADER="" + DB_LIBS="" + DB_LDFLAGS="" + DB_CFLAGS="" + + if test -z $minversion ; then + minvermajor=0 + minverminor=0 + minverpatch=0 + AC_MSG_CHECKING([for Berkeley DB]) + else + minvermajor=`echo $minversion | cut -d. -f1` + minverminor=`echo $minversion | cut -d. -f2` + minverpatch=`echo $minversion | cut -d. -f3` + minvermajor=${minvermajor:-0} + minverminor=${minverminor:-0} + minverpatch=${minverpatch:-0} + AC_MSG_CHECKING([for Berkeley DB >= $minversion]) + fi + + if test x$libdbdir != x""; then + DB_CFLAGS="-I${libdbdir}/include" + DB_LDFLAGS="-L${libdbdir}/lib" + LDFLAGS="$DB_LDFLAGS $old_LDFLAGS" + CFLAGS="$DB_CFLAGS $old_CPPFLAGS" + fi + + for version in "" 5.0 4.9 4.8 4.7 4.6 4.5 4.4 4.3 4.2 4.1 4.0 3.6 3.5 3.4 3.3 3.2 3.1 ; do + + if test -z $version ; then + db_lib="-ldb" + try_headers="db.h" + else + db_lib="-ldb-$version" + try_headers="db$version/db.h db`echo $version | sed -e 's,\..*,,g'`/db.h" + fi + + LIBS="$old_LIBS $db_lib" + + for db_hdr in $try_headers ; do + if test -z $DB_HEADER ; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [ + #include <${db_hdr}> + ], + [ + #if !((DB_VERSION_MAJOR > (${minvermajor}) || \ + (DB_VERSION_MAJOR == (${minvermajor}) && \ + DB_VERSION_MINOR > (${minverminor})) || \ + (DB_VERSION_MAJOR == (${minvermajor}) && \ + DB_VERSION_MINOR == (${minverminor}) && \ + DB_VERSION_PATCH >= (${minverpatch})))) + #error "too old version" + #endif + + DB *db; + db_create(&db, NULL, 0); + ])], + [ + AC_MSG_RESULT([header $db_hdr, library $db_lib]) + + DB_HEADER="$db_hdr" + DB_LIBS="$db_lib" + ]) + fi + done + done + + LIBS="$old_LIBS" + LDFLAGS="$old_LDFLAGS" + CFLAGS="$old_CPPFLAGS" + + if test -z $DB_HEADER ; then + AC_MSG_RESULT([not found]) + DB_LDFLAGS="" + DB_CFLAGS="" + ifelse([$3], , :, [$3]) + else + AC_DEFINE_UNQUOTED(DB_HEADER, ["$DB_HEADER"], ["Berkeley DB Header File"]) + AC_SUBST(DB_LIBS) + AC_SUBST(DB_LDFLAGS) + AC_SUBST(DB_CFLAGS) + ifelse([$2], , :, [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_blas_f77_func.m4 projectm-3.1.0/m4/autoconf-archive/ax_blas_f77_func.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_blas_f77_func.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_blas_f77_func.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,204 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_blas_f77_func.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BLAS_F77_FUNC([ACTION-IF-PASS[, ACTION-IF-FAIL[, ACTION-IF-CROSS-COMPILING]]) +# AX_BLAS_WITH_F77_FUNC([ACTION-IF-FOUND-AND-PASS[, ACTION-IF-NOT-FOUND-OR-FAIL]]) +# +# DESCRIPTION +# +# These macros are intended as a supplement to the AX_BLAS macro, to +# verify that BLAS functions are properly callable from Fortran. This is +# necessary, for example, if you want to build the LAPACK library on top +# of the BLAS. +# +# AX_BLAS_F77_FUNC uses the defined BLAS_LIBS and Fortran environment to +# check for compatibility, and takes a specific action in case of success, +# resp. failure, resp. cross-compilation. +# +# AX_BLAS_WITH_F77_FUNC is a drop-in replacement wrapper for AX_BLAS that +# calls AX_BLAS_F77_FUNC after detecting a BLAS library and rejects it on +# failure (i.e. pretends that no library was found). +# +# LICENSE +# +# Copyright (c) 2008 Jaroslav Hajek +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AU_ALIAS([ACX_BLAS_F77_FUNC], [AX_BLAS_F77_FUNC]) +AC_DEFUN([AX_BLAS_F77_FUNC], [ +AC_PREREQ(2.50) +AC_REQUIRE([AX_BLAS]) + +# F77 call-compatibility checks +if test "$cross_compiling" = yes ; then + ifelse($3, ,$1,$3) +elif test x"$ax_blas_ok" = xyes; then + save_ax_blas_f77_func_LIBS="$LIBS" + LIBS="$BLAS_LIBS $LIBS" + AC_LANG_PUSH(Fortran 77) +# LSAME check (LOGICAL return values) + AC_MSG_CHECKING([whether LSAME is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + logical lsame,w + external lsame + character c1,c2 + c1 = 'A' + c2 = 'B' + w = lsame(c1,c2) + if (w) stop 1 + w = lsame(c1,c1) + if (.not. w) stop 1 + ]]),[ax_blas_lsame_fcall_ok=yes], + [ax_blas_lsame_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_lsame_fcall_ok]) +# ISAMAX check (INTEGER return values) + AC_MSG_CHECKING([whether ISAMAX is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + integer isamax,i + external isamax + real a(2) + a(1) = 1e0 + a(2) = -2e0 + i = isamax(2,a,1) + if (i.ne.2) stop 1 + ]]),[ax_blas_isamax_fcall_ok=yes], + [ax_blas_isamax_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_isamax_fcall_ok]) +# SDOT check (REAL return values) + AC_MSG_CHECKING([whether SDOT is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + real sdot,a(1),b(1),w + external sdot + a(1) = 1e0 + b(1) = 2e0 + w = sdot(1,a,1,b,1) + if (w .ne. a(1)*b(1)) stop 1 + ]]),[ax_blas_sdot_fcall_ok=yes], + [ax_blas_sdot_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_sdot_fcall_ok]) +# DDOT check (DOUBLE return values) + AC_MSG_CHECKING([whether DDOT is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + double precision ddot,a(1),b(1),w + external ddot + a(1) = 1d0 + b(1) = 2d0 + w = ddot(1,a,1,b,1) + if (w .ne. a(1)*b(1)) stop 1 + ]]),[ax_blas_ddot_fcall_ok=yes], + [ax_blas_ddot_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_ddot_fcall_ok]) +# CDOTU check (COMPLEX return values) + AC_MSG_CHECKING([whether CDOTU is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + complex cdotu,a(1),b(1),w + external cdotu + a(1) = cmplx(1e0,1e0) + b(1) = cmplx(1e0,2e0) + w = cdotu(1,a,1,b,1) + if (w .ne. a(1)*b(1)) stop 1 + ]]),[ax_blas_cdotu_fcall_ok=yes], + [ax_blas_cdotu_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_cdotu_fcall_ok]) +# ZDOTU check (DOUBLE COMPLEX return values) + AC_MSG_CHECKING([whether ZDOTU is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + double complex zdotu,a(1),b(1),w + external zdotu + a(1) = dcmplx(1d0,1d0) + b(1) = dcmplx(1d0,2d0) + w = zdotu(1,a,1,b,1) + if (w .ne. a(1)*b(1)) stop 1 + ]]),[ax_blas_zdotu_fcall_ok=yes], + [ax_blas_zdotu_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_zdotu_fcall_ok]) +# Check for correct integer size +# FIXME: this may fail with things like -ftrapping-math. + AC_MSG_CHECKING([whether the integer size is correct]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + integer n,nn(3) + real s,a(1),b(1),sdot + a(1) = 1.0 + b(1) = 1.0 +c Generate -2**33 + 1, if possible + n = 2 + n = -4 * (n ** 30) + n = n + 1 + if (n >= 0) goto 1 +c This means we're on 64-bit integers. Check whether the BLAS is, too. + s = sdot(n,a,1,b,1) + if (s .ne. 0.0) stop 1 + 1 continue +c We may be on 32-bit integers, and the BLAS on 64 bits. This is almost bound +c to have already failed, but just in case, we'll check. + nn(1) = -1 + nn(2) = 1 + nn(3) = -1 + s = sdot(nn(2),a,1,b,1) + if (s .ne. 1.0) stop 1 + ]]),[ax_blas_integer_size_ok=yes], + [ax_blas_integer_size_ok=no]) + AC_MSG_RESULT([$ax_blas_integer_size_ok]) + + AC_LANG_POP(Fortran 77) + +# if any of the tests failed, reject the BLAS library + if test $ax_blas_lsame_fcall_ok = yes \ + -a $ax_blas_sdot_fcall_ok = yes \ + -a $ax_blas_ddot_fcall_ok = yes \ + -a $ax_blas_cdotu_fcall_ok = yes \ + -a $ax_blas_zdotu_fcall_ok = yes \ + -a $ax_blas_integer_size_ok = yes; then + ax_blas_f77_func_ok=yes; + $1 + else + ax_blas_f77_func_ok=no; + $2 + fi + LIBS="$save_ax_blas_f77_func_LIBS" +fi + +])dnl AX_BLAS_F77_FUNC + +AC_DEFUN([AX_BLAS_WITH_F77_FUNC], [ +AC_PREREQ(2.50) +AX_BLAS([# disable special action], []) +if test x$ax_blas_ok = xyes ; then + AX_BLAS_F77_FUNC( + [ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])], + [ax_blas_ok=no; BLAS_LIBS=]) +fi +if test x$ax_blas_ok = xno ; then + $2 +fi +])dnl AX_BLAS_WITH_F77_FUNC diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_blas.m4 projectm-3.1.0/m4/autoconf-archive/ax_blas.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_blas.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_blas.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,238 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_blas.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BLAS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro looks for a library that implements the BLAS linear-algebra +# interface (see http://www.netlib.org/blas/). On success, it sets the +# BLAS_LIBS output variable to hold the requisite library linkages. +# +# To link with BLAS, you should link with: +# +# $BLAS_LIBS $LIBS $FLIBS +# +# in that order. FLIBS is the output variable of the +# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is +# sometimes necessary in order to link with F77 libraries. Users will also +# need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same +# reason. +# +# Many libraries are searched for, from ATLAS to CXML to ESSL. The user +# may also use --with-blas= in order to use some specific BLAS +# library . In order to link successfully, however, be aware that you +# will probably need to use the same Fortran compiler (which can be set +# via the F77 env. var.) as was used to compile the BLAS library. +# +# ACTION-IF-FOUND is a list of shell commands to run if a BLAS library is +# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is +# not found. If ACTION-IF-FOUND is not specified, the default action will +# define HAVE_BLAS. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 15 + +AU_ALIAS([ACX_BLAS], [AX_BLAS]) +AC_DEFUN([AX_BLAS], [ +AC_PREREQ(2.50) +AC_REQUIRE([AC_F77_LIBRARY_LDFLAGS]) +AC_REQUIRE([AC_CANONICAL_HOST]) +ax_blas_ok=no + +AC_ARG_WITH(blas, + [AS_HELP_STRING([--with-blas=], [use BLAS library ])]) +case $with_blas in + yes | "") ;; + no) ax_blas_ok=disable ;; + -* | */* | *.a | *.so | *.so.* | *.o) BLAS_LIBS="$with_blas" ;; + *) BLAS_LIBS="-l$with_blas" ;; +esac + +# Get fortran linker names of BLAS functions to check for. +AC_F77_FUNC(sgemm) +AC_F77_FUNC(dgemm) + +ax_blas_save_LIBS="$LIBS" +LIBS="$LIBS $FLIBS" + +# First, check BLAS_LIBS environment variable +if test $ax_blas_ok = no; then +if test "x$BLAS_LIBS" != x; then + save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" + AC_MSG_CHECKING([for $sgemm in $BLAS_LIBS]) + AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes], [BLAS_LIBS=""]) + AC_MSG_RESULT($ax_blas_ok) + LIBS="$save_LIBS" +fi +fi + +# BLAS linked to by default? (happens on some supercomputers) +if test $ax_blas_ok = no; then + save_LIBS="$LIBS"; LIBS="$LIBS" + AC_MSG_CHECKING([if $sgemm is being linked in already]) + AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes]) + AC_MSG_RESULT($ax_blas_ok) + LIBS="$save_LIBS" +fi + +# BLAS in OpenBLAS library? (http://xianyi.github.com/OpenBLAS/) +if test $ax_blas_ok = no; then + AC_CHECK_LIB(openblas, $sgemm, [ax_blas_ok=yes + BLAS_LIBS="-lopenblas"]) +fi + +# BLAS in ATLAS library? (http://math-atlas.sourceforge.net/) +if test $ax_blas_ok = no; then + AC_CHECK_LIB(atlas, ATL_xerbla, + [AC_CHECK_LIB(f77blas, $sgemm, + [AC_CHECK_LIB(cblas, cblas_dgemm, + [ax_blas_ok=yes + BLAS_LIBS="-lcblas -lf77blas -latlas"], + [], [-lf77blas -latlas])], + [], [-latlas])]) +fi + +# BLAS in PhiPACK libraries? (requires generic BLAS lib, too) +if test $ax_blas_ok = no; then + AC_CHECK_LIB(blas, $sgemm, + [AC_CHECK_LIB(dgemm, $dgemm, + [AC_CHECK_LIB(sgemm, $sgemm, + [ax_blas_ok=yes; BLAS_LIBS="-lsgemm -ldgemm -lblas"], + [], [-lblas])], + [], [-lblas])]) +fi + +# BLAS in Intel MKL library? +if test $ax_blas_ok = no; then + # MKL for gfortran + if test x"$ac_cv_fc_compiler_gnu" = xyes; then + # 64 bit + if test $host_cpu = x86_64; then + AC_CHECK_LIB(mkl_gf_lp64, $sgemm, + [ax_blas_ok=yes;BLAS_LIBS="-lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread"],, + [-lmkl_gf_lp64 -lmkl_sequential -lmkl_core -lpthread]) + # 32 bit + elif test $host_cpu = i686; then + AC_CHECK_LIB(mkl_gf, $sgemm, + [ax_blas_ok=yes;BLAS_LIBS="-lmkl_gf -lmkl_sequential -lmkl_core -lpthread"],, + [-lmkl_gf -lmkl_sequential -lmkl_core -lpthread]) + fi + # MKL for other compilers (Intel, PGI, ...?) + else + # 64-bit + if test $host_cpu = x86_64; then + AC_CHECK_LIB(mkl_intel_lp64, $sgemm, + [ax_blas_ok=yes;BLAS_LIBS="-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread"],, + [-lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread]) + # 32-bit + elif test $host_cpu = i686; then + AC_CHECK_LIB(mkl_intel, $sgemm, + [ax_blas_ok=yes;BLAS_LIBS="-lmkl_intel -lmkl_sequential -lmkl_core -lpthread"],, + [-lmkl_intel -lmkl_sequential -lmkl_core -lpthread]) + fi + fi +fi +# Old versions of MKL +if test $ax_blas_ok = no; then + AC_CHECK_LIB(mkl, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lmkl -lguide -lpthread"],,[-lguide -lpthread]) +fi + +# BLAS in Apple vecLib library? +if test $ax_blas_ok = no; then + save_LIBS="$LIBS"; LIBS="-framework vecLib $LIBS" + AC_MSG_CHECKING([for $sgemm in -framework vecLib]) + AC_TRY_LINK_FUNC($sgemm, [ax_blas_ok=yes;BLAS_LIBS="-framework vecLib"]) + AC_MSG_RESULT($ax_blas_ok) + LIBS="$save_LIBS" +fi + +# BLAS in Alpha CXML library? +if test $ax_blas_ok = no; then + AC_CHECK_LIB(cxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-lcxml"]) +fi + +# BLAS in Alpha DXML library? (now called CXML, see above) +if test $ax_blas_ok = no; then + AC_CHECK_LIB(dxml, $sgemm, [ax_blas_ok=yes;BLAS_LIBS="-ldxml"]) +fi + +# BLAS in Sun Performance library? +if test $ax_blas_ok = no; then + if test "x$GCC" != xyes; then # only works with Sun CC + AC_CHECK_LIB(sunmath, acosp, + [AC_CHECK_LIB(sunperf, $sgemm, + [BLAS_LIBS="-xlic_lib=sunperf -lsunmath" + ax_blas_ok=yes],[],[-lsunmath])]) + fi +fi + +# BLAS in SCSL library? (SGI/Cray Scientific Library) +if test $ax_blas_ok = no; then + AC_CHECK_LIB(scs, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lscs"]) +fi + +# BLAS in SGIMATH library? +if test $ax_blas_ok = no; then + AC_CHECK_LIB(complib.sgimath, $sgemm, + [ax_blas_ok=yes; BLAS_LIBS="-lcomplib.sgimath"]) +fi + +# BLAS in IBM ESSL library? (requires generic BLAS lib, too) +if test $ax_blas_ok = no; then + AC_CHECK_LIB(blas, $sgemm, + [AC_CHECK_LIB(essl, $sgemm, + [ax_blas_ok=yes; BLAS_LIBS="-lessl -lblas"], + [], [-lblas $FLIBS])]) +fi + +# Generic BLAS library? +if test $ax_blas_ok = no; then + AC_CHECK_LIB(blas, $sgemm, [ax_blas_ok=yes; BLAS_LIBS="-lblas"]) +fi + +AC_SUBST(BLAS_LIBS) + +LIBS="$ax_blas_save_LIBS" + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$ax_blas_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1]) + : +else + ax_blas_ok=no + $2 +fi +])dnl AX_BLAS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_asio.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_asio.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_asio.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_asio.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_asio.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_ASIO +# +# DESCRIPTION +# +# Test for Asio library from the Boost C++ libraries. The macro requires a +# preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_ASIO_LIB) +# +# And sets: +# +# HAVE_BOOST_ASIO +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Pete Greenwell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 17 + +AC_DEFUN([AX_BOOST_ASIO], +[ + AC_ARG_WITH([boost-asio], + AS_HELP_STRING([--with-boost-asio@<:@=special-lib@:>@], + [use the ASIO library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-asio=boost_system-gcc41-mt-1_34 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_asio_lib="" + else + want_boost="yes" + ax_boost_user_asio_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::ASIO library is available, + ax_cv_boost_asio, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @%:@include + ]], + [[ + + boost::asio::io_service io; + boost::system::error_code timer_result; + boost::asio::deadline_timer t(io); + t.cancel(); + io.run_one(); + return 0; + ]])], + ax_cv_boost_asio=yes, ax_cv_boost_asio=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_asio" = "xyes"; then + AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO library is available]) + BN=boost_system + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_asio_lib" = "x"; then + for ax_lib in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.dylib* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_system.*\)\.a.*$;\1;' ` ; do + AC_CHECK_LIB($ax_lib, main, [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_thread="yes" break], + [link_thread="no"]) + done + else + for ax_lib in $ax_boost_user_asio_lib $BN-$ax_boost_user_asio_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_ASIO_LIB="-l$ax_lib" AC_SUBST(BOOST_ASIO_LIB) link_asio="yes" break], + [link_asio="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_asio" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_base.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_base.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_base.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_base.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,301 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_base.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_BASE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the Boost C++ libraries of a particular version (or newer) +# +# If no path to the installed boost library is given the macro searchs +# under /usr, /usr/local, /opt and /opt/local and evaluates the +# $BOOST_ROOT environment variable. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_CPPFLAGS) / AC_SUBST(BOOST_LDFLAGS) +# +# And sets: +# +# HAVE_BOOST +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2009 Peter Adolphs +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 43 + +# example boost program (need to pass version) +m4_define([_AX_BOOST_BASE_PROGRAM], + [AC_LANG_PROGRAM([[ +#include +]],[[ +(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))])); +]])]) + +AC_DEFUN([AX_BOOST_BASE], +[ +AC_ARG_WITH([boost], + [AS_HELP_STRING([--with-boost@<:@=ARG@:>@], + [use Boost library from a standard location (ARG=yes), + from the specified location (ARG=), + or disable it (ARG=no) + @<:@ARG=yes@:>@ ])], + [ + AS_CASE([$withval], + [no],[want_boost="no";_AX_BOOST_BASE_boost_path=""], + [yes],[want_boost="yes";_AX_BOOST_BASE_boost_path=""], + [want_boost="yes";_AX_BOOST_BASE_boost_path="$withval"]) + ], + [want_boost="yes"]) + + +AC_ARG_WITH([boost-libdir], + [AS_HELP_STRING([--with-boost-libdir=LIB_DIR], + [Force given directory for boost libraries. + Note that this will override library path detection, + so use this parameter only if default library detection fails + and you know exactly where your boost libraries are located.])], + [ + AS_IF([test -d "$withval"], + [_AX_BOOST_BASE_boost_lib_path="$withval"], + [AC_MSG_ERROR([--with-boost-libdir expected directory name])]) + ], + [_AX_BOOST_BASE_boost_lib_path=""]) + +BOOST_LDFLAGS="" +BOOST_CPPFLAGS="" +AS_IF([test "x$want_boost" = "xyes"], + [_AX_BOOST_BASE_RUNDETECT([$1],[$2],[$3])]) +AC_SUBST(BOOST_CPPFLAGS) +AC_SUBST(BOOST_LDFLAGS) +]) + + +# convert a version string in $2 to numeric and affect to polymorphic var $1 +AC_DEFUN([_AX_BOOST_BASE_TONUMERICVERSION],[ + AS_IF([test "x$2" = "x"],[_AX_BOOST_BASE_TONUMERICVERSION_req="1.20.0"],[_AX_BOOST_BASE_TONUMERICVERSION_req="$2"]) + _AX_BOOST_BASE_TONUMERICVERSION_req_shorten=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\.[[0-9]]*\)'` + _AX_BOOST_BASE_TONUMERICVERSION_req_major=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '\([[0-9]]*\)'` + AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_major" = "x"], + [AC_MSG_ERROR([You should at least specify libboost major version])]) + _AX_BOOST_BASE_TONUMERICVERSION_req_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.\([[0-9]]*\)'` + AS_IF([test "x$_AX_BOOST_BASE_TONUMERICVERSION_req_minor" = "x"], + [_AX_BOOST_BASE_TONUMERICVERSION_req_minor="0"]) + _AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + AS_IF([test "X$_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor" = "X"], + [_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor="0"]) + _AX_BOOST_BASE_TONUMERICVERSION_RET=`expr $_AX_BOOST_BASE_TONUMERICVERSION_req_major \* 100000 \+ $_AX_BOOST_BASE_TONUMERICVERSION_req_minor \* 100 \+ $_AX_BOOST_BASE_TONUMERICVERSION_req_sub_minor` + AS_VAR_SET($1,$_AX_BOOST_BASE_TONUMERICVERSION_RET) +]) + +dnl Run the detection of boost should be run only if $want_boost +AC_DEFUN([_AX_BOOST_BASE_RUNDETECT],[ + _AX_BOOST_BASE_TONUMERICVERSION(WANT_BOOST_VERSION,[$1]) + succeeded=no + + + AC_REQUIRE([AC_CANONICAL_HOST]) + dnl On 64-bit systems check for system libraries in both lib64 and lib. + dnl The former is specified by FHS, but e.g. Debian does not adhere to + dnl this (as it rises problems for generic multi-arch support). + dnl The last entry in the list is chosen by default when no libraries + dnl are found, e.g. when only header-only libraries are installed! + AS_CASE([${host_cpu}], + [x86_64],[libsubdirs="lib64 libx32 lib lib64"], + [ppc64|s390x|sparc64|aarch64|ppc64le],[libsubdirs="lib64 lib lib64"], + [libsubdirs="lib"] + ) + + dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give + dnl them priority over the other paths since, if libs are found there, they + dnl are almost assuredly the ones desired. + AS_CASE([${host_cpu}], + [i?86],[multiarch_libsubdir="lib/i386-${host_os}"], + [multiarch_libsubdir="lib/${host_cpu}-${host_os}"] + ) + + dnl first we check the system location for boost libraries + dnl this location ist chosen if boost libraries are installed with the --layout=system option + dnl or if you install boost with RPM + AS_IF([test "x$_AX_BOOST_BASE_boost_path" != "x"],[ + AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) includes in "$_AX_BOOST_BASE_boost_path/include"]) + AS_IF([test -d "$_AX_BOOST_BASE_boost_path/include" && test -r "$_AX_BOOST_BASE_boost_path/include"],[ + AC_MSG_RESULT([yes]) + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include" + for _AX_BOOST_BASE_boost_path_tmp in $multiarch_libsubdir $libsubdirs; do + AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION) lib path in "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp"]) + AS_IF([test -d "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" && test -r "$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp" ],[ + AC_MSG_RESULT([yes]) + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path/$_AX_BOOST_BASE_boost_path_tmp"; + break; + ], + [AC_MSG_RESULT([no])]) + done],[ + AC_MSG_RESULT([no])]) + ],[ + if test X"$cross_compiling" = Xyes; then + search_libsubdirs=$multiarch_libsubdir + else + search_libsubdirs="$multiarch_libsubdir $libsubdirs" + fi + for _AX_BOOST_BASE_boost_path_tmp in /usr /usr/local /opt /opt/local ; do + if test -d "$_AX_BOOST_BASE_boost_path_tmp/include/boost" && test -r "$_AX_BOOST_BASE_boost_path_tmp/include/boost" ; then + for libsubdir in $search_libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path_tmp/$libsubdir" + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path_tmp/include" + break; + fi + done + ]) + + dnl overwrite ld flags if we have required special directory with + dnl --with-boost-libdir parameter + AS_IF([test "x$_AX_BOOST_BASE_boost_lib_path" != "x"], + [BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_lib_path"]) + + AC_MSG_CHECKING([for boostlib >= $1 ($WANT_BOOST_VERSION)]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_REQUIRE([AC_PROG_CXX]) + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([_AX_BOOST_BASE_PROGRAM($WANT_BOOST_VERSION)],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + + + + dnl if we found no boost with system layout we search for boost libraries + dnl built and installed without the --layout=system option or for a staged(not installed) version + if test "x$succeeded" != "xyes" ; then + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + BOOST_CPPFLAGS= + if test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + BOOST_LDFLAGS= + fi + _version=0 + if test -n "$_AX_BOOST_BASE_boost_path" ; then + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path"; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "x$V_CHECK" = "x1" ; then + _version=$_version_tmp + fi + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path/include/boost-$VERSION_UNDERSCORE" + done + dnl if nothing found search for layout used in Windows distributions + if test -z "$BOOST_CPPFLAGS"; then + if test -d "$_AX_BOOST_BASE_boost_path/boost" && test -r "$_AX_BOOST_BASE_boost_path/boost"; then + BOOST_CPPFLAGS="-I$_AX_BOOST_BASE_boost_path" + fi + fi + dnl if we found something and BOOST_LDFLAGS was unset before + dnl (because "$_AX_BOOST_BASE_boost_lib_path" = ""), set it here. + if test -n "$BOOST_CPPFLAGS" && test -z "$BOOST_LDFLAGS"; then + for libsubdir in $libsubdirs ; do + if ls "$_AX_BOOST_BASE_boost_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$_AX_BOOST_BASE_boost_path/$libsubdir" + fi + fi + else + if test "x$cross_compiling" != "xyes" ; then + for _AX_BOOST_BASE_boost_path in /usr /usr/local /opt /opt/local ; do + if test -d "$_AX_BOOST_BASE_boost_path" && test -r "$_AX_BOOST_BASE_boost_path" ; then + for i in `ls -d $_AX_BOOST_BASE_boost_path/include/boost-* 2>/dev/null`; do + _version_tmp=`echo $i | sed "s#$_AX_BOOST_BASE_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'` + V_CHECK=`expr $_version_tmp \> $_version` + if test "x$V_CHECK" = "x1" ; then + _version=$_version_tmp + best_path=$_AX_BOOST_BASE_boost_path + fi + done + fi + done + + VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'` + BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE" + if test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + for libsubdir in $libsubdirs ; do + if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + BOOST_LDFLAGS="-L$best_path/$libsubdir" + fi + fi + + if test -n "$BOOST_ROOT" ; then + for libsubdir in $libsubdirs ; do + if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi + done + if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then + version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'` + stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'` + stage_version_shorten=`expr $stage_version : '\([[0-9]]*\.[[0-9]]*\)'` + V_CHECK=`expr $stage_version_shorten \>\= $_version` + if test "x$V_CHECK" = "x1" && test -z "$_AX_BOOST_BASE_boost_lib_path" ; then + AC_MSG_NOTICE(We will use a staged boost library from $BOOST_ROOT) + BOOST_CPPFLAGS="-I$BOOST_ROOT" + BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir" + fi + fi + fi + fi + + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([_AX_BOOST_BASE_PROGRAM($WANT_BOOST_VERSION)],[ + AC_MSG_RESULT(yes) + succeeded=yes + found_system=yes + ],[ + ]) + AC_LANG_POP([C++]) + fi + + if test "x$succeeded" != "xyes" ; then + if test "x$_version" = "x0" ; then + AC_MSG_NOTICE([[We could not detect the boost libraries (version $1 or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in . See http://randspringer.de/boost for more documentation.]]) + else + AC_MSG_NOTICE([Your boost libraries seems to old (version $_version).]) + fi + # execute ACTION-IF-NOT-FOUND (if present): + ifelse([$3], , :, [$3]) + else + AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available]) + # execute ACTION-IF-FOUND (if present): + ifelse([$2], , :, [$2]) + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_chrono.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_chrono.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_chrono.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_chrono.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,118 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_chrono.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_CHRONO +# +# DESCRIPTION +# +# Test for Chrono library from the Boost C++ libraries. The macro requires +# a preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_CHRONO_LIB) +# +# And sets: +# +# HAVE_BOOST_CHRONO +# +# LICENSE +# +# Copyright (c) 2012 Xiyue Deng +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_BOOST_CHRONO], +[ + AC_ARG_WITH([boost-chrono], + AS_HELP_STRING([--with-boost-chrono@<:@=special-lib@:>@], + [use the Chrono library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-chrono=boost_chrono-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_chrono_lib="" + else + want_boost="yes" + ax_boost_user_chrono_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Chrono library is available, + ax_cv_boost_chrono, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::chrono::system_clock::time_point time;]])], + ax_cv_boost_chrono=yes, ax_cv_boost_chrono=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_chrono" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_CHRONO,,[define if the Boost::Chrono library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_chrono_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_chrono*.so* $BOOSTLIBDIR/libboost_chrono*.dylib* $BOOSTLIBDIR/libboost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_chrono.*\)\.so.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_chrono.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], + [link_chrono="no"]) + done + if test "x$link_chrono" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_chrono*.dll* $BOOSTLIBDIR/boost_chrono*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_chrono.*\)\.dll.*$;\1;' -e 's;^\(boost_chrono.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], + [link_chrono="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_chrono_lib boost_chrono-$ax_boost_user_chrono_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_CHRONO_LIB="-l$ax_lib"; AC_SUBST(BOOST_CHRONO_LIB) link_chrono="yes"; break], + [link_chrono="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_chrono" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_context.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_context.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_context.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_context.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,122 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_context.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_CONTEXT +# +# DESCRIPTION +# +# Test for Context library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_CONTEXT_LIB) +# +# And sets: +# +# HAVE_BOOST_CONTEXT +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2013 Daniel Casimiro +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_BOOST_CONTEXT], +[ + AC_ARG_WITH([boost-context], + AS_HELP_STRING([--with-boost-context@<:@=special-lib@:>@], + [use the Context library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-context=boost_context-gcc-mt ]), [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_context_lib="" + else + want_boost="yes" + ax_boost_user_context_lib="$withval" + fi + ], [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Context library is available, + ax_cv_boost_context, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[@%:@include ]], + [[boost::context::fcontext_t* fc = boost::context::make_fcontext(0, 0, 0);]])], + ax_cv_boost_context=yes, ax_cv_boost_context=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + + if test "x$ax_cv_boost_context" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_CONTEXT,,[define if the Boost::Context library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_context_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_context*.so* $BOOSTLIBDIR/libboost_context*.dylib* $BOOSTLIBDIR/libboost_context*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_context.*\)\.so.*$;\1;' -e 's;^lib\(boost_context.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_context.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_CONTEXT_LIB="-l$ax_lib"; AC_SUBST(BOOST_CONTEXT_LIB) link_context="yes"; break], + [link_context="no"]) + done + + if test "x$link_context" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_context*.dll* $BOOSTLIBDIR/boost_context*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_context.*\)\.dll.*$;\1;' -e 's;^\(boost_context.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_CONTEXT_LIB="-l$ax_lib"; AC_SUBST(BOOST_CONTEXT_LIB) link_context="yes"; break], + [link_context="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_context_lib boost_context-$ax_boost_user_context_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_CONTEXT_LIB="-l$ax_lib"; AC_SUBST(BOOST_CONTEXT_LIB) link_context="yes"; break], + [link_context="no"]) + done + fi + + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + + if test "x$link_context" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_coroutine.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_coroutine.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_coroutine.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_coroutine.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,122 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_coroutine.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_COROUTINE +# +# DESCRIPTION +# +# Test for Coroutine library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_COROUTINE_LIB) +# +# And sets: +# +# HAVE_BOOST_COROUTINE +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2013 Daniel Casimiro +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_BOOST_COROUTINE], +[ + AC_ARG_WITH([boost-coroutine], + AS_HELP_STRING([--with-boost-coroutine@<:@=special-lib@:>@], + [use the Coroutine library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-coroutine=boost_coroutine-gcc-mt ]), [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_coroutine_lib="" + else + want_boost="yes" + ax_boost_user_coroutine_lib="$withval" + fi + ], [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Coroutine library is available, + ax_cv_boost_coroutine, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[@%:@include ]], + [[boost::coroutines::coroutine< void() > f;]])], + ax_cv_boost_coroutine=yes, ax_cv_boost_coroutine=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + + if test "x$ax_cv_boost_coroutine" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_COROUTINE,,[define if the Boost::Coroutine library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_coroutine_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_coroutine*.so* $BOOSTLIBDIR/libboost_coroutine*.dylib* $BOOSTLIBDIR/libboost_coroutine*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_coroutine.*\)\.so.*$;\1;' -e 's;^lib\(boost_coroutine.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_coroutine.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_COROUTINE_LIB="-l$ax_lib"; AC_SUBST(BOOST_COROUTINE_LIB) link_coroutine="yes"; break], + [link_coroutine="no"]) + done + + if test "x$link_coroutine" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_coroutine*.dll* $BOOSTLIBDIR/boost_coroutine*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_coroutine.*\)\.dll.*$;\1;' -e 's;^\(boost_coroutine.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_COROUTINE_LIB="-l$ax_lib"; AC_SUBST(BOOST_COROUTINE_LIB) link_coroutine="yes"; break], + [link_coroutine="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_coroutine_lib boost_coroutine-$ax_boost_user_coroutine_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_COROUTINE_LIB="-l$ax_lib"; AC_SUBST(BOOST_COROUTINE_LIB) link_coroutine="yes"; break], + [link_coroutine="no"]) + done + fi + + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + + if test "x$link_coroutine" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_date_time.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_date_time.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_date_time.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_date_time.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,113 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_date_time.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_DATE_TIME +# +# DESCRIPTION +# +# Test for Date_Time library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_DATE_TIME_LIB) +# +# And sets: +# +# HAVE_BOOST_DATE_TIME +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 22 + +AC_DEFUN([AX_BOOST_DATE_TIME], +[ + AC_ARG_WITH([boost-date-time], + AS_HELP_STRING([--with-boost-date-time@<:@=special-lib@:>@], + [use the Date_Time library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-date-time=boost_date_time-gcc-mt-d-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_date_time_lib="" + else + want_boost="yes" + ax_boost_user_date_time_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Date_Time library is available, + ax_cv_boost_date_time, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using namespace boost::gregorian; date d(2002,Jan,10); + return 0; + ]])], + ax_cv_boost_date_time=yes, ax_cv_boost_date_time=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_date_time" = "xyes"; then + AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_date_time_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_date_time*.so* $BOOSTLIBDIR/libboost_date_time*.dylib* $BOOSTLIBDIR/libboost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break], + [link_date_time="no"]) + done + if test "x$link_date_time" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_date_time*.dll* $BOOSTLIBDIR/boost_date_time*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e 's;^\(boost_date_time.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break], + [link_date_time="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break], + [link_date_time="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_date_time" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_filesystem.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_filesystem.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_filesystem.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_filesystem.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,118 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_filesystem.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_FILESYSTEM +# +# DESCRIPTION +# +# Test for Filesystem library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_FILESYSTEM_LIB) +# +# And sets: +# +# HAVE_BOOST_FILESYSTEM +# +# LICENSE +# +# Copyright (c) 2009 Thomas Porschberg +# Copyright (c) 2009 Michael Tindal +# Copyright (c) 2009 Roman Rybalko +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 27 + +AC_DEFUN([AX_BOOST_FILESYSTEM], +[ + AC_ARG_WITH([boost-filesystem], + AS_HELP_STRING([--with-boost-filesystem@<:@=special-lib@:>@], + [use the Filesystem library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-filesystem=boost_filesystem-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_filesystem_lib="" + else + want_boost="yes" + ax_boost_user_filesystem_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + LIBS_SAVED=$LIBS + LIBS="$LIBS $BOOST_SYSTEM_LIB" + export LIBS + + AC_CACHE_CHECK(whether the Boost::Filesystem library is available, + ax_cv_boost_filesystem, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using namespace boost::filesystem; + path my_path( "foo/bar/data.txt" ); + return 0;]])], + ax_cv_boost_filesystem=yes, ax_cv_boost_filesystem=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_filesystem" = "xyes"; then + AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_filesystem_lib" = "x"; then + for libextension in `ls -r $BOOSTLIBDIR/libboost_filesystem* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + if test "x$link_filesystem" != "xyes"; then + for libextension in `ls -r $BOOSTLIBDIR/boost_filesystem* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + fi + else + for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_filesystem" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + LIBS="$LIBS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_iostreams.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_iostreams.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_iostreams.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_iostreams.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,116 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_iostreams.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_IOSTREAMS +# +# DESCRIPTION +# +# Test for IOStreams library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_IOSTREAMS_LIB) +# +# And sets: +# +# HAVE_BOOST_IOSTREAMS +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 21 + +AC_DEFUN([AX_BOOST_IOSTREAMS], +[ + AC_ARG_WITH([boost-iostreams], + AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@], + [use the IOStreams library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_iostreams_lib="" + else + want_boost="yes" + ax_boost_user_iostreams_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::IOStreams library is available, + ax_cv_boost_iostreams, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + @%:@include + ]], + [[std::string input = "Hello World!"; + namespace io = boost::iostreams; + io::filtering_istream in(boost::make_iterator_range(input)); + return 0; + ]])], + ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_iostreams" = "xyes"; then + AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_iostreams_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break], + [link_iostreams="no"]) + done + if test "x$link_iostreams" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* $BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break], + [link_iostreams="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break], + [link_iostreams="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_iostreams" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_locale.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_locale.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_locale.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_locale.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,119 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_locale.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_LOCALE +# +# DESCRIPTION +# +# Test for System library from the Boost C++ libraries. The macro requires +# a preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_LOCALE_LIB) +# +# And sets: +# +# HAVE_BOOST_LOCALE +# +# LICENSE +# +# Copyright (c) 2012 Xiyue Deng +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_BOOST_LOCALE], +[ + AC_ARG_WITH([boost-locale], + AS_HELP_STRING([--with-boost-locale@<:@=special-lib@:>@], + [use the Locale library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-locale=boost_locale-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_locale_lib="" + else + want_boost="yes" + ax_boost_user_locale_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Locale library is available, + ax_cv_boost_locale, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::locale::generator gen; + std::locale::global(gen(""));]])], + ax_cv_boost_locale=yes, ax_cv_boost_locale=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_locale" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_LOCALE,,[define if the Boost::Locale library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_locale_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_locale*.so* $BOOSTLIBDIR/libboost_locale*.dylib* $BOOSTLIBDIR/libboost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_locale.*\)\.so.*$;\1;' -e 's;^lib\(boost_locale.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_locale.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break], + [link_locale="no"]) + done + if test "x$link_locale" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_locale*.dll* $BOOSTLIBDIR/boost_locale*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_locale.*\)\.dll.*$;\1;' -e 's;^\(boost_locale.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break], + [link_locale="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break], + [link_locale="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_locale" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_log.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_log.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_log.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_log.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,122 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_log.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_LOG +# +# DESCRIPTION +# +# Test for Log library from the Boost C++ libraries. The macro requires a +# preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_LOG_LIB) +# +# And sets: +# +# HAVE_BOOST_LOG +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2013 Daniel Casimiro +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_BOOST_LOG], +[ + AC_ARG_WITH([boost-log], + AS_HELP_STRING([--with-boost-log@<:@=special-lib@:>@], + [use the Log library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-log=boost_log-gcc-mt ]), [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_log_lib="" + else + want_boost="yes" + ax_boost_user_log_lib="$withval" + fi + ], [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Log library is available, + ax_cv_boost_log, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[@%:@include ]], + [[BOOST_LOG_TRIVIAL(trace) << "A boost::log test";]])], + ax_cv_boost_log=yes, ax_cv_boost_log=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + + if test "x$ax_cv_boost_log" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_LOG,,[define if the Boost::Log library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_log_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_log*.so* $BOOSTLIBDIR/libboost_log*.dylib* $BOOSTLIBDIR/libboost_log*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_log.*\)\.so.*$;\1;' -e 's;^lib\(boost_log.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_log.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOG_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_LIB) link_log="yes"; break], + [link_log="no"]) + done + + if test "x$link_log" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_log*.dll* $BOOSTLIBDIR/boost_log*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_log.*\)\.dll.*$;\1;' -e 's;^\(boost_log.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOG_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_LIB) link_log="yes"; break], + [link_log="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_log_lib boost_log-$ax_boost_user_log_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOG_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_LIB) link_log="yes"; break], + [link_log="no"]) + done + fi + + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + + if test "x$link_log" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_log_setup.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_log_setup.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_log_setup.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_log_setup.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,113 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_log_setup.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_LOG_SETUP +# +# DESCRIPTION +# +# Test for LogSetup library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_LOG_SETUP_LIB) +# +# And sets: +# +# HAVE_BOOST_LOG_SETUP +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2013 Daniel Casimiro +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_BOOST_LOG_SETUP], +[ + AC_ARG_WITH([boost-log_setup], + AS_HELP_STRING([--with-boost-log_setup@<:@=special-lib@:>@], + [use the Log_setup library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-log_setup=boost_log_setup-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_log_setup_lib="" + else + want_boost="yes" + ax_boost_user_log_setup_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + AC_REQUIRE([AX_BOOST_LOG]) + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_LOG_SETUP,, + [define if the Boost::Log_setup library is available]) + + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_log_setup_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_log_setup*.so* $BOOSTLIBDIR/libboost_log_setup*.dylib* $BOOSTLIBDIR/libboost_log_setup*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_log_setup.*\)\.so.*$;\1;' -e 's;^lib\(boost_log_setup.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_log_setup.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOG_SETUP_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_SETUP_LIB) link_log_setup="yes"; break], + [link_log_setup="no"]) + done + + if test "x$link_log_setup" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_log_setup*.dll* $BOOSTLIBDIR/boost_log_setup*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_log_setup.*\)\.dll.*$;\1;' -e 's;^\(boost_log_setup.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOG_SETUP_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_SETUP_LIB) link_log_setup="yes"; break], + [link_log_setup="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_log_setup_lib boost_log_setup-$ax_boost_user_log_setup_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_LOG_SETUP_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOG_SETUP_LIB) link_log_setup="yes"; break], + [link_log_setup="no"]) + done + + fi + + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + + if test "x$link_log_setup" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_program_options.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_program_options.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_program_options.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_program_options.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,108 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_boost_program_options.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_BOOST_PROGRAM_OPTIONS +# +# DESCRIPTION +# +# Test for program options library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) +# +# And sets: +# +# HAVE_BOOST_PROGRAM_OPTIONS +# +# LICENSE +# +# Copyright (c) 2009 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 25 + +AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS], +[ + AC_ARG_WITH([boost-program-options], + AS_HELP_STRING([--with-boost-program-options@<:@=special-lib@:>@], + [use the program options library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-program-options=boost_program_options-gcc-mt-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_program_options_lib="" + else + want_boost="yes" + ax_boost_user_program_options_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + export want_boost + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + AC_CACHE_CHECK([whether the Boost::Program_Options library is available], + ax_cv_boost_program_options, + [AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[boost::program_options::error err("Error message"); + return 0;]])], + ax_cv_boost_program_options=yes, ax_cv_boost_program_options=no) + AC_LANG_POP([C++]) + ]) + if test "$ax_cv_boost_program_options" = yes; then + AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the Boost::PROGRAM_OPTIONS library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_program_options_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_program_options*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.so.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.dylib* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.dylib.*$;\1;'` `ls $BOOSTLIBDIR/libboost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_program_options.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], + [link_program_options="no"]) + done + if test "x$link_program_options" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_program_options*.dll* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.dll.*$;\1;'` `ls $BOOSTLIBDIR/boost_program_options*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_program_options.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], + [link_program_options="no"]) + done + fi + else + for ax_lib in $ax_boost_user_program_options_lib boost_program_options-$ax_boost_user_program_options_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_PROGRAM_OPTIONS_LIB="-l$ax_lib"; AC_SUBST(BOOST_PROGRAM_OPTIONS_LIB) link_program_options="yes"; break], + [link_program_options="no"]) + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_program_options" != "xyes"; then + AC_MSG_ERROR([Could not link against [$ax_lib] !]) + fi + fi + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_python.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_python.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_python.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_python.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,121 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_python.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_PYTHON +# +# DESCRIPTION +# +# This macro checks to see if the Boost.Python library is installed. It +# also attempts to guess the correct library name using several attempts. +# It tries to build the library name using a user supplied name or suffix +# and then just the raw library. +# +# If the library is found, HAVE_BOOST_PYTHON is defined and +# BOOST_PYTHON_LIB is set to the name of the library. +# +# This macro calls AC_SUBST(BOOST_PYTHON_LIB). +# +# In order to ensure that the Python headers and the Boost libraries are +# specified on the include path, this macro requires AX_PYTHON_DEVEL and +# AX_BOOST_BASE to be called. +# +# LICENSE +# +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2013 Daniel M"ullner +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 22 + +AC_DEFUN([AX_BOOST_PYTHON], +[AC_REQUIRE([AX_PYTHON_DEVEL])dnl +AC_REQUIRE([AX_BOOST_BASE])dnl +AC_LANG_PUSH([C++]) +ax_boost_python_save_CPPFLAGS="$CPPFLAGS" +ax_boost_python_save_LDFLAGS="$LDFLAGS" +ax_boost_python_save_LIBS="$LIBS" +if test "x$PYTHON_CPPFLAGS" != "x"; then + CPPFLAGS="$PYTHON_CPPFLAGS $CPPFLAGS" +fi + +# Versions of AX_PYTHON_DEVEL() before serial 18 provided PYTHON_LDFLAGS +# instead of PYTHON_LIBS, so this is just here for compatibility. +if test "x$PYTHON_LDFLAGS" != "x"; then + LDFLAGS="$PYTHON_LDFLAGS $LDFLAGS" +fi + +# Note: Only versions of AX_PYTHON_DEVEL() since serial 18 provide PYTHON_LIBS +# instead of PYTHON_LDFLAGS. +if test "x$PYTHON_LIBS" != "x"; then + LIBS="$PYTHON_LIBS $LIBS" +fi + +if test "x$BOOST_CPPFLAGS" != "x"; then + CPPFLAGS="$BOOST_CPPFLAGS $CPPFLAGS" +fi +if test "x$BOOST_LDFLAGS" != "x"; then + LDFLAGS="$BOOST_LDFLAGS $LDFLAGS" +fi +AC_CACHE_CHECK(whether the Boost::Python library is available, +ac_cv_boost_python, +[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], [])], + ac_cv_boost_python=yes, ac_cv_boost_python=no) +]) +if test "$ac_cv_boost_python" = "yes"; then + AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is available]) + ax_python_lib=boost_python + AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify yes/no or the boost python library or suffix to use]), + [if test "x$with_boost_python" != "xno" -a "x$with_boost_python" != "xyes"; then + ax_python_lib=$with_boost_python + ax_boost_python_lib=boost_python-$with_boost_python + fi]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + for ax_lib in $ax_python_lib $ax_boost_python_lib `ls $BOOSTLIBDIR/libboost_python*.so* $BOOSTLIBDIR/libboost_python*.dylib* $BOOSTLIBDIR/libboost_python*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_python.*\)\.so.*$;\1;' -e 's;^lib\(boost_python.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_python.*\)\.a.*$;\1;' ` boost_python boost_python3; do + AS_VAR_PUSHDEF([ax_Lib], [ax_cv_lib_$ax_lib''_BOOST_PYTHON_MODULE])dnl + AC_CACHE_CHECK([whether $ax_lib is the correct library], [ax_Lib], + [LIBS="-l$ax_lib $ax_boost_python_save_LIBS $PYTHON_LIBS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +#include +BOOST_PYTHON_MODULE(test) { throw "Boost::Python test."; }]], [])], + [AS_VAR_SET([ax_Lib], [yes])], + [AS_VAR_SET([ax_Lib], [no])])]) + AS_VAR_IF([ax_Lib], [yes], [BOOST_PYTHON_LIB=$ax_lib break], []) + AS_VAR_POPDEF([ax_Lib])dnl + done + AC_SUBST(BOOST_PYTHON_LIB) +fi +CPPFLAGS="$ax_boost_python_save_CPPFLAGS" +LDFLAGS="$ax_boost_python_save_LDFLAGS" +LIBS="$ax_boost_python_save_LIBS" +AC_LANG_POP([C++]) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_regex.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_regex.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_regex.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_regex.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,111 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_regex.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_REGEX +# +# DESCRIPTION +# +# Test for Regex library from the Boost C++ libraries. The macro requires +# a preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_REGEX_LIB) +# +# And sets: +# +# HAVE_BOOST_REGEX +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 23 + +AC_DEFUN([AX_BOOST_REGEX], +[ + AC_ARG_WITH([boost-regex], + AS_HELP_STRING([--with-boost-regex@<:@=special-lib@:>@], + [use the Regex library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-regex=boost_regex-gcc-mt-d-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_regex_lib="" + else + want_boost="yes" + ax_boost_user_regex_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Regex library is available, + ax_cv_boost_regex, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[boost::regex r(); return 0;]])], + ax_cv_boost_regex=yes, ax_cv_boost_regex=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_regex" = "xyes"; then + AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_regex_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_regex*.so* $BOOSTLIBDIR/libboost_regex*.dylib* $BOOSTLIBDIR/libboost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_regex.*\)\.so.*$;\1;' -e 's;^lib\(boost_regex.*\)\.dylib.*;\1;' -e 's;^lib\(boost_regex.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break], + [link_regex="no"]) + done + if test "x$link_regex" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_regex*.dll* $BOOSTLIBDIR/boost_regex*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_regex.*\)\.dll.*$;\1;' -e 's;^\(boost_regex.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break], + [link_regex="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_regex_lib boost_regex-$ax_boost_user_regex_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_REGEX_LIB="-l$ax_lib"; AC_SUBST(BOOST_REGEX_LIB) link_regex="yes"; break], + [link_regex="no"]) + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the Boost::Regex library!) + fi + if test "x$link_regex" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_serialization.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_serialization.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_serialization.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_serialization.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,117 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_serialization.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_SERIALIZATION +# +# DESCRIPTION +# +# Test for Serialization library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_SERIALIZATION_LIB) +# +# And sets: +# +# HAVE_BOOST_SERIALIZATION +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 22 + +AC_DEFUN([AX_BOOST_SERIALIZATION], +[ + AC_ARG_WITH([boost-serialization], + AS_HELP_STRING([--with-boost-serialization@<:@=special-lib@:>@], + [use the Serialization library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-serialization=boost_serialization-gcc-mt-d-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_serialization_lib="" + else + want_boost="yes" + ax_boost_user_serialization_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + AC_MSG_WARN(BOOST_CPPFLAGS $BOOST_CPPFLAGS) + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Serialization library is available, + ax_cv_boost_serialization, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + @%:@include + @%:@include + ]], + [[std::ofstream ofs("filename"); + boost::archive::text_oarchive oa(ofs); + return 0; + ]])], + ax_cv_boost_serialization=yes, ax_cv_boost_serialization=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_serialization" = "xyes"; then + AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the Boost::Serialization library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_serialization_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_serialization*.so* $BOOSTLIBDIR/libboost_serialization*.dylib* $BOOSTLIBDIR/libboost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_serialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_serialization.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break], + [link_serialization="no"]) + done + if test "x$link_serialization" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_serialization*.dll* $BOOSTLIBDIR/boost_serialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_serialization.*\)\.dll.*$;\1;' -e 's;^\(boost_serialization.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break], + [link_serialization="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_serialization_lib boost_serialization-$ax_boost_user_serialization_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_SERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_SERIALIZATION_LIB) link_serialization="yes"; break], + [link_serialization="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_serialization" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_signals.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_signals.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_signals.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_signals.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,114 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_signals.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_SIGNALS +# +# DESCRIPTION +# +# Test for Signals library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_SIGNALS_LIB) +# +# And sets: +# +# HAVE_BOOST_SIGNALS +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 22 + +AC_DEFUN([AX_BOOST_SIGNALS], +[ + AC_ARG_WITH([boost-signals], + AS_HELP_STRING([--with-boost-signals@<:@=special-lib@:>@], + [use the Signals library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-signals=boost_signals-gcc-mt-d ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_signals_lib="" + else + want_boost="yes" + ax_boost_user_signals_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Signals library is available, + ax_cv_boost_signals, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[boost::signal sig; + return 0; + ]])], + ax_cv_boost_signals=yes, ax_cv_boost_signals=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_signals" = "xyes"; then + AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_signals_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_signals*.so* $BOOSTLIBDIR/libboost_signals*.dylib* $BOOSTLIBDIR/libboost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_signals.*\)\.so.*$;\1;' -e 's;^lib\(boost_signals.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_signals.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break], + [link_signals="no"]) + done + if test "x$link_signals" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_signals*.dll* $BOOSTLIBDIR/boost_signals*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_signals.*\)\.dll.*$;\1;' -e 's;^\(boost_signals.*\)\.a*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break], + [link_signals="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_signals_lib boost_signals-$ax_boost_user_signals_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_SIGNALS_LIB="-l$ax_lib"; AC_SUBST(BOOST_SIGNALS_LIB) link_signals="yes"; break], + [link_signals="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_signals" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_system.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_system.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_system.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_system.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,121 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_system.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_SYSTEM +# +# DESCRIPTION +# +# Test for System library from the Boost C++ libraries. The macro requires +# a preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_SYSTEM_LIB) +# +# And sets: +# +# HAVE_BOOST_SYSTEM +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# Copyright (c) 2008 Michael Tindal +# Copyright (c) 2008 Daniel Casimiro +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 19 + +AC_DEFUN([AX_BOOST_SYSTEM], +[ + AC_ARG_WITH([boost-system], + AS_HELP_STRING([--with-boost-system@<:@=special-lib@:>@], + [use the System library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-system=boost_system-gcc-mt ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_system_lib="" + else + want_boost="yes" + ax_boost_user_system_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::System library is available, + ax_cv_boost_system, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + CXXFLAGS= + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[boost::system::error_category *a = 0;]])], + ax_cv_boost_system=yes, ax_cv_boost_system=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_system" = "xyes"; then + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_system_lib" = "x"; then + for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + if test "x$link_system" != "xyes"; then + for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_system" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_test_exec_monitor.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_test_exec_monitor.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_test_exec_monitor.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_test_exec_monitor.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,139 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_test_exec_monitor.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_BOOST_TEST_EXEC_MONITOR +# +# DESCRIPTION +# +# Test for Test_Exec_Monitor library from the Boost C++ libraries. The +# macro requires a preceding call to AX_BOOST_BASE. Further documentation +# is available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB) +# +# And sets: +# +# HAVE_BOOST_TEST_EXEC_MONITOR +# +# LICENSE +# +# Copyright (c) 2008 Dodji Seketeli +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 21 + +AC_DEFUN([AX_BOOST_TEST_EXEC_MONITOR], +[ + AC_ARG_WITH([boost-test-exec-monitor], + AS_HELP_STRING([--with-boost-test-exec-monitor@<:@=special-lib@:>@], + [use the Test_Exec_Monitor library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-test-exec-monitor=boost_test_exec_monitor-gcc ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_test_exec_monitor_lib="" + else + want_boost="yes" + ax_boost_user_test_exec_monitor_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Test_Exec_Monitor library is available, + ax_cv_boost_test_exec_monitor, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[int i=1 ; BOOST_REQUIRE(i==1); ; return 0;]])], + ax_cv_boost_test_exec_monitor=yes, ax_cv_boost_test_exec_monitor=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_test_exec_monitor" = "xyes"; then + AC_DEFINE(HAVE_BOOST_TEST_EXEC_MONITOR,,[define if the Boost::Test_Exec_Monitor library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_test_exec_monitor_lib" = "x"; then + saved_ldflags="${LDFLAGS}" + + for monitor_library in `ls $BOOSTLIBDIR/libboost_test_exec_monitor*.so* $BOOSTLIBDIR/libboost_test_exec_monitor*.dylib* $BOOSTLIBDIR/libboost_test_exec_monitor*.a* 2>/dev/null` ; do + if test -r $monitor_library ; then + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_test_exec_monitor.*\)\.so.*$;\1;' -e 's;^lib\(boost_test_exec_monitor.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_test_exec_monitor.*\)\.a.*$;\1;'` + ax_lib=${libextension} + link_test_exec_monitor="yes" + else + link_test_exec_monitor="no" + fi + + if test "x$link_test_exec_monitor" = "xyes"; then + BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib" + AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB) + break + fi + done + if test "x$link_test_exec_monitor" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_test_exec_monitor*.dll* $BOOSTLIBDIR/boost_test_exec_monitor*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_test_exec_monitor.*\)\.dll.*$;\1;' -e 's;^\(boost_test_exec_monitor.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib"; AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB) link_test_exec_monitor="yes"; break], + [link_test_exec_monitor="no"]) + done + fi + + else + link_test_exec_monitor="no" + saved_ldflags="${LDFLAGS}" + for ax_lib in boost_test_exec_monitor-$ax_boost_user_test_exec_monitor_lib $ax_boost_user_test_exec_monitor_lib ; do + if test "x$link_test_exec_monitor" = "xyes"; then + break; + fi + for monitor_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do + if test -r $monitor_library ; then + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_test_exec_monitor.*\)\.so.*$;\1;' -e 's;^lib\(boost_test_exec_monitor.*\)\.a*$;\1;'` + ax_lib=${libextension} + link_test_exec_monitor="yes" + else + link_test_exec_monitor="no" + fi + + if test "x$link_test_exec_monitor" = "xyes"; then + BOOST_TEST_EXEC_MONITOR_LIB="-l$ax_lib" + AC_SUBST(BOOST_TEST_EXEC_MONITOR_LIB) + break + fi + done + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_test_exec_monitor" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_thread.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_thread.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_thread.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_thread.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,163 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_thread.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_THREAD +# +# DESCRIPTION +# +# Test for Thread library from the Boost C++ libraries. The macro requires +# a preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_THREAD_LIB) +# +# And sets: +# +# HAVE_BOOST_THREAD +# +# LICENSE +# +# Copyright (c) 2009 Thomas Porschberg +# Copyright (c) 2009 Michael Tindal +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 31 + +AC_DEFUN([AX_BOOST_THREAD], +[ + AC_ARG_WITH([boost-thread], + AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@], + [use the Thread library from boost - + it is possible to specify a certain library for the linker + e.g. --with-boost-thread=boost_thread-gcc-mt ]), + [ + if test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_thread_lib="" + else + want_boost="yes" + ax_boost_user_thread_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_BUILD]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Thread library is available, + ax_cv_boost_thread, + [AC_LANG_PUSH([C++]) + CXXFLAGS_SAVE=$CXXFLAGS + + if test "x$host_os" = "xsolaris" ; then + CXXFLAGS="-pthreads $CXXFLAGS" + elif test "x$host_os" = "xmingw32" ; then + CXXFLAGS="-mthreads $CXXFLAGS" + else + CXXFLAGS="-pthread $CXXFLAGS" + fi + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[@%:@include ]], + [[boost::thread_group thrds; + return 0;]])], + ax_cv_boost_thread=yes, ax_cv_boost_thread=no) + CXXFLAGS=$CXXFLAGS_SAVE + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_thread" = "xyes"; then + if test "x$host_os" = "xsolaris" ; then + BOOST_CPPFLAGS="-pthreads $BOOST_CPPFLAGS" + elif test "x$host_os" = "xmingw32" ; then + BOOST_CPPFLAGS="-mthreads $BOOST_CPPFLAGS" + else + BOOST_CPPFLAGS="-pthread $BOOST_CPPFLAGS" + fi + + AC_SUBST(BOOST_CPPFLAGS) + + AC_DEFINE(HAVE_BOOST_THREAD,, + [define if the Boost::Thread library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + LDFLAGS_SAVE=$LDFLAGS + case "x$host_os" in + *bsd* ) + LDFLAGS="-pthread $LDFLAGS" + break; + ;; + esac + if test "x$ax_boost_user_thread_lib" = "x"; then + for libextension in `ls -r $BOOSTLIBDIR/libboost_thread* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'`; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [link_thread="yes"; break], + [link_thread="no"]) + done + if test "x$link_thread" != "xyes"; then + for libextension in `ls -r $BOOSTLIBDIR/boost_thread* 2>/dev/null | sed 's,.*/,,' | sed 's,\..*,,'`; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [link_thread="yes"; break], + [link_thread="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_thread_lib boost_thread-$ax_boost_user_thread_lib; do + AC_CHECK_LIB($ax_lib, exit, + [link_thread="yes"; break], + [link_thread="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_thread" = "xno"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + else + BOOST_THREAD_LIB="-l$ax_lib" + case "x$host_os" in + *bsd* ) + BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS" + break; + ;; + xsolaris ) + BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread" + break; + ;; + xmingw32 ) + break; + ;; + * ) + BOOST_THREAD_LIB="$BOOST_THREAD_LIB -lpthread" + break; + ;; + esac + AC_SUBST(BOOST_THREAD_LIB) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_unit_test_framework.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_unit_test_framework.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_unit_test_framework.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_unit_test_framework.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,137 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_boost_unit_test_framework.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_BOOST_UNIT_TEST_FRAMEWORK +# +# DESCRIPTION +# +# Test for Unit_Test_Framework library from the Boost C++ libraries. The +# macro requires a preceding call to AX_BOOST_BASE. Further documentation +# is available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) +# +# And sets: +# +# HAVE_BOOST_UNIT_TEST_FRAMEWORK +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 20 + +AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], +[ + AC_ARG_WITH([boost-unit-test-framework], + AS_HELP_STRING([--with-boost-unit-test-framework@<:@=special-lib@:>@], + [use the Unit_Test_Framework library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-unit-test-framework=boost_unit_test_framework-gcc ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_unit_test_framework_lib="" + else + want_boost="yes" + ax_boost_user_unit_test_framework_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::Unit_Test_Framework library is available, + ax_cv_boost_unit_test_framework, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], + [[using boost::unit_test::test_suite; + test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" ); return 0;]])], + ax_cv_boost_unit_test_framework=yes, ax_cv_boost_unit_test_framework=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then + AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + + if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then + saved_ldflags="${LDFLAGS}" + for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.so* $BOOSTLIBDIR/libboost_unit_test_framework*.dylib* $BOOSTLIBDIR/libboost_unit_test_framework*.a* 2>/dev/null` ; do + if test -r $monitor_library ; then + libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a.*$;\1;'` + ax_lib=${libextension} + link_unit_test_framework="yes" + else + link_unit_test_framework="no" + fi + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) + break + fi + done + if test "x$link_unit_test_framework" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_unit_test_framework*.dll* $BOOSTLIBDIR/boost_unit_test_framework*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_unit_test_framework.*\)\.dll.*$;\1;' -e 's;^\(boost_unit_test_framework.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"; AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) link_unit_test_framework="yes"; break], + [link_unit_test_framework="no"]) + done + fi + else + link_unit_test_framework="no" + saved_ldflags="${LDFLAGS}" + for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do + if test "x$link_unit_test_framework" = "xyes"; then + break; + fi + for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do + if test -r $unittest_library ; then + libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'` + ax_lib=${libextension} + link_unit_test_framework="yes" + else + link_unit_test_framework="no" + fi + + if test "x$link_unit_test_framework" = "xyes"; then + BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib" + AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) + break + fi + done + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_unit_test_framework" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_wave.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_wave.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_wave.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_wave.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,127 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_boost_wave.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BOOST_WAVE +# +# DESCRIPTION +# +# Test for Wave library from the Boost C++ libraries. The macro requires a +# preceding call to AX_BOOST_BASE. Further documentation is available at +# . +# +# This macro calls: +# +# AC_SUBST(BOOST_WAVE_LIB) +# +# And sets: +# +# HAVE_BOOST_WAVE +# +# LICENSE +# +# Copyright (c) 2009 Thomas Porschberg +# Copyright (c) 2009 Michael Tindal +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 16 + +AC_DEFUN([AX_BOOST_WAVE], +[ + AC_ARG_WITH([boost-wave], + AS_HELP_STRING([--with-boost-wave@<:@=special-lib@:>@], + [use the Wave library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-wave=boost_wave-gcc-mt-d-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_wave_lib="" + else + want_boost="yes" + ax_boost_user_wave_lib="$withval" + fi + ], + [want_boost="yes"] + ) + AM_CONDITIONAL(ROSE_USE_BOOST_WAVE, test "x$want_boost" = "xyes" ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + LIBS_SAVED=$LIBS + LIBS="$LIBS $BOOST_THREAD_LIB" + export LIBS + + AC_CACHE_CHECK(whether the Boost::Wave library is available, + ax_cv_boost_wave, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[boost::wave::token_category r; return 0;]])], + ax_cv_boost_wave=yes, ax_cv_boost_wave=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_wave" = "xyes"; then + + AC_DEFINE(HAVE_BOOST_WAVE,,[define if the Boost::Wave library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_wave_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_wave*.so* $BOOSTLIBDIR/libboost_wave*.dylib* $BOOSTLIBDIR/libboost_wave*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_wave.*\)\.so.*$;\1;' -e 's;^lib\(boost_wave.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_wave.*\)\.a.*$;\1;' ` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_WAVE_LIB="-l$ax_lib"; AC_SUBST(BOOST_WAVE_LIB) link_wave="yes"; break], + [link_wave="no"]) + done + if test "x$link_wave" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_wave*.dll* $BOOSTLIBDIR/boost_wave*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_wave.*\)\.dll.*$;\1;' -e 's;^\(boost_wave.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_WAVE_LIB="-l$ax_lib"; AC_SUBST(BOOST_WAVE_LIB) link_wave="yes"; break], + [link_wave="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_wave_lib boost_wave-$ax_boost_user_wave_lib; do + AC_CHECK_LIB($ax_lib, exit, + [BOOST_WAVE_LIB="-l$ax_lib"; AC_SUBST(BOOST_WAVE_LIB) link_wave="yes"; break], + [link_wave="no"]) + done + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_wave" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + # DQ (4/7/2006): build a macro to use in source code to know when WAVE is to be used. + AC_DEFINE([USE_ROSE_BOOST_WAVE_SUPPORT],1,[Controls use of BOOST WAVE support in ROSE.]) + + else + AC_DEFINE([USE_ROSE_BOOST_WAVE_SUPPORT],0,[Controls use of BOOST WAVE support in ROSE.]) + + fi + + + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + LIBS="$LIBS_SAVED" + + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_wserialization.m4 projectm-3.1.0/m4/autoconf-archive/ax_boost_wserialization.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_boost_wserialization.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_boost_wserialization.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,116 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_boost_wserialization.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_BOOST_WSERIALIZATION +# +# DESCRIPTION +# +# Test for Serialization library from the Boost C++ libraries. The macro +# requires a preceding call to AX_BOOST_BASE. Further documentation is +# available at . +# +# This macro calls: +# +# AC_SUBST(BOOST_WSERIALIZATION_LIB) +# +# And sets: +# +# HAVE_BOOST_WSERIALIZATION +# +# LICENSE +# +# Copyright (c) 2008 Thomas Porschberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 21 + +AC_DEFUN([AX_BOOST_WSERIALIZATION], +[ + AC_ARG_WITH([boost-wserialization], + AS_HELP_STRING([--with-boost-wserialization@<:@=special-lib@:>@], + [use the WSerialization library from boost - it is possible to specify a certain library for the linker + e.g. --with-boost-wserialization=boost_wserialization-gcc-mt-d-1_33_1 ]), + [ + if test "$withval" = "no"; then + want_boost="no" + elif test "$withval" = "yes"; then + want_boost="yes" + ax_boost_user_wserialization_lib="" + else + want_boost="yes" + ax_boost_user_wserialization_lib="$withval" + fi + ], + [want_boost="yes"] + ) + + if test "x$want_boost" = "xyes"; then + AC_REQUIRE([AC_PROG_CC]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(whether the Boost::WSerialization library is available, + ax_cv_boost_wserialization, + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include + @%:@include + @%:@include + ]], + [[std::ofstream ofs("filename"); + boost::archive::text_oarchive oa(ofs); + return 0; + ]])], + ax_cv_boost_wserialization=yes, ax_cv_boost_wserialization=no) + AC_LANG_POP([C++]) + ]) + if test "x$ax_cv_boost_wserialization" = "xyes"; then + AC_DEFINE(HAVE_BOOST_WSERIALIZATION,,[define if the Boost::WSerialization library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_wserialization_lib" = "x"; then + for libextension in `ls $BOOSTLIBDIR/libboost_wserialization*.so* $BOOSTLIBDIR/libboost_wserialization*.dylib* $BOOSTLIBDIR/libboost_wserialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_wserialization.*\)\.so.*$;\1;' -e 's;^lib\(boost_wserialization.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_wserialization.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_WSERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break], + [link_wserialization="no"]) + done + if test "x$link_wserialization" != "xyes"; then + for libextension in `ls $BOOSTLIBDIR/boost_wserialization*.dll* $BOOSTLIBDIR/boost_wserialization*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_wserialization.*\)\.dll.*$;\1;' -e 's;^\(boost_wserialization.*\)\.a.*$;\1;'` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_WSERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break], + [link_wserialization="no"]) + done + fi + + else + for ax_lib in $ax_boost_user_wserialization_lib boost_wserialization-$ax_boost_user_wserialization_lib; do + AC_CHECK_LIB($ax_lib, main, + [BOOST_WSERIALIZATION_LIB="-l$ax_lib"; AC_SUBST(BOOST_WSERIALIZATION_LIB) link_wserialization="yes"; break], + [link_wserialization="no"]) + done + + fi + if test "x$ax_lib" = "x"; then + AC_MSG_ERROR(Could not find a version of the library!) + fi + if test "x$link_wserialization" != "xyes"; then + AC_MSG_ERROR(Could not link against $ax_lib !) + fi + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_build_date_epoch.m4 projectm-3.1.0/m4/autoconf-archive/ax_build_date_epoch.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_build_date_epoch.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_build_date_epoch.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_build_date_epoch.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_BUILD_DATE_EPOCH(VARIABLE[, FORMAT[, ACTION-IF-FAIL]]) +# +# DESCRIPTION +# +# Sets VARIABLE to a string representing the current time. It is +# formatted according to FORMAT if specified, otherwise it is formatted as +# the number of seconds (excluding leap seconds) since the UNIX epoch (01 +# Jan 1970 00:00:00 UTC). +# +# If the SOURCE_DATE_EPOCH environment variable is set, it uses the value +# of that variable instead of the current time. See +# https://reproducible-builds.org/specs/source-date-epoch). If +# SOURCE_DATE_EPOCH is set but cannot be properly interpreted as a UNIX +# timestamp, then execute ACTION-IF-FAIL if specified, otherwise error. +# +# VARIABLE is AC_SUBST-ed. +# +# LICENSE +# +# Copyright (c) 2016 Eric Bavier +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_BUILD_DATE_EPOCH], +[dnl +AC_MSG_CHECKING([for build time]) +ax_date_fmt="m4_default($2,%s)" +AS_IF([test x"$SOURCE_DATE_EPOCH" = x], + [$1=`date "+$ax_date_fmt"`], + [ax_build_date=`date -u -d "@$SOURCE_DATE_EPOCH" "+$ax_date_fmt" 2>/dev/null \ + || date -u -r "$SOURCE_DATE_EPOCH" "+$ax_date_fmt" 2>/dev/null` + AS_IF([test x"$ax_build_date" = x], + [m4_ifval([$3], + [$3], + [AC_MSG_ERROR([malformed SOURCE_DATE_EPOCH])])], + [$1=$ax_build_date])]) +AC_MSG_RESULT([$$1]) +])dnl AX_BUILD_DATE_EPOCH diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c99_inline.m4 projectm-3.1.0/m4/autoconf-archive/ax_c99_inline.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c99_inline.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c99_inline.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c99_inline.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C99_INLINE +# +# DESCRIPTION +# +# This macro defines HAVE_C99_INLINE if the C compiler supports "inline" +# and "extern inline" correctly. An application may replace "inline" with +# "static inline" as a workaround for older compilers. +# +# LICENSE +# +# Copyright (c) 2009 Michael McMaster +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_C99_INLINE], [ + AC_MSG_CHECKING([whether the compiler supports C99 inline functions]) + AC_REQUIRE([AC_PROG_CC_C99]) + + AC_LANG_PUSH([C]) + + dnl In a conforming C99 implementation a function marked "inline" will not + dnl be compiled into the translation unit if the compiler was not able to + dnl inline the function. + dnl GCC versions before 4.3 would output the inline functions into all + dnl translation units that could require the definition. + AC_LINK_IFELSE( + AC_LANG_SOURCE([ + inline void* foo() { foo(); return &foo; } + int main() { return foo() != 0;} + ]), + + dnl the invalid source compiled, so the inline keyword does not work + dnl correctly. + AC_MSG_RESULT([no]), + + dnl Secondary test of valid source. + AC_LINK_IFELSE( + AC_LANG_SOURCE([ + extern inline void* foo() { foo(); return &foo; } + int main() { return foo() != 0;} + ]), + + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_C99_INLINE], [1], + [Define to 1 if the "extern" keyword controls whether an inline function appears in a translation unit.]), + + dnl Perhaps inline functions aren't supported at all ? + AC_MSG_RESULT([no]) + ) + ) + + AC_LANG_POP([C]) + ]); diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cache_size.m4 projectm-3.1.0/m4/autoconf-archive/ax_cache_size.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cache_size.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cache_size.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,87 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cache_size.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CACHE_SIZE +# +# DESCRIPTION +# +# Find L1 and L2 caches size by reading the corresponding file on UNIX or +# by requesting cpuid. The results are available in the defines +# CPU_L1_CACHE and CPU_L2_CACHE. +# +# This macro depends on AX_GCC_X86_CPUID, AC_PROG_SED, AX_COUNT_CPUS, and +# AX_CPU_VENDOR. +# +# LICENSE +# +# Copyright (c) 2008 Christophe Tournayre +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_CACHE_SIZE], +[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AX_COUNT_CPUS]) + AC_REQUIRE([AX_GCC_X86_CPUID]) + AC_REQUIRE([AX_CPU_VENDOR]) + + AX_COUNT_CPUS + AX_CPU_VENDOR + + ax_l1_size=unknown + ax_l2_size=unknown + + #Check if the variable is present + if test -e /sys/devices/system/cpu/cpu0/cache/index0/size; then + for ncpu in `seq 0 $(($CPU_COUNT-1))`; do + for idx in `seq 0 3`; do + if test -e /sys/devices/system/cpu/cpu$ncpu/cache/index$idx/size ; then + level=`cat /sys/devices/system/cpu/cpu$ncpu/cache/index$idx/level` + size=`cat /sys/devices/system/cpu/cpu$ncpu/cache/index$idx/size` + eval CPU$ncpu\_L$level\_CACHE="$size" + fi + done + done + + # This part can (must !!!) be optimized, because we know all caches per proc but + # we only take care about the first proc + ax_l1_size=$CPU0_L1_CACHE + ax_l2_size=$CPU0_L2_CACHE + + else + #Or use CPUID + if test $ax_xpu_vendor != "Intel"; then + AX_GCC_X86_CPUID(0x80000005) # For L1 cache (not available on intel !!!) + + l1_hexval=$(( 16#`echo $ax_cv_gcc_x86_cpuid_0x80000005 | cut -d ":" -f 4`)) + ax_l1_size=$(($l1_hexval >> 24)) + fi + + AX_GCC_X86_CPUID(0x80000006) # For L2 cache + + l2_hexval=$(( 16#`echo $ax_cv_gcc_x86_cpuid_0x80000006 | cut -d ":" -f 3`)) + ax_l2_size=$(($l2_hexval >> 16)) + fi + + # Keep only digits if there is a unit (ie 1024K -> 1024) and convert in Bytes + AC_MSG_CHECKING(the L1 cache size) + ax_l1_size=`echo $ax_l1_size | $SED 's/\([[0-9]]\)[[A-Za-z]]$/\1/g'` + ax_l1_size=$(($ax_l1_size*1024)) + AC_MSG_RESULT( $ax_l1_size Bytes) + + AC_MSG_CHECKING(the L2 cache size) + ax_l2_size=`echo $ax_l2_size | $SED 's/\([[0-9]]\)[[A-Za-z]]$/\1/g'` + ax_l2_size=$(($ax_l2_size*1024)) + AC_MSG_RESULT( $ax_l2_size Bytes) + + AC_DEFINE_UNQUOTED([CPU_L1_CACHE], ${ax_l1_size}, [L1 cache size (in Bytes)]) + AC_DEFINE_UNQUOTED([CPU_L2_CACHE], ${ax_l2_size}, [L2 cache size (in Bytes)]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_caolan_check_package.m4 projectm-3.1.0/m4/autoconf-archive/ax_caolan_check_package.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_caolan_check_package.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_caolan_check_package.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,94 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_caolan_check_package.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_caolan_CHECK_PACKAGE(PACKAGE, FUNCTION, LIBRARY , HEADERFILE [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Provides --with-PACKAGE, --with-PACKAGE-include and +# --with-PACKAGE-libdir options to configure. Supports the now standard +# --with-PACKAGE=DIR approach where the package's include dir and lib dir +# are underneath DIR, but also allows the include and lib directories to +# be specified separately +# +# adds the extra -Ipath to CFLAGS if needed adds extra -Lpath to LD_FLAGS +# if needed searches for the FUNCTION in the LIBRARY with AC_CHECK_LIBRARY +# and thus adds the lib to LIBS +# +# defines HAVE_PKG_PACKAGE if it is found, (where PACKAGE in the +# HAVE_PKG_PACKAGE is replaced with the actual first parameter passed) +# note that autoheader will complain of not having the HAVE_PKG_PACKAGE +# and you will have to add it to acconfig.h manually +# +# LICENSE +# +# Copyright (c) 2008 Caolan McNamara +# Copyright (c) 2008 Alexandre Duret-Lutz +# Copyright (c) 2008 Matthew Mueller +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_caolan_CHECK_PACKAGE], +[ + +AC_ARG_WITH($1, +[ --with-$1[=DIR] root directory of $1 installation], +with_$1=$withval +if test "${with_$1}" != yes; then + $1_include="$withval/include" + $1_libdir="$withval/lib" +fi +) + +AC_ARG_WITH($1-include, +[ --with-$1-include=DIR specify exact include dir for $1 headers], +$1_include="$withval") + +AC_ARG_WITH($1-libdir, +[ --with-$1-libdir=DIR specify exact library dir for $1 library + --without-$1 disables $1 usage completely], +$1_libdir="$withval") + +if test "${with_$1}" != no ; then + OLD_LIBS=$LIBS + OLD_LDFLAGS=$LDFLAGS + OLD_CFLAGS=$CFLAGS + OLD_CPPFLAGS=$CPPFLAGS + + if test "${$1_libdir}" ; then + LDFLAGS="$LDFLAGS -L${$1_libdir}" + fi + if test "${$1_include}" ; then + CPPFLAGS="$CPPFLAGS -I${$1_include}" + CFLAGS="$CFLAGS -I${$1_include}" + fi + + no_good=no + AC_CHECK_LIB($3,$2,,no_good=yes) + AC_CHECK_HEADER($4,,no_good=yes) + if test "$no_good" = yes; then +dnl broken + ifelse([$6], , , [$6]) + + LIBS=$OLD_LIBS + LDFLAGS=$OLD_LDFLAGS + CPPFLAGS=$OLD_CPPFLAGS + CFLAGS=$OLD_CFLAGS + else +dnl fixed + ifelse([$5], , , [$5]) + + AC_DEFINE(HAVE_PKG_$1) + fi + +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_caolan_search_package.m4 projectm-3.1.0/m4/autoconf-archive/ax_caolan_search_package.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_caolan_search_package.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_caolan_search_package.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,91 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_caolan_search_package.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_caolan_SEARCH_PACKAGE(PACKAGE, FUNCTION, LIBRARY LIST, HEADERFILE [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Provides --with-PACKAGE, --with-PACKAGE-include and +# --with-PACKAGE-libdir options to configure. Supports the now standard +# --with-PACKAGE=DIR approach where the package's include dir and lib dir +# are underneath DIR, but also allows the include and lib directories to +# be specified separately +# +# adds the extra -Ipath to CFLAGS if needed adds extra -Lpath to LD_FLAGS +# if needed searches for the FUNCTION in each of the LIBRARY LIST with +# AC_SEARCH_LIBRARY and thus adds the lib to LIBS +# +# defines HAVE_PKG_PACKAGE if it is found, (where PACKAGE in the +# HAVE_PKG_PACKAGE is replaced with the actual first parameter passed) +# note that autoheader will complain of not having the HAVE_PKG_PACKAGE +# and you will have to add it to acconfig.h manually +# +# LICENSE +# +# Copyright (c) 2009 Caolan McNamara +# Copyright (c) 2009 Alexandre Duret-Lutz +# Copyright (c) 2009 Matthew Mueller +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_caolan_SEARCH_PACKAGE], +[ + +AC_ARG_WITH($1, +[ --with-$1[=DIR] root directory of $1 installation], +with_$1=$withval +if test "${with_$1}" != yes; then + $1_include="$withval/include" + $1_libdir="$withval/lib" +fi +) + +AC_ARG_WITH($1-include, +[ --with-$1-include=DIR specify exact include dir for $1 headers], +$1_include="$withval") + +AC_ARG_WITH($1-libdir, +[ --with-$1-libdir=DIR specify exact library dir for $1 library + --without-$1 disables $1 usage completely], +$1_libdir="$withval") + +if test "${with_$1}" != no ; then + OLD_LIBS=$LIBS + OLD_LDFLAGS=$LDFLAGS + OLD_CFLAGS=$CFLAGS + OLD_CPPFLAGS=$CPPFLAGS + + if test "${$1_libdir}" ; then + LDFLAGS="$LDFLAGS -L${$1_libdir}" + fi + if test "${$1_include}" ; then + CPPFLAGS="$CPPFLAGS -I${$1_include}" + CFLAGS="$CFLAGS -I${$1_include}" + fi + + success=no + AC_SEARCH_LIBS($2,$3,success=yes) + AC_CHECK_HEADERS($4,success=yes) + if test "$success" = yes; then +dnl fixed + ifelse([$5], , , [$5]) + AC_DEFINE(HAVE_PKG_$1) + else +dnl broken + ifelse([$6], , , [$6]) + LIBS=$OLD_LIBS + LDFLAGS=$OLD_LDFLAGS + CPPFLAGS=$OLD_CPPFLAGS + CFLAGS=$OLD_CFLAGS + fi +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_arithmetic_rshift.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_arithmetic_rshift.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_arithmetic_rshift.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_arithmetic_rshift.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,36 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_arithmetic_rshift.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C_ARITHMETIC_RSHIFT +# +# DESCRIPTION +# +# Checks if the right shift operation is arithmetic. +# +# This macro uses compile-time detection and so is cross-compile ready. +# +# LICENSE +# +# Copyright (c) 2008 YAMAMOTO Kengo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_C_ARITHMETIC_RSHIFT], [ + AC_CACHE_CHECK([whether right shift operation is arithmetic], + [ax_cv_c_arithmetic_rshift], + [AC_COMPILE_IFELSE([[int dummy[((-1 >> 1) < 0) ? 1 : -1];]], + [ax_cv_c_arithmetic_rshift=yes], + [ax_cv_c_arithmetic_rshift=no])]) + if test "x$ax_cv_c_arithmetic_rshift" = xyes; then + AC_DEFINE([HAVE_ARITHMETIC_RSHIFT], [1], + [Define to 1 if the right shift operation is arithmetic.]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c___attribute__.m4 projectm-3.1.0/m4/autoconf-archive/ax_c___attribute__.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c___attribute__.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c___attribute__.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c___attribute__.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C___ATTRIBUTE__ +# +# DESCRIPTION +# +# Provides a test for the compiler support of __attribute__ extensions. +# Defines HAVE___ATTRIBUTE__ if it is found. +# +# LICENSE +# +# Copyright (c) 2008 Stepan Kasal +# Copyright (c) 2008 Christian Haggstrom +# Copyright (c) 2008 Ryan McCabe +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_C___ATTRIBUTE__], [ + AC_CACHE_CHECK([for __attribute__], [ax_cv___attribute__], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + static void foo(void) __attribute__ ((unused)); + static void + foo(void) { + exit(1); + } + ]], [])], + [ax_cv___attribute__=yes], + [ax_cv___attribute__=no] + ) + ]) + if test "$ax_cv___attribute__" = "yes"; then + AC_DEFINE([HAVE___ATTRIBUTE__], 1, [define if your compiler has __attribute__]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cc_for_build.m4 projectm-3.1.0/m4/autoconf-archive/ax_cc_for_build.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cc_for_build.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cc_for_build.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,77 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CC_FOR_BUILD +# +# DESCRIPTION +# +# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. +# +# LICENSE +# +# Copyright (c) 2010 Reuben Thomas +# Copyright (c) 1999 Richard Henderson +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +dnl Get a default for CC_FOR_BUILD to put into Makefile. +AC_DEFUN([AX_CC_FOR_BUILD], +[# Put a plausible default for CC_FOR_BUILD in Makefile. +if test -z "$CC_FOR_BUILD"; then + if test "x$cross_compiling" = "xno"; then + CC_FOR_BUILD='$(CC)' + else + CC_FOR_BUILD=gcc + fi +fi +AC_SUBST(CC_FOR_BUILD) +# Also set EXEEXT_FOR_BUILD. +if test "x$cross_compiling" = "xno"; then + EXEEXT_FOR_BUILD='$(EXEEXT)' +else + AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, + [rm -f conftest* + echo 'int main () { return 0; }' > conftest.c + bfd_cv_build_exeext= + ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 + for file in conftest.*; do + case $file in + *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done + rm -f conftest* + test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) + EXEEXT_FOR_BUILD="" + test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} +fi +AC_SUBST(EXEEXT_FOR_BUILD)])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cc_maxopt.m4 projectm-3.1.0/m4/autoconf-archive/ax_cc_maxopt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cc_maxopt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cc_maxopt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,193 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cc_maxopt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CC_MAXOPT +# +# DESCRIPTION +# +# Try to turn on "good" C optimization flags for various compilers and +# architectures, for some definition of "good". (In our case, good for +# FFTW and hopefully for other scientific codes. Modify as needed.) +# +# The user can override the flags by setting the CFLAGS environment +# variable. The user can also specify --enable-portable-binary in order to +# disable any optimization flags that might result in a binary that only +# runs on the host architecture. +# +# Note also that the flags assume that ANSI C aliasing rules are followed +# by the code (e.g. for gcc's -fstrict-aliasing), and that floating-point +# computations can be re-ordered as needed. +# +# Requires macros: AX_CHECK_COMPILE_FLAG, AX_COMPILER_VENDOR, +# AX_GCC_ARCHFLAG, AX_GCC_X86_CPUID. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 17 + +AC_DEFUN([AX_CC_MAXOPT], +[ +AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AX_COMPILER_VENDOR]) +AC_REQUIRE([AC_CANONICAL_HOST]) + +AC_ARG_ENABLE(portable-binary, [AS_HELP_STRING([--enable-portable-binary], [disable compiler optimizations that would produce unportable binaries])], + acx_maxopt_portable=$enableval, acx_maxopt_portable=no) + +# Try to determine "good" native compiler flags if none specified via CFLAGS +if test "$ac_test_CFLAGS" != "set"; then + CFLAGS="" + case $ax_cv_c_compiler_vendor in + dec) CFLAGS="-newc -w0 -O5 -ansi_alias -ansi_args -fp_reorder -tune host" + if test "x$acx_maxopt_portable" = xno; then + CFLAGS="$CFLAGS -arch host" + fi;; + + sun) CFLAGS="-native -fast -xO5 -dalign" + if test "x$acx_maxopt_portable" = xyes; then + CFLAGS="$CFLAGS -xarch=generic" + fi;; + + hp) CFLAGS="+Oall +Optrs_ansi +DSnative" + if test "x$acx_maxopt_portable" = xyes; then + CFLAGS="$CFLAGS +DAportable" + fi;; + + ibm) if test "x$acx_maxopt_portable" = xno; then + xlc_opt="-qarch=auto -qtune=auto" + else + xlc_opt="-qtune=auto" + fi + AX_CHECK_COMPILE_FLAG($xlc_opt, + CFLAGS="-O3 -qansialias -w $xlc_opt", + [CFLAGS="-O3 -qansialias -w" + echo "******************************************************" + echo "* You seem to have the IBM C compiler. It is *" + echo "* recommended for best performance that you use: *" + echo "* *" + echo "* CFLAGS=-O3 -qarch=xxx -qtune=xxx -qansialias -w *" + echo "* ^^^ ^^^ *" + echo "* where xxx is pwr2, pwr3, 604, or whatever kind of *" + echo "* CPU you have. (Set the CFLAGS environment var. *" + echo "* and re-run configure.) For more info, man cc. *" + echo "******************************************************"]) + ;; + + intel) CFLAGS="-O3 -ansi_alias" + if test "x$acx_maxopt_portable" = xno; then + icc_archflag=unknown + icc_flags="" + case $host_cpu in + i686*|x86_64*) + # icc accepts gcc assembly syntax, so these should work: + AX_GCC_X86_CPUID(0) + AX_GCC_X86_CPUID(1) + case $ax_cv_gcc_x86_cpuid_0 in # see AX_GCC_ARCHFLAG + *:756e6547:6c65746e:49656e69) # Intel + case $ax_cv_gcc_x86_cpuid_1 in + *0?6[[78ab]]?:*:*:*|?6[[78ab]]?:*:*:*|6[[78ab]]?:*:*:*) icc_flags="-xK" ;; + *0?6[[9d]]?:*:*:*|?6[[9d]]?:*:*:*|6[[9d]]?:*:*:*|*1?65?:*:*:*) icc_flags="-xSSE2 -xB -xK" ;; + *0?6e?:*:*:*|?6e?:*:*:*|6e?:*:*:*) icc_flags="-xSSE3 -xP -xO -xB -xK" ;; + *0?6f?:*:*:*|?6f?:*:*:*|6f?:*:*:*|*1?66?:*:*:*) icc_flags="-xSSSE3 -xT -xB -xK" ;; + *1?6[[7d]]?:*:*:*) icc_flags="-xSSE4.1 -xS -xT -xB -xK" ;; + *1?6[[aef]]?:*:*:*|*2?6[[5cef]]?:*:*:*) icc_flags="-xSSE4.2 -xS -xT -xB -xK" ;; + *2?6[[ad]]?:*:*:*) icc_flags="-xAVX -SSE4.2 -xS -xT -xB -xK" ;; + *3?6[[ae]]?:*:*:*) icc_flags="-xCORE-AVX-I -xAVX -SSE4.2 -xS -xT -xB -xK" ;; + *3?6[[cf]]?:*:*:*|*4?6[[56]]?:*:*:*) icc_flags="-xCORE-AVX2 -xCORE-AVX-I -xAVX -SSE4.2 -xS -xT -xB -xK" ;; + *000?f[[346]]?:*:*:*|?f[[346]]?:*:*:*|f[[346]]?:*:*:*) icc_flags="-xSSE3 -xP -xO -xN -xW -xK" ;; + *00??f??:*:*:*|??f??:*:*:*|?f??:*:*:*|f??:*:*:*) icc_flags="-xSSE2 -xN -xW -xK" ;; + esac ;; + esac ;; + esac + if test "x$icc_flags" != x; then + for flag in $icc_flags; do + AX_CHECK_COMPILE_FLAG($flag, [icc_archflag=$flag; break]) + done + fi + AC_MSG_CHECKING([for icc architecture flag]) + AC_MSG_RESULT($icc_archflag) + if test "x$icc_archflag" != xunknown; then + CFLAGS="$CFLAGS $icc_archflag" + fi + fi + ;; + + gnu) + # default optimization flags for gcc on all systems + CFLAGS="-O3 -fomit-frame-pointer" + + # -malign-double for x86 systems + AX_CHECK_COMPILE_FLAG(-malign-double, CFLAGS="$CFLAGS -malign-double") + + # -fstrict-aliasing for gcc-2.95+ + AX_CHECK_COMPILE_FLAG(-fstrict-aliasing, + CFLAGS="$CFLAGS -fstrict-aliasing") + + # note that we enable "unsafe" fp optimization with other compilers, too + AX_CHECK_COMPILE_FLAG(-ffast-math, CFLAGS="$CFLAGS -ffast-math") + + AX_GCC_ARCHFLAG($acx_maxopt_portable) + ;; + + microsoft) + # default optimization flags for MSVC opt builds + CFLAGS="-O2" + ;; + esac + + if test -z "$CFLAGS"; then + echo "" + echo "********************************************************" + echo "* WARNING: Don't know the best CFLAGS for this system *" + echo "* Use ./configure CFLAGS=... to specify your own flags *" + echo "* (otherwise, a default of CFLAGS=-O3 will be used) *" + echo "********************************************************" + echo "" + CFLAGS="-O3" + fi + + AX_CHECK_COMPILE_FLAG($CFLAGS, [], [ + echo "" + echo "********************************************************" + echo "* WARNING: The guessed CFLAGS don't seem to work with *" + echo "* your compiler. *" + echo "* Use ./configure CFLAGS=... to specify your own flags *" + echo "********************************************************" + echo "" + CFLAGS="" + ]) + +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_compile_value.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_compile_value.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_compile_value.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_compile_value.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,124 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_compile_value.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C_COMPILE_VALUE (COMPILE-VALUE, ALIAS, INCLUDES) +# +# DESCRIPTION +# +# The AX_C_COMPILE_VALUE macro determines a compile time value by +# generating the object code and reading the value from the code. Static +# data initializers like sizeof(int) are unavailable to preprocessor. The +# macro calculates the values known to compiler's static initializer. +# +# Assumptions: The sought value should not exceed 65535. The shell +# interpreter and the sed utility are expected to exist and work similarly +# across possible build platforms. +# +# Result: The resulting configure script will generate the preprocessor +# symbol definition: +# +# #define COMPILE_VALUE_ +# +# It was important that the value was embedded into the object file in a +# predefined byte order during the test. This ensured that the result was +# independent from the target platform's byte order. +# +# The existing AC_CHECK_SIZEOF macro also computes the size of the given +# type without running the test program. However, the existing macro will +# produce a piece of configure script that will take the time proportional +# to the logarithm of the sought value. +# +# Example of use in configure.in: +# +# AX_C_COMPILE_VALUE(sizeof(int), sizeof_int) +# AX_C_COMPILE_VALUE([sizeof(int[[543]])], sizeof_int543) +# +# As a result of running the generated configure script, the following +# definition will appear in config.h: +# +# #define COMPILE_VALUE_SIZEOF_INT 4 +# #define COMPILE_VALUE_SIZEOF_INT543 2172 +# +# LICENSE +# +# Copyright (c) 2008 Ilguiz Latypov +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +## Portability defines that help interoperate with classic and modern autoconfs +ifdef([AC_TR_SH],[ +define([AC_TR_SH_REUSE],[AC_TR_SH([$1])]) +define([AC_TR_CPP_REUSE],[AC_TR_CPP([$1])]) +], [ +define([AC_TR_SH_REUSE], + [patsubst(translit([[$1]], [*+], [pp]), [[^a-zA-Z0-9_]], [_])]) +define([AC_TR_CPP_REUSE], + [patsubst(translit([[$1]], + [*abcdefghijklmnopqrstuvwxyz], + [PABCDEFGHIJKLMNOPQRSTUVWXYZ]), + [[^A-Z0-9_]], [_])]) +]) + +AC_DEFUN([AX_C_COMPILE_VALUE], [ + pushdef([ac_c_compile_value], + AC_TR_SH_REUSE([ac_cv_c_compile_value_$2]))dnl + ac_c_compile_value_expand="$1" + AC_CACHE_CHECK([value of $1 by analyzing object code], + ac_c_compile_value, [ + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -c -o conftest.o" + AC_TRY_COMPILE([$3 + #include + #include + #include + #define COMPILE_VALUE $ac_c_compile_value_expand + #define HEX_DIGIT(n) ((n) >= 10 ? 'a' + (n) - 10 : '0' + (n)) + char object_code_block[] = { + '\n', 'e', '4', 'V', 'A', + '0', 'x', + (char) HEX_DIGIT((((COMPILE_VALUE / 16) / 16) / 16) % 16), + (char) HEX_DIGIT(((COMPILE_VALUE / 16) / 16) % 16), + (char) HEX_DIGIT((COMPILE_VALUE / 16) % 16), + (char) HEX_DIGIT(COMPILE_VALUE % 16), + 'Y', '3', 'p', 'M', '\n' + };], + [], + [ac_c_compile_value=` + typeset -i n=\`sed -ne 's/^e4VA0x\(.*\)Y3pM$/0x\1/p' < conftest.o\`; + echo $n`], + [ac_c_compile_value=0]) + CFLAGS="$save_CFLAGS"]) + AC_DEFINE_UNQUOTED(AC_TR_CPP_REUSE(compile_value_$2), + [$[]ac_c_compile_value], + [$1]) + popdef([ac_c_compile_value])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_declare_block.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_declare_block.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_declare_block.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_declare_block.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,89 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_declare_block.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C_DECLARE_BLOCK +# +# DESCRIPTION +# +# The macro will compile a test program to see whether the compiler does +# allow new variable declarations in the middle of a C statement block, +# i.e. after some non-declaration line. New compilers will allow that +# which makes the behave a bit more like C++ - the gcc did support it for +# quite a time already. +# +# #define DECLARE_BLOCK_NEEDED says they need to be at the beginning of of +# a statement block. Additionally two defines DECLARE_BLOCK { and +# DECLARE_END } are being set. That makes it possible to do the following +# in your source code (which this macro is really made up for): +# +# #define ___ DECLARE_BLOCK +# #define ____ DECLARE_END +# +# int f() { +# char buffer[1024]; +# fgets(buffer, 1024, stdin); +# ___ int i; int ii = strlen(buffer); +# for (i=0; i < ii; i++) { +# fputc(buffer[i], stdout); +# }____; +# } +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_C_DECLARE_BLOCK],[dnl +AC_CACHE_CHECK( + [if C variables must be declared at the beginning of a block], + ax_cv_c_declare_block,[ + AC_TRY_COMPILE([#include + int f() { + char buffer[1024]; + fgets(buffer, 1024, stdin); + int i; int ii = strlen(buffer); + for (i=0; i < ii; i++) { + fputc(buffer[i], stdout); + } + }], + [], + ax_cv_c_declare_block=no, ax_cv_c_declare_block=yes)]) + if test "$ax_cv_c_declare_block" = yes; then + AC_DEFINE([DECLARE_BLOCK_NEEDED],[1], + [if C variables must be declared at the beginning of a block]) + AC_DEFINE([DECLARE_BLOCK],[{], + [set to { if variable declarations need a block start before]) + AC_DEFINE([DECLARE_END],[}], + [set to } if variable declarations need a block start before]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cf_ebcdic.m4 projectm-3.1.0/m4/autoconf-archive/ax_cf_ebcdic.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cf_ebcdic.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cf_ebcdic.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cf_ebcdic.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CF_EBCDIC +# +# DESCRIPTION +# +# If the target character set is EBCDIC, defines variables cf_cv_ebcdic, +# EBCDIC, and NOT_ASCII. +# +# I originally wrote this and submitted it to the Lynx distribution. +# Editorial revisions by Tom Dickey, et. al. +# +# LICENSE +# +# Copyright (c) 2008 Paul Gilmartin +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +dnl Check whether character set is EBCDIC. +AU_ALIAS([CF_EBCDIC], [AX_CF_EBCDIC]) +AC_DEFUN([AX_CF_EBCDIC],[ +AC_MSG_CHECKING(if character set is EBCDIC) +AC_CACHE_VAL(cf_cv_ebcdic,[ + AC_TRY_COMPILE([ ], +[ /* TryCompile function for CharSet. + Treat any failure as ASCII for compatibility with existing art. + Use compile-time rather than run-time tests for cross-compiler + tolerance. */ +#if '0'!=240 +make an error "Character set is not EBCDIC" +#endif ], +[ # TryCompile action if true +cf_cv_ebcdic=yes ], +[ # TryCompile action if false +cf_cv_ebcdic=no]) +# end of TryCompile ]) +# end of CacheVal CvEbcdic +AC_MSG_RESULT($cf_cv_ebcdic) +case "$cf_cv_ebcdic" in #(vi + yes) AC_DEFINE(EBCDIC) + AC_DEFINE(NOT_ASCII);; #(vi + *) ;; +esac +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_aix_option.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_aix_option.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_aix_option.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_aix_option.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_aix_option.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_AIX_OPTION (optionflag [,[shellvar][,[A][,[NA]]]) +# +# DESCRIPTION +# +# AX_CFLAGS_AIX_OPTION(-qubicle) would show a message as like "checking +# CFLAGS for aix/cc -qubicle ... yes" and adds the optionflag to CFLAGS if +# it is understood. You can override the shellvar-default of CFLAGS of +# course. The order of arguments stems from the explicit macros like +# AX_CFLAGS_WARN_ALL. +# +# The cousin AX_CXXFLAGS_AIX_OPTION would check for an option to add to +# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it +# is possible to use different compilers for C and C++). +# +# The macro is a lot simpler than any special AX_CFLAGS_* macro (or +# ax_cxx_rtti.m4 macro) but allows to check for arbitrary options. +# However, if you use this macro in a few places, it would be great if you +# would make up a new function-macro and submit it to the ac-archive. +# +# - $1 option-to-check-for : required ("-option" as non-value) +# - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case) +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# note: in earlier versions, $1-$2 were swapped. We try to detect the +# situation and accept a $2=~/-/ as being the old option-to-check-for. +# +# see also: AX_CFLAGS_GCC_OPTION for the widely used original variant. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_FLAGS_AIX_OPTION_PRIVATE], [dnl +AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [-qlanglvl=ansi -qsrcmsg]) +AS_CASE([".$flag_ok"], + [.ok|.ok,*], [$3], + [.|.no|.no,*], [$4], + [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])]) +]) + +AC_DEFUN([AX_CFLAGS_AIX_OPTION],[ + AC_LANG_PUSH([C]) + AX_FLAGS_AIX_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) + +AC_DEFUN([AX_CXXFLAGS_AIX_OPTION],[ + AC_LANG_PUSH([C++]) + AX_FLAGS_AIX_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_force_c89.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_force_c89.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_force_c89.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_force_c89.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,93 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_force_c89.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_FORCE_C89 [(shellvar [,default, [A/NA]])] +# +# DESCRIPTION +# +# Try to find a compiler option that enables strict C89 mode. +# +# For the GNU CC compiler it will be -ansi -pedantic. The result is added +# to the shellvar being CFLAGS by default. +# +# Currently this macro knows about GCC, Solaris C compiler, Digital Unix C +# compiler, C for AIX Compiler, HP-UX C compiler, IRIX C compiler, NEC +# SX-5 (Super-UX 10) C compiler, and Cray J90 (Unicos 10.0.0.8) C +# compiler. +# +# - $1 shell-variable-to-add-to : CFLAGS +# - $2 add-value-if-not-found : nothing +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# NOTE: These macros depend on AX_APPEND_FLAG. +# +# LICENSE +# +# Copyright (c) 2009 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_CFLAGS_FORCE_C89],[dnl +AS_VAR_PUSHDEF([FLAGS],[CFLAGS])dnl +AS_VAR_PUSHDEF([VAR],[ac_cv_cflags_force_c89])dnl +AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for C89 mode], +VAR,[VAR="no, unknown" + AC_LANG_SAVE + AC_LANG_C + ac_save_[]FLAGS="$[]FLAGS" +for ac_arg dnl +in "-pedantic % -ansi -pedantic" dnl GCC + "-xstrconst % -v -Xc" dnl Solaris C + "-std1 % -std1" dnl Digital Unix + " % -qlanglvl=ansi" dnl AIX + " % -ansi -ansiE" dnl IRIX + "+ESlit % -Aa" dnl HP-UX C + "-Xc % -Xc" dnl NEC SX-5 (Super-UX 10) + "-h conform % -h conform" dnl Cray C (Unicos) + # +do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + AC_TRY_COMPILE([],[return 0;], + [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) +done + FLAGS="$ac_save_[]FLAGS" + AC_LANG_RESTORE +]) +AS_VAR_POPDEF([FLAGS])dnl +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +case ".$VAR" in + .ok|.ok,*) m4_ifvaln($3,$3) ;; + .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; + *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_hpux_option.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_hpux_option.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_hpux_option.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_hpux_option.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_hpux_option.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_HPUX_OPTION (optionflag [,[shellvar][,[A][,[NA]]]) +# +# DESCRIPTION +# +# AX_CFLAGS_HPUX_OPTION(-Afresh) would show a message as like "checking +# CFLAGS for hpux/cc -Afresh ... yes" and adds the optionflag to CFLAGS if +# it is understood. You can override the shellvar-default of CFLAGS of +# course. The order of arguments stems from the explicit macros like +# AX_CFLAGS_WARN_ALL. +# +# The cousin AX_CXXFLAGS_HPUX_OPTION would check for an option to add to +# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it +# is possible to use different compilers for C and C++). +# +# The macro is a lot simpler than any special AX_CFLAGS_* macro (or +# ax_cxx_rtti.m4 macro) but allows to check for arbitrary options. +# However, if you use this macro in a few places, it would be great if you +# would make up a new function-macro and submit it to the ac-archive. +# +# - $1 option-to-check-for : required ("-option" as non-value) +# - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case) +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# note: in earlier versions, $1-$2 were swapped. We try to detect the +# situation and accept a $2=~/-/ as being the old option-to-check-for. +# +# see also: AX_CFLAGS_GCC_OPTION for the widely used original variant. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_FLAGS_HPUX_OPTION_PRIVATE], [dnl +AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [+ESlit +w1 -Aa]) +AS_CASE([".$flag_ok"], + [.ok|.ok,*], [$3], + [.|.no|.no,*], [$4], + [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])]) +]) + +AC_DEFUN([AX_CFLAGS_HPUX_OPTION],[ + AC_LANG_PUSH([C]) + AX_FLAGS_HPUX_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) + +AC_DEFUN([AX_CXXFLAGS_HPUX_OPTION],[ + AC_LANG_PUSH([C++]) + AX_FLAGS_HPUX_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_irix_option.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_irix_option.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_irix_option.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_irix_option.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_irix_option.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_IRIX_OPTION (optionflag [,[shellvar][,[A][,[NA]]]) +# +# DESCRIPTION +# +# AX_CFLAGS_IRIX_OPTION(-go_for_it) would show a message as like "checking +# CFLAGS for irix/cc -go_for_it ... yes" and adds the optionflag to CFLAGS +# if it is understood. You can override the shellvar-default of CFLAGS of +# course. The order of arguments stems from the explicit macros like +# AX_CFLAGS_WARN_ALL. +# +# The cousin AX_CXXFLAGS_IRIX_OPTION would check for an option to add to +# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it +# is possible to use different compilers for C and C++). +# +# The macro is a lot simpler than any special AX_CFLAGS_* macro (or +# ax_cxx_rtti.m4 macro) but allows to check for arbitrary options. +# However, if you use this macro in a few places, it would be great if you +# would make up a new function-macro and submit it to the ac-archive. +# +# - $1 option-to-check-for : required ("-option" as non-value) +# - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case) +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# note: in earlier versions, $1-$2 were swapped. We try to detect the +# situation and accept a $2=~/-/ as being the old option-to-check-for. +# +# see also: AX_CFLAGS_GCC_OPTION for the widely used original variant. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_FLAGS_IRIX_OPTION_PRIVATE], [dnl +AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [-fullwarn -use_readonly_const]) +AS_CASE([".$flag_ok"], + [.ok|.ok,*], [$3], + [.|.no|.no,*], [$4], + [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])]) +]) + +AC_DEFUN([AX_CFLAGS_IRIX_OPTION],[ + AC_LANG_PUSH([C]) + AX_FLAGS_IRIX_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) + +AC_DEFUN([AX_CXXFLAGS_IRIX_OPTION],[ + AC_LANG_PUSH([C++]) + AX_FLAGS_IRIX_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_no_writable_strings.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_no_writable_strings.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_no_writable_strings.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_no_writable_strings.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,121 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_no_writable_strings.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_NO_WRITABLE_STRINGS [(shellvar [,default, [A/NA]])] +# +# DESCRIPTION +# +# Try to find a compiler option that makes all string literals readonly. +# +# The sanity check is done by looking at string.h which has a set of +# strcpy definitions that should be defined with const-modifiers to not +# emit a warning in all so many places. +# +# For the GNU CC compiler it will be -fno-writable-strings -Wwrite-strings +# The result is added to the shellvar being CFLAGS by default. +# +# DEFAULTS: +# +# - $1 shell-variable-to-add-to : CFLAGS +# - $2 add-value-if-not-found : nothing +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# NOTE: These macros depend on AX_APPEND_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_FLAGS_NO_WRITABLE_STRINGS],[dnl +AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl +AS_VAR_PUSHDEF([VAR],[ax_cv_[]_AC_LANG_ABBREV[]flags_no_writable_strings])dnl +AC_CACHE_CHECK([m4_ifval([$1],[$1],FLAGS) making strings readonly], +VAR,[VAR="no, unknown" +ac_save_[]FLAGS="$[]FLAGS" +# IRIX C compiler: +# -use_readonly_const is the default for IRIX C, +# puts them into .rodata, but they are copied later. +# need to be "-G0 -rdatashared" for strictmode but +# I am not sure what effect that has really. - guidod +for ac_arg dnl +in "-pedantic -Werror % -fno-writable-strings -Wwrite-strings" dnl GCC + "-pedantic -Werror % -fconst-strings -Wwrite-strings" dnl newer GCC + "-pedantic % -fconst-strings %% no, const-strings is default" dnl newer GCC + "-v -Xc % -xstrconst" dnl Solaris C - strings go into readonly segment + "+w1 -Aa % +ESlit" dnl HP-UX C - strings go into readonly segment + "-w0 -std1 % -readonly_strings" dnl Digital Unix - again readonly segment + "-fullwarn -use_readonly_const %% ok, its the default" dnl IRIX C + # +do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + AC_TRY_COMPILE([],[return 0;], + [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) +done +case ".$VAR" in + .|.no|.no,*) ;; + *) # sanity check - testing strcpy() from string.h + cp config.log config.tmp + AC_TRY_COMPILE([#include ],[ + char test[16]; + if (strcpy (test, "test")) return 1;], + dnl the original did use test -n `$CC testprogram.c` + [if test `diff config.log config.tmp | grep -i warning | wc -l` != 0 + then VAR="no, suppressed, string.h," ; fi], + [VAR="no, suppressed, string.h"]) + rm config.tmp + ;; +esac +FLAGS="$ac_save_[]FLAGS" +]) +AS_VAR_POPDEF([FLAGS])dnl +AC_REQUIRE([AX_APPEND_FLAG]) +case ".$VAR" in + .ok|.ok,*) m4_ifvaln($3,$3) ;; + .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; + *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +])dnl AX_FLAGS_NO_WRITABLE_STRINGS + +AC_DEFUN([AX_CFLAGS_NO_WRITABLE_STRINGS],[dnl +AC_LANG_PUSH([C]) +AX_FLAGS_NO_WRITABLE_STRINGS([$1], [$2], [$3], [$4]) +AC_LANG_POP([C]) +]) + +AC_DEFUN([AX_CXXFLAGS_NO_WRITABLE_STRINGS],[dnl +AC_LANG_PUSH([C++]) +AX_FLAGS_NO_WRITABLE_STRINGS([$1], [$2], [$3], [$4]) +AC_LANG_POP([C++]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_strict_prototypes.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_strict_prototypes.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_strict_prototypes.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_strict_prototypes.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,118 @@ +# ================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cflags_strict_prototypes.html +# ================================================================================ +# +# SYNOPSIS +# +# AX_CFLAGS_STRICT_PROTOTYPES [(shellvar [,default, [A/NA]] +# +# DESCRIPTION +# +# Try to find a compiler option that requires strict prototypes. +# +# The sanity check is done by looking at sys/signal.h which has a set of +# macro-definitions SIG_DFL and SIG_IGN that are cast to the local +# signal-handler type. If that signal-handler type is not fully qualified +# then the system headers are not seen as strictly prototype clean. +# +# For the GNU CC compiler it will be -fstrict-prototypes +# -Wstrict-prototypes The result is added to the shellvar being CFLAGS by +# default. +# +# DEFAULTS: +# +# - $1 shell-variable-to-add-to : CFLAGS +# - $2 add-value-if-not-found : nothing +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# NOTE: These macros depend on AX_APPEND_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AC_DEFUN([AX_FLAGS_STRICT_PROTOTYPES],[dnl +AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl +AS_VAR_PUSHDEF([VAR],[ac_cv_[]_AC_LANG_ABBREV[]flags_strict_prototypes])dnl +AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for strict prototypes], +VAR,[VAR="no, unknown" +ac_save_[]FLAGS="$[]FLAGS" +for ac_arg dnl +in "-pedantic -Werror % -fstrict-prototypes -Wstrict-prototypes" dnl GCC + "-pedantic -Werror % -Wstrict-prototypes" dnl try to warn at least + "-pedantic -Werror % -Wmissing-prototypes" dnl try to warn at least + "-pedantic -Werror % -Werror-implicit-function-declaration" dnl + "-pedantic -Werror % -Wimplicit-function-declaration" dnl + "-pedantic % -Wstrict-prototypes %% no, unsupported" dnl oops + # +do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + AC_TRY_COMPILE([],[return 0;], + [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) +done +case ".$VAR" in + .|.no|.no,*) ;; + *) # sanity check with signal() from sys/signal.h + cp config.log config.tmp + AC_TRY_COMPILE([#include ],[ + if (signal (SIGINT, SIG_IGN) == SIG_DFL) return 1; + if (signal (SIGINT, SIG_IGN) != SIG_DFL) return 2;], + dnl the original did use test -n `$CC testprogram.c` + [if test `diff config.log config.tmp | grep -i warning | wc -l` != 0 +then if test `diff config.log config.tmp | grep -i warning | wc -l` != 1 +then VAR="no, suppressed, signal.h," ; fi ; fi], + [VAR="no, suppressed, signal.h"]) + rm config.tmp + ;; +esac +FLAGS="$ac_save_[]FLAGS" +]) +AS_VAR_POPDEF([FLAGS])dnl +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +case ".$VAR" in + .ok|.ok,*) m4_ifvaln($3,$3) ;; + .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; + *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +])dnl AX_FLAGS_STRICT_PROTOTYPES + +AC_DEFUN([AX_CFLAGS_STRICT_PROTOTYPES],[dnl +AC_LANG_PUSH([C]) +AX_FLAGS_STRICT_PROTOTYPES([$1], [$2], [$3], [$4]) +AC_LANG_POP([C]) +]) + +AC_DEFUN([AX_CXXFLAGS_STRICT_PROTOTYPES],[dnl +AC_LANG_PUSH([C++]) +AX_FLAGS_STRICT_PROTOTYPES([$1], [$2], [$3], [$4]) +AC_LANG_POP([C++]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_sun_option.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_sun_option.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_sun_option.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_sun_option.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_sun_option.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_SUN_OPTION (optionflag [,[shellvar][,[A][,[NA]]]) +# +# DESCRIPTION +# +# AX_CFLAGS_SUN_OPTION(+xtreme) would show a message as like "checking +# CFLAGS for sun/cc +xtreme ... yes" and adds the optionflag to CFLAGS if +# it is understood. You can override the shellvar-default of CFLAGS of +# course. The order of arguments stems from the explicit macros like +# AX_CFLAGS_WARN_ALL. +# +# The cousin AX_CXXFLAGS_SUN_OPTION would check for an option to add to +# CXXFLAGS - and it uses the autoconf setup for C++ instead of C (since it +# is possible to use different compilers for C and C++). +# +# The macro is a lot simpler than any special AX_CFLAGS_* macro (or +# ax_cxx_rtti.m4 macro) but allows to check for arbitrary options. +# However, if you use this macro in a few places, it would be great if you +# would make up a new function-macro and submit it to the ac-archive. +# +# - $1 option-to-check-for : required ("-option" as non-value) +# - $2 shell-variable-to-add-to : CFLAGS (or CXXFLAGS in the other case) +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# note: in earlier versions, $1-$2 were swapped. We try to detect the +# situation and accept a $2=~/-/ as being the old option-to-check-for. +# +# see also: AX_CFLAGS_GCC_OPTION for the widely used original variant. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 15 + +AC_DEFUN([AX_FLAGS_SUN_OPTION_PRIVATE], [dnl +AX_CHECK_COMPILE_FLAG([$1], [flag_ok="yes"], [flag_ok="no"], [+xstrconst -Xc]) +AS_CASE([".$flag_ok"], + [.ok|.ok,*], [$3], + [.|.no|.no,*], [$4], + [m4_default($3,[AX_APPEND_FLAG([$1],[$2])])]) +]) + +AC_DEFUN([AX_CFLAGS_SUN_OPTION],[ + AC_LANG_PUSH([C]) + AX_FLAGS_SUN_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) + +AC_DEFUN([AX_CXXFLAGS_SUN_OPTION],[ + AC_LANG_PUSH([C++]) + AX_FLAGS_SUN_OPTION_PRIVATE(ifelse(m4_bregexp([$2],[-]),-1,[[$1],[$2]],[[$2],[$1]]),[$3],[$4]) + AC_LANG_POP +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_warn_all.m4 projectm-3.1.0/m4/autoconf-archive/ax_cflags_warn_all.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cflags_warn_all.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cflags_warn_all.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,122 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cflags_warn_all.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])] +# AX_CXXFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])] +# AX_FCFLAGS_WARN_ALL [(shellvar [,default, [A/NA]])] +# +# DESCRIPTION +# +# Try to find a compiler option that enables most reasonable warnings. +# +# For the GNU compiler it will be -Wall (and -ansi -pedantic) The result +# is added to the shellvar being CFLAGS, CXXFLAGS, or FCFLAGS by default. +# +# Currently this macro knows about the GCC, Solaris, Digital Unix, AIX, +# HP-UX, IRIX, NEC SX-5 (Super-UX 10), Cray J90 (Unicos 10.0.0.8), and +# Intel compilers. For a given compiler, the Fortran flags are much more +# experimental than their C equivalents. +# +# - $1 shell-variable-to-add-to : CFLAGS, CXXFLAGS, or FCFLAGS +# - $2 add-value-if-not-found : nothing +# - $3 action-if-found : add value to shellvariable +# - $4 action-if-not-found : nothing +# +# NOTE: These macros depend on AX_APPEND_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2010 Rhys Ulerich +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AC_DEFUN([AX_FLAGS_WARN_ALL],[dnl +AS_VAR_PUSHDEF([FLAGS],[_AC_LANG_PREFIX[]FLAGS])dnl +AS_VAR_PUSHDEF([VAR],[ac_cv_[]_AC_LANG_ABBREV[]flags_warn_all])dnl +AC_CACHE_CHECK([m4_ifval($1,$1,FLAGS) for maximum warnings], +VAR,[VAR="no, unknown" +ac_save_[]FLAGS="$[]FLAGS" +for ac_arg dnl +in "-warn all % -warn all" dnl Intel + "-pedantic % -Wall" dnl GCC + "-xstrconst % -v" dnl Solaris C + "-std1 % -verbose -w0 -warnprotos" dnl Digital Unix + "-qlanglvl=ansi % -qsrcmsg -qinfo=all:noppt:noppc:noobs:nocnd" dnl AIX + "-ansi -ansiE % -fullwarn" dnl IRIX + "+ESlit % +w1" dnl HP-UX C + "-Xc % -pvctl[,]fullmsg" dnl NEC SX-5 (Super-UX 10) + "-h conform % -h msglevel 2" dnl Cray C (Unicos) + # +do FLAGS="$ac_save_[]FLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'` + AC_COMPILE_IFELSE([AC_LANG_PROGRAM], + [VAR=`echo $ac_arg | sed -e 's,.*% *,,'` ; break]) +done +FLAGS="$ac_save_[]FLAGS" +]) +AS_VAR_POPDEF([FLAGS])dnl +AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) +case ".$VAR" in + .ok|.ok,*) m4_ifvaln($3,$3) ;; + .|.no|.no,*) m4_default($4,[m4_ifval($2,[AX_APPEND_FLAG([$2], [$1])])]) ;; + *) m4_default($3,[AX_APPEND_FLAG([$VAR], [$1])]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +])dnl AX_FLAGS_WARN_ALL +dnl implementation tactics: +dnl the for-argument contains a list of options. The first part of +dnl these does only exist to detect the compiler - usually it is +dnl a global option to enable -ansi or -extrawarnings. All other +dnl compilers will fail about it. That was needed since a lot of +dnl compilers will give false positives for some option-syntax +dnl like -Woption or -Xoption as they think of it is a pass-through +dnl to later compile stages or something. The "%" is used as a +dnl delimiter. A non-option comment can be given after "%%" marks +dnl which will be shown but not added to the respective C/CXXFLAGS. + +AC_DEFUN([AX_CFLAGS_WARN_ALL],[dnl +AC_LANG_PUSH([C]) +AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4]) +AC_LANG_POP([C]) +]) + +AC_DEFUN([AX_CXXFLAGS_WARN_ALL],[dnl +AC_LANG_PUSH([C++]) +AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4]) +AC_LANG_POP([C++]) +]) + +AC_DEFUN([AX_FCFLAGS_WARN_ALL],[dnl +AC_LANG_PUSH([Fortran]) +AX_FLAGS_WARN_ALL([$1], [$2], [$3], [$4]) +AC_LANG_POP([Fortran]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_float_words_bigendian.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_float_words_bigendian.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_float_words_bigendian.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_float_words_bigendian.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,83 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_float_words_bigendian.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_C_FLOAT_WORDS_BIGENDIAN([ACTION-IF-TRUE], [ACTION-IF-FALSE], [ACTION-IF-UNKNOWN]) +# +# DESCRIPTION +# +# Checks the ordering of words within a multi-word float. This check is +# necessary because on some systems (e.g. certain ARM systems), the float +# word ordering can be different from the byte ordering. In a multi-word +# float context, "big-endian" implies that the word containing the sign +# bit is found in the memory location with the lowest address. This +# implementation was inspired by the AC_C_BIGENDIAN macro in autoconf. +# +# The endianess is detected by first compiling C code that contains a +# special double float value, then grepping the resulting object file for +# certain strings of ASCII values. The double is specially crafted to have +# a binary representation that corresponds with a simple string. In this +# implementation, the string "noonsees" was selected because the +# individual word values ("noon" and "sees") are palindromes, thus making +# this test byte-order agnostic. If grep finds the string "noonsees" in +# the object file, the target platform stores float words in big-endian +# order. If grep finds "seesnoon", float words are in little-endian order. +# If neither value is found, the user is instructed to specify the +# ordering. +# +# LICENSE +# +# Copyright (c) 2008 Daniel Amelang +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN], + [AC_CACHE_CHECK(whether float word ordering is bigendian, + ax_cv_c_float_words_bigendian, [ + +ax_cv_c_float_words_bigendian=unknown +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + +double d = 90904234967036810337470478905505011476211692735615632014797120844053488865816695273723469097858056257517020191247487429516932130503560650002327564517570778480236724525140520121371739201496540132640109977779420565776568942592.0; + +]])], [ + +if grep noonsees conftest.$ac_objext >/dev/null ; then + ax_cv_c_float_words_bigendian=yes +fi +if grep seesnoon conftest.$ac_objext >/dev/null ; then + if test "$ax_cv_c_float_words_bigendian" = unknown; then + ax_cv_c_float_words_bigendian=no + else + ax_cv_c_float_words_bigendian=unknown + fi +fi + +])]) + +case $ax_cv_c_float_words_bigendian in + yes) + m4_default([$1], + [AC_DEFINE([FLOAT_WORDS_BIGENDIAN], 1, + [Define to 1 if your system stores words within floats + with the most significant word first])]) ;; + no) + $2 ;; + *) + m4_default([$3], + [AC_MSG_ERROR([ + +Unknown float word ordering. You need to manually preset +ax_cv_c_float_words_bigendian=no (or yes) according to your system. + + ])]) ;; +esac + +])# AX_C_FLOAT_WORDS_BIGENDIAN diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_aligned_access_required.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_aligned_access_required.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_aligned_access_required.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_aligned_access_required.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,92 @@ +# ===================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_aligned_access_required.html +# ===================================================================================== +# +# SYNOPSIS +# +# AX_CHECK_ALIGNED_ACCESS_REQUIRED +# +# DESCRIPTION +# +# While the x86 CPUs allow access to memory objects to be unaligned it +# happens that most of the modern designs require objects to be aligned - +# or they will fail with a buserror. That mode is quite known by +# big-endian machines (sparc, etc) however the alpha cpu is little- +# endian. +# +# The following function will test for aligned access to be required and +# set a config.h define HAVE_ALIGNED_ACCESS_REQUIRED (name derived by +# standard usage). Structures loaded from a file (or mmapped to memory) +# should be accessed per-byte in that case to avoid segfault type errors. +# +# The function checks if unaligned access would ignore the lowest bit of +# the address. If that happens or if the test binary crashes, aligned +# access is required. +# +# If cross-compiling, assume that aligned access is needed to be safe. Set +# ax_cv_have_aligned_access_required=no to override that assumption. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_CHECK_ALIGNED_ACCESS_REQUIRED], +[AC_CACHE_CHECK([if pointers to integers require aligned access], + [ax_cv_have_aligned_access_required], + [AC_RUN_IFELSE([ + AC_LANG_PROGRAM([[@%:@include ]], + [[ + int i; + int *p; + int *q; + char *str; + str = (char *) malloc(40); + for (i = 0; i < 40; i++) { + *(str + i) = i; + } + p = (int *) (str + 1); + q = (int *) (str + 2); + return (*p == *q); + ]])], + [ax_cv_have_aligned_access_required=no], + [ax_cv_have_aligned_access_required=yes], + [ax_cv_have_aligned_access_required=maybe])]) + +if test "x$ax_cv_have_aligned_access_required" = "xmaybe"; then + AC_MSG_WARN([Assuming aligned access is required when cross-compiling]) + ax_cv_have_aligned_access_required=yes +fi + +if test "x$ax_cv_have_aligned_access_required" = "xyes"; then + AC_DEFINE([HAVE_ALIGNED_ACCESS_REQUIRED], [1], + [Define if pointers to integers require aligned access]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_allocated_ctime.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_allocated_ctime.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_allocated_ctime.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_allocated_ctime.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_check_allocated_ctime.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CHECK_ALLOCATED_CTIME +# +# DESCRIPTION +# +# Check whether we need to free the memory returned by ctime. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AG_CHECK_ALLOCATED_CTIME], [AX_CHECK_ALLOCATED_CTIME]) +AC_DEFUN([AX_CHECK_ALLOCATED_CTIME],[ + AC_MSG_CHECKING([whether ctime() allocates memory for its result]) + AC_CACHE_VAL([ax_cv_allocated_ctime],[ + AC_TRY_RUN([#include +int main (int argc, char** argv) { + time_t timeVal = time( (time_t*)NULL ); + char* pzTime = ctime( &timeVal ); + free( pzTime ); + return 0; }],[ax_cv_allocated_ctime=yes],[ax_cv_allocated_ctime=no],[ax_cv_allocated_ctime=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_allocated_ctime]) + if test x$ax_cv_allocated_ctime = xyes + then + AC_DEFINE(HAVE_ALLOCATED_CTIME, 1, + [Define this if ctime() allocates memory for its result]) + fi +]) # end of AC_DEFUN of AX_CHECK_ALLOCATED_CTIME diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_and.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_and.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_and.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_and.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_and.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_AND([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports and() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_AND], [ + AX_TRY_AWK_EXPOUT([and()], + [],[ print and(1,1) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_argind.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_argind.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_argind.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_argind.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_argind.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ARGIND([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports ARGIND variable. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ARGIND], [ + AX_TRY_AWK_EXPOUT([ARGIND], + [],[ if ( !ARGIND ) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_array_delete_elem.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_array_delete_elem.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_array_delete_elem.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_array_delete_elem.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_array_delete_elem.html +# =================================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ARRAY_DELETE_ELEM([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports delete on array element. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ARRAY_DELETE_ELEM], [ + AX_TRY_AWK_EXPOUT([array delete element], + [],[ a[1]=1; delete a[1]; if (a[1]!=0) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_array_delete.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_array_delete.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_array_delete.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_array_delete.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_array_delete.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ARRAY_DELETE([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports delete on array. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ARRAY_DELETE], [ + AX_TRY_AWK_EXPOUT([array delete], + [],[ a[1]=1; delete a; if (a[1]!=0) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_array_in.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_array_in.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_array_in.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_array_in.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_array_in.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ARRAY_IN([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports 'in' on array. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ARRAY_IN], [ + AX_TRY_AWK_EXPOUT([array in], + [],[ i="x"; a[i]="1"; if (! (i in a)) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_asorti.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_asorti.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_asorti.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_asorti.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_asorti.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ASORTI([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports asorti() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ASORTI], [ + AX_TRY_AWK_EXPOUT([asorti()], + [],[ s[1]="b"; s[2]="a"; if (asorti(s) != 2) exit(1); print s[1] ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_asort.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_asort.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_asort.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_asort.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_asort.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ASORT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports asort() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ASORT], [ + AX_TRY_AWK_EXPOUT([asort()], + [],[ s[1]="b"; s[2]="a"; if (asort(s) != 2) exit(1); print s[1] ],[a], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_associative_array.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_associative_array.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_associative_array.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_associative_array.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_associative_array.html +# =================================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ASSOCIATIVE_ARRAY([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports associative array. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ASSOCIATIVE_ARRAY], [ + AX_TRY_AWK_EXPOUT([associative array], + [],[ a ["i"] = "x"; print a ["i"] ],[x], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_atan2.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_atan2.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_atan2.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_atan2.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_atan2.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ATAN2([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports atan2() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ATAN2], [ + AX_TRY_AWK_EXPOUT([atan2()], + [],[ print atan2(0, 1) ],[0], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_compl.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_compl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_compl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_compl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_compl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_COMPL([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports compl() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_COMPL], [ + AX_TRY_AWK_ANYOUT([compl()], + [],[ print compl(10) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_conditional_expression.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_conditional_expression.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_conditional_expression.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_conditional_expression.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ======================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_conditional_expression.html +# ======================================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_CONDITIONAL_EXPRESSION([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports conditional expression (e.g. x = y ? 5 : 6). If +# successful execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_CONDITIONAL_EXPRESSION], [ + AX_TRY_AWK_EXPOUT([conditional expression], + [],[ a=(1)?("y"):("n"); print a ],[y], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_cos.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_cos.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_cos.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_cos.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_cos.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_COS([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports cos() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_COS], [ + AX_TRY_AWK_EXPOUT([cos()], + [],[ print cos(0) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_environ.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_environ.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_environ.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_environ.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_environ.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ENVIRON([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports ENVIRON variable. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ENVIRON], [ + AX_TRY_AWK_EXPOUT([ENVIRON], + [],[ if ( !ENVIRON["PATH"] ) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_errno.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_errno.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_errno.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_errno.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_errno.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_ERRNO([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports ERRNO variable. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_ERRNO], [ + AX_TRY_AWK_EXPOUT([ERRNO], + [],[ getline s < "./this_file_should_not_exist"; if ( !ERRNO ) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_exit.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_exit.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_exit.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_exit.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_exit.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_EXIT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports exit(). If successful execute ACTION-IF-SUCCESS +# otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_EXIT],[ + AC_REQUIRE([AX_NEED_AWK]) + + AC_MSG_CHECKING([if $AWK supports exit()]) + echo "" | $AWK '{ exit(99); }' 2>/dev/null + AS_IF([test $? -eq 99],[ + AC_MSG_RESULT([yes]) + $1 + ],[ + AC_MSG_RESULT([no]) + $2 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_exp.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_exp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_exp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_exp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_exp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_EXP([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports exp() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_EXP], [ + AX_TRY_AWK_EXPOUT([exp()], + [],[ print exp(0) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_gensub.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_gensub.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_gensub.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_gensub.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_gensub.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_GENSUB([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports gensub() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_GENSUB], [ + AX_TRY_AWK_EXPOUT([gensub()], + [],[ print gensub(/u/, "x", "g", "uu") ],[xx], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_getline.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_getline.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_getline.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_getline.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_getline.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_GETLINE([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports getline function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_GETLINE], [ + AX_TRY_AWK_ANYOUT([getline], + [1],[ getline; if ( $][0 != "1" ) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_gsub.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_gsub.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_gsub.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_gsub.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_gsub.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_GSUB([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports gsub() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_GSUB], [ + AX_TRY_AWK_EXPOUT([gsub()], + [],[ s = "AB"; gsub(/./, "X", s); print s ],[XX], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_ignorecase.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_ignorecase.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_ignorecase.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_ignorecase.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_ignorecase.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CHECK_AWK_IGNORECASE([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports IGNORECASE variable. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_IGNORECASE], [ + AX_TRY_AWK_EXPOUT([IGNORECASE], + [],[ IGNORECASE = 1; if ( !("A" ~ "a") ) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_index.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_index.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_index.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_index.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_index.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_INDEX([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports index() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_INDEX], [ + AX_TRY_AWK_EXPOUT([index[]()], + [],[ print index("AB", "B") ],[2], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_int.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_int.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_int.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_int.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_int.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_INT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports int() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_INT], [ + AX_TRY_AWK_EXPOUT([int()], + [],[ print int(1.5) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_length.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_length.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_length.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_length.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_length.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_LENGTH([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports length() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_LENGTH], [ + AX_TRY_AWK_EXPOUT([length()], + [],[ print length("A") ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_log.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_log.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_log.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_log.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_log.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_LOG([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports log() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_LOG], [ + AX_TRY_AWK_EXPOUT([log()], + [],[ print log(1) ],[0], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_lshift.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_lshift.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_lshift.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_lshift.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_lshift.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_LSHIFT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports lshift() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_LSHIFT], [ + AX_TRY_AWK_EXPOUT([lshift()], + [],[ print lshift(10,1) ],[20], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_match_2parms.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_match_2parms.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_match_2parms.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_match_2parms.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_match_2parms.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_MATCH_2PARMS([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports match() function with 2 parameters (standard). If +# successful execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_MATCH_2PARMS], [ + AX_TRY_AWK_EXPOUT([match() with 2 parameters], + [],[ print match("ab", /b/) ],[2], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_match_3parms.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_match_3parms.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_match_3parms.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_match_3parms.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,36 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_match_3parms.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_MATCH_3PARMS([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports match() function with 3 parameters (GNU +# extension). If successful execute ACTION-IF-SUCCESS otherwise +# ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_MATCH_3PARMS], [ + AX_TRY_AWK_EXPOUT([match() with 3 parameters], + [],[ match("abc", /(b)/, a) ; print a[1]],[b], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_operator_multiply_multiply.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_operator_multiply_multiply.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_operator_multiply_multiply.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_operator_multiply_multiply.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_operator_multiply_multiply.html +# ============================================================================================ +# +# SYNOPSIS +# +# AX_CHECK_AWK_OPERATOR_MULTIPLY_MULTIPLY([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports the '**' operator. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_OPERATOR_MULTIPLY_MULTIPLY], [ + AX_TRY_AWK_EXPOUT([operator **], + [],[ print 2**2 ],[4], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_operator_square.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_operator_square.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_operator_square.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_operator_square.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_operator_square.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_CHECK_AWK_OPERATOR_SQUARE([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports the '^' operator. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_OPERATOR_SQUARE], [ + AX_TRY_AWK_EXPOUT([operator ^], + [],[ print 2^2 ],[4], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_or.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_or.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_or.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_or.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_or.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_OR([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports or() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_OR], [ + AX_TRY_AWK_EXPOUT([or()], + [],[ print or(1,0) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_printf.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_printf.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_printf.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_printf.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_printf.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_PRINTF([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports printf() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_PRINTF], [ + AX_TRY_AWK_EXPOUT([printf()], + [],[ printf("%s\n", "X") ],[X], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_rand.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_rand.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_rand.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_rand.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_rand.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_RAND([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports rand() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_RAND], [ + AX_TRY_AWK_ANYOUT([rand()], + [],[ print rand() ], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_rshift.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_rshift.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_rshift.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_rshift.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_rshift.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_RSHIFT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports rshift() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_RSHIFT], [ + AX_TRY_AWK_EXPOUT([rshift()], + [],[ print rshift(10,1) ],[5], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sin.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sin.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sin.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sin.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_sin.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SIN([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports sin() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SIN], [ + AX_TRY_AWK_EXPOUT([sin()], + [],[ print sin(0) ],[0], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_split.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_split.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_split.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_split.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_split.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SPLIT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports split() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SPLIT], [ + AX_TRY_AWK_EXPOUT([split()], + [],[ print split("A B", a, " ") ],[2], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sprintf.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sprintf.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sprintf.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sprintf.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_sprintf.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SPRINTF([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports sprintf() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SPRINTF], [ + AX_TRY_AWK_EXPOUT([sprintf()], + [],[ print sprintf("%.1s", "AB") ],[A], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sqrt.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sqrt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sqrt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sqrt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_sqrt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SQRT([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports sqrt() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SQRT], [ + AX_TRY_AWK_EXPOUT([sqrt()], + [],[ print sqrt(1) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_srand.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_srand.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_srand.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_srand.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_srand.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SRAND([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports srand() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SRAND], [ + AX_TRY_AWK_EXPOUT([srand()], + [],[ srand() ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_strftime.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_strftime.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_strftime.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_strftime.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_strftime.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_STRFTIME([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports strftime() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_STRFTIME], [ + AX_TRY_AWK_EXPOUT([strftime()], + [],[ print strftime("%d.%m.%y", 0) ],[01.01.70], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_strtonum.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_strtonum.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_strtonum.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_strtonum.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_strtonum.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_STRTONUM([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports strtonum() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_STRTONUM], [ + AX_TRY_AWK_EXPOUT([strtonum()], + [],[ print strtonum(15) ],[15], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sub.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sub.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_sub.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_sub.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_sub.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SUB([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports sub() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SUB], [ + AX_TRY_AWK_EXPOUT([sub()], + [],[ s = "AB"; sub(/./, "X", s); print s ],[XB], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_substr.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_substr.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_substr.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_substr.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_substr.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SUBSTR([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports substr() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SUBSTR], [ + AX_TRY_AWK_EXPOUT([substr()], + [],[ print substr("AB", 2, 1) ],[B], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_system.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_system.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_system.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_system.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_system.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SYSTEM([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports system() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SYSTEM], [ + AX_TRY_AWK_EXPOUT([system()], + [],[ system(":") ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_systime.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_systime.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_systime.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_systime.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_systime.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_SYSTIME([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports systime() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_SYSTIME], [ + AX_TRY_AWK_ANYOUT([systime()], + [],[ print systime() ], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_tolower.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_tolower.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_tolower.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_tolower.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_tolower.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_TOLOWER([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports tolower() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_TOLOWER], [ + AX_TRY_AWK_EXPOUT([tolower()], + [],[ print tolower("A") ],[a], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_toupper.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_toupper.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_toupper.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_toupper.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_toupper.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_TOUPPER([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports toupper() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_TOUPPER], [ + AX_TRY_AWK_EXPOUT([toupper()], + [],[ print toupper("a") ],[A], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_user_defined_functions.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_user_defined_functions.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_user_defined_functions.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_user_defined_functions.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# ======================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_user_defined_functions.html +# ======================================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_USER_DEFINED_FUNCTIONS([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports user defined functions. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_USER_DEFINED_FUNCTIONS],[ + AC_REQUIRE([AX_NEED_AWK]) + + AC_MSG_CHECKING([if $AWK supports user defined functions]) + + ax_awk_command=`echo "" | $AWK 'function mydouble(x) { return 2*x ; } ; { print mydouble(1) ; }' 2> /dev/null` + AS_IF([test $? -eq 0],[ + AS_IF([test X"$ax_awk_command" = X"2"],[ + AC_MSG_RESULT([yes]) + $1 + ],[ + AC_MSG_RESULT([no]) + $2 + ]) + ],[ + AC_MSG_RESULT([no]) + $2 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_variable_value_pairs.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_variable_value_pairs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_variable_value_pairs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_variable_value_pairs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# ====================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_variable_value_pairs.html +# ====================================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_VARIABLE_VALUE_PAIRS([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports variable=value pairs ($AWK '' var=val). +# If successful execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_VARIABLE_VALUE_PAIRS],[ + AC_REQUIRE([AX_NEED_AWK]) + + AC_MSG_CHECKING([if $AWK supports variable=value pairs]) + + ax_try_awk_output=`echo "" | $AWK '{ print variable; }' variable=A 2> /dev/null` + AS_IF([test $? -eq 0],[ + AS_IF([test "X$ax_try_awk_output" = "XA"],[ + AC_MSG_RESULT([yes]) + $1 + ],[ + AC_MSG_RESULT([no]) + $2 + ]) + ],[ + AC_MSG_RESULT([no]) + $2 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_var_regexp.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_var_regexp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_var_regexp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_var_regexp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_var_regexp.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CHECK_AWK_VAR_REGEXP([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports variable regexp. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_VAR_REGEXP], [ + AX_TRY_AWK_EXPOUT([variable regexp], + [],[ r="x"; if ( "x" ~ r ) print "yes" ],[yes], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk__v.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk__v.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk__v.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk__v.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk__v.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK__V([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports -v option ($AWK -v var=val ''). If +# successful execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK__V],[ + AC_REQUIRE([AX_NEED_AWK]) + + AC_MSG_CHECKING([if $AWK supports -v option]) + + ax_try_awk_output=`echo "" | $AWK -v variable=A '{ print variable; }' 2> /dev/null` + AS_IF([test $? -eq 0],[ + AS_IF([test "X$ax_try_awk_output" = "XA"],[ + AC_MSG_RESULT([yes]) + $1 + ],[ + AC_MSG_RESULT([no]) + $2 + ]) + ],[ + AC_MSG_RESULT([no]) + $2 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk__x_escapes.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk__x_escapes.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk__x_escapes.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk__x_escapes.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_check_awk__x_escapes.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CHECK_AWK__X_ESCAPES([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports \x escape codes. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK__X_ESCAPES], [ + AX_TRY_AWK_EXPOUT([\x escapes], + [],[ if ( "\x41" != "A" ) exit (1) ],[], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_xor.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_awk_xor.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_awk_xor.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_awk_xor.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_awk_xor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_AWK_XOR([ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Check if AWK supports xor() function. If successful execute +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CHECK_AWK_XOR], [ + AX_TRY_AWK_EXPOUT([xor()], + [],[ print xor(1,0) ],[1], + [$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_class.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_class.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_class.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_class.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,79 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_class.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_CLASS +# +# DESCRIPTION +# +# AX_CHECK_CLASS tests the existence of a given Java class, either in a +# jar or in a '.class' file. +# +# *Warning*: its success or failure can depend on a proper setting of the +# CLASSPATH env. variable. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 12 + +AU_ALIAS([AC_CHECK_CLASS], [AX_CHECK_CLASS]) +AC_DEFUN([AX_CHECK_CLASS],[ +AC_REQUIRE([AX_PROG_JAVA]) +ac_var_name=`echo $1 | sed 's/\./_/g'` +dnl Normally I'd use a AC_CACHE_CHECK here but since the variable name is +dnl dynamic I need an extra level of extraction +AC_MSG_CHECKING([for $1 class]) +AC_CACHE_VAL(ax_cv_class_$ac_var_name, [ + AX_TRY_COMPILE_JAVA([$1], , [eval "ac_cv_class_$ac_var_name=yes"], + [eval "ac_cv_class_$ac_var_name=no"]) +eval "ac_var_val=$`eval echo ac_cv_class_$ac_var_name`" +eval "HAVE_$ac_var_name=$`echo ac_cv_class_$ac_var_val`" +HAVE_LAST_CLASS=$ac_var_val +if test x$ac_var_val = xyes; then + ifelse([$2], , :, [$2]) +else + ifelse([$3], , :, [$3]) +fi +]) +dnl for some reason the above statement didn't fall though here? +dnl do scripts have variable scoping? +eval "ac_var_val=$`eval echo ac_cv_class_$ac_var_name`" +AC_MSG_RESULT($ac_var_val) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_classpath.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_classpath.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_classpath.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_classpath.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_classpath.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_CLASSPATH +# +# DESCRIPTION +# +# AX_CHECK_CLASSPATH just displays the CLASSPATH, for the edification of +# the user. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_CLASSPATH], [AX_CHECK_CLASSPATH]) +AC_DEFUN([AX_CHECK_CLASSPATH],[ +if test "x$CLASSPATH" = x; then + echo "You have no CLASSPATH, I hope it is good" +else + echo "You have CLASSPATH $CLASSPATH, hope it is correct" +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_compile_flag.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_compile_flag.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_compile_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_compile_flag.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_define.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_define.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_define.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_define.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,94 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_define.html +# =========================================================================== +# +# SYNOPSIS +# +# AC_CHECK_DEFINE([symbol], [ACTION-IF-FOUND], [ACTION-IF-NOT]) +# AX_CHECK_DEFINE([includes],[symbol], [ACTION-IF-FOUND], [ACTION-IF-NOT]) +# +# DESCRIPTION +# +# Complements AC_CHECK_FUNC but it does not check for a function but for a +# define to exist. Consider a usage like: +# +# AC_CHECK_DEFINE(__STRICT_ANSI__, CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500") +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_CHECK_DEFINED], [AC_CHECK_DEFINE]) +AC_DEFUN([AC_CHECK_DEFINE],[ +AS_VAR_PUSHDEF([ac_var],[ac_cv_defined_$1])dnl +AC_CACHE_CHECK([for $1 defined], ac_var, +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ + #ifdef $1 + int ok; + (void)ok; + #else + choke me + #endif +]])],[AS_VAR_SET(ac_var, yes)],[AS_VAR_SET(ac_var, no)])) +AS_IF([test AS_VAR_GET(ac_var) != "no"], [$2], [$3])dnl +AS_VAR_POPDEF([ac_var])dnl +]) + +AU_ALIAS([AX_CHECK_DEFINED], [AX_CHECK_DEFINE]) +AC_DEFUN([AX_CHECK_DEFINE],[ +AS_VAR_PUSHDEF([ac_var],[ac_cv_defined_$2_$1])dnl +AC_CACHE_CHECK([for $2 defined in $1], ac_var, +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <$1>]], [[ + #ifdef $2 + int ok; + (void)ok; + #else + choke me + #endif +]])],[AS_VAR_SET(ac_var, yes)],[AS_VAR_SET(ac_var, no)])) +AS_IF([test AS_VAR_GET(ac_var) != "no"], [$3], [$4])dnl +AS_VAR_POPDEF([ac_var])dnl +]) + +AC_DEFUN([AX_CHECK_FUNC], +[AS_VAR_PUSHDEF([ac_var], [ac_cv_func_$2])dnl +AC_CACHE_CHECK([for $2], ac_var, +dnl AC_LANG_FUNC_LINK_TRY +[AC_LINK_IFELSE([AC_LANG_PROGRAM([$1 + #undef $2 + char $2 ();],[ + char (*f) () = $2; + return f != $2; ])], + [AS_VAR_SET(ac_var, yes)], + [AS_VAR_SET(ac_var, no)])]) +AS_IF([test AS_VAR_GET(ac_var) = yes], [$3], [$4])dnl +AS_VAR_POPDEF([ac_var])dnl +])# AC_CHECK_FUNC diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_docbook_dtd.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_docbook_dtd.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_docbook_dtd.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_docbook_dtd.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,105 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_docbook_dtd.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_DOCBOOK_DTD([dtd-version]) +# +# DESCRIPTION +# +# Check for access to a docbook DTD of a particular revision. This macro +# can be used for multiple versions within the same script. +# +# Input: +# +# $1 is the version of docbook to search for; default 'current'. +# +# Output: +# +# $HAVE_DOCBOOK_DTD_VERS will be set to 'yes' or 'no' depending on the +# results of the test, where VERS is $1, with '_' substituted for '.' +# $HAVE_DOCBOOK_DTD will also be set to the same value. +# +# Example: +# +# AX_CHECK_DOCBOOK_DTD(4.3) +# if test "x$HAVE_DOCBOOK_DTD_4_3" = "xyes"; then +# ... +# +# LICENSE +# +# Copyright (c) 2008 Zmanda Inc. +# Copyright (c) 2008 Dustin J. Mitchell +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_DOCBOOK_DTD], [AX_CHECK_DOCBOOK_DTD]) +AC_DEFUN([AX_CHECK_DOCBOOK_DTD], +[ + AC_REQUIRE([AX_PROG_XSLTPROC]) + + dnl define a temporary variable for the version, so this macro can be + dnl used with multiple versions + define([_VERS], $1) + ifelse(_VERS, [], [define([_VERS], [current])]) + define([ac_cv_docbook_dtd_VERS], patsubst([ac_cv_docbook_dtd_]_VERS, [\.], [_])) + define([HAVE_DOCBOOK_DTD_VERS], patsubst([HAVE_DOCBOOK_DTD_]_VERS, [\.], [_])) + + AC_CACHE_CHECK([for Docbook DTD version ]_VERS, [ac_cv_docbook_dtd_VERS], + [ + ac_cv_docbook_dtd_VERS=no + if test -n "$XSLTPROC"; then + MY_XSLTPROC_FLAGS=`echo "" $XSLTPROC_FLAGS|sed -e s/--novalid//g` + cat <conftest.xml + + + + +EOF + echo "Trying '$XSLTPROC $MY_XSLTPROC_FLAGS conftest.xml'" >&AS_MESSAGE_LOG_FD + $XSLTPROC $MY_XSLTPROC_FLAGS conftest.xml >conftest.out 2>&1 + if test "$?" = 0 -o "$?" = 5; then + # failing to load the DTD is just a warning, so check for it in the output. + if grep 'warning: failed to load external entity' conftest_out >/dev/null 2>&1; then + : # no good.. + else + ac_cv_docbook_dtd_VERS=yes + fi + fi + cat conftest.out >&AS_MESSAGE_LOG_FD + + rm -f conftest.xml conftest.out + fi + ]) + + HAVE_DOCBOOK_DTD_VERS="$ac_cv_docbook_dtd_VERS" + HAVE_DOCBOOK_DTD=HAVE_DOCBOOK_DTD_VERS + undefine([_VERS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_docbook_xslt.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_docbook_xslt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_docbook_xslt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_docbook_xslt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,98 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_docbook_xslt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_DOCBOOK_XSLT([xslt-version]) +# +# DESCRIPTION +# +# Check for access to docbook stylesheets of a particular revision. This +# macro can be used for multiple versions within the same script. +# +# Input: +# +# $1 is the version of docbook to search for; default 'current'. +# +# Output: +# +# $HAVE_DOCBOOK_XSLT_VERS will be set to 'yes' or 'no' depending on the +# results of the test, where VERS is $1, with '_' substituted for '.'. +# $HAVE_DOCBOOK_XSLT will also be set to the same value. +# +# Example: +# +# AX_CHECK_DOCBOOK_XSLT(1.72.0) +# if test "x$HAVE_DOCBOOK_XSLT_1_72_0" = "xyes"; then +# ... +# +# LICENSE +# +# Copyright (c) 2008 Zmanda Inc. +# Copyright (c) 2008 Dustin J. Mitchell +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_DOCBOOK_XSLT], [AX_CHECK_DOCBOOK_XSLT]) +AC_DEFUN([AX_CHECK_DOCBOOK_XSLT], +[ + AC_REQUIRE([AX_PROG_XSLTPROC]) + + dnl define a temporary variable for the version, so this macro can be + dnl used with multiple versions + define([_VERS], $1) + ifelse(_VERS, [], [define([_VERS], [current])]) + + dnl define variable names ending in _VERS which will actually have the + dnl version number as a suffix + define([ac_cv_docbook_xslt_VERS], patsubst([ac_cv_docbook_xslt_]_VERS, [\.], [_])) + define([HAVE_DOCBOOK_XSLT_VERS], patsubst([HAVE_DOCBOOK_XSLT_]_VERS, [\.], [_])) + + AC_CACHE_CHECK([for Docbook XSLT version ]_VERS, [ac_cv_docbook_xslt_VERS], + [ + ac_cv_docbook_xslt_VERS=no + if test -n "$XSLTPROC"; then + echo "Trying '$XSLTPROC $XSLTPROC_FLAGS http://docbook.sourceforge.net/release/xsl/_VERS/xhtml/docbook.xsl'" >&AS_MESSAGE_LOG_FD + $XSLTPROC $XSLTPROC_FLAGS http://docbook.sourceforge.net/release/xsl/_VERS/xhtml/docbook.xsl >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + + if test "$?" = 0; then + ac_cv_docbook_xslt_VERS=yes + fi + fi + ]) + + HAVE_DOCBOOK_XSLT_VERS="$ac_cv_docbook_xslt_VERS" + HAVE_DOCBOOK_XSLT="$HAVE_DOCBOOK_XSLT_VERS" + + dnl clean up m4 namespace + undefine([_VERS]) + undefine([ac_cv_docbook_xslt_VERS]) + undefine([HAVE_DOCBOOK_XSLT_VERS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_docbook_xslt_min.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_docbook_xslt_min.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_docbook_xslt_min.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_docbook_xslt_min.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_docbook_xslt_min.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CHECK_DOCBOOK_XSLT_MIN(min-xslt-version) +# +# DESCRIPTION +# +# Check that the 'current' version of docbook is at least version +# min-xslt-version. If the test is successful, +# $DOCBOOK_XSLT_CURRENT_VERSION will be set to the current docbook +# version; if not, it will be set to 'no'. +# +# Example: +# +# AX_CHECK_DOCBOOK_XSLT_MIN(1.72.0) +# if test "x$DOCBOOK_XSLT_CURRENT_VERSION" = "xno"; then +# ... +# +# LICENSE +# +# Copyright (c) 2008 Zmanda Inc. +# Copyright (c) 2008 Dustin J. Mitchell +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_DOCBOOK_XSLT_MIN], [AX_CHECK_DOCBOOK_XSLT_MIN]) +AC_DEFUN([AX_CHECK_DOCBOOK_XSLT_MIN], +[ + AC_REQUIRE([AX_PROG_XSLTPROC]) + + AC_CACHE_CHECK([for current Docbook XSLT version], [ac_cv_docbook_xslt_current_version], + [ + ac_cv_docbook_xslt_current_version=no + + if test -n "$XSLTPROC"; then + cat >conftest.xsl < + + + + + + + +EOF + echo "Trying '$XSLTPROC $XSLTPROC_FLAGS http://docbook.sourceforge.net/release/xsl/current/VERSION' with input:" >&AS_MESSAGE_LOG_FD + echo "====" >&AS_MESSAGE_LOG_FD + cat conftest.xsl >&AS_MESSAGE_LOG_FD + echo "====" >&AS_MESSAGE_LOG_FD + + ac_cv_docbook_xslt_current_version=`$XSLTPROC $XSLTPROC_FLAGS conftest.xsl http://docbook.sourceforge.net/release/xsl/current/VERSION 2>&AS_MESSAGE_LOG_FD` + + if test "$?" != 0; then + ac_cv_docbook_xslt_current_version='no' + fi + + rm conftest.xsl + fi + ]) + + DOCBOOK_XSLT_CURRENT_VERSION="$ac_cv_docbook_xslt_current_version" + AC_MSG_CHECKING([whether Docbook XSLT version is $1 or newer]) + + if test x"$DOCBOOK_XSLT_CURRENT_VERSION" = x"no"; then + AC_MSG_RESULT([no]) + else + AX_COMPARE_VERSION([$DOCBOOK_XSLT_CURRENT_VERSION], [lt], [$1], [ + # version is less than required, so mark it as "no" + DOCBOOK_XSLT_CURRENT_VERSION=no + ]) + + if test x"$DOCBOOK_XSLT_CURRENT_VERSION" = x"no"; then + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([yes ($DOCBOOK_XSLT_CURRENT_VERSION)]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_dos_filesys.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_dos_filesys.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_dos_filesys.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_dos_filesys.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_dos_filesys.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_DOS_FILESYS_LIMITATIONS +# +# DESCRIPTION +# +# Check if the target is running on DOS. DOS doesn't allow a dot as the +# first character, more than one dot, more than eight characters before a +# dot, and just three letters after the dot. A DOS VM running under +# Windows 9X does not have these restrictions. A DOS program can be +# running in either environment, so its important to code accordingly. +# Defines HAVE_DOS_FILESYS_LIMITATIONS if under DOS. +# +# Use in conjunction with AX_CHECK_PATHNAME_STYLE_DOS. +# +# LICENSE +# +# Copyright (c) 2008 Mark Elbrecht +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AU_ALIAS([ACX_CHECK_DOS_FILESYS], [AX_CHECK_DOS_FILESYS]) +AC_DEFUN([AX_CHECK_DOS_FILESYS_LIMITATIONS], +[AC_MSG_CHECKING(for potential DOS filename limitations) +AC_CACHE_VAL(ax_cv_dos_limitations, +[AC_REQUIRE([AC_CANONICAL_HOST]) +ax_cv_dos_limitations="yes" +case ${host_os} in + *dos | *djgpp) ax_cv_dos_limitations="yes" +esac +]) +AC_MSG_RESULT($ax_cv_dos_limitations) +if test $ax_cv_dos_limitations = "yes"; then + AC_DEFINE(HAVE_DOS_FILESYS_LIMITATIONS) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_enable_debug.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_enable_debug.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_enable_debug.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_enable_debug.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,124 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], [ENABLE DEBUG VARIABLES ...], [DISABLE DEBUG VARIABLES NDEBUG ...], [IS-RELEASE]) +# +# DESCRIPTION +# +# Check for the presence of an --enable-debug option to configure, with +# the specified default value used when the option is not present. Return +# the value in the variable $ax_enable_debug. +# +# Specifying 'yes' adds '-g -O0' to the compilation flags for all +# languages. Specifying 'info' adds '-g' to the compilation flags. +# Specifying 'profile' adds '-g -pg' to the compilation flags and '-pg' to +# the linking flags. Otherwise, nothing is added. +# +# Define the variables listed in the second argument if debug is enabled, +# defaulting to no variables. Defines the variables listed in the third +# argument if debug is disabled, defaulting to NDEBUG. All lists of +# variables should be space-separated. +# +# If debug is not enabled, ensure AC_PROG_* will not add debugging flags. +# Should be invoked prior to any AC_PROG_* compiler checks. +# +# IS-RELEASE can be used to change the default to 'no' when making a +# release. Set IS-RELEASE to 'yes' or 'no' as appropriate. By default, it +# uses the value of $ax_is_release, so if you are using the AX_IS_RELEASE +# macro, there is no need to pass this parameter. +# +# AX_IS_RELEASE([git-directory]) +# AX_CHECK_ENABLE_DEBUG() +# +# LICENSE +# +# Copyright (c) 2011 Rhys Ulerich +# Copyright (c) 2014, 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +#serial 8 + +AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[ + AC_BEFORE([$0],[AC_PROG_CC])dnl + AC_BEFORE([$0],[AC_PROG_CXX])dnl + AC_BEFORE([$0],[AC_PROG_F77])dnl + AC_BEFORE([$0],[AC_PROG_FC])dnl + + AC_MSG_CHECKING(whether to enable debugging) + + ax_enable_debug_default=m4_tolower(m4_normalize(ifelse([$1],,[no],[$1]))) + ax_enable_debug_is_release=m4_tolower(m4_normalize(ifelse([$4],, + [$ax_is_release], + [$4]))) + + # If this is a release, override the default. + AS_IF([test "$ax_enable_debug_is_release" = "yes"], + [ax_enable_debug_default="no"]) + + m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))]) + m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))]) + + AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug=]@<:@yes/info/profile/no@:>@,[compile with debugging])], + [],enable_debug=$ax_enable_debug_default) + + # empty mean debug yes + AS_IF([test "x$enable_debug" = "x"], + [enable_debug="yes"]) + + # case of debug + AS_CASE([$enable_debug], + [yes],[ + AC_MSG_RESULT(yes) + CFLAGS="${CFLAGS} -g -O0" + CXXFLAGS="${CXXFLAGS} -g -O0" + FFLAGS="${FFLAGS} -g -O0" + FCFLAGS="${FCFLAGS} -g -O0" + OBJCFLAGS="${OBJCFLAGS} -g -O0" + ], + [info],[ + AC_MSG_RESULT(info) + CFLAGS="${CFLAGS} -g" + CXXFLAGS="${CXXFLAGS} -g" + FFLAGS="${FFLAGS} -g" + FCFLAGS="${FCFLAGS} -g" + OBJCFLAGS="${OBJCFLAGS} -g" + ], + [profile],[ + AC_MSG_RESULT(profile) + CFLAGS="${CFLAGS} -g -pg" + CXXFLAGS="${CXXFLAGS} -g -pg" + FFLAGS="${FFLAGS} -g -pg" + FCFLAGS="${FCFLAGS} -g -pg" + OBJCFLAGS="${OBJCFLAGS} -g -pg" + LDFLAGS="${LDFLAGS} -pg" + ], + [ + AC_MSG_RESULT(no) + dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags + dnl by setting any unset environment flag variables + AS_IF([test "x${CFLAGS+set}" != "xset"], + [CFLAGS=""]) + AS_IF([test "x${CXXFLAGS+set}" != "xset"], + [CXXFLAGS=""]) + AS_IF([test "x${FFLAGS+set}" != "xset"], + [FFLAGS=""]) + AS_IF([test "x${FCFLAGS+set}" != "xset"], + [FCFLAGS=""]) + AS_IF([test "x${OBJCFLAGS+set}" != "xset"], + [OBJCFLAGS=""]) + ]) + + dnl Define various variables if debugging is disabled. + dnl assert.h is a NOP if NDEBUG is defined, so define it by default. + AS_IF([test "x$enable_debug" = "xyes"], + [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])], + [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])]) + ax_enable_debug=$enable_debug +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_func_in.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_func_in.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_func_in.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_func_in.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,94 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_func_in.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_FUNC_IN(HEADER, FUNCTION [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Checking for library functions in a given header file. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +dnl AX_CHECK_FUNC_IN(HEADER, FUNCTION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +AU_ALIAS([AC_CHECK_FUNC_IN], [AX_CHECK_FUNC_IN]) +AC_DEFUN([AX_CHECK_FUNC_IN], +[AC_MSG_CHECKING([for $2 in $1]) +AC_CACHE_VAL(ac_cv_func_$2, +[AC_TRY_LINK( +dnl Don't include because on OSF/1 3.0 it includes +dnl which includes which contains a prototype for +dnl select. Similarly for bzero. +[/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2(); below. */ +#include +#include <$1> +/* Override any gcc2 internal prototype to avoid an error. */ +]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus +extern "C" +#endif +])dnl +[/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $2(); +], [ +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$2) || defined (__stub___$2) +choke me +#else +$2(); +#endif +], eval "ac_cv_func_$2=yes", eval "ac_cv_func_$2=no")]) +if eval "test \"`echo '$ac_cv_func_'$2`\" = yes"; then + AC_MSG_RESULT(yes) + ifelse([$3], , :, [$3]) +else + AC_MSG_RESULT(no) +ifelse([$4], , , [$4 +])dnl +fi +]) + +dnl AC_CHECK_FUNCS_IN(HEADER, FUNCTION... [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +AC_DEFUN([AC_CHECK_FUNCS_IN], +[for ac_func in $2 +do +AX_CHECK_FUNC_IN($1, $ac_func, + ac_tr_func=HAVE_`echo $ac_func | sed -e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:' -e 's:[[^A-Z0-9]]:_:g'` + AC_DEFINE_UNQUOTED($ac_tr_func) $3], $4)dnl +done +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gd.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_gd.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gd.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_gd.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,82 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_gd.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GD +# +# DESCRIPTION +# +# Check for the gd library. (See http://www.boutell.com/gd/) If gd is +# found, the output variables GD_CFLAGS, GD_LDFLAGS and GD_LIBS will +# contain the compiler flags, linker flags and libraries necessary to use +# gd; otherwise, those variables will be empty. In addition, the symbol +# HAVE_GD is defined if the library is found, and the symbols HAVE_GD_GIF, +# HAVE_GD_JPEG and HAVE_GD_PNG are defined if the library supports +# creating images in gif, jpeg and png formats, respectively. +# +# The user may use --with-gd=no or --without-gd to skip checking for the +# library. (The default is --with-gd=yes.) If the library is installed in +# an unusual location, --with-gd=DIR will cause the macro to look for +# gdlib-config in DIR/bin or, failing that, for the headers and libraries +# in DIR/include and DIR/lib. +# +# Feedback welcome! +# +# LICENSE +# +# Copyright (c) 2008 Nick Markham +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_CHECK_GD], [ + AC_ARG_WITH(gd, + AS_HELP_STRING([--with-gd(=DIR)], [use the gd library (in DIR)]),, + with_gd=yes) + + if test "$with_gd" != no; then + AC_PATH_PROG(GDLIB_CONFIG, gdlib-config, , [$with_gd/bin:$PATH]) + if test -n "$GDLIB_CONFIG"; then + GD_CFLAGS=`$GDLIB_CONFIG --cflags` + GD_LDFLAGS=`$GDLIB_CONFIG --ldflags` + GD_LIBS=`$GDLIB_CONFIG --libs` + elif test -d "$with_gd"; then + GD_CFLAGS="-I$with_gd/include" + GD_LDFLAGS="-L$with_gd/lib" + AC_CHECK_LIB(z, inflateReset, GD_LIBS="-lz") + AC_CHECK_LIB(png, png_check_sig, GD_LIBS="-lpng $GD_LIBS", , $GD_LIBS) + fi + + save_CFLAGS="$CFLAGS" + CFLAGS="$GD_CFLAGS $CFLAGS" + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$GD_LDFLAGS $LDFLAGS" + + AC_CHECK_LIB(gd, gdImageCreate, [ + AC_DEFINE(HAVE_GD, 1, [ Define if you have gd library. ]) + AC_CHECK_LIB(gd, gdImageGif, AC_DEFINE(HAVE_GD_GIF, 1, [ Define if GD supports gif. ]), , "$GD_LIBS") + AC_CHECK_LIB(gd, gdImageJpeg, AC_DEFINE(HAVE_GD_JPEG, 1, [ Define if GD supports jpeg. ]), , "$GD_LIBS") + AC_CHECK_LIB(gd, gdImagePng, AC_DEFINE(HAVE_GD_PNG, 1, [ Define if GD supports png. ]), , "$GD_LIBS") + GD_LIBS="-lgd $GD_LIBS" + ], with_gd=no, $GD_LIBS) + + CFLAGS="$save_CFLAGS" + LDFLAGS="$save_LDFLAGS" + fi + + if test "$with_gd" = "no"; then + GD_CFLAGS=""; + GD_LDFLAGS=""; + GD_LIBS=""; + fi + + AC_SUBST(GD_CFLAGS) + AC_SUBST(GD_LDFLAGS) + AC_SUBST(GD_LIBS) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_girs_gjs.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_girs_gjs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_girs_gjs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_girs_gjs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,68 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_girs_gjs.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GIRS_GJS(MODULE, API_VERSION [, MODULE, API_VERSION...]) +# +# DESCRIPTION +# +# Check that the GObject Introspection module $MODULE is importable in GJS +# (GNOME's JavaScript engine, https://wiki.gnome.org/Projects/Gjs). The +# API version must be $API_VERSION. +# +# GObject Introspection +# (https://wiki.gnome.org/Projects/GObjectIntrospection) is a tool for +# generating bindings from C libraries to higher-level languages. The +# bindings live in a GObject Introspection repository (GIR) file, which is +# what this macro checks. +# +# Note that for the purposes of GObject Introspection, the API version is +# different from the release version. For example, GTK currently has API +# version 3.0, but that could mean any release from the 3.0, 3.2, 3.4,... +# series. To check for specific API that was added in a later version, use +# AX_CHECK_GIR_SYMBOLS_GJS. +# +# Example: +# +# AX_CHECK_GIRS_GJS([Gdk], [3.0], +# [Gtk], [3.0]) +# +# NOTE: This macro depends on AX_PROG_GJS. +# +# LICENSE +# +# Copyright (c) 2013, 2016 Endless Mobile, Inc.; contributed by Philip Chimento +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([_AX_CHECK_GIR_GJS], [ + AC_MSG_CHECKING([for version $2 of $1]) + _AX_GJS_IFELSE([ + imports.gi.versions@<:@\"$1\"@:>@ = \"$2\"; + const Library = imports.gi.$1; + ], + [AC_MSG_RESULT([yes])], + [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([You do not have API version $2 of the GObject +Introspection bindings for the $1 library. +Build a version from source, or find out what package to +install with one of these commands, depending on your system: + apt-file search $1-$2.typelib + dnf provides \*/$1-$2.typelib +]) + ] + ) +]) + +AC_DEFUN([AX_CHECK_GIRS_GJS], [ + AC_REQUIRE([AX_PROG_GJS]) + m4_map_args_pair([_AX_CHECK_GIR_GJS], [AC_MSG_ERROR], $@) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gir_symbols_gjs.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_gir_symbols_gjs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gir_symbols_gjs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_gir_symbols_gjs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,83 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_check_gir_symbols_gjs.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CHECK_GIR_SYMBOLS_GJS(MODULE, APIVERSION, SYMBOLS) +# +# DESCRIPTION +# +# Check that each symbol from the whitespace-separated list of $SYMBOLS is +# defined inside the GObject Introspection module $MODULE with API version +# $APIVERSION, and is importable in GJS, GNOME's JavaScript engine +# (https://wiki.gnome.org/Projects/Gjs). +# +# GObject Introspection +# (https://wiki.gnome.org/Projects/GObjectIntrospection) is a tool for +# generating bindings from C libraries to higher-level languages. The +# bindings live in a GObject Introspection repository (GIR) file, which is +# what this macro checks. +# +# Note that for the purposes of GObject Introspection, the API version is +# different from the release version. For example, GTK currently has API +# version 3.0, but that could mean any release from the 3.0, 3.2, 3.4,... +# series. +# +# Example: +# +# AX_CHECK_GIR_SYMBOLS_GJS([Gtk], [3.0], [ListBox FlowBox +# Widget.get_action_group]) +# +# NOTE: This macro depends on AX_PROG_GJS. +# +# LICENSE +# +# Copyright (c) 2013, 2016 Endless Mobile, Inc.; contributed by Philip Chimento +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_CHECK_GIR_SYMBOLS_GJS], [ + AC_REQUIRE([AX_PROG_GJS]) + m4_foreach_w([SYMBOL], [$3], [ + AC_MSG_CHECKING([for $1.SYMBOL in $1-$2]) + _AX_GJS_IFELSE([ + imports.gi.versions@<:@\"$1\"@:>@ = \"$2\"; + const Library = imports.gi.$1; + let symbols = \"SYMBOL\".split('.'); + function check_symbols(symbols_list) { + printerr('gjs: checking', symbols_list.join('.')); + try { + symbols_list.reduce(function (prev, curr) { + if (typeof prev@<:@curr@:>@ === 'undefined') + throw 1; + return prev@<:@curr@:>@; + }, Library); + return true; + } catch (e) { + if (e === 1) + return false; + throw e; + } + } + if (!check_symbols(symbols)) { + dnl For methods, we need to check the class's prototype + symbols.splice(-1, 0, 'prototype'); + if (!check_symbols(symbols)) + throw 1; + } + ], + [AC_MSG_RESULT([yes])], + [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([The symbol $1.SYMBOL was not importable +in GJS, although the $1 library was present. +Perhaps you need a newer version of the library?]) + ]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gl.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_gl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_gl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,298 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_gl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GL([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks for an OpenGL implementation. If a valid OpenGL implementation is +# found, this macro would set C preprocessor symbol HAVE_GL to 1. +# +# If either a valid OpenGL header or library was not found, by default the +# configuration would exits on error. This behavior can be overwritten by +# providing a custom "ACTION-IF-NOT-FOUND" hook. +# +# If the header, library was found, and been tested for compiling and +# linking the configuration would export the required compiler flags to +# "GL_CFLAGS" and "GL_LIBS". These two variables can also be overwritten +# by user from the command line if they want to link against the library +# they specified instead of having the configuration script to detect the +# flags automatically. Note that having "GL_CFLAGS" or "GL_LIBS" set +# doesn't mean it can compile or link with the flags, since it could be +# overwritten by user. However the "HAVE_GL" symbol and "ACTION-IF-FOUND" +# hook is always guaranteed to reflect a valid OpenGL implementation. +# +# If user didn't specify the "ACTION-IF-FOUND" hook, the configuration +# would prepend "GL_CFLAGS" and "GL_LIBS" to "CFLAGS" and "LIBS", like +# many other autoconf macros do. +# +# OpenGL is one of the libraries that has different header names on +# different platforms. This macro does the header detection, and will +# export the following symbol: "HAVE_GL_GL_H" for having "GL/gl.h" or +# "HAVE_OPENGL_GL_H" for having "OpenGL/gl.h". To write a portable OpenGL +# code, you should include OpenGL header like so: +# +# #if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# # include +# #endif +# #ifdef HAVE_GL_GL_H +# # include +# #elif defined(HAVE_OPENGL_GL_H) +# # include +# #else +# # error no gl.h +# #endif +# +# On the OSX platform, there's two possible OpenGL implementation. One is +# the OpenGL that ships with OSX, the other comes with X11/XQuartz +# (http://www.xquartz.org). To use the xquartz variant, user can use the +# option --with-xquartz-gl[=path to xquartz root]. By default the +# configuration will check "/opt/X11", which is the default X11 install +# location on OSX. +# +# LICENSE +# +# Copyright (c) 2009 Braden McDaniel +# Copyright (c) 2012 Bastien Roucaries +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 22 + +# example gl program +m4_define([_AX_CHECK_GL_PROGRAM], + [AC_LANG_PROGRAM([[ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GL_H +# include +# elif defined(HAVE_OPENGL_GL_H) +# include +# else +# error no gl.h +# endif +]],[[glBegin(0)]])]) + +dnl Default include : add windows.h +dnl see http://www.opengl.org/wiki/Platform_specifics:_Windows +dnl (acceded 20120801) +AC_DEFUN([_AX_CHECK_GL_INCLUDES_DEFAULT],dnl +[ + AC_INCLUDES_DEFAULT + [ + # if defined(HAVE_WINDOWS_H) && defined(_WIN32) + # include + # endif + ] +]) + + +# _AX_CHECK_GL_SAVE_FLAGS(LIST-OF-FLAGS) +# Use this macro before you modify the flags. +# Restore the flags by _AX_CHECK_GL_RESTORE_FLAGS +# +# Example: _AX_CHECK_GL_SAVE_FLAGS([[CFLAGS],[LIBS]]) expands to +# gl_saved_flag_cflags=$CFLAGS +# gl_saved_flag_libs=$LIBS +# CFLAGS="$GL_CFLAGS $CFLAGS" +# LIBS="$GL_LIBS $LIBS" +AC_DEFUN([_AX_CHECK_GL_SAVE_FLAGS], [ + AX_SAVE_FLAGS_WITH_PREFIX([GL],[$1]) + AC_LANG_PUSH([C]) +]) + +# _AX_CHECK_GL_RESTORE_FLAGS(LIST-OF-FLAGS) +# Use this marcro to restore the flags you saved using +# _AX_CHECK_GL_SAVE_FLAGS +# +# Example: _AX_CHECK_GL_RESTORE_FLAGS([[CFLAGS],[LIBS]]) expands to +# CFLAGS="$gl_saved_flag_cflags" +# LIBS="$gl_saved_flag_libs" +AC_DEFUN([_AX_CHECK_GL_RESTORE_FLAGS], [ + AX_RESTORE_FLAGS_WITH_PREFIX([GL],[$1]) + AC_LANG_POP([C]) +]) + +# Check if the program compiles +AC_DEFUN([_AX_CHECK_GL_COMPILE], +[dnl + _AX_CHECK_GL_SAVE_FLAGS([CFLAGS]) + AC_COMPILE_IFELSE([_AX_CHECK_GL_PROGRAM], + [ax_check_gl_compile_opengl="yes"], + [ax_check_gl_compile_opengl="no"]) + _AX_CHECK_GL_RESTORE_FLAGS([CFLAGS]) +]) + +# Compile the example program (cache) +AC_DEFUN([_AX_CHECK_GL_COMPILE_CV], +[dnl + AC_CACHE_CHECK([for compiling a minimal OpenGL program],[ax_cv_check_gl_compile_opengl], + [_AX_CHECK_GL_COMPILE() + ax_cv_check_gl_compile_opengl="${ax_check_gl_compile_opengl}"]) + ax_check_gl_compile_opengl="${ax_cv_check_gl_compile_opengl}" +]) + +# Link the example program +AC_DEFUN([_AX_CHECK_GL_LINK], +[dnl + _AX_CHECK_GL_SAVE_FLAGS([[CFLAGS],[LIBS],[LDFLAGS]]) + AC_LINK_IFELSE([_AX_CHECK_GL_PROGRAM], + [ax_check_gl_link_opengl="yes"], + [ax_check_gl_link_opengl="no"]) + _AX_CHECK_GL_RESTORE_FLAGS([[CFLAGS],[LIBS],[LDFLAGS]]) +]) + +# Link the example program (cache) +AC_DEFUN([_AX_CHECK_GL_LINK_CV], +[dnl + AC_CACHE_CHECK([for linking a minimal OpenGL program],[ax_cv_check_gl_link_opengl], + [_AX_CHECK_GL_LINK() + ax_cv_check_gl_link_opengl="${ax_check_gl_link_opengl}"]) + ax_check_gl_link_opengl="${ax_cv_check_gl_link_opengl}" +]) + + +# _AX_CHECK_GL_MANUAL_LIBS_GENERIC(LIBRARIES-TO-SEARCH) +# Searches library provided in $1, and output the flag +# $ax_check_gl_lib_opengl +AC_DEFUN([_AX_CHECK_GL_MANUAL_LIBS_GENERIC], [ + AS_IF([test -n "$GL_LIBS"],[], [ + ax_check_gl_manual_libs_generic_extra_libs="$1" + AS_IF([test "X$ax_check_gl_manual_libs_generic_extra_libs" = "X"], + [AC_MSG_ERROR([AX_CHECK_GL_MANUAL_LIBS_GENERIC argument must no be empty])]) + + _AX_CHECK_GL_SAVE_FLAGS([CFLAGS]) + AC_SEARCH_LIBS([glBegin],[$ax_check_gl_manual_libs_generic_extra_libs], [ + ax_check_gl_lib_opengl="yes" + break + ]) + AS_IF([test "X$ax_check_gl_lib_opengl"="Xyes"], + [GL_LIBS="${ac_cv_search_glBegin}"]) + _AX_CHECK_GL_RESTORE_FLAGS([CFLAGS]) + ]) +]) + +# _WITH_XQUARTZ_GL +# ---------------- +# Provides an option in command line to specify the XQuartz installation +# path on OSX, so that user can link to it instead of using the default +# OSX OpenGL framework. (Mac OSX only) +AC_DEFUN_ONCE([_WITH_XQUARTZ_GL],[ + AC_ARG_WITH([xquartz-gl], + [AS_HELP_STRING([--with-xquartz-gl@<:@=DIR@:>@], + [On Mac OSX, use opengl provided by X11/XQuartz instead of the built-in framework. + If enabled, the default location is @<:@DIR=/opt/X11@:>@. + This option is default to false.])], + [AS_IF([test "X$with_xquartz_gl"="Xyes"], + [with_xquartz_gl="/opt/X11"])], + [with_xquartz_gl=no]) + AS_IF([test "X$with_xquartz_gl" != "Xno"], + [AC_MSG_CHECKING([OSX X11 path]) + AS_IF([test -e "$with_xquartz_gl"], + [AC_MSG_RESULT(["$with_xquartz_gl"]) + CFLAGS="-I$with_xquartz_gl/include $CFLAGS" + LIBS="-L$with_xquartz_gl/lib $LIBS" + ], + [with_xquartz_gl=no + AC_MSG_RESULT([no]) + AC_MSG_WARN([--with-xquartz-gl was given, but test for X11 failed. Fallback to system framework]) + ]) + ]) +]) + +# OSX specific setup for OpenGL check +AC_DEFUN([_AX_CHECK_DARWIN_GL], [ + AC_REQUIRE([_WITH_XQUARTZ_GL]) + AS_IF([test "x$with_xquartz_gl" != "xno" && test "x$EMSCRIPTEN" == "x"], + [GL_LIBS="${GL_LIBS:--lGL}"], + [GL_LIBS="${GL_LIBS:--framework OpenGL}"]) +]) + + +# AX_CHECK_GL_LIB([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------- +# Checks OpenGL headers and library and provides hooks for success and failures. +# When $1 is not set, this macro would modify CFLAGS and LIBS environment variables. +# However, user can override this behavior by providing their own hooks. +# The CFLAGS and LIBS flags required by OpenGL is always exported in +# GL_CFLAGS and GL_LIBS environment variable. +# +# In other words, the default behavior of AX_CHECK_GL_LIB() is equivalent to +# AX_CHECK_GL_LIB( +# [CFLAGS="$GL_CFLAGS $CFLAGS" +# LIBS="$GL_LIBS $LIBS"] +# ) +AC_DEFUN([AX_CHECK_GL], +[AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR([GL_CFLAGS],[C compiler flags for GL, overriding configure script defaults]) + AC_ARG_VAR([GL_LIBS],[Linker flags for GL, overriding configure script defaults]) + + dnl --with-gl or not can be implemented outside of check-gl + AS_CASE([${host}], + [*-darwin*],[_AX_CHECK_DARWIN_GL], + dnl some windows may support X11 opengl, and should be able to linked + dnl by -lGL. However I have no machine to test it. + [*-cygwin*|*-mingw*],[ + _AX_CHECK_GL_MANUAL_LIBS_GENERIC([opengl32 GL gl]) + AC_CHECK_HEADERS([windows.h]) + ], + [PKG_PROG_PKG_CONFIG + PKG_CHECK_MODULES([GL],[gl], + [], + [_AX_CHECK_GL_MANUAL_LIBS_GENERIC([GL gl])]) + ]) dnl host specific checks + + dnl this was cache + _AX_CHECK_GL_SAVE_FLAGS([CFLAGS]) + AC_CHECK_HEADERS([GL/gl.h OpenGL/gl.h], + [ax_check_gl_have_headers="yes";break]) + _AX_CHECK_GL_RESTORE_FLAGS([CFLAGS]) + + AS_IF([test "X$ax_check_gl_have_headers" = "Xyes"], + [_AX_CHECK_GL_COMPILE_CV()], + [no_gl=yes]) + AS_IF([test "X$ax_check_gl_compile_opengl" = "Xyes"], + [_AX_CHECK_GL_LINK_CV()], + [no_gl=yes]) + AS_IF([test "X$no_gl" = "X"], + [AC_DEFINE([HAVE_GL], [1], [Defined if a valid OpenGL implementation is found.]) + m4_ifval([$1], + [$1], + [CFLAGS="$GL_CFLAGS $CFLAGS" + LIBS="$GL_LIBS $LIBS"]) + ], + [m4_ifval([$2], + [$2], + [AC_MSG_ERROR([Could not find a valid OpenGL implementation])]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_glu.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_glu.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_glu.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_glu.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,282 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_glu.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GLU([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks for GLUT. If a valid GLU implementation is found, the configure +# script would export the C preprocessor symbol "HAVE_GLU=1". +# +# If either a valid GLU header or library was not found, by default the +# configure script would exit on error. This behavior can be overwritten +# by providing a custom "ACTION-IF-NOT-FOUND" hook. +# +# If the header, library was found, and been tested for compiling and +# linking the configuration would export the required compiler flags to +# "GLU_CFLAGS" and "GLU_LIBS" environment variables. These two variables +# can also be overwritten by defining the environment variables before +# executing the configure program. If it was predefined, configure would +# not try to overwrite it, but it would still perform the compile and link +# test. Only when the tests succeeded does the configure script to export +# "HAVE_GLU=1" and to run "ACTION-IF-FOUND" hook. +# +# If user didn't specify the "ACTION-IF-FOUND" hook, the configuration +# would prepend "GLU_CFLAGS" and "GLU_LIBS" to "CFLAGS" and "LIBS", like +# many other autoconf macros do. +# +# If the header "GL/glu.h" is found, "HAVE_GL_GLU_H" is defined. If the +# header "OpenGL/glu.h" is found, HAVE_OPENGL_GLU_H is defined. +# +# You should use something like this in your headers: +# +# # if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# # include +# # endif +# # if defined(HAVE_GL_GLU_H) +# # include +# # elif defined(HAVE_OPENGL_GLU_H) +# # include +# # else +# # error no glu.h +# # endif +# +# On the OSX platform, you can use the option --with-xquartz-gl to use +# X11/Xquartz GLU implementation instead of the system built in GLU +# framework. +# +# Some implementations (in particular, some versions of Mac OS X) are +# known to treat the GLU tesselator callback function type as "GLvoid +# (*)(...)" rather than the standard "GLvoid (*)()". If the former +# condition is detected, this macro defines "HAVE_VARARGS_GLU_TESSCB". +# +# LICENSE +# +# Copyright (c) 2009 Braden McDaniel +# Copyright (c) 2013 Bastien Roucaries +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 23 + +# example program +m4_define([_AX_CHECK_GLU_PROGRAM], + [AC_LANG_PROGRAM([[ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GLU_H +# include +# elif defined(HAVE_OPENGL_GLU_H) +# include +# else +# error no glu.h +# endif +]],[[gluBeginCurve(0)]])]) + + +dnl Default include : add windows.h +dnl see http://www.opengl.org/wiki/Platform_specifics:_Windows +dnl (acceded 20120801) +AC_DEFUN([_AX_CHECK_GLU_INCLUDES_DEFAULT],dnl +[ + AC_INCLUDES_DEFAULT + [ + # if defined(HAVE_WINDOWS_H) && defined(_WIN32) + # include + # endif + ] +]) + +# check tesselation callback function signature. +m4_define([_AX_CHECK_GLU_VARARGS_TESSVB_PROGRAM], +[AC_LANG_PROGRAM([[ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GLU_H +# include +# elif defined(HAVE_OPENGL_GLU_H) +# include +# else +# error no glu.h +# endif +]], +[[GLvoid (*func)(...); gluTessCallback(0, 0, func)]]) +]) + + +# _AX_CHECK_GLU_SAVE_FLAGS(LIST-OF-FLAGS,[LANG]) +# ---------------------------------------------- +# Save the flags to shell variables. +# Example: _AX_CHECK_GLU_SAVE_FLAGS([[CFLAGS],[LIBS]]) expands to +# AC_LANG_PUSH([C]) +# glu_saved_flag_cflags=$CFLAGS +# glu_saved_flag_libs=$LIBS +# CFLAGS="$GLU_CFLAGS $CFLAGS" +# LIBS="$GLU_LIBS $LIBS" +# +# Can optionally support other LANG by specifying $2 +AC_DEFUN([_AX_CHECK_GLU_SAVE_FLAGS], [ + m4_ifval([$2], + [AC_LANG_PUSH([$2])], + [AC_LANG_PUSH([C])]) + AX_SAVE_FLAGS_WITH_PREFIX([GLU],[$1]) dnl defined in ax_check_gl +]) + +# _AX_CHECK_GLU_RESTORE_FLAGS(LIST-OF-FLAGS) +# Use this marcro to restore the flags you saved using +# _AX_CHECK_GLU_SAVE_FLAGS +# +# Example: _AX_CHECK_GLU_RESTORE_FLAGS([[CFLAGS],[LIBS]]) expands to +# CFLAGS="$glu_saved_flag_cflags" +# LIBS="$glu_saved_flag_libs" +# AC_LANG_POP([C]) +AC_DEFUN([_AX_CHECK_GLU_RESTORE_FLAGS], [ + AX_RESTORE_FLAGS_WITH_PREFIX([GLU],[$1]) dnl defined in ax_check_gl + m4_ifval([$2], + [AC_LANG_POP([$2])], + [AC_LANG_POP([C])]) +]) + + +# Search headers and export $ax_check_glu_have_headers +AC_DEFUN([_AX_CHECK_GLU_HEADERS], [ + _AX_CHECK_GLU_SAVE_FLAGS([CFLAGS]) + AC_CHECK_HEADERS([$1], + [ax_check_glu_have_headers="yes";], + [], + [_AX_CHECK_GLU_INCLUDES_DEFAULT()]) + _AX_CHECK_GLU_RESTORE_FLAGS([CFLAGS]) +]) + + +# _AX_CHECK_GLU_SEARCH_LIBS(LIBS) +# ------------------------------- +# Search for a valid GLU lib from $1 and set +# GLU_LIBS respectively +AC_DEFUN([_AX_CHECK_GLU_SEARCH_LIBS], [ + _AX_CHECK_GLU_SAVE_FLAGS([[CFLAGS],[LIBS]]) + AC_SEARCH_LIBS([gluBeginCurve],[$1], + [GLU_LIBS="${GLU_LIBS:-$ac_cv_search_gluBeginCurve}"]) + _AX_CHECK_GLU_RESTORE_FLAGS([[CFLAGS],[LIBS]]) +]) + +# OSX specific GLU checks +AC_DEFUN([_AX_CHECK_DARWIN_GLU], [ + AC_REQUIRE([_WITH_XQUARTZ_GL]) + AS_IF([test "x$with_xquartz_gl" != "xno"], + [GLU_LIBS="${GLU_LIBS:--lGLU}"], + [GLU_LIBS="${GLU_LIBS:--framework OpenGL}"]) +]) + +# AX_CHECK_GLU([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# ----------------------------------------------------- +# Checks GLU and provides hooks for success and failures +AC_DEFUN([AX_CHECK_GLU],[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([_WITH_XQUARTZ_GL]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR([GLU_CFLAGS],[C compiler flags for GLU, overriding system check]) + AC_ARG_VAR([GLU_LIBS],[Linker flags for GLU, overriding system check]) + + dnl Setup GLU_CFLAGS and GLU_LIBS + AS_CASE([${host}], + [*-darwin*],[_AX_CHECK_DARWIN_GLU], + [*-cygwin*],[_AX_CHECK_GLU_SEARCH_LIBS([GLU glu MesaGLU glu32]) + AC_CHECK_HEADERS([windows.h])], + # try first native + [*-mingw*],[_AX_CHECK_GLU_SEARCH_LIBS([glu32 GLU glu MesaGLU]) + AC_CHECK_HEADERS([windows.h])], + [PKG_PROG_PKG_CONFIG + PKG_CHECK_MODULES([GLU],[glu], + [], + [_AX_CHECK_GLU_SEARCH_LIBS([GLU glu MesaGLU])]) + ]) + + AS_CASE([$host], + [*-darwin*], + [AS_IF([test "X$with_xquartz_gl" = "Xno"], + [_AX_CHECK_GLU_HEADERS([OpenGL/glu.h])], + [_AX_CHECK_GLU_HEADERS([GL/glu.h])] + )], + [_AX_CHECK_GLU_HEADERS([GL/glu.h])]) + + dnl compile test + AS_IF([test "X$ax_check_glu_have_headers" = "Xyes"], + [AC_CACHE_CHECK([for compiling a minimal OpenGL Utility (GLU) program], + [ax_cv_check_glu_compile], + [_AX_CHECK_GLU_SAVE_FLAGS([CFLAGS]) + AC_COMPILE_IFELSE([_AX_CHECK_GLU_PROGRAM], + [ax_cv_check_glu_compile="yes"], + [ax_cv_check_glu_compile="no"]) + _AX_CHECK_GLU_RESTORE_FLAGS([CFLAGS])]) + ]) + + dnl link test + AS_IF([test "X$ax_cv_check_glu_compile" = "Xyes"], + [AC_CACHE_CHECK([for linking a minimal GLU program], + [ax_cv_check_glu_link], + [_AX_CHECK_GLU_SAVE_FLAGS([[CFLAGS],[LIBS]]) + AC_LINK_IFELSE([_AX_CHECK_GLU_PROGRAM], + [ax_cv_check_glu_link="yes"], + [ax_cv_check_glu_link="no"]) + _AX_CHECK_GLU_RESTORE_FLAGS([[CFLAGS],[LIBS]])]) + ]) + +# +# Some versions of Mac OS X include a broken interpretation of the GLU +# tesselation callback function signature. + AS_IF([test "X$ax_cv_check_glu_link" = "Xyes"], + [AC_CACHE_CHECK([if GLU varargs tesselator is using non-standard form], + [ax_cv_varargs_glu_tesscb], + [_AX_CHECK_GLU_SAVE_FLAGS([CFLAGS],[C++]) + AC_COMPILE_IFELSE([_AX_CHECK_GLU_VARARGS_TESSVB_PROGRAM], + [ax_cv_varargs_glu_tesscb="yes"], + [ax_cv_varargs_glu_tesscb="no"]) + _AX_CHECK_GLU_RESTORE_FLAGS([CFLAGS],[C++])]) + AS_IF([test "X$ax_cv_varargs_glu_tesscb" = "yes"], + [AC_DEFINE([HAVE_VARARGS_GLU_TESSCB], [1], + [Use nonstandard varargs form for the GLU tesselator callback])]) + ]) + + dnl hook + AS_IF([test "X$ax_cv_check_glu_link" = "Xyes"], + [AC_DEFINE([HAVE_GLU],[1],[Defined if a valid GLU implementation is found.]) + m4_ifval([$1], + [$1], + [CFLAGS="$GLU_CFLAGS $CFLAGS" + LIBS="$GLU_LIBS $LIBS"])], + [m4_ifval([$2], + [$2], + [AC_MSG_ERROR([Could not find a valid GLU implementation])]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_glut.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_glut.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_glut.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_glut.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,210 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_glut.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GLUT([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks for GLUT. If a valid GLUT implementation is found, the configure +# script would export the C preprocessor symbol "HAVE_GLUT=1". +# +# If either a valid GLUT header or library was not found, by default the +# configure script would exit on error. This behavior can be overwritten +# by providing a custom "ACTION-IF-NOT-FOUND" hook. +# +# If the header, library was found, and been tested for compiling and +# linking the configuration would export the required compiler flags to +# "GLUT_CFLAGS" and "GLUT_LIBS" environment variables. These two variables +# can also be overwritten by defining the environment variables before +# executing the configure program. If it was predefined, configure would +# not try to overwrite it, but it would still perform the compile and link +# test. Only when the tests succeeded does the configure script to export +# "HAVE_GLUT=1" and to run "ACTION-IF-FOUND" hook. +# +# If user didn't specify the "ACTION-IF-FOUND" hook, the configuration +# would prepend "GLUT_CFLAGS" and "GLUT_LIBS" to "CFLAGS" and "LIBS", like +# many other autoconf macros do. +# +# If the header "GL/glut.h" is found, "HAVE_GL_GLUT_H" is defined. If the +# header "GLUT/glut.h" is found, HAVE_GLUT_GLUT_H is defined. +# +# You should use something like this in your headers: +# +# # if HAVE_WINDOWS_H && defined(_WIN32) +# # include +# # endif +# # if defined(HAVE_GL_GLUT_H) +# # include +# # elif defined(HAVE_GLUT_GLUT_H) +# # include +# # else +# # error no glut.h +# # endif +# +# On the OSX platform, you can use the option --with-xquartz-gl to use +# X11/Xquartz GLUT implementation instead of the system built in GLUT +# framework. +# +# LICENSE +# +# Copyright (c) 2009 Braden McDaniel +# Copyright (c) 2013 Bastien Roucaries +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 17 + +AC_DEFUN([_AX_CHECK_GLUT_SAVE_FLAGS], [ + AX_SAVE_FLAGS_WITH_PREFIX([GLUT],[$1]) dnl defined in ax_check_gl + AC_LANG_PUSH([C]) +]) + +AC_DEFUN([_AX_CHECK_GLUT_RESTORE_FLAGS], [ + AX_RESTORE_FLAGS_WITH_PREFIX([GLUT],[$1]) dnl defined in ax_check_gl + AC_LANG_POP([C]) +]) + +dnl Default include : add windows.h +dnl see http://www.opengl.org/wiki/Platform_specifics:_Windows +dnl (acceded 20120801) +AC_DEFUN([_AX_CHECK_GLUT_INCLUDES_DEFAULT],dnl +[ + AC_INCLUDES_DEFAULT + [ + # if defined(HAVE_WINDOWS_H) && defined(_WIN32) + # include + # endif + ] +]) + +m4_define([_AX_CHECK_GLUT_PROGRAM], + [AC_LANG_PROGRAM([[ +# if HAVE_WINDOWS_H && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GLUT_H +# include +# elif defined(HAVE_GLUT_GLUT_H) +# include +# else +# error no glut.h +# endif]], +[[glutMainLoop()]])]) + + +# _AX_CHECK_GLUT_MANUAL_LIBS_GENERIC(LIST-OF-LIBS) +# ------------------------------------------------ +# Searches libraries provided in $1, and export variable +# $ax_check_glut_lib_glut +AC_DEFUN([_AX_CHECK_GLUT_MANUAL_LIBS_GENERIC], +[ + _AX_CHECK_GLUT_SAVE_FLAGS([[CFLAGS],[LIBS]]) + AC_SEARCH_LIBS([glutMainLoop],[$1], + [GLUT_LIBS="${GLUT_LIBS:-$ac_cv_search_glutMainLoop}"]) + _AX_CHECK_GLUT_RESTORE_FLAGS([[CFLAGS],[LIBS]]) +]) + +# Wrapper macro to check GLUT header +AC_DEFUN([_AX_CHECK_GLUT_HEADER],[ + _AX_CHECK_GLUT_SAVE_FLAGS([CFLAGS]) + AC_CHECK_HEADERS([$1], + [ax_check_glut_have_headers=yes]) + _AX_CHECK_GLUT_RESTORE_FLAGS([CFLAGS]) +]) + + +# AX_CHECK_GLUT_LIB([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------- +# Checks GLUT headers and library and provides hooks for success and failures. +AC_DEFUN([AX_CHECK_GLUT], +[AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([_WITH_XQUARTZ_GL]) + AC_ARG_VAR([GLUT_CFLAGS],[C compiler flags for GLUT, overriding configure script defaults]) + AC_ARG_VAR([GLUT_LIBS],[Linker flags for GLUT, overriding configure script defaults]) + + AS_CASE([${host}], + [*-darwin*],[AS_IF([test "x$with_xquartz_gl" != "xno"], + [GLUT_LIBS="${GLUT_LIBS:--lGLUT}"], + [GLUT_LIBS="${GLUT_LIBS:--framework GLUT}"])], + [*-cygwin*|*-mingw*],[ + _AX_CHECK_GLUT_MANUAL_LIBS_GENERIC([glut32 glut]) + AC_CHECK_HEADERS([windows.h]) + ], + [_AX_CHECK_GLUT_MANUAL_LIBS_GENERIC([glut]) + ]) dnl host specific checks + + dnl checks header + AS_CASE([${host}], + [*-darwin*],[AS_IF([test "x$with_xquartz_gl" = "xno"], + [_AX_CHECK_GLUT_HEADER([GLUT/glut.h])], + [_AX_CHECK_GLUT_HEADER([GL/glut.h])] + )], + [_AX_CHECK_GLUT_HEADER([GL/glut.h])]) + + dnl compile + AS_IF([test "X$ax_check_glut_have_headers" = "Xyes"], + [AC_CACHE_CHECK([for compiling a minimal GLUT program], + [ax_cv_check_glut_compile], + [_AX_CHECK_GLUT_SAVE_FLAGS([CFLAGS]) + AC_COMPILE_IFELSE([_AX_CHECK_GLUT_PROGRAM], + [ax_cv_check_glut_compile="yes"], + [ax_cv_check_glut_compile="no"]) + _AX_CHECK_GLUT_RESTORE_FLAGS([CFLAGS]) + ]) + ]) + + dnl link + AS_IF([test "X$ax_cv_check_glut_compile" = "Xyes"], + [AC_CACHE_CHECK([for linking a minimal GLUT program], + [ax_cv_check_glut_link], + [_AX_CHECK_GLUT_SAVE_FLAGS([[CFLAGS],[LIBS]]) + AC_LINK_IFELSE([_AX_CHECK_GLUT_PROGRAM], + [ax_cv_check_glut_link="yes"], + [ax_cv_check_glut_link="no"]) + _AX_CHECK_GLUT_RESTORE_FLAGS([[CFLAGS],[LIBS]]) + ]) + ]) + + dnl hook + AS_IF([test "X$ax_cv_check_glut_link" = "Xyes"], + [AC_DEFINE([HAVE_GLUT], [1], [Defined if a valid GLUT implementation is found]) + m4_ifval([$1], + [$1], + [CFLAGS="$GLUT_CFLAGS $CFLAGS" + LIBS="$GLUT_LIBS $LIBS"]) + ], + [m4_ifval([$2], + [$2], + [AC_MSG_ERROR([Could not find a valid GLUT implementation])] + ) + ]) + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_glx.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_glx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_glx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_glx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,323 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_glx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GLX +# +# DESCRIPTION +# +# Check for GLX. If GLX is found, the required preprocessor and linker +# flags are included in the output variables "GLX_CFLAGS" and "GLX_LIBS", +# respectively. If no GLX implementation is found, "no_glx" is set to +# "yes". +# +# If the header "GL/glx.h" is found, "HAVE_GL_GLX_H" is defined. If the +# header "OpenGL/glx.h" is found, HAVE_OPENGL_GLX_H is defined. These +# preprocessor definitions may not be mutually exclusive. +# +# You should use something like this in your headers: +# +# # if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# # include +# # endif +# # if defined(HAVE_GL_GLX_H) +# # include +# # elif defined(HAVE_OPENGL_GLX_H) +# # include +# # else +# # error no glx.h +# # endif +# +# LICENSE +# +# Copyright (c) 2009 Braden McDaniel +# Copyright (c) 2013-2014 Bastien Roucaries +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +# example program +m4_define([_AX_CHECK_GLX_PROGRAM], + [AC_LANG_PROGRAM([[ +# if defined(HAVE_WINDOWS_H) && defined(_WIN32) +# include +# endif +# ifdef HAVE_GL_GLX_H +# include +# elif defined(HAVE_OPENGL_GLX_H) +# include +# else +# error no glx.h +# endif +]],[[ + int major, minor; + (void)glXQueryVersion(0,&major,&minor);]])]) + + +dnl Default include : add windows.h +dnl see http://www.opengl.org/wiki/Platform_specifics:_Windows +dnl (acceded 20120801) +AC_DEFUN([_AX_CHECK_GLX_INCLUDES_DEFAULT],dnl +[ + AC_INCLUDES_DEFAULT + [ + # if defined(HAVE_WINDOWS_H) && defined(_WIN32) + # include + # endif + ] +]) + +dnl local save flags +AC_DEFUN([_AX_CHECK_GLX_SAVE_FLAGS], +[dnl +ax_check_glx_saved_libs="${LIBS}" +ax_check_glx_saved_cflags="${CFLAGS}" +ax_check_glx_saved_cppflags="${CPPFLAGS}" +ax_check_glx_saved_ldflags="${LDFLAGS}" +]) + + +dnl local restore flags +AC_DEFUN([_AX_CHECK_GLX_RESTORE_FLAGS], +[dnl +LIBS="${ax_check_glx_saved_libs}" +CFLAGS="${ax_check_glx_saved_cflags}" +CPPFLAGS="${ax_check_glx_saved_cppflags}" +LDFLAGS="${ax_check_glx_saved_ldflags}" +]) + + +# compile the example program +AC_DEFUN([_AX_CHECK_GLX_COMPILE], +[dnl + AC_LANG_PUSH([C]) + _AX_CHECK_GLX_SAVE_FLAGS() + CFLAGS="${GLX_CFLAGS} ${CFLAGS}" + AC_COMPILE_IFELSE([_AX_CHECK_GLX_PROGRAM], + [ax_check_glx_compile_opengl="yes"], + [ax_check_glx_compile_opengl="no"]) + _AX_CHECK_GLX_RESTORE_FLAGS() + AC_LANG_POP([C]) +]) + +# compile the example program (cache) +AC_DEFUN([_AX_CHECK_GLX_COMPILE_CV], +[dnl + AC_CACHE_CHECK([for compiling a minimal OpenGL Utility (GLX) program],[ax_cv_check_glx_compile_opengl], + [_AX_CHECK_GLX_COMPILE() + ax_cv_check_glx_compile_opengl="${ax_check_glx_compile_opengl}"]) + ax_check_glx_compile_opengl="${ax_cv_check_glx_compile_opengl}" +]) + +# link the example program +AC_DEFUN([_AX_CHECK_GLX_LINK], +[dnl + AC_LANG_PUSH([C]) + _AX_CHECK_GLX_SAVE_FLAGS() + CFLAGS="${GLX_CFLAGS} ${CFLAGS}" + LIBS="${GLX_LIBS} ${LIBS}" + LDFLAGS="${GLX_LDFLAGS} ${LDFLAGS}" + AC_LINK_IFELSE([_AX_CHECK_GLX_PROGRAM], + [ax_check_glx_link_opengl="yes"], + [ax_check_glx_link_opengl="no"]) + _AX_CHECK_GLX_RESTORE_FLAGS() + AC_LANG_POP([C]) +]) + +# link the example program (cache) +AC_DEFUN([_AX_CHECK_GLX_LINK_CV], +[dnl + AC_CACHE_CHECK([for linking a minimal OpenGL Utility (GLX) program],[ax_cv_check_glx_link_opengl], + [_AX_CHECK_GLX_LINK() + ax_cv_check_glx_link_opengl="${ax_check_glx_link_opengl}"]) + ax_check_glx_link_opengl="${ax_cv_check_glx_link_opengl}" +]) + +dnl Check headers manually (default case) +AC_DEFUN([_AX_CHECK_GLX_HEADERS], +[AC_LANG_PUSH([C]) + _AX_CHECK_GLX_SAVE_FLAGS() + CFLAGS="${GLX_CFLAGS} ${CFLAGS}" + # see comment in _AX_CHECK_GLX_INCLUDES_DEFAULT + AC_CHECK_HEADERS([windows.h],[],[],[AC_INCLUDES_DEFAULT]) + AC_CHECK_HEADERS([GL/glx.h OpenGL/glx.h], + [ax_check_glx_have_headers="yes";break], + [ax_check_glx_have_headers_headers="no"], + [_AX_CHECK_GLX_INCLUDES_DEFAULT()]) + # do not try darwin specific OpenGl/gl.h + _AX_CHECK_GLX_RESTORE_FLAGS() + AC_LANG_POP([C]) +]) + + + +# dnl try to found library (generic case) +# dnl $1 is set to the library to found +AC_DEFUN([_AX_CHECK_GLX_MANUAL_LIBS_GENERIC], +[dnl + ax_check_glx_manual_libs_generic_extra_libs="$1" + AS_IF([test "X$ax_check_glx_manual_libs_generic_extra_libs" = "X"], + [AC_MSG_ERROR([AX_CHECK_GLX_MANUAL_LIBS_GENERIC argument must no be empty])]) + + AC_LANG_PUSH([C]) + _AX_CHECK_GLX_SAVE_FLAGS() + CFLAGS="${GLX_CFLAGS} ${CFLAGS}" + LIBS="${GLX_LIBS} ${LIBS}" + AC_SEARCH_LIBS([glXGetClientString],[$ax_check_glx_manual_libs_generic_extra_libs], + [ax_check_glx_lib_opengl="yes"], + [ax_check_glx_lib_opengl="no"]) + AS_CASE([$ac_cv_search_glXGetClientString], + ["none required"],[], + [no],[], + [GLX_LIBS="${ac_cv_search_glXGetClientString} ${GLX_LIBS}"]) + _AX_CHECK_GLX_RESTORE_FLAGS() + AC_LANG_PUSH([C]) +]) + + +dnl Check library manually: subroutine must set +dnl $ax_check_gl_lib_opengl={yes,no} +AC_DEFUN([_AX_CHECK_GLX_MANUAL_LIBS], +[AC_REQUIRE([AC_CANONICAL_HOST]) + GLX_LIBS="${GLX_LIBS} ${GL_LIBS}" + _AX_CHECK_GLX_MANUAL_LIBS_GENERIC([GLX glx MesaGLX]) + + AC_CACHE_CHECK([for OpenGL Utility (GLX) libraries],[ax_cv_check_glx_lib_opengl], + [ax_cv_check_glx_lib_opengl="${ax_check_glx_lib_opengl}"]) + ax_check_glx_lib_opengl="${ax_cv_check_glx_lib_opengl}" +]) + + +dnl Manual way to detect GLX +AC_DEFUN([_AX_CHECK_GLX_MANUAL], +[dnl + +# inherit cflags +GLX_CFLAGS="${GLX_CFLAGS} ${GL_CFLAGS}" + +# check headers +_AX_CHECK_GLX_HEADERS + +AS_IF([test "X$ax_check_glx_have_headers" = "Xyes"], + [_AX_CHECK_GLX_MANUAL_LIBS], + [ax_check_glx_lib_opengl="no"]) + +AS_IF([test "X$ax_check_glx_lib_opengl" = "Xyes"], + [_AX_CHECK_GLX_COMPILE_CV()], + [ax_cv_check_glx_compile_opengl="no"]) + +AS_IF([test "X$ax_cv_check_glx_compile_opengl" = "Xyes"], + [_AX_CHECK_GLX_LINK_CV()], + [ax_cv_check_glx_link_opengl="no"]) + +AS_IF([test "X$ax_cv_check_glx_link_opengl" = "Xyes"], + [no_glx="no"], + [no_glx="yes"]) +]) + +# detect using pkgconfig +AC_DEFUN([_AX_CHECK_GLX_PKG_CONFIG], +[ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + PKG_CHECK_MODULES([GLX],[glx],[ax_check_glx_pkg_config=yes],[ax_check_glx_pkg_config=no]) + + AS_IF([test "X$ax_check_glx_pkg_config" = "Xyes"],[ + # check headers + AC_LANG_PUSH([C]) + _AX_CHECK_GLX_SAVE_FLAGS() + CFLAGS="${GLX_CFLAGS} ${CFLAGS}" + AC_CHECK_HEADERS([windows.h],[],[],[AC_INCLUDES_DEFAULT]) + AC_CHECK_HEADERS([GL/glx.h OpenGL/glx.h], + [ax_check_glx_have_headers="yes";break], + [ax_check_glx_have_headers_headers="no"], + [_AX_CHECK_GLX_INCLUDES_DEFAULT()]) + _AX_CHECK_GLX_RESTORE_FLAGS() + AC_LANG_POP([C]) + AC_CACHE_CHECK([for OpenGL Utility (GLX) headers],[ax_cv_check_glx_have_headers], + [ax_cv_check_glx_have_headers="${ax_check_glx_have_headers}"]) + + # pkgconfig library are supposed to work ... + AS_IF([test "X$ax_cv_check_glx_have_headers" = "Xno"], + [AC_MSG_ERROR("Pkgconfig detected OpenGL Utility (GLX) library has no headers!")]) + + _AX_CHECK_GLX_COMPILE_CV() + AS_IF([test "X$ax_cv_check_glx_compile_opengl" = "Xno"], + [AC_MSG_ERROR("Pkgconfig detected OpenGL Utility (GLX) library could not be used for compiling minimal program!")]) + + _AX_CHECK_GLX_LINK_CV() + AS_IF([test "X$ax_cv_check_glx_link_opengl" = "Xno"], + [AC_MSG_ERROR("Pkgconfig detected OpenGL Utility (GLX) library could not be used for linking minimal program!")]) + ]) +]) + +# entry point +AC_DEFUN([AX_CHECK_GLX],dnl +[ + AC_REQUIRE([AX_CHECK_GL]) + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + + # set flags + no_glx="yes" + have_GLX="no" + + AC_MSG_CHECKING([for a working OpenGL Utility (GLX) implementation by pkg-config]) + # try first pkgconfig + AS_IF([test "X${PKG_CONFIG}" = "X"], + [AC_MSG_RESULT([no]) + ax_check_glx_pkg_config=no], + [AC_MSG_RESULT([yes]) + _AX_CHECK_GLX_PKG_CONFIG()]) + + # if no pkg-config or pkg-config fail try manual way + AS_IF([test "X$ax_check_glx_pkg_config" = "Xno"], + [_AX_CHECK_GLX_MANUAL()], + [no_glx=no]) + + AC_MSG_CHECKING([for a working OpenGL Utility (GLX) implementation]) + AS_IF([test "X$no_glx" = "Xno"], + [have_GLX="yes" + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([for CFLAGS needed for OpenGL Utility (GLX)]) + AC_MSG_RESULT(["${GLX_CFLAGS}"]) + AC_MSG_CHECKING([for LIBS needed for OpenGL Utility (GLX)]) + AC_MSG_RESULT(["${GLX_LIBS}"]) + AC_MSG_CHECKING([for LDFLAGS needed for OpenGL Utility (GLX)]) + AC_MSG_RESULT(["${GLX_LDFLAGS}"])], + [AC_MSG_RESULT([no]) + GLX_CFLAGS="" + GLX_LIBS="" + GLX_LDFLAGS=""]) + + AC_SUBST([GLX_CFLAGS]) + AC_SUBST([GLX_LIBS]) + AC_SUBST([GLX_LDFLAGS]) + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gnu_make.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_gnu_make.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_gnu_make.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_gnu_make.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,95 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_gnu_make.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_GNU_MAKE([run-if-true],[run-if-false]) +# +# DESCRIPTION +# +# This macro searches for a GNU version of make. If a match is found: +# +# * The makefile variable `ifGNUmake' is set to the empty string, otherwise +# it is set to "#". This is useful for including a special features in a +# Makefile, which cannot be handled by other versions of make. +# * The makefile variable `ifnGNUmake' is set to #, otherwise +# it is set to the empty string. This is useful for including a special +# features in a Makefile, which can be handled +# by other versions of make or to specify else like clause. +# * The variable `_cv_gnu_make_command` is set to the command to invoke +# GNU make if it exists, the empty string otherwise. +# * The variable `ax_cv_gnu_make_command` is set to the command to invoke +# GNU make by copying `_cv_gnu_make_command`, otherwise it is unset. +# * If GNU Make is found, its version is extracted from the output of +# `make --version` as the last field of a record of space-separated +# columns and saved into the variable `ax_check_gnu_make_version`. +# * Additionally if GNU Make is found, run shell code run-if-true +# else run shell code run-if-false. +# +# Here is an example of its use: +# +# Makefile.in might contain: +# +# # A failsafe way of putting a dependency rule into a makefile +# $(DEPEND): +# $(CC) -MM $(srcdir)/*.c > $(DEPEND) +# +# @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND))) +# @ifGNUmake@ include $(DEPEND) +# @ifGNUmake@ else +# fallback code +# @ifGNUmake@ endif +# +# Then configure.in would normally contain: +# +# AX_CHECK_GNU_MAKE() +# AC_OUTPUT(Makefile) +# +# Then perhaps to cause gnu make to override any other make, we could do +# something like this (note that GNU make always looks for GNUmakefile +# first): +# +# if ! test x$_cv_gnu_make_command = x ; then +# mv Makefile GNUmakefile +# echo .DEFAULT: > Makefile ; +# echo \ $_cv_gnu_make_command \$@ >> Makefile; +# fi +# +# Then, if any (well almost any) other make is called, and GNU make also +# exists, then the other make wraps the GNU make. +# +# LICENSE +# +# Copyright (c) 2008 John Darrington +# Copyright (c) 2015 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_CHECK_GNU_MAKE],dnl + [AC_PROG_AWK + AC_CACHE_CHECK([for GNU make],[_cv_gnu_make_command],[dnl + _cv_gnu_make_command="" ; +dnl Search all the common names for GNU make + for a in "$MAKE" make gmake gnumake ; do + if test -z "$a" ; then continue ; fi ; + if "$a" --version 2> /dev/null | grep GNU 2>&1 > /dev/null ; then + _cv_gnu_make_command=$a ; + AX_CHECK_GNU_MAKE_HEADLINE=$("$a" --version 2> /dev/null | grep "GNU Make") + ax_check_gnu_make_version=$(echo ${AX_CHECK_GNU_MAKE_HEADLINE} | ${AWK} -F " " '{ print $(NF); }') + break ; + fi + done ;]) +dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise + AS_VAR_IF([_cv_gnu_make_command], [""], [AS_VAR_SET([ifGNUmake], ["#"])], [AS_VAR_SET([ifGNUmake], [""])]) + AS_VAR_IF([_cv_gnu_make_command], [""], [AS_VAR_SET([ifnGNUmake], [""])], [AS_VAR_SET([ifGNUmake], ["#"])]) + AS_VAR_IF([_cv_gnu_make_command], [""], [AS_UNSET(ax_cv_gnu_make_command)], [AS_VAR_SET([ax_cv_gnu_make_command], [${_cv_gnu_make_command}])]) + AS_VAR_IF([_cv_gnu_make_command], [""],[$2],[$1]) + AC_SUBST([ifGNUmake]) + AC_SUBST([ifnGNUmake]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_icu.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_icu.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_icu.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_icu.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_icu.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_ICU(version, action-if, action-if-not) +# +# DESCRIPTION +# +# Defines ICU_LIBS, ICU_CFLAGS, ICU_CXXFLAGS. See icu-config(1) man page. +# +# LICENSE +# +# Copyright (c) 2008 Akos Maroy +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CHECK_ICU], [AX_CHECK_ICU]) +AC_DEFUN([AX_CHECK_ICU], [ + succeeded=no + + if test -z "$ICU_CONFIG"; then + AC_PATH_PROG(ICU_CONFIG, icu-config, no) + fi + + if test "$ICU_CONFIG" = "no" ; then + echo "*** The icu-config script could not be found. Make sure it is" + echo "*** in your path, and that taglib is properly installed." + echo "*** Or see http://ibm.com/software/globalization/icu/" + else + ICU_VERSION=`$ICU_CONFIG --version` + AC_MSG_CHECKING(for ICU >= $1) + VERSION_CHECK=`expr $ICU_VERSION \>\= $1` + if test "$VERSION_CHECK" = "1" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING(ICU_CPPFLAGS) + ICU_CPPFLAGS=`$ICU_CONFIG --cppflags` + AC_MSG_RESULT($ICU_CPPFLAGS) + + AC_MSG_CHECKING(ICU_CFLAGS) + ICU_CFLAGS=`$ICU_CONFIG --cflags` + AC_MSG_RESULT($ICU_CFLAGS) + + AC_MSG_CHECKING(ICU_CXXFLAGS) + ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` + AC_MSG_RESULT($ICU_CXXFLAGS) + + AC_MSG_CHECKING(ICU_LIBS) + ICU_LIBS=`$ICU_CONFIG --ldflags` + AC_MSG_RESULT($ICU_LIBS) + else + ICU_CPPFLAGS="" + ICU_CFLAGS="" + ICU_CXXFLAGS="" + ICU_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. + ifelse([$3], ,echo "can't find ICU >= $1",) + fi + + AC_SUBST(ICU_CPPFLAGS) + AC_SUBST(ICU_CFLAGS) + AC_SUBST(ICU_CXXFLAGS) + AC_SUBST(ICU_LIBS) + fi + + if test $succeeded = yes; then + ifelse([$2], , :, [$2]) + else + ifelse([$3], , AC_MSG_ERROR([Library requirements (ICU) not met.]), [$3]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_java_home.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_java_home.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_java_home.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_java_home.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_java_home.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_JAVA_HOME +# +# DESCRIPTION +# +# Check for Sun Java (JDK / JRE) installation, where the 'java' VM is in. +# If found, set environment variable JAVA_HOME = Java installation home, +# else left JAVA_HOME untouch, which in most case means JAVA_HOME is +# empty. +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_CHECK_JAVA_HOME], [AX_CHECK_JAVA_HOME]) + +AC_DEFUN([AX_CHECK_JAVA_HOME], +[AC_MSG_CHECKING([for JAVA_HOME]) +# We used a fake loop so that we can use "break" to exit when the result +# is found. +while true +do + # If the user defined JAVA_HOME, don't touch it. + test "${JAVA_HOME+set}" = set && break + + # On Mac OS X 10.5 and following, run /usr/libexec/java_home to get + # the value of JAVA_HOME to use. + # (http://developer.apple.com/library/mac/#qa/qa2001/qa1170.html). + JAVA_HOME=`/usr/libexec/java_home 2>/dev/null` + test x"$JAVA_HOME" != x && break + + # See if we can find the java executable, and compute from there. + TRY_JAVA_HOME=`ls -dr /usr/java/* 2> /dev/null | head -n 1` + if test x$TRY_JAVA_HOME != x; then + PATH=$PATH:$TRY_JAVA_HOME/bin + fi + AC_PATH_PROG([JAVA_PATH_NAME], [java]) + if test "x$JAVA_PATH_NAME" != x; then + JAVA_HOME=`echo $JAVA_PATH_NAME | sed "s/\(.*\)[[/]]bin[[/]]java.*/\1/"` + break + fi + + AC_MSG_NOTICE([Could not compute JAVA_HOME]) + break +done +AC_MSG_RESULT([$JAVA_HOME]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_java_plugin.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_java_plugin.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_java_plugin.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_java_plugin.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,101 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_java_plugin.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_JAVA_PLUGIN() +# +# DESCRIPTION +# +# This macro sets to empty on failure and to a compatible +# version of plugin.jar otherwise. Directories searched are /usr/java/* +# and /usr/local/java/*, which are assumed to be j{dk,re} installations. +# Apply the shell variable as you see fit. If sun changes things so +# /lib/plugin.jar is not the magic file it will stop working. +# +# This macro assumes that unzip, zipinfo or pkzipc is available (and can +# list the contents of the jar archive). The first two are assumed to work +# similarly enough to the infozip versions. The pkzipc version is assumed +# to work if I understand the documentation on pkware's site but YMMV. I +# do not have access to pwkware's version to test it. +# +# LICENSE +# +# Copyright (c) 2008 Duncan Simpson +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([DPS_CHECK_PLUGIN], [AX_CHECK_JAVA_PLUGIN]) +AC_DEFUN([AX_CHECK_JAVA_PLUGIN], +[AC_REQUIRE([AC_PROG_AWK]) +AC_REQUIRE([AC_PROG_FGREP]) +AC_CHECK_PROG(ZIPINFO,[zipinfo unzip pkzipc]) +AC_MSG_CHECKING([for the java plugin]) +case "x$ZIPINFO" in +[*/zipinfo)] + zipinf="zipinfo -1" ;; +[*/unzip)] + zipinf="unzip -l";; +[*/pkzipc)] + ziping="unzipc -view";; +[x*)] + AC_MSG_RESULT([skiped, none of zipinfo, unzip and pkzipc found]) + AC_SUBST($1,[]) + zipinf="";; +esac +if test "x$zipinf" != "x"; then +jplugin="" +for jhome in `ls -dr /usr/java/* /usr/local/java/* 2> /dev/null`; do +for jfile in lib/plugin.jar jre/lib/plugin.jar; do +if test "x$jplugin" = "x" && test -f "$jhome/$jfile"; then +eval "$zipinf $jhome/$jfile | $AWK '{ print \$NF; }' | $FGREP netscape/javascript/JSObject" >/dev/null 2>/dev/null +if test $? -eq 0; then +dnl Some version of gcj (and javac) refuse to work with some files +dnl that pass this test. To stop this problem make sure that the compiler +dnl still works with this jar file in the classpath +cat << \EOF > Test.java +/* [#]line __oline__ "configure" */ +public class Test { +} +EOF +if eval "$JAVAC -classpath $jhome/$jfile Test.java 2>/dev/null >/dev/null" && test -f Test.class; then +jplugin="$jhome/$jfile" +fi +rm -f Test.java Test.class +fi; fi; done; done +if test "x$jplugin" != "x"; then +AC_SUBST($1,$jplugin) +AC_MSG_RESULT($jplugin) +else +AC_MSG_RESULT([java plugin not found]) +AC_SUBST($1,[]) +fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_junit.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_junit.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_junit.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_junit.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_junit.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_JUNIT +# +# DESCRIPTION +# +# AX_CHECK_JUNIT tests the availability of the Junit testing framework, +# and set some variables for conditional compilation of the test suite by +# automake. +# +# If available, JUNIT is set to a command launching the text based user +# interface of Junit, @JAVA_JUNIT@ is set to $JAVA_JUNIT and @TESTS_JUNIT@ +# is set to $TESTS_JUNIT, otherwise they are set to empty values. +# +# You can use these variables in your Makefile.am file like this : +# +# # Some of the following classes are built only if junit is available +# JAVA_JUNIT = Class1Test.java Class2Test.java AllJunitTests.java +# +# noinst_JAVA = Example1.java Example2.java @JAVA_JUNIT@ +# +# EXTRA_JAVA = $(JAVA_JUNIT) +# +# TESTS_JUNIT = AllJunitTests +# +# TESTS = StandaloneTest1 StandaloneTest2 @TESTS_JUNIT@ +# +# EXTRA_TESTS = $(TESTS_JUNIT) +# +# AllJunitTests : +# echo "#! /bin/sh" > $@ +# echo "exec @JUNIT@ my.package.name.AllJunitTests" >> $@ +# chmod +x $@ +# +# LICENSE +# +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_CHECK_JUNIT], [AX_CHECK_JUNIT]) +AC_DEFUN([AX_CHECK_JUNIT],[ +AC_CACHE_VAL(ac_cv_prog_JUNIT,[ +AC_CHECK_CLASS(junit.textui.TestRunner) +if test x"`eval 'echo $ac_cv_class_junit_textui_TestRunner'`" != xno ; then + ac_cv_prog_JUNIT='$(CLASSPATH_ENV) $(JAVA) $(JAVAFLAGS) junit.textui.TestRunner' +fi]) +AC_MSG_CHECKING([for junit]) +if test x"`eval 'echo $ac_cv_prog_JUNIT'`" != x ; then + JUNIT="$ac_cv_prog_JUNIT" + JAVA_JUNIT='$(JAVA_JUNIT)' + TESTS_JUNIT='$(TESTS_JUNIT)' +else + JUNIT= + JAVA_JUNIT= + TESTS_JUNIT= +fi +AC_MSG_RESULT($JAVA_JUNIT) +AC_SUBST(JUNIT) +AC_SUBST(JAVA_JUNIT) +AC_SUBST(TESTS_JUNIT)]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_library.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_library.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_library.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_library.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,95 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_library.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_LIBRARY(VARIABLE-PREFIX, HEADER-FILE, LIBRARY-FILE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT_FOUND]) +# +# DESCRIPTION +# +# Provides a generic test for a given library, similar in concept to the +# PKG_CHECK_MODULES macro used by pkg-config. +# +# Most simplest libraries can be checked against simply through the +# presence of a header file and a library to link to. This macro allows to +# wrap around the test so that it doesn't have to be recreated each time. +# +# Rather than define --with-$LIBRARY arguments, it uses variables in the +# same way that PKG_CHECK_MODULES does. It doesn't, though, use the same +# names, since you shouldn't provide a value for LIBS or CFLAGS but rather +# for LDFLAGS and CPPFLAGS, to tell the linker and compiler where to find +# libraries and headers respectively. +# +# If the library is find, HAVE_PREFIX is defined, and in all cases +# PREFIX_LDFLAGS and PREFIX_CPPFLAGS are substituted. +# +# Example: +# +# AX_CHECK_LIBRARY([LIBEVENT], [event.h], [event], [], +# [AC_MSG_ERROR([Unable to find libevent])]) +# +# LICENSE +# +# Copyright (c) 2010 Diego Elio Petteno` +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_LIBRARY], [ + AC_ARG_VAR($1[_CPPFLAGS], [C preprocessor flags for ]$1[ headers]) + AC_ARG_VAR($1[_LDFLAGS], [linker flags for ]$1[ libraries]) + + AC_CACHE_VAL(AS_TR_SH([ax_cv_have_]$1), + [save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + save_LIBS="$LIBS" + + AS_IF([test "x$]$1[_CPPFLAGS" != "x"], + [CPPFLAGS="$CPPFLAGS $]$1[_CPPFLAGS"]) + + AS_IF([test "x$]$1[_LDFLAGS" != "x"], + [LDFLAGS="$LDFLAGS $]$1[_LDFLAGS"]) + + AC_CHECK_HEADER($2, [ + AC_CHECK_LIB($3, [main], + [AS_TR_SH([ax_cv_have_]$1)=yes], + [AS_TR_SH([ax_cv_have_]$1)=no]) + ], [AS_TR_SH([ax_cv_have_]$1)=no]) + + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + ]) + + AS_IF([test "$]AS_TR_SH([ax_cv_have_]$1)[" = "yes"], + AC_DEFINE([HAVE_]$1, [1], [Define to 1 if ]$1[ is found]) + [$4], + [$5]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_link_flag.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_link_flag.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_link_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_link_flag.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the linker or gives an error. +# (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the linker's default flags +# when the check is done. The check is thus made with the flags: "LDFLAGS +# EXTRA-FLAGS FLAG". This can for example be used to force the linker to +# issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_LINK_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_LINK_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl +AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ + ax_check_save_flags=$LDFLAGS + LDFLAGS="$LDFLAGS $4 $1" + AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + LDFLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_LINK_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_mysql_db.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_mysql_db.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_mysql_db.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_mysql_db.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,67 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_mysql_db.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_MYSQL_DB +# +# DESCRIPTION +# +# Check if the specified MySQL database exists, if yes set your +# environment variable to that database name else unset your environment +# variable +# +# Example: +# +# AX_CHECK_MYSQL_DB(DBNAME, [fishmarket]) +# if test x$DBNAME = xfishmarket; then +# bla..bla..bla.. +# else +# bla..bla..bla.. +# fi +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_CHECK_MYSQL_DB], [AX_CHECK_MYSQL_DB]) +AC_DEFUN([AX_CHECK_MYSQL_DB],[ +AC_REQUIRE([AX_PROG_MYSQLSHOW])dnl +AC_MSG_CHECKING([for MySQL db $2]) +if $MYSQLSHOW -u root -prootpass $2 > /dev/null 2>&1; then + $1=$2 + AC_MSG_RESULT([yes]) +else + unset $1 + AC_MSG_RESULT([no]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_mysql.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_mysql.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_mysql.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_mysql.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,393 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_mysql.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_MYSQL([MYSQL-PLUGIN-NEEDED],[MYSQL-REQUIRED],[MINIMUM-VERSION],[INCLUDES-REQUIRED]) +# AX_SOURCE_MYSQL() +# AX_CHECK_MYSQL_INSTALL([ROOT-DIR],[IF-FOUND],[IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Looks for a MySQL installation in typical locations, or can take in a +# flag designating where a MySQL installation is found. Sets the variables +# stated to various attributes of the desired MySQL installation. +# +# In detail, AX_CHECK_MYSQL will automatically look for a MySQL +# installation in the directories that a mysql source or binary install +# typically install to. AX_CHECK_MYSQL will throw an error if it cannot +# find one, and it is required. +# +# AX_CHECK_MYSQL can also check for specific variables passed regarding a +# location of a MySQL installation. +# +# If a MySQL installation is found, AX_CHECK_MYSQL sets variables +# regarding the version of MySQL, its architecture (32 or 64 bit), and +# wether the version supports Plugins. +# +# AX_CHECK_MYSQL_INSTALL will check a designated root directory for a +# command, plugin, and include directory. If a mysql binary is not found +# or not found, the IF-FOUND and IF-NOT-FOUND directive will be executed, +# respectively. +# +# AX_CHECK_MYSQL adds the following flags: +# +# --with-mysql, for the root of a desired MySQL installation +# --with-mysql-plugin, for the path to the plugin directory of the MySQL installation +# --with-mysql-include, for the path to the include directory of the MySQL installation +# --with-mysql-command, for the path to the binary directory of the MySQL installation +# --with-mysql-source, for the path to a directory containing the source of the MySQL installation +# +# AX_CHECK_MYSQL sets: +# +# MYSQL to indicate whether MySQL was found or not +# MYSQL_INCLUDES to the include directory (if one exists) +# MYSQL_PLUGINS to the plugin directory +# MYSQL_COMMANDS to the mysql executable directory +# MYSQL_ARCHITECTURE to whether MySQL is 32 or 64 bit (32 if 32, 64 if 64) +# MYSQL_VERSION to what the MySQL version is (5.1,5.5, etc) +# MYSQL_PLUGIN_OK to whether MySQL version supports plugins (5.1 or greater) +# MYSQL_55 to whether the version of MySQL is 5.5 or greater +# MYSQL_SOURCE to the source directory passed by --with-mysql-source +# +# LICENSE +# +# Copyright (c) 2011 University of Washington +# Copyright (c) 2011 Yusuke Tsutsumi +# Copyright (c) 2011 Craig Stimmel +# Copyright (c) 2011 Eric Wu +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_ARG_WITH(mysql,AS_HELP_STRING([--with-mysql],[root of the MySQL installation])) +AC_ARG_WITH(mysql_plugin,AS_HELP_STRING([--with-mysql-plugin],[path to the MySQL installation plugin directory])) +AC_ARG_WITH(mysql_include,AS_HELP_STRING([--with-mysql-include],[path to the MySQL installation include directory])) +AC_ARG_WITH(mysql_command,AS_HELP_STRING([--with-mysql-command],[path to the MySQL executables directory])) +AC_ARG_WITH(mysql_source,AS_HELP_STRING([--with-mysql-source],[path to MySQL source files])) + +# Used to look for MySQL installation specifically. Checks if binary exists. +AC_DEFUN([AX_CHECK_MYSQL_COMMANDS],[ + # Define variables passed + COMMAND_DIR="$1" + + # Check for the binary, and set appropriate variables + unset ac_cv_mysql_bin_test + AC_CHECK_PROG(mysql_bin_test,mysql,$COMMAND_DIR,no,$COMMAND_DIR) + if test "$mysql_bin_test" != "no"; then + AC_SUBST(MYSQL_COMMANDS,$mysql_bin_test) + AC_SUBST(MYSQL,yes) + else + AC_SUBST(MYSQL_COMMANDS,no) + AC_SUBST(MYSQL,no) + fi +]) + +# Use to look for the plugins directory +AC_DEFUN([AX_CHECK_MYSQL_PLUGINS],[ + # Define variables passed + PLUGIN_DIR="$1" + + AC_MSG_CHECKING([if $PLUGIN_DIR exists...]) + if [[ -d "$PLUGIN_DIR" ]]; then + AC_SUBST(MYSQL_PLUGIN,yes) + AC_MSG_RESULT([yes]) + else + AC_SUBST(MYSQL_PLUGIN,no) + AC_MSG_RESULT([no]) + fi +]) + +# Use to look if includes are installed (determined by the existence of mysql_version.h) +AC_DEFUN([AX_CHECK_MYSQL_INCLUDES],[ + # Define variables passed + INCLUDE_DIR="$1" + AC_CHECK_HEADER($INCLUDE_DIR/mysql_version.h, + AC_SUBST(MYSQL_INCLUDES,$INCLUDE_DIR/), + AC_SUBST(MYSQL_INCLUDES,no)) +]) + +AC_DEFUN([AX_CHECK_MYSQL_INSTALL],[ + + #Define variables passed + ROOT_DIR="$1" + + # Check for include directory + AX_CHECK_MYSQL_INCLUDES([$ROOT_DIR/include/mysql/mysql_version.h]) + if test "$MYSQL_INCLUDES" == "no" ; then + AX_CHECK_MYSQL_INCLUDES([$ROOT_DIR/include/mysql_version.h]) + fi + mysql_include_test=$MYSQL_INCLUDES + + # Check for plugin directory + AX_CHECK_MYSQL_PLUGINS([$ROOT_DIR/lib/mysql/plugin/]) + if test "$MYSQL_PLUGIN" == "no" ; then + unset $MYSQL_PLUGIN + AX_CHECK_MYSQL_PLUGINS([$ROOT_DIR/lib/plugin/]) + fi + mysql_plugin_test=$MYSQL_PLUGIN + + # Check for binary directory + AX_CHECK_MYSQL_COMMANDS([$ROOT_DIR/bin/]) + + if test "$MYSQL" != "no" + then + true + $2 + else + true + $3 + fi +]) + +AC_DEFUN([AX_CHECK_MYSQL],[ + mysql_test="no" + + # Define variables + MYSQL_PLUGIN_NEEDED=`echo $1 | grep -i -o "y"` + MYSQL_REQUIRED=`echo $2 | grep -i -o "y"` + MINIMUM_V="$3" + INCLUDES_REQUIRED=`echo $4 | grep -i -o "y"` + CLASSIFIER="none" + mysql_issue="" + + + + # Checks for common installation locations of MySQL + + echo "Testing if MySQL was installed to common source/binary directory" + AC_CHECK_PROG(mysqlsource,mysql,yes,no,/usr/local/mysql/bin,) + echo "Testing if MySQL was installed to common package manager directory" + AC_CHECK_PROG(mysqlpackage,mysql,yes,no,/usr/bin,) + + # Checks whether the directories contains what they're supposed to, then produces an error otherwise. + # In addition, will also generate an error if no installations exist, or two installations are detected. + + if test "$ac_cv_prog_mysqlsource" == "yes" && test "$ac_cv_prog_mysqlpackage" == "yes" + then + mysql_issue="Multiple MySQL installations found. Please specify the MySQL installation directory with --with-mysql" + else if test "$ac_cv_prog_mysqlsource" == "yes" + then + AX_CHECK_MYSQL_INSTALL(/usr/local/mysql,,) + CLASSIFIER="source" + else if test "$ac_cv_prog_mysqlpackage" == "yes" + then + AX_CHECK_MYSQL_INSTALL(/usr,,) + CLASSIFIER="package" + else + mysql_issue="No default MySQL installs detected. Please specify the MySQL installation directory with --with-mysql" + fi + fi + fi + + # Checks if --with-mysql flag was passed. If so, verifies that the directory follows assumed + # structure and include,plugin, and bin directory is found. If there are no issues, this + # will nullify any errors that would have been thrown by the above checking. + if test "$with_mysql" != "" + then + AX_CHECK_MYSQL_INSTALL($with_mysql,,) + CLASSIFIER="root" + mysql_issue="" + fi + + + # Checks if specific MySQL directory flags were passed (--with-mysql-plugin, --with-mysql-include, --with-mysql-bin) + # If so then checks if these variables are proper directories. If not, returns an error. Requires that all three directories must be defined. + + if test "$with_mysql_plugin" != "" || test "$with_mysql_include" != "" || test "$with_mysql_command" != "" + then + mysql_test="yes" + if test "$with_mysql_plugin" == "" || test "$with_mysql_command" == "" + then + mysql_test="no" + if test "$MYSQL_REQUIRED" != "" + then + AC_MSG_ERROR([Argument is missing! When using --with-mysql-plugin --with-mysql-bin please enter arguments for each.]) + else + AC_MSG_WARN([Argument is missing! When using --with-mysql-plugin --with-mysql-bin please enter arguments for each.]) + fi + else + mysql_issue="" + AX_CHECK_MYSQL_PLUGINS([$with_mysql_plugin]) + AX_CHECK_MYSQL_INCLUDES([$with_mysql_include]) + AX_CHECK_MYSQL_COMMANDS([$with_mysql_command]) + CLASSIFIER="custom" + fi + fi + # If the installation does not exist or satisfy requirements, send an error or warning + mysql_dne_message="" + mysql_include_dne_message="" + + if test "$mysql_issue" != "" + then + if test "$MYSQL_REQUIRED" != "" + then + AC_MSG_ERROR([$mysql_issue]) + else + AC_MSG_WARN([$mysql_issue]) + fi + fi + # Error message for not finding mysql executable + if test "$MYSQL_BIN" == "no" + then + if test "$CLASSIFIER" == "root" + then + mysql_dne_message="Could not find directory containing MySQL includes. Please designate the command\,plugin\,and include directories manually with --with-mysql-command\, --with-mysql-plugin\, and --with-mysql-include" + fi + if test "$CLASSIFIER" == "custom" + then + mysql_dne_message="Could not find mysql executable in designated command directory. Please pass the directory containing the mysql executable with --with-mysql-command" + fi + fi + + # Error message for not finding mysql plugin directory + if test "$MYSQL_PLUGINS" == "no" + then + if test "$CLASSIFIER" == "source" + then + AC_MSG_WARN([Could not find plugin directory for detected source installation. Please pass the root directory of the MySQL installation with --with-mysql]) + fi + if test "$CLASSIFIER" == "package" + then + AC_MSG_WARN([Could not find plugin directory for detected package installation. Please pass the root directory of the MySQL installation with --with-mysql]) + fi + if test "$CLASSIFIER" == "root" + then + AC_MSG_WARN([Could not find directory for MySQL plugins. Please designate the command\,plugin\,and include directories manually with --with-mysql-command\, --with-mysql-plugin\, and --with-mysql-include]) + fi + if test "$CLASSIFIER" == "custom" + then + AC_MSG_WARN([Could not find mysql includes in designated plugin directory. Please pass the directory containing the mysql executable with --with-mysql-plugin]) + fi + fi + + # Error message for not finding mysql include directory + if test "$MYSQL_INCLUDES" == "no" + then + if test "$CLASSIFIER" == "source" + then + mysql_include_dne_message="A source install was detected, but the include directory could not be found! MySQL development library may not be installed. If development library is installed please use --with-mysql-include --with-mysql-plugin --with-mysql-command to manually assign directory locations" + fi + if test "$CLASSIFIER" == "package" + then + mysql_include_dne_message="A package install was detected, but the include directory could not be found! MySQL development library may not be installed. If development library is installed please use --with-mysql-include --with-mysql-plugin --with-mysql-command to manually assign directory locations" + fi + if test "$CLASSIFIER" == "root" + then + mysql_include_dne_message="Could not find directory containing MySQL includes. The MySQL development library may not be installed. If development library is installed\, please designate the command\,plugin\,and include directories manually with --with-mysql-command\, --with-mysql-plugin\, and --with-mysql-include" + fi + if test "$CLASSIFIER" == "custom" + then + mysql_include_dne_message="Could not find mysql includes in designated include directory. Please pass the directory containing the mysql_version.h include file with --with-mysql-include" + fi + fi + + # And execute the error messages + if test "$mysql_dne_message" != "" + then + if test "$MYSQL_REQUIRED" != "" + then + AC_MSG_ERROR([$mysql_dne_message]) + else + AC_MSG_WARN([$mysql_dne_message]) + fi + fi + if test "$mysql_include_dne_message" != "" + then + if test "$INCLUDES_REQUIRED" != "" + then + AC_MSG_ERROR([$mysql_include_dne_message]) + else + AC_MSG_WARN([$mysql_include_dne_message]) + fi + fi + + if test "$MYSQL" == "yes" + then + # Check MySQL version, wether it's 32 or 64 bit, and modifies the architecture variable accordingly + AC_MSG_CHECKING([MySQL Architecture]) + MYSQL_ARCHITECTURE='file '$MYSQL_COMMANDS'/mysql' + MYSQL_ARCHITECTURE=`$MYSQL_ARCHITECTURE | grep -o ".*bit" | sed s/-bit//g | grep -o "[[0-9]][[0-9]]$"` + AC_MSG_RESULT([$MYSQL_ARCHITECTURE]) + AC_SUBST(MYSQL_ARCHITECTURE,$MYSQL_ARCHITECTURE) + + # Checks MySQL binary version + AC_MSG_CHECKING([MySQL Version]) + MYSQL_PREFIX=$MYSQL_COMMANDS'/mysqladmin -v' + MYSQL_V=`$MYSQL_PREFIX | grep -o 'Distrib.*,' | sed s/Distrib\ //g | sed s/,//g` + AC_MSG_RESULT([$MYSQL_V]) + + # Checks whether MySQL version is greater than 5.1, the version needed for plugins + AC_MSG_CHECKING([if MySQL install supports Plugins]) + MYSQL_MAJOR_V=`echo $MYSQL_V | cut -c 1` + MYSQL_MINOR_V=`echo $MYSQL_V | cut -c 3` + MYSQL_REV_V=`echo $MYSQL_V | cut -c 5-6` + MYSQL_PLUGIN_MINOR_V=1 + MYSQL_PLUGIN_MAJOR_V=5 + if test "$MYSQL_MAJOR_V" -lt "$MYSQL_PLUGIN_MAJOR_V" || (test "$MYSQL_MAJOR_V" -eq "$MYSQL_PLUGIN_MAJOR_V" && test "$MYSQL_MINOR_V" -lt "$MYSQL_PLUGIN_MINOR_V") + then + AC_SUBST(MYSQL_PLUGIN_OK,no) + AC_MSG_RESULT([no]) + else + AC_SUBST(MYSQL_PLUGIN_OK,yes) + AC_MSG_RESULT([yes]) + fi + + if test "$MYSQL_PLUGIN_NEEDED" != "" + then + if test "$MYSQL_PLUGIN_OK" == "no" + then + AC_MSG_ERROR([MySQL version is not able to support plugins! Please upgrade your version of MySQL before installing]) + fi + fi + + # Checks wether MINIMUM-VERSION was passed, does error checking for the value, and checks for version + if test "$MINIMUM_V" != "" + then + MINIMUM_MAJOR_V=`echo $MINIMUM_V | cut -c 1` + MINIMUM_MINOR_V=`echo $MINIMUM_V | cut -c 3` + MINIMUM_REV_V=`echo $MINIMUM_V | cut -c 5-6` + CHECKER_MAJOR=`echo $MINIMUM_MAJOR_V | grep -o '[[0-9]]'` + CHECKER_MINOR=`echo $MINIMUM_MINOR_V | grep -o '[[0-9]]'` + CHECKER_REV=`echo $MINIMUM_REV_V | grep -o '^[[0-9]]+'` + if test "$CHECKER_MAJOR" != "" && test "$CHECKER_MINOR" != "" && test "$CHECKER_REV" == "" + then + AC_MSG_CHECKING([if MySQL version is equal or greater than $MINIMUM_V]) + if test "$MYSQL_MAJOR_V" -lt "$MINIMUM_MAJOR_V" || (test "$MYSQL_MAJOR_V" -eq "$MINIMUM_MAJOR_V" && test "$MYSQL_MINOR_V" -lt "$MINIMUM_MINOR_V") || (test "$MYSQL_MAJOR_V" -eq "$MINIMUM_MAJOR_V" && test "$MYSQL_MINOR_V" -eq "$MINIMUM_MINOR_V" && "$MYSQL_REV_V" -lt "MINIMUM_REV_V") + then + AC_SUBST(MYSQL_PLUGIN_OK,no) + AC_MSG_RESULT([no]) + AC_MSG_ERROR([installed MySQL version is not above $MINIMUM_V. Please upgrade your version of MySQL]) + else + AC_SUBST(MYSQL_PLUGIN_OK,yes) + AC_MSG_RESULT([yes]) + fi + else + AC_MSG_ERROR([MINIMUM-VERSION variable in AX_CHEC_MYSQL is not formatted properly. Please use X.X or X.X.XX]) + fi + fi + + # Checks whether MySQL version is 5.5 or greater, the production release with major header/include changes from before + if test "$MYSQL_MAJOR_V" -gt 4 && test "$MYSQL_MINOR_V" -gt 4 + then + AC_SUBST(MYSQL_55,yes) + else + AC_SUBST(MYSQL_55,no) + fi + fi + +]) + +AC_DEFUN([AX_SOURCE_MYSQL],[ + if test "$with_mysql_source" == "" + then + AC_MSG_ERROR(["Please Designate MySQL source path, using --with-mysql-source=YOUR_PATH"]) + else + AC_SUBST(MYSQL_SOURCE,$with_mysql_source) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_mysqlr.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_mysqlr.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_mysqlr.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_mysqlr.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,47 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_mysqlr.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_MYSQLR +# +# DESCRIPTION +# +# First check if mysqlconfig exists. It fails if mysqlconfig is not in +# path. Then it checks for the libraries and replaces -lmysqlclient +# statement with -lmysqlclient_r statement, to enable threaded client +# library. +# +# The following are exported environment variables: +# +# MYSQL_LIBS +# MYSQL_CFLAGS +# +# LICENSE +# +# Copyright (c) 2008 Can Bican +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_CHECK_MYSQLR], [AX_CHECK_MYSQLR]) +AC_DEFUN([AX_CHECK_MYSQLR],[ +AC_PATH_PROG(mysqlconfig,mysql_config) +if test [ -z "$mysqlconfig" ] +then + AC_MSG_ERROR([mysql_config executable not found]) +else + AC_MSG_CHECKING(mysql libraries) + MYSQL_LIBS=`${mysqlconfig} --libs | sed -e \ + 's/-lmysqlclient /-lmysqlclient_r /' -e 's/-lmysqlclient$/-lmysqlclient_r/'` + AC_MSG_RESULT($MYSQL_LIBS) + AC_MSG_CHECKING(mysql includes) + MYSQL_CFLAGS=`${mysqlconfig} --cflags` + AC_MSG_RESULT($MYSQL_CFLAGS) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_off64_t.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_off64_t.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_off64_t.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_off64_t.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,68 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_off64_t.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_OFF64_T +# +# DESCRIPTION +# +# Check if off64_t is defined. On true define HAVE_OFF64_T, also define +# __LARGEFILE64_SOURCE where one is needed. (Note that an appropriative +# entry must be in config.h.in.) +# +# LICENSE +# +# Copyright (c) 2008 Ruslan Shevchenko +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([RSSH_CHECK_OFF64_T], [AX_CHECK_OFF64_T]) +AC_DEFUN([AX_CHECK_OFF64_T], [ +AC_REQUIRE([AC_SYS_LARGEFILE])dnl +AC_CHECK_HEADER(unistd.h) +AC_CACHE_CHECK([whether type off64_t support], + [ax_cv_check_off64_t], + [ + AC_COMPILE_IFELSE( +AC_LANG_SOURCE([ +#ifdef HAVE_UNISTD_H +#include +#endif +extern off64_t x1; +]) +,ax_have_off64t=1) + if test "x$ax_have_off64t" = "x" + then + AC_COMPILE_IFELSE( +AC_LANG_SOURCE([ +#define _LARGEFILE64_SOURCE +#ifdef HAVE_UNISTD_H +#include +#endif +extern off64_t x1; +]), + ax_cv_check_off64_t="_LARGEFILE64_SOURCE", + ax_cv_check_off64_t="no" +)dnl + + else + ax_cv_check_off64_t=yes + fi + ])dnl + +if test "x$ax_cv_check_off64_t" = "x_LARGEFILE64_SOURCE" +then + AC_DEFINE(_LARGEFILE64_SOURCE) + AC_DEFINE(HAVE_OFF64_T) +elif test "x$ax_cv_check_off64_t" = "xyes" +then + AC_DEFINE(HAVE_OFF64_T) +fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_openssl.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_openssl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_openssl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_openssl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,124 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_openssl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]]) +# +# DESCRIPTION +# +# Look for OpenSSL in a number of default spots, or in a user-selected +# spot (via --with-openssl). Sets +# +# OPENSSL_INCLUDES to the include directives required +# OPENSSL_LIBS to the -l directives required +# OPENSSL_LDFLAGS to the -L or -R flags required +# +# and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately +# +# This macro sets OPENSSL_INCLUDES such that source files should use the +# openssl/ directory in include directives: +# +# #include +# +# LICENSE +# +# Copyright (c) 2009,2010 Zmanda Inc. +# Copyright (c) 2009,2010 Dustin J. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL]) +AC_DEFUN([AX_CHECK_OPENSSL], [ + found=false + AC_ARG_WITH([openssl], + [AS_HELP_STRING([--with-openssl=DIR], + [root of the OpenSSL directory])], + [ + case "$withval" in + "" | y | ye | yes | n | no) + AC_MSG_ERROR([Invalid --with-openssl value]) + ;; + *) ssldirs="$withval" + ;; + esac + ], [ + # if pkg-config is installed and openssl has installed a .pc file, + # then use that information and don't search ssldirs + AC_CHECK_TOOL([PKG_CONFIG], [pkg-config]) + if test x"$PKG_CONFIG" != x""; then + OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null` + if test $? = 0; then + OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null` + OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null` + found=true + fi + fi + + # no such luck; use some default ssldirs + if ! $found; then + ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr" + fi + ] + ) + + + # note that we #include , so the OpenSSL headers have to be in + # an 'openssl' subdirectory + + if ! $found; then + OPENSSL_INCLUDES= + for ssldir in $ssldirs; do + AC_MSG_CHECKING([for openssl/ssl.h in $ssldir]) + if test -f "$ssldir/include/openssl/ssl.h"; then + OPENSSL_INCLUDES="-I$ssldir/include" + OPENSSL_LDFLAGS="-L$ssldir/lib" + OPENSSL_LIBS="-lssl -lcrypto" + found=true + AC_MSG_RESULT([yes]) + break + else + AC_MSG_RESULT([no]) + fi + done + + # if the file wasn't found, well, go ahead and try the link anyway -- maybe + # it will just work! + fi + + # try the preprocessor and linker with our new flags, + # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS + + AC_MSG_CHECKING([whether compiling and linking against OpenSSL works]) + echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \ + "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD + + save_LIBS="$LIBS" + save_LDFLAGS="$LDFLAGS" + save_CPPFLAGS="$CPPFLAGS" + LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS" + LIBS="$OPENSSL_LIBS $LIBS" + CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([#include ], [SSL_new(NULL)])], + [ + AC_MSG_RESULT([yes]) + $1 + ], [ + AC_MSG_RESULT([no]) + $2 + ]) + CPPFLAGS="$save_CPPFLAGS" + LDFLAGS="$save_LDFLAGS" + LIBS="$save_LIBS" + + AC_SUBST([OPENSSL_INCLUDES]) + AC_SUBST([OPENSSL_LIBS]) + AC_SUBST([OPENSSL_LDFLAGS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_page_aligned_malloc.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_page_aligned_malloc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_page_aligned_malloc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_page_aligned_malloc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_check_page_aligned_malloc.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_CHECK_PAGE_ALIGNED_MALLOC +# +# DESCRIPTION +# +# Some operating systems (generally, BSD Unix variants) lack a +# posix_memalign function, a memalign function, and a working (meaning, +# the memory can be freed) valloc function. To make up for it, the malloc +# function promises to return page-aligned addresses if more than one +# page's worth of memory is allocated. AX_CHECK_PAGE_ALIGNED_MALLOC checks +# for this condition and defines HAVE_PAGE_ALIGNED_MALLOC if the condition +# holds. +# +# As an aside, note that valloc'd memory cannot safely be freed on all +# operating systems. (Again, some flavors of BSD are the troublemakers.) +# It's best to avoid using valloc in favor of posix_memalign, memalign, or +# an aligned malloc as detected by AX_CHECK_PAGE_ALIGNED_MALLOC. +# +# Caveat: AX_CHECK_PAGE_ALIGNED_MALLOC takes a probabilistic approach. If +# 100 calls to malloc all return page-aligned addresses, it assumes that +# all calls will behave likewise. It is therefore possible -- albeit +# extremely unlikely -- that AX_CHECK_PAGE_ALIGNED_MALLOC can return a +# false positive. +# +# LICENSE +# +# Copyright (c) 2008 Scott Pakin +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_CHECK_PAGE_ALIGNED_MALLOC], +[AC_CACHE_CHECK([if large mallocs guarantee page-alignment], + [ax_cv_func_malloc_aligned], + [AC_TRY_RUN([ +#include +#include +#if HAVE_UNISTD_H +# include +#endif + +int main() +{ + int pagesize = getpagesize(); + int i; + + for (i=0; i<100; i++) + if ((unsigned long)malloc(pagesize+1) & (pagesize-1)) + exit (1); + exit (0); +} + ], + [ax_cv_func_malloc_aligned=yes], + [ax_cv_func_malloc_aligned=no], + [ax_cv_func_malloc_aligned=no]) + ]) +if test "$ax_cv_func_malloc_aligned" = yes ; then + AC_DEFINE([HAVE_PAGE_ALIGNED_MALLOC], [1], + [Define if `malloc'ing more than one page always returns a page-aligned address.]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_pathfind.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_pathfind.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_pathfind.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_pathfind.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_pathfind.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_PATHFIND +# +# DESCRIPTION +# +# Not all systems have pathfind(3). See if we need to substitute. To make +# this work, you have to do horrible things. See the doc for +# AX_CHECK_STRCSPN. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_PATHFIND], [AX_CHECK_PATHFIND]) +AC_DEFUN([AX_CHECK_PATHFIND],[ + AC_MSG_CHECKING([whether pathfind(3) works]) + AC_CACHE_VAL([ax_cv_pathfind],[ + AC_TRY_RUN([#include +#include +int main (int argc, char** argv) { + char* pz = pathfind( getenv( "PATH" ), "sh", "x" ); + return (pz == 0) ? 1 : 0; +}],[ax_cv_pathfind=yes],[ax_cv_pathfind=no],[ax_cv_pathfind=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_pathfind]) + if test x$ax_cv_pathfind = xyes + then + AC_DEFINE(HAVE_PATHFIND, 1, + [Define this if pathfind(3) works]) + else + if test x$ac_cv_lib_gen_pathfind = xyes + then : + else + COMPATOBJ="$COMPATOBJ pathfind.lo" + fi + fi +]) # end of AC_DEFUN of AX_CHECK_PATHFIND diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_pathname_style.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_pathname_style.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_pathname_style.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_pathname_style.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_check_pathname_style.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CHECK_PATHNAME_STYLE_DOS +# +# DESCRIPTION +# +# Check if host OS uses DOS-style pathnames. This includes the use of +# drive letters and backslashes. Under DOS, Windows, and OS/2, defines +# HAVE_PATHNAME_STYLE_DOS and PATH_SEPARATOR to ';'. Otherwise, defines +# PATH_SEPARATOR to ':'. +# +# This macro depends on the AC_CANONICAL_HOST. +# +# Use for enabling code to handle drive letters, backslashes in filenames +# and semicolons in the PATH. +# +# LICENSE +# +# Copyright (c) 2008 Mark Elbrecht +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([ACX_CHECK_PATHNAME_STYLE], [AX_CHECK_PATHNAME_STYLE]) +AC_DEFUN([AX_CHECK_PATHNAME_STYLE_DOS], +[AC_MSG_CHECKING(for Windows and DOS and OS/2 style pathnames) +AC_CACHE_VAL(ax_cv_pathname_style_dos, +[AC_REQUIRE([AC_CANONICAL_HOST]) + +ax_cv_pathname_style_dos="no" +case ${host_os} in + *djgpp | *mingw32* | *emx*) ax_cv_pathname_style_dos="yes" ;; +esac +]) +AC_MSG_RESULT($ax_cv_pathname_style_dos) +if test "$ax_cv_pathname_style_dos" = "yes"; then + AC_DEFINE(HAVE_PATHNAME_STYLE_DOS,,[defined if running on a system with dos style paths]) + AC_DEFINE(PATH_SEPARATOR, ';') +else + AC_DEFINE(PATH_SEPARATOR, ':') +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_pgsql_db.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_pgsql_db.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_pgsql_db.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_pgsql_db.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,106 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_pgsql_db.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_PGSQL_DB([DB], [USER], [HOST], [PASSWORD], [ACTION_IF_FAILED], [ACTION_IF_OK]) +# +# DESCRIPTION +# +# This macro checks wether we can connect to a PostgreSQL server with the +# given data. The macro AX_PROG_PGCLIENT is required by this one. The +# variable $pgclient_call is set for later use in Makefiles, if you'd like +# to make use of this, you must do +# +# AC_SUBST(pgclient_call) +# +# after having called AX_CHECK_PGSQL_DB. You can then do something like +# the following in your Makefile.am: +# +# @pgclient_call@ -f file.sql +# +# If you want the user to set the data, you should support something like +# these configure options: +# +# AC_ARG_WITH(pgsql-host, +# [ --with-pgsql-host=HOST server is running on HOST @<:@local socket@:>@], +# [pg_host=$withval], [pg_host=]) +# +# AC_ARG_WITH(pgsql-db, +# [ --with-pgsql-db=DATABASE use DATABASE @<:@tarantoola@:>@], +# [pg_db=$withval], [pg_db=tarantoola]) +# +# AC_ARG_WITH(pgsql-user, +# [ --with-pgsql-user=USER use USER @<:@postgres@:>@], +# [pg_user=$withval], [pg_user=postgres]) +# +# AC_ARG_WITH(pgsql-password, +# [ --with-pgsql-password=PASSWORD use PASSWORD @<:@none@:>@], +# [pg_password=$withval], [pg_password=""]) +# +# You can then call the macro like this: +# +# AX_CHECK_PGSQL_DB([$pg_db], [$pg_user], [$pg_host], [$pg_password], [AC_MSG_ERROR([We need a database connection!])]) +# +# LICENSE +# +# Copyright (c) 2008 Moritz Sinn +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([MS_CHECK_PGSQL_DB], [AX_CHECK_PGSQL_DB]) +AC_DEFUN([AX_CHECK_PGSQL_DB], [ +AC_REQUIRE([AX_PROG_PGCLIENT]) +AC_MSG_CHECKING([for PostgreSQL db $1 (user: $2, host: $3)]) + +pgclient_call="$pgclient" + +if test "x$1" != "x"; then + pgclient_call="$pgclient_call dbname=$1"; +fi +if test "x$2" != "x"; then + pgclient_call="$pgclient_call user=$2"; +fi +if test "x$3" != "x"; then + pgclient_call="$pgclient_call host=$3"; +fi +if test "x$4" != "x"; then + pgclient_call="$pgclient_call password=$4"; +fi + +$pgclient_call -c 'SELECT 1' > /dev/null 2>&1 +if test "x$?" = "x0"; then + AC_MSG_RESULT([yes]) + $6 +else + AC_MSG_RESULT([no]) + $5 +fi; +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_posix_regcomp.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_posix_regcomp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_posix_regcomp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_posix_regcomp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,46 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_posix_regcomp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_POSIX_REGCOMP +# +# DESCRIPTION +# +# Check that the POSIX compliant regular expression compiler is available +# in the POSIX specified manner, and it works. If it fails, we have a +# backup -- use gnu-regex. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_POSIX_REGCOMP], [AX_CHECK_POSIX_REGCOMP]) +AC_DEFUN([AX_CHECK_POSIX_REGCOMP],[ + AC_MSG_CHECKING([whether POSIX compliant regcomp()/regexec()]) + AC_CACHE_VAL([ax_cv_posix_regcomp],[ + AC_TRY_RUN([#include +#include +int main() { + int flags = REG_EXTENDED|REG_ICASE|REG_NEWLINE; + regex_t re; + if (regcomp( &re, "^.*$", flags ) != 0) + return 1; + return regcomp( &re, "|no.*", flags ); }],[ax_cv_posix_regcomp=yes],[ax_cv_posix_regcomp=no],[ax_cv_posix_regcomp=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_posix_regcomp]) + if test x$ax_cv_posix_regcomp = xyes + then + AC_DEFINE(HAVE_POSIX_REGCOMP, 1, + [Define this if POSIX compliant regcomp()/regexec()]) + fi +]) # end of AC_DEFUN of AX_CHECK_POSIX_REGCOMP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_posix_sysinfo.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_posix_sysinfo.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_posix_sysinfo.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_posix_sysinfo.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_posix_sysinfo.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_POSIX_SYSINFO +# +# DESCRIPTION +# +# Check that the POSIX compliant sysinfo(2) call works properly. Linux has +# its own weirdo alternative. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_POSIX_SYSINFO], [AX_CHECK_POSIX_SYSINFO]) +AC_DEFUN([AX_CHECK_POSIX_SYSINFO],[ + AC_MSG_CHECKING([whether sysinfo(2) is POSIX]) + AC_CACHE_VAL([ax_cv_posix_sysinfo],[ + AC_TRY_RUN([#include +int main() { char z[ 256 ]; +long sz = sysinfo( SI_SYSNAME, z, sizeof( z )); +return (sz > 0) ? 0 : 1; }],[ax_cv_posix_sysinfo=yes],[ax_cv_posix_sysinfo=no],[ax_cv_posix_sysinfo=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_posix_sysinfo]) + if test x$ax_cv_posix_sysinfo = xyes + then + AC_DEFINE(HAVE_POSIX_SYSINFO, 1, + [Define this if sysinfo(2) is POSIX]) + fi +]) # end of AC_DEFUN of AX_CHECK_POSIX_SYSINFO diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_postgres_db.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_postgres_db.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_postgres_db.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_postgres_db.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,109 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_postgres_db.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_POSTGRES_DB([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro tries to find the headers and libraries for the PostgreSQL +# database to build client applications. +# +# If includes are found, the variable PQINCPATH will be set, and +# have_pqinc will be 'yes'. If libraries are found, the variable PQLIBPATH +# will be set, and have_pqlib will be 'yes'. If both PQINCPATH and +# PQLIBPATH are found, HAVE_LIBPQ will be set to 'yes' (and AC_DEFINEd), +# and -lpq will be added to the beginning of LIBS. If their respective +# conditions are not met, have_pqinc, have_pqlib, HAVE_LIBPQ, will be +# 'no'. +# +# This macro does fails if either the headers or the library are not +# found, unless ACTION-IF-NOT-FOUND is not empty. When both are found, +# ACTION-IF-FOUND, if defined, is executed after the variables have been +# defined. If --with-pgsql=no (or equivalents) is given, nothing happens. +# +# An automake conditional can be subsequently defined as +# +# AM_CONDITIONAL([HAVE_LIBPQ], [test x$HAVE_LIBPQ = x$yes]) +# +# in configure.ac. +# +# LICENSE +# +# Copyright (c) 2008 Christian Toepp +# Copyright (c) 2012 Olivier Mehani +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AU_ALIAS([CT_CHECK_POSTGRES_DB], [AX_CHECK_POSTGRES_DB]) +AC_DEFUN([AX_CHECK_POSTGRES_DB], [ + +pushdef([ACTION_IF_FOUND],$1) +pushdef([ACTION_IF_NOT_FOUND],$2) + +AC_ARG_WITH(pgsql, + [AS_HELP_STRING([--with-pgsql[[=PREFIX]]], + [Prefix of your PostgreSQL installation @<:@PREFIX@:>@])], + [pg_prefix=$withval], [pg_prefix=]) +AC_ARG_WITH(pgsql-inc, + [AS_HELP_STRING([--with-pgsql-inc=[[PATH]]], + [Path to the include directory of PostgreSQL @<:@INCLUDEDIR@:>@])], + [pg_inc=$withval], [pg_inc=]) +AC_ARG_WITH(pgsql-lib, + [AS_HELP_STRING([--with-pgsql-lib=[[PATH]]], + [Path to the libraries of PostgreSQL @<:@LIBDIR@:>@])], + [pg_lib=$withval], [pg_lib=]) + +have_pqinc=no +have_pqlib=no +HAVE_LIBPQ=no + +AS_IF([test "$pg_prefix" != "no"],[ + AS_IF([test "$pg_prefix" != "yes" && test "$pg_prefix" != ""], [ + PQINCPATH="-I$pg_prefix/include $PQINCPATH" + PQLIBPATH="-L$pg_prefix/lib $PQLIBPATH" + ]) + AS_IF([test "$pg_inc" != ""], [PQINCPATH="-I$pg_inc $PQINCPATH"]) + AS_IF([test "$pg_lib" != ""], [PQLIBPATH="-L$pg_lib $PQLIBPATH"]) + + oldCPPFLAGS=$CPPFLAGS + oldLDFLAGS=$LDFLAGS + + CPPFLAGS="$PQINCPATH $CPPFLAGS" + LDFLAGS="$PQLIBPATH $LDFLAGS" + + AC_CHECK_HEADER([libpq-fe.h], [have_pqinc=yes]) + AC_CHECK_LIB([pq], [PQconnectdb], [ + dnl We only search for libpq, so we know why we're here + LIBPQ_LIBS=-lpq + have_pqlib=yes + ]) + + HAVE_LIBPQ=`(test x$have_pqinc = xyes && test x$have_pqlib = xyes && echo yes) || echo no` + + CPPFLAGS=$oldCPPFLAGS + LDFLAGS=$oldLDFLAGS + + AC_SUBST(PQINCPATH) + AC_SUBST(PQLIBPATH) + AC_SUBST(LIBPQ_LIBS) + + AS_IF([test x$HAVE_LIBPQ = xyes],[ + AC_DEFINE([HAVE_LIBPQ], [1], [Define if libpq is installed]) + ACTION_IF_FOUND + ], + [m4_ifset([ACTION_IF_NOT_FOUND],[ACTION_IF_NOT_FOUND], + [AC_MSG_ERROR(some support files for PostgreSQL were missing)])]) +]) + +popdef([ACTION_IF_FOUND]) +popdef([ACTION_IF_NOT_FOUND]) + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_preproc_flag.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_preproc_flag.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_preproc_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_preproc_flag.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_preproc_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_PREPROC_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's +# preprocessor or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the preprocessor's default +# flags when the check is done. The check is thus made with the flags: +# "CPPFLAGS EXTRA-FLAGS FLAG". This can for example be used to force the +# preprocessor to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_PREPROC_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{COMPILE,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2011 Maarten Bosmans +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_PREPROC_FLAG], +[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]cppflags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG preprocessor accepts $1], CACHEVAR, [ + ax_check_save_flags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $4 $1" + AC_PREPROC_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + CPPFLAGS=$ax_check_save_flags]) +AS_VAR_IF(CACHEVAR,yes, + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_PREPROC_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_rqrd_class.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_rqrd_class.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_rqrd_class.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_rqrd_class.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,62 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_rqrd_class.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_RQRD_CLASS +# +# DESCRIPTION +# +# AX_CHECK_RQRD_CLASS tests the existence of a given Java class, either in +# a jar or in a '.class' file and fails if it doesn't exist. Its success +# or failure can depend on a proper setting of the CLASSPATH env. +# variable. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_RQRD_CLASS], [AX_CHECK_RQRD_CLASS]) +AC_DEFUN([AX_CHECK_RQRD_CLASS],[ +CLASS=`echo $1|sed 's/\./_/g'` +AC_CHECK_CLASS($1) +if test "$HAVE_LAST_CLASS" = "no"; then + AC_MSG_ERROR([Required class $1 missing, exiting.]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_sign.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_sign.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_sign.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_sign.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,54 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_sign.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_SIGN (TYPE, [ACTION-IF-SIGNED], [ACTION-IF-UNSIGNED], [INCLUDES]) +# +# DESCRIPTION +# +# Checks whether TYPE is signed or not. If no INCLUDES are specified, the +# default includes are used. If ACTION-IF-SIGNED is given, it is +# additional shell code to execute when the type is signed. If +# ACTION-IF-UNSIGNED is given, it is executed when the type is unsigned. +# +# This macro assumes that the type exists. Therefore the existence of the +# type should be checked before calling this macro. For example: +# +# AC_CHECK_HEADERS([wchar.h]) +# AC_CHECK_TYPE([wchar_t],,[ AC_MSG_ERROR([Type wchar_t not found.]) ]) +# AX_CHECK_SIGN([wchar_t], +# [ AC_DEFINE(WCHAR_T_SIGNED, 1, [Define if wchar_t is signed]) ], +# [ AC_DEFINE(WCHAR_T_UNSIGNED, 1, [Define if wchar_t is unsigned]) ], [ +# #ifdef HAVE_WCHAR_H +# #include +# #endif +# ]) +# +# LICENSE +# +# Copyright (c) 2008 Ville Laurikari +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([VL_CHECK_SIGN], [AX_CHECK_SIGN]) +AC_DEFUN([AX_CHECK_SIGN], [ + typename=`echo $1 | sed "s/@<:@^a-zA-Z0-9_@:>@/_/g"` + AC_CACHE_CHECK([whether $1 is signed], ax_cv_decl_${typename}_signed, [ + AC_TRY_COMPILE([$4], + [ int foo @<:@ 1 - 2 * !((($1) -1) < 0) @:>@ ], + [ eval "ax_cv_decl_${typename}_signed=\"yes\"" ], + [ eval "ax_cv_decl_${typename}_signed=\"no\"" ])]) + symbolname=`echo $1 | sed "s/@<:@^a-zA-Z0-9_@:>@/_/g" | tr "a-z" "A-Z"` + if eval "test \"\${ax_cv_decl_${typename}_signed}\" = \"yes\""; then + $2 + elif eval "test \"\${ax_cv_decl_${typename}_signed}\" = \"no\""; then + $3 + fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_strcspn.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_strcspn.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_strcspn.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_strcspn.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,57 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_strcspn.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_STRCSPN +# +# DESCRIPTION +# +# Not all systems have strcspn(3). See if we need to substitute. To make +# this work, you have to do horrible things. In one of your Makefile.am +# files, you must make an explicit rule to make this object. It should +# look like this: +# +# strcspn.lo : $(top_srcdir)/compat/strcspn.c +# $(LTCOMPILE) -o $@ -c $(top_srcdir)/compat/strcspn.c +# +# and you must include ``@COMPATOBJ@'' in a LIBADD somewhere and, finally, +# you must add another artificial dependency, something like: +# +# makeshell.lo : genshell.c @COMPATOBJ@ +# +# It is all pretty horrific, but I have found nothing else that works. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_STRCSPN], [AX_CHECK_STRCSPN]) +AC_DEFUN([AX_CHECK_STRCSPN],[ + AC_MSG_CHECKING([whether strcspn matches prototype and works]) + AC_CACHE_VAL([ax_cv_strcspn],[ + AC_TRY_RUN([#include +int main (int argc, char** argv) { + char zRej[] = "reject"; + char zAcc[] = "a-ok-eject"; + return strcspn( zAcc, zRej ) - 5; +}],[ax_cv_strcspn=yes],[ax_cv_strcspn=no],[ax_cv_strcspn=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_strcspn]) + if test x$ax_cv_strcspn = xyes + then + AC_DEFINE(HAVE_STRCSPN, 1, + [Define this if strcspn matches prototype and works]) + else + COMPATOBJ="$COMPATOBJ strcspn.lo" + fi +]) # end of AC_DEFUN of AX_CHECK_STRCSPN diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_strftime.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_strftime.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_strftime.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_strftime.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_strftime.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_STRFTIME +# +# DESCRIPTION +# +# Check for existence and functioning of strftime routine. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_STRFTIME], [AX_CHECK_STRFTIME]) +AC_DEFUN([AX_CHECK_STRFTIME],[ + AC_MSG_CHECKING([whether strftime() works]) + AC_CACHE_VAL([ax_cv_strftime],[ + AC_TRY_RUN([#include +char t_buf[ 64 ]; +int main() { + static const char z[] = "Thursday Aug 28 240"; + struct tm tm; + tm.tm_sec = 36; /* seconds after the minute [0, 61] */ + tm.tm_min = 44; /* minutes after the hour [0, 59] */ + tm.tm_hour = 12; /* hour since midnight [0, 23] */ + tm.tm_mday = 28; /* day of the month [1, 31] */ + tm.tm_mon = 7; /* months since January [0, 11] */ + tm.tm_year = 86; /* years since 1900 */ + tm.tm_wday = 4; /* days since Sunday [0, 6] */ + tm.tm_yday = 239; /* days since January 1 [0, 365] */ + tm.tm_isdst = 1; /* flag for daylight savings time */ + strftime( t_buf, sizeof( t_buf ), "%A %b %d %j", &tm ); + return (strcmp( t_buf, z ) != 0); }],[ax_cv_strftime=yes],[ax_cv_strftime=no],[ax_cv_strftime=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_strftime]) + if test x$ax_cv_strftime = xyes + then + AC_DEFINE(HAVE_STRFTIME, 1, + [Define this if strftime() works]) + fi +]) # end of AC_DEFUN of AX_CHECK_STRFTIME diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_struct_for.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_struct_for.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_struct_for.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_struct_for.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,57 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_struct_for.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_STRUCT_FOR(INCLUDES,STRUCT,MEMBER,DEFINE,[no]) +# +# DESCRIPTION +# +# Checks STRUCT for MEMBER and defines DEFINE if found. +# +# LICENSE +# +# Copyright (c) 2008 Wes Hardaker +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_CHECK_STRUCT_FOR], [AX_CHECK_STRUCT_FOR]) +AC_DEFUN([AX_CHECK_STRUCT_FOR],[ +ac_safe_struct=`echo "$2" | sed 'y%./+-%__p_%'` +ac_safe_member=`echo "$3" | sed 'y%./+-%__p_%'` +ac_safe_all="ac_cv_struct_${ac_safe_struct}_has_${ac_safe_member}" +changequote(, )dnl + ac_uc_define=STRUCT_`echo "${ac_safe_struct}_HAS_${ac_safe_member}" | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` +changequote([, ])dnl + +AC_MSG_CHECKING([for $2.$3]) +AC_CACHE_VAL($ac_safe_all, +[ +if test "x$4" = "x"; then + defineit="= 0" +elif test "x$4" = "xno"; then + defineit="" +else + defineit="$4" +fi +AC_TRY_COMPILE([ +$1 +],[ +struct $2 testit; +testit.$3 $defineit; +], eval "${ac_safe_all}=yes", eval "${ac_safe_all}=no" ) +]) + +if eval "test \"x$`echo ${ac_safe_all}`\" = \"xyes\""; then + AC_MSG_RESULT(yes) + AC_DEFINE_UNQUOTED($ac_uc_define) +else + AC_MSG_RESULT(no) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_symbol.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_symbol.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_symbol.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_symbol.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,84 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_symbol.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_SYMBOL(SYMBOL, HEADER... [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# A wrapper around AC_EGREP_HEADER. The shellvar $ac_found will hold the +# HEADER-name that had been containing the symbol. This value is shown to +# the user. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_SYMBOL], [AX_CHECK_SYMBOL]) +AC_DEFUN([AX_CHECK_SYMBOL], +[AC_MSG_CHECKING([for $1 in $2]) +AC_CACHE_VAL(ac_cv_func_$1, +[AC_REQUIRE_CPP()dnl +changequote(, )dnl +symbol="[^a-zA-Z_0-9]$1[^a-zA-Z_0-9]" +changequote([, ])dnl +ac_found=no +for ac_header in $2 ; do + ac_safe=`echo "$ac_header" | sed 'y%./+-%__p_%' ` + if test $ac_found != "yes" ; then + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + AC_EGREP_HEADER( $symbol, $ac_header, [ac_found="$ac_header"] ) + fi + fi +done +if test "$ac_found" != "no" ; then + AC_MSG_RESULT($ac_found) + ifelse([$3], , :, [$3]) +else + AC_MSG_RESULT(no) + ifelse([$4], , , [$4 +])dnl +fi +])]) + +dnl AX_CHECK_SYMBOLS( symbol..., header... [, action-if-found [, action-if-not-found]]) +AC_DEFUN([AX_CHECK_SYMBOLS], +[for ac_func in $1 +do +P4_CHECK_SYMBOL($ac_func, $2, +[changequote(, )dnl + ac_tr_func=HAVE_`echo $ac_func | sed -e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:' -e 's:[[^A-Z0-9]]:_:'` +changequote([, ])dnl + AC_DEFINE_UNQUOTED($ac_tr_func) $2], $3)dnl +done +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_sys_siglist.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_sys_siglist.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_sys_siglist.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_sys_siglist.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_sys_siglist.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_SYS_SIGLIST +# +# DESCRIPTION +# +# Check for existence of global sys_siglist[]. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_SYS_SIGLIST], [AX_CHECK_SYS_SIGLIST]) +AC_DEFUN([AX_CHECK_SYS_SIGLIST],[ + AC_MSG_CHECKING([whether there is a global text array sys_siglist]) + AC_CACHE_VAL([ax_cv_sys_siglist],[ + AC_TRY_RUN([#include +int main() { + const char* pz = sys_siglist[1]; + return (pz != 0) ? 0 : 1; }],[ax_cv_sys_siglist=yes],[ax_cv_sys_siglist=no],[ax_cv_sys_siglist=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_sys_siglist]) + if test x$ax_cv_sys_siglist = xyes + then + AC_DEFINE(HAVE_SYS_SIGLIST, 1, + [Define this if there is a global text array sys_siglist]) + NEED_SYS_SIGLIST=false + else + NEED_SYS_SIGLIST=true + fi + AC_SUBST(NEED_SYS_SIGLIST) +]) # end of AC_DEFUN of AX_CHECK_SYS_SIGLIST diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_typedef.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_typedef.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_typedef.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_typedef.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,76 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_typedef.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_TYPEDEF(TYPEDEF, HEADER [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]) +# +# DESCRIPTION +# +# Check if the given typedef-name is recognized as a type. The trick is to +# use a sizeof(TYPEDEF) and see if the compiler is happy with that. +# +# This can be thought of as a mixture of AC_CHECK_TYPE(TYPEDEF,DEFAULT) +# and AC_CHECK_LIB(LIBRARY,FUNCTION,ACTION-IF-FOUND,ACTION-IF-NOT-FOUND). +# +# A convenience macro AX_CHECK_TYPEDEF_ is provided that will not emit any +# message to the user - it just executes one of the actions. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_TYPEDEF], [AX_CHECK_TYPEDEF]) +AC_DEFUN([AX_CHECK_TYPEDEF_], +[dnl +ac_lib_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` +AC_CACHE_VAL(ac_cv_lib_$ac_lib_var, +[ eval "ac_cv_type_$ac_lib_var='not-found'" + ac_cv_check_typedef_header=`echo ifelse([$2], , stddef.h, $2)` + AC_TRY_COMPILE( [#include <$ac_cv_check_typedef_header>], + [int x = sizeof($1); x = x;], + eval "ac_cv_type_$ac_lib_var=yes" , + eval "ac_cv_type_$ac_lib_var=no" ) + if test `eval echo '$ac_cv_type_'$ac_lib_var` = "no" ; then + ifelse([$4], , :, $4) + else + ifelse([$3], , :, $3) + fi +])]) + +dnl AX_CHECK_TYPEDEF(TYPEDEF, HEADER [, ACTION-IF-FOUND, +dnl [, ACTION-IF-NOT-FOUND ]]) +AC_DEFUN([AX_CHECK_TYPEDEF], +[dnl + AC_MSG_CHECKING([for $1 in $2]) + AX_CHECK_TYPEDEF_($1,$2,AC_MSG_RESULT(yes),AC_MSG_RESULT(no))dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_uname_syscall.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_uname_syscall.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_uname_syscall.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_uname_syscall.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_uname_syscall.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_UNAME_SYSCALL +# +# DESCRIPTION +# +# Check that the POSIX compliant uname(2) call works properly. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AG_CHECK_UNAME_SYSCALL], [AX_CHECK_UNAME_SYSCALL]) +AC_DEFUN([AX_CHECK_UNAME_SYSCALL],[ + AC_MSG_CHECKING([whether uname(2) is POSIX]) + AC_CACHE_VAL([ax_cv_uname_syscall],[ + AC_TRY_RUN([#include +int main() { struct utsname unm; +return uname( &unm ); }],[ax_cv_uname_syscall=yes],[ax_cv_uname_syscall=no],[ax_cv_uname_syscall=no] + ) # end of TRY_RUN]) # end of CACHE_VAL + + AC_MSG_RESULT([$ax_cv_uname_syscall]) + if test x$ax_cv_uname_syscall = xyes + then + AC_DEFINE(HAVE_UNAME_SYSCALL, 1, + [Define this if uname(2) is POSIX]) + fi +]) # end of AC_DEFUN of AX_CHECK_UNAME_SYSCALL diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_user.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_user.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_user.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_user.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_user.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_USER +# +# DESCRIPTION +# +# Check if the specified UNIX user exists, if yes set your environment +# variable to that username else unset your environment variable +# +# Example: +# +# AX_CHECK_USER(USER, [gleensalmon]) +# if test x$USER = xgleensalmon; then +# bla..bla..bla.. +# else +# bla..bla..bla.. +# fi +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# USER_HOME = home directory of user, written in /etc/passwd +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CHECK_USER], [AX_CHECK_USER]) +AC_DEFUN([AX_CHECK_USER],[ +AC_MSG_CHECKING([for user $2]) +if grep ^$2: /etc/passwd > /dev/null; then + $1=$2 + USER_HOME=`grep ^$2: /etc/passwd | sed "s/^\([[^:]]*:\)\{5\}\([[^:]]*\):[[^:]]*$/\2/"` + AC_MSG_RESULT([yes]) +else + unset $1 + unset USER_HOME + AC_MSG_RESULT([no]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_vscript.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_vscript.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_vscript.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_vscript.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,142 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_vscript.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_VSCRIPT +# +# DESCRIPTION +# +# Check whether the linker supports version scripts. Version scripts are +# used when building shared libraries to bind symbols to version nodes +# (helping to detect incompatibilities) or to limit the visibility of +# non-public symbols. +# +# Output: +# +# If version scripts are supported, VSCRIPT_LDFLAGS will contain the +# appropriate flag to pass to the linker. On GNU systems this would +# typically be "-Wl,--version-script", and on Solaris it would typically +# be "-Wl,-M". +# +# Two Automake conditionals are also set: +# +# HAVE_VSCRIPT is true if the linker supports version scripts with +# entries that use simple wildcards, like "local: *". +# +# HAVE_VSCRIPT_COMPLEX is true if the linker supports version scripts with +# pattern matching wildcards, like "global: Java_*". +# +# On systems that do not support symbol versioning, such as Mac OS X, both +# conditionals will be false. They will also be false if the user passes +# "--disable-symvers" on the configure command line. +# +# Example: +# +# configure.ac: +# +# AX_CHECK_VSCRIPT +# +# Makefile.am: +# +# if HAVE_VSCRIPT +# libfoo_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libfoo.map +# endif +# +# if HAVE_VSCRIPT_COMPLEX +# libbar_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbar.map +# endif +# +# LICENSE +# +# Copyright (c) 2014 Kevin Cernekee +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +# _AX_CHECK_VSCRIPT(flag, global-sym, action-if-link-succeeds, [junk-file=no]) +AC_DEFUN([_AX_CHECK_VSCRIPT], [ + AC_LANG_PUSH([C]) + ax_check_vscript_save_flags="$LDFLAGS" + echo "V1 { global: $2; local: *; };" > conftest.map + AS_IF([test x$4 = xyes], [ + echo "{" >> conftest.map + ]) + LDFLAGS="$LDFLAGS -Wl,$1,conftest.map" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[int show, hide;]], [])], [$3]) + LDFLAGS="$ax_check_vscript_save_flags" + rm -f conftest.map + AC_LANG_POP([C]) +]) dnl _AX_CHECK_VSCRIPT + +AC_DEFUN([AX_CHECK_VSCRIPT], [ + + AC_ARG_ENABLE([symvers], + AS_HELP_STRING([--disable-symvers], + [disable library symbol versioning [default=auto]]), + [want_symvers=$enableval], + [want_symvers=yes] + ) + + AS_IF([test x$want_symvers = xyes], [ + + dnl First test --version-script and -M with a simple wildcard. + + AC_CACHE_CHECK([linker version script flag], ax_cv_check_vscript_flag, [ + ax_cv_check_vscript_flag=unsupported + _AX_CHECK_VSCRIPT([--version-script], [show], [ + ax_cv_check_vscript_flag=--version-script + ]) + AS_IF([test x$ax_cv_check_vscript_flag = xunsupported], [ + _AX_CHECK_VSCRIPT([-M], [show], [ax_cv_check_vscript_flag=-M]) + ]) + + dnl The linker may interpret -M (no argument) as "produce a load map." + dnl If "-M conftest.map" doesn't fail when conftest.map contains + dnl obvious syntax errors, assume this is the case. + + AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [ + _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [show], + [ax_cv_check_vscript_flag=unsupported], [yes]) + ]) + ]) + + dnl If the simple wildcard worked, retest with a complex wildcard. + + AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [ + ax_check_vscript_flag=$ax_cv_check_vscript_flag + AC_CACHE_CHECK([if version scripts can use complex wildcards], + ax_cv_check_vscript_complex_wildcards, [ + ax_cv_check_vscript_complex_wildcards=no + _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [sh*], [ + ax_cv_check_vscript_complex_wildcards=yes]) + ]) + ax_check_vscript_complex_wildcards="$ax_cv_check_vscript_complex_wildcards" + ], [ + ax_check_vscript_flag= + ax_check_vscript_complex_wildcards=no + ]) + ], [ + AC_MSG_CHECKING([linker version script flag]) + AC_MSG_RESULT([disabled]) + + ax_check_vscript_flag= + ax_check_vscript_complex_wildcards=no + ]) + + AS_IF([test x$ax_check_vscript_flag != x], [ + VSCRIPT_LDFLAGS="-Wl,$ax_check_vscript_flag" + AC_SUBST([VSCRIPT_LDFLAGS]) + ]) + + AM_CONDITIONAL([HAVE_VSCRIPT], + [test x$ax_check_vscript_flag != x]) + AM_CONDITIONAL([HAVE_VSCRIPT_COMPLEX], + [test x$ax_check_vscript_complex_wildcards = xyes]) + +]) dnl AX_CHECK_VSCRIPT diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_x86_features.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_x86_features.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_x86_features.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_x86_features.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,77 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_x86_features.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_X86_FEATURES([ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks if the host cpu supports various x86 instruction set, the +# instructions that will get tested are "mmx, popcnt, sse, sse2, sse3, +# sse4.1, sse4.2, sse4a, avx, avx2, avx512f, fma, fma4, bmi, bmi2". If the +# instruction set is supported by the host cpu, the C preprocessor macro +# HAVE_XXX_INSTRUCTIONS is set to 1. The XXX is up-cased instruction case +# with dot replaced by underscore. For example, the test for "sse4.2" +# would export HAVE_SSE4_2_INSTRUCTIONS=1. Also the compiler flag +# "-msse4.2" would be added to X86_FEATURE_CFLAGS variable, that can be +# obtained in Makefile.am using @X86_FEATURE_CFLAGS@. +# +# If any of the test for the instruction set were succeeded, the configure +# script would run ACTION-IF-FOUND if it is specified, or append +# X86_FEATURE_CFLAGS to CFLAGS. If none of the instruction were found, +# ACTION-IF-NOT-FOUND hook is triggered. +# +# This macro requires gcc extended builtin function "__builtin_cpu_init" +# and "__builtin_cpu_supports" to detect the cpu features. It will error +# out if the compiler doesn't has these builtins. +# +# See also AX_GCC_X86_CPU_SUPPORTS, which is the actual macro that perform +# the checks for the instruction sets. +# +# LICENSE +# +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CHECK_X86_FEATURES], + [m4_foreach_w( + [ax_x86_feature], + [mmx popcnt sse sse2 sse3 sse4.1 sse4.2 sse4a avx avx2 avx512f fma fma4 bmi bmi2], + [AX_GCC_X86_CPU_SUPPORTS(ax_x86_feature, + [X86_FEATURE_CFLAGS="$X86_FEATURE_CFLAGS -m[]ax_x86_feature"], + []) + ]) + AC_SUBST([X86_FEATURE_CFLAGS]) + m4_ifval([$1],[$1], + [CFLAGS="$CFLAGS $X86_FEATURE_CFLAGS"]) + $2 +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_zlib.m4 projectm-3.1.0/m4/autoconf-archive/ax_check_zlib.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_check_zlib.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_check_zlib.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,142 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_check_zlib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_ZLIB([action-if-found], [action-if-not-found]) +# +# DESCRIPTION +# +# This macro searches for an installed zlib library. If nothing was +# specified when calling configure, it searches first in /usr/local and +# then in /usr, /opt/local and /sw. If the --with-zlib=DIR is specified, +# it will try to find it in DIR/include/zlib.h and DIR/lib/libz.a. If +# --without-zlib is specified, the library is not searched at all. +# +# If either the header file (zlib.h) or the library (libz) is not found, +# shell commands 'action-if-not-found' is run. If 'action-if-not-found' is +# not specified, the configuration exits on error, asking for a valid zlib +# installation directory or --without-zlib. +# +# If both header file and library are found, shell commands +# 'action-if-found' is run. If 'action-if-found' is not specified, the +# default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends +# '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls +# AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition +# for this symbol in a config.h file. Sample usage in a C/C++ source is as +# follows: +# +# #ifdef HAVE_LIBZ +# #include +# #endif /* HAVE_LIBZ */ +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary +# Copyright (c) 2010 Bastien Chevreux +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 15 + +AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB]) +AC_DEFUN([AX_CHECK_ZLIB], +# +# Handle user hints +# +[AC_MSG_CHECKING(if zlib is wanted) +zlib_places="/usr/local /usr /opt/local /sw" +AC_ARG_WITH([zlib], +[ --with-zlib=DIR root directory path of zlib installation @<:@defaults to + /usr/local or /usr if not found in /usr/local@:>@ + --without-zlib to disable zlib usage completely], +[if test "$withval" != no ; then + AC_MSG_RESULT(yes) + if test -d "$withval" + then + zlib_places="$withval $zlib_places" + else + AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) + fi +else + zlib_places= + AC_MSG_RESULT(no) +fi], +[AC_MSG_RESULT(yes)]) + +# +# Locate zlib, if wanted +# +if test -n "${zlib_places}" +then + # check the user supplied or any other more or less 'standard' place: + # Most UNIX systems : /usr/local and /usr + # MacPorts / Fink on OSX : /opt/local respectively /sw + for ZLIB_HOME in ${zlib_places} ; do + if test -f "${ZLIB_HOME}/include/zlib.h"; then break; fi + ZLIB_HOME="" + done + + ZLIB_OLD_LDFLAGS=$LDFLAGS + ZLIB_OLD_CPPFLAGS=$CPPFLAGS + if test -n "${ZLIB_HOME}"; then + LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + fi + AC_LANG_SAVE + AC_LANG_C + AC_CHECK_LIB([z], [inflateEnd], [zlib_cv_libz=yes], [zlib_cv_libz=no]) + AC_CHECK_HEADER([zlib.h], [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no]) + AC_LANG_RESTORE + if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes" + then + # + # If both library and header were found, action-if-found + # + m4_ifblank([$1],[ + CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" + LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" + LIBS="-lz $LIBS" + AC_DEFINE([HAVE_LIBZ], [1], + [Define to 1 if you have `z' library (-lz)]) + ],[ + # Restore variables + LDFLAGS="$ZLIB_OLD_LDFLAGS" + CPPFLAGS="$ZLIB_OLD_CPPFLAGS" + $1 + ]) + else + # + # If either header or library was not found, action-if-not-found + # + m4_default([$2],[ + AC_MSG_ERROR([either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib]) + ]) + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_long_long.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_long_long.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_long_long.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_long_long.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_long_long.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C_LONG_LONG +# +# DESCRIPTION +# +# Provides a test for the existence of the long long int type and defines +# HAVE_LONG_LONG if it is found. +# +# LICENSE +# +# Copyright (c) 2008 Caolan McNamara +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_C_LONG_LONG], [AX_C_LONG_LONG]) +AC_DEFUN([AX_C_LONG_LONG], +[AC_CACHE_CHECK(for long long int, ac_cv_c_long_long, +[if test "$GCC" = yes; then + ac_cv_c_long_long=yes + else + AC_TRY_COMPILE(,[long long int i;], + ac_cv_c_long_long=yes, + ac_cv_c_long_long=no) + fi]) + if test $ac_cv_c_long_long = yes; then + AC_DEFINE(HAVE_LONG_LONG, 1, [compiler understands long long]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_code_coverage.m4 projectm-3.1.0/m4/autoconf-archive/ax_code_coverage.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_code_coverage.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_code_coverage.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,264 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CODE_COVERAGE() +# +# DESCRIPTION +# +# Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS, +# CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included +# in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every +# build target (program or library) which should be built with code +# coverage support. Also defines CODE_COVERAGE_RULES which should be +# substituted in your Makefile; and $enable_code_coverage which can be +# used in subsequent configure output. CODE_COVERAGE_ENABLED is defined +# and substituted, and corresponds to the value of the +# --enable-code-coverage option, which defaults to being disabled. +# +# Test also for gcov program and create GCOV variable that could be +# substituted. +# +# Note that all optimization flags in CFLAGS must be disabled when code +# coverage is enabled. +# +# Usage example: +# +# configure.ac: +# +# AX_CODE_COVERAGE +# +# Makefile.am: +# +# @CODE_COVERAGE_RULES@ +# my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ... +# my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ... +# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... +# my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ... +# +# This results in a "check-code-coverage" rule being added to any +# Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module +# has been configured with --enable-code-coverage). Running `make +# check-code-coverage` in that directory will run the module's test suite +# (`make check`) and build a code coverage report detailing the code which +# was touched, then print the URI for the report. +# +# In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined +# instead of CODE_COVERAGE_LIBS. They are both still defined, but use of +# CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is +# deprecated. They have the same value. +# +# This code was derived from Makefile.decl in GLib, originally licenced +# under LGPLv2.1+. +# +# LICENSE +# +# Copyright (c) 2012, 2016 Philip Withnall +# Copyright (c) 2012 Xan Lopez +# Copyright (c) 2012 Christian Persch +# Copyright (c) 2012 Paolo Borelli +# Copyright (c) 2012 Dan Winship +# Copyright (c) 2015 Bastien ROUCARIES +# +# This library is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or (at +# your option) any later version. +# +# This library is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . + +#serial 25 + +AC_DEFUN([AX_CODE_COVERAGE],[ + dnl Check for --enable-code-coverage + AC_REQUIRE([AC_PROG_SED]) + + # allow to override gcov location + AC_ARG_WITH([gcov], + [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov], + [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov]) + + AC_MSG_CHECKING([whether to build with code coverage support]) + AC_ARG_ENABLE([code-coverage], + AS_HELP_STRING([--enable-code-coverage], + [Whether to enable code coverage support]),, + enable_code_coverage=no) + + AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes]) + AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) + AC_MSG_RESULT($enable_code_coverage) + + AS_IF([ test "$enable_code_coverage" = "yes" ], [ + # check for gcov + AC_CHECK_TOOL([GCOV], + [$_AX_CODE_COVERAGE_GCOV_PROG_WITH], + [:]) + AS_IF([test "X$GCOV" = "X:"], + [AC_MSG_ERROR([gcov is needed to do coverage])]) + AC_SUBST([GCOV]) + + dnl Check if gcc is being used + AS_IF([ test "$GCC" = "no" ], [ + AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) + ]) + + AC_CHECK_PROG([LCOV], [lcov], [lcov]) + AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) + + AS_IF([ test -z "$LCOV" ], [ + AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed]) + ]) + + AS_IF([ test -z "$GENHTML" ], [ + AC_MSG_ERROR([Could not find genhtml from the lcov package]) + ]) + + dnl Build the code coverage flags + dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility + CODE_COVERAGE_CPPFLAGS="-DNDEBUG" + CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" + CODE_COVERAGE_LIBS="-lgcov" + CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS" + + AC_SUBST([CODE_COVERAGE_CPPFLAGS]) + AC_SUBST([CODE_COVERAGE_CFLAGS]) + AC_SUBST([CODE_COVERAGE_CXXFLAGS]) + AC_SUBST([CODE_COVERAGE_LIBS]) + AC_SUBST([CODE_COVERAGE_LDFLAGS]) + + [CODE_COVERAGE_RULES_CHECK=' + -$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check + $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture +'] + [CODE_COVERAGE_RULES_CAPTURE=' + $(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS) + $(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS) + -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp + $(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS) + @echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html" +'] + [CODE_COVERAGE_RULES_CLEAN=' +clean: code-coverage-clean +distclean: code-coverage-clean +code-coverage-clean: + -$(LCOV) --directory $(top_builddir) -z + -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) + -find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete +'] + ], [ + [CODE_COVERAGE_RULES_CHECK=' + @echo "Need to reconfigure with --enable-code-coverage" +'] + CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK" + CODE_COVERAGE_RULES_CLEAN='' + ]) + +[CODE_COVERAGE_RULES=' +# Code coverage +# +# Optional: +# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. +# Multiple directories may be specified, separated by whitespace. +# (Default: $(top_builddir)) +# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated +# by lcov for code coverage. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info) +# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage +# reports to be created. (Default: +# $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage) +# - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage, +# set to 0 to disable it and leave empty to stay with the default. +# (Default: empty) +# - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov +# instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov +# instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) +# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov +# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the +# collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov +# instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +# - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering +# lcov instance. (Default: empty) +# - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov +# instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +# - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the +# genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) +# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml +# instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) +# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore +# +# The generated report will be titled using the $(PACKAGE_NAME) and +# $(PACKAGE_VERSION). In order to add the current git hash to the title, +# use the git-version-gen script, available online. + +# Optional variables +CODE_COVERAGE_DIRECTORY ?= $(top_builddir) +CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info +CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage +CODE_COVERAGE_BRANCH_COVERAGE ?= +CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) +CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)" +CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) +CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) +CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?= +CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) +CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\ +$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\ +--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE)) +CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) +CODE_COVERAGE_IGNORE_PATTERN ?= + +GITIGNOREFILES ?= +GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) + +code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V)) +code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_cap_0 = @echo " LCOV --capture"\ + $(CODE_COVERAGE_OUTPUT_FILE); +code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V)) +code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_lcov_ign_0 = @echo " LCOV --remove /tmp/*"\ + $(CODE_COVERAGE_IGNORE_PATTERN); +code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V)) +code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY)) +code_coverage_v_genhtml_0 = @echo " GEN " $(CODE_COVERAGE_OUTPUT_DIRECTORY); +code_coverage_quiet = $(code_coverage_quiet_$(V)) +code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY)) +code_coverage_quiet_0 = --quiet + +# sanitizes the test-name: replaces with underscores: dashes and dots +code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1))) + +# Use recursive makes in order to ignore errors during check +check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"' + +# Capture code coverage data +code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"' + +# Hook rule executed before code-coverage-capture, overridable by the user +code-coverage-capture-hook: + +'"$CODE_COVERAGE_RULES_CLEAN"' + +A''M_DISTCHECK_CONFIGURE_FLAGS ?= +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage + +.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean +'] + + AC_SUBST([CODE_COVERAGE_RULES]) + m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compare_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_compare_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compare_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compare_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,177 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compare_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro compares two version strings. Due to the various number of +# minor-version numbers that can exist, and the fact that string +# comparisons are not compatible with numeric comparisons, this is not +# necessarily trivial to do in a autoconf script. This macro makes doing +# these comparisons easy. +# +# The six basic comparisons are available, as well as checking equality +# limited to a certain number of minor-version levels. +# +# The operator OP determines what type of comparison to do, and can be one +# of: +# +# eq - equal (test A == B) +# ne - not equal (test A != B) +# le - less than or equal (test A <= B) +# ge - greater than or equal (test A >= B) +# lt - less than (test A < B) +# gt - greater than (test A > B) +# +# Additionally, the eq and ne operator can have a number after it to limit +# the test to that number of minor versions. +# +# eq0 - equal up to the length of the shorter version +# ne0 - not equal up to the length of the shorter version +# eqN - equal up to N sub-version levels +# neN - not equal up to N sub-version levels +# +# When the condition is true, shell commands ACTION-IF-TRUE are run, +# otherwise shell commands ACTION-IF-FALSE are run. The environment +# variable 'ax_compare_version' is always set to either 'true' or 'false' +# as well. +# +# Examples: +# +# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[lt],[3.15.8]) +# +# would both be true. +# +# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8]) +# AX_COMPARE_VERSION([3.15],[gt],[3.15.8]) +# +# would both be false. +# +# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8]) +# +# would be true because it is only comparing two minor versions. +# +# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15]) +# +# would be true because it is only comparing the lesser number of minor +# versions of the two values. +# +# Note: The characters that separate the version numbers do not matter. An +# empty string is the same as version 0. OP is evaluated by autoconf, not +# configure, so must be a string, not a variable. +# +# The author would like to acknowledge Guido Draheim whose advice about +# the m4_case and m4_ifvaln functions make this macro only include the +# portions necessary to perform the specific comparison specified by the +# OP argument in the final configure script. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +dnl ######################################################################### +AC_DEFUN([AX_COMPARE_VERSION], [ + AC_REQUIRE([AC_PROG_AWK]) + + # Used to indicate true or false condition + ax_compare_version=false + + # Convert the two version strings to be compared into a format that + # allows a simple string comparison. The end result is that a version + # string of the form 1.12.5-r617 will be converted to the form + # 0001001200050617. In other words, each number is zero padded to four + # digits, and non digits are removed. + AS_VAR_PUSHDEF([A],[ax_compare_version_A]) + A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + AS_VAR_PUSHDEF([B],[ax_compare_version_B]) + B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \ + -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \ + -e 's/[[^0-9]]//g'` + + dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary + dnl # then the first line is used to determine if the condition is true. + dnl # The sed right after the echo is to remove any indented white space. + m4_case(m4_tolower($2), + [lt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [gt],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"` + ], + [le],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ], + [ge],[ + ax_compare_version=`echo "x$A +x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"` + ],[ + dnl Split the operator from the subversion count if present. + m4_bmatch(m4_substr($2,2), + [0],[ + # A count of zero means use the length of the shorter version. + # Determine the number of characters in A and B. + ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'` + ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'` + + # Set A to no more than B's length and B to no more than A's length. + A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"` + B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"` + ], + [[0-9]+],[ + # A count greater than zero means use only that many subversions + A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"` + ], + [.+],[ + AC_WARNING( + [invalid OP numeric parameter: $2]) + ],[]) + + # Pad zeros at end of numbers to make same length. + ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`" + B="$B`echo $A | sed 's/./0/g'`" + A="$ax_compare_version_tmp_A" + + # Check for equality or inequality as necessary. + m4_case(m4_tolower(m4_substr($2,0,2)), + [eq],[ + test "x$A" = "x$B" && ax_compare_version=true + ], + [ne],[ + test "x$A" != "x$B" && ax_compare_version=true + ],[ + AC_WARNING([invalid OP parameter: $2]) + ]) + ]) + + AS_VAR_POPDEF([A])dnl + AS_VAR_POPDEF([B])dnl + + dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE. + if test "$ax_compare_version" = "true" ; then + m4_ifvaln([$4],[$4],[:])dnl + m4_ifvaln([$5],[else $5])dnl + fi +]) dnl AX_COMPARE_VERSION diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compile_check_sizeof.m4 projectm-3.1.0/m4/autoconf-archive/ax_compile_check_sizeof.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compile_check_sizeof.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compile_check_sizeof.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,115 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_compile_check_sizeof.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_COMPILE_CHECK_SIZEOF(TYPE [, HEADERS [, EXTRA_SIZES...]]) +# +# DESCRIPTION +# +# This macro checks for the size of TYPE using compile checks, not run +# checks. You can supply extra HEADERS to look into. the check will cycle +# through 1 2 4 8 16 and any EXTRA_SIZES the user supplies. If a match is +# found, it will #define SIZEOF_`TYPE' to that value. Otherwise it will +# emit a configure time error indicating the size of the type could not be +# determined. +# +# The trick is that C will not allow duplicate case labels. While this is +# valid C code: +# +# switch (0) case 0: case 1:; +# +# The following is not: +# +# switch (0) case 0: case 0:; +# +# Thus, the AC_TRY_COMPILE will fail if the currently tried size does not +# match. +# +# Here is an example skeleton configure.in script, demonstrating the +# macro's usage: +# +# AC_PROG_CC +# AC_CHECK_HEADERS(stddef.h unistd.h) +# AC_TYPE_SIZE_T +# AC_CHECK_TYPE(ssize_t, int) +# +# headers='#ifdef HAVE_STDDEF_H +# #include +# #endif +# #ifdef HAVE_UNISTD_H +# #include +# #endif +# ' +# +# AX_COMPILE_CHECK_SIZEOF(char) +# AX_COMPILE_CHECK_SIZEOF(short) +# AX_COMPILE_CHECK_SIZEOF(int) +# AX_COMPILE_CHECK_SIZEOF(long) +# AX_COMPILE_CHECK_SIZEOF(unsigned char *) +# AX_COMPILE_CHECK_SIZEOF(void *) +# AX_COMPILE_CHECK_SIZEOF(size_t, $headers) +# AX_COMPILE_CHECK_SIZEOF(ssize_t, $headers) +# AX_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers) +# AX_COMPILE_CHECK_SIZEOF(off_t, $headers) +# +# LICENSE +# +# Copyright (c) 2008 Kaveh Ghazi +# Copyright (c) 2017 Reini Urban +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_COMPILE_CHECK_SIZEOF], [AX_COMPILE_CHECK_SIZEOF]) +AC_DEFUN([AX_COMPILE_CHECK_SIZEOF], +[changequote(<<, >>)dnl +dnl The name to #define. +define(<>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl +dnl The cache variable name. +define(<>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl +changequote([, ])dnl +AC_MSG_CHECKING(size of $1) +AC_CACHE_VAL(AC_CV_NAME, +[for ac_size in 4 8 1 2 16 $3 ; do # List sizes in rough order of prevalence. + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include +$2 +]], [[switch (0) case 0: case (sizeof ($1) == $ac_size):;]])], [AC_CV_NAME=$ac_size]) + if test x$AC_CV_NAME != x ; then break; fi +done +]) +if test x$AC_CV_NAME = x ; then + AC_MSG_ERROR([cannot determine a size for $1]) +fi +AC_MSG_RESULT($AC_CV_NAME) +AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in type $1]) +undefine([AC_TYPE_NAME])dnl +undefine([AC_CV_NAME])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_cflags.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_cflags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_cflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_cflags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,160 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cflags.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_CFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the C compiler to VARIABLE, which defaults to +# WARN_CFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the CFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# Copyright (c) 2017, 2018 Reini Urban +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 16 + +AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[ + AC_REQUIRE([AC_PROG_SED]) + AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + + # Variable names + m4_define([ax_warn_cflags_variable], + [m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))]) + + AC_LANG_PUSH([C]) + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ + [#ifndef __cplusplus + #error "no C++" + #endif]])], + [ax_compiler_cxx=yes;], + [ax_compiler_cxx=no;]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_cflags variable, and + # Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + # Check that -Wno-suggest-attribute=format is supported + AX_CHECK_COMPILE_FLAG([-Wno-suggest-attribute=format],[ + ax_compiler_no_suggest_attribute_flags="-Wno-suggest-attribute=format" + ],[ + ax_compiler_no_suggest_attribute_flags="" + ]) + + # Base flags + AX_APPEND_COMPILE_FLAGS([ dnl + -fno-strict-aliasing dnl + $3 dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_COMPILE_FLAGS([ dnl + -Wall dnl + -Wextra dnl + -Wundef dnl + -Wwrite-strings dnl + -Wpointer-arith dnl + -Wmissing-declarations dnl + -Wredundant-decls dnl + -Wno-unused-parameter dnl + -Wno-missing-field-initializers dnl + -Wformat=2 dnl + -Wcast-align dnl + -Wformat-nonliteral dnl + -Wformat-security dnl + -Wsign-compare dnl + -Wstrict-aliasing dnl + -Wshadow dnl + -Winline dnl + -Wpacked dnl + -Wmissing-format-attribute dnl + -Wmissing-noreturn dnl + -Winit-self dnl + -Wredundant-decls dnl + -Wmissing-include-dirs dnl + -Wunused-but-set-variable dnl + -Warray-bounds dnl + -Wreturn-type dnl + -Wswitch-enum dnl + -Wswitch-default dnl + -Wduplicated-cond dnl + -Wduplicated-branches dnl + -Wlogical-op dnl + -Wrestrict dnl + -Wnull-dereference dnl + -Wdouble-promotion dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + if test "$ax_compiler_cxx" = "no" ; then + # C-only flags. Warn in C++ + AX_APPEND_COMPILE_FLAGS([ dnl + -Wnested-externs dnl + -Wmissing-prototypes dnl + -Wstrict-prototypes dnl + -Wdeclaration-after-statement dnl + -Wimplicit-function-declaration dnl + -Wold-style-definition dnl + -Wjump-misses-init dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + fi + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable) + + AX_APPEND_COMPILE_FLAGS([ dnl + [$ax_compiler_no_suggest_attribute_flags] dnl + ],ax_warn_cflags_variable,[$ax_compiler_flags_test]) + ]) + + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $ax_warn_cflags_variable; do + AS_CASE([$flag], + [-Wno-*=*],[], + [-Wno-*],[ + AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], + ax_warn_cflags_variable, + [$ax_compiler_flags_test]) + ]) + done + + AC_LANG_POP([C]) + + # Substitute the variables + AC_SUBST(ax_warn_cflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_cxxflags.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_cxxflags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_cxxflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_cxxflags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,136 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cxxflags.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_CXXFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the C++ compiler to VARIABLE, which defaults to +# WARN_CXXFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the CXXFLAGS variable for each target in the code +# base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2015 David King +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_COMPILER_FLAGS_CXXFLAGS],[ + AC_REQUIRE([AC_PROG_SED]) + AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + + # Variable names + m4_define([ax_warn_cxxflags_variable], + [m4_normalize(ifelse([$1],,[WARN_CXXFLAGS],[$1]))]) + + AC_LANG_PUSH([C++]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_cxxflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + # Check that -Wno-suggest-attribute=format is supported + AX_CHECK_COMPILE_FLAG([-Wno-suggest-attribute=format],[ + ax_compiler_no_suggest_attribute_flags="-Wno-suggest-attribute=format" + ],[ + ax_compiler_no_suggest_attribute_flags="" + ]) + + # Base flags + AX_APPEND_COMPILE_FLAGS([ dnl + -fno-strict-aliasing dnl + $3 dnl + ],ax_warn_cxxflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_COMPILE_FLAGS([ dnl + -Wall dnl + -Wextra dnl + -Wundef dnl + -Wwrite-strings dnl + -Wpointer-arith dnl + -Wmissing-declarations dnl + -Wredundant-decls dnl + -Wno-unused-parameter dnl + -Wno-missing-field-initializers dnl + -Wformat=2 dnl + -Wcast-align dnl + -Wformat-nonliteral dnl + -Wformat-security dnl + -Wsign-compare dnl + -Wstrict-aliasing dnl + -Wshadow dnl + -Winline dnl + -Wpacked dnl + -Wmissing-format-attribute dnl + -Wmissing-noreturn dnl + -Winit-self dnl + -Wredundant-decls dnl + -Wmissing-include-dirs dnl + -Wunused-but-set-variable dnl + -Warray-bounds dnl + -Wreturn-type dnl + -Wno-overloaded-virtual dnl + -Wswitch-enum dnl + -Wswitch-default dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_cxxflags_variable,[$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_FLAG([-Werror],ax_warn_cxxflags_variable) + + AX_APPEND_COMPILE_FLAGS([ dnl + [$ax_compiler_no_suggest_attribute_flags] dnl + ],ax_warn_cxxflags_variable,[$ax_compiler_flags_test]) + ]) + + # In the flags below, when disabling specific flags, always add *both* + # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example) + # we enable -Werror, disable a flag, and a build bot passes CXXFLAGS=-Wall, + # which effectively turns that flag back on again as an error. + for flag in $ax_warn_cxxflags_variable; do + AS_CASE([$flag], + [-Wno-*=*],[], + [-Wno-*],[ + AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')], + ax_warn_cxxflags_variable, + [$ax_compiler_flags_test]) + ]) + done + + AC_LANG_POP([C++]) + + # Substitute the variables + AC_SUBST(ax_warn_cxxflags_variable) +])dnl AX_COMPILER_FLAGS_CXXFLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_gir.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_gir.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_gir.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_gir.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the g-ir-scanner (from GObject Introspection) to +# VARIABLE, which defaults to WARN_SCANNERFLAGS. VARIABLE is AC_SUBST-ed +# by this macro, but must be manually added to the SCANNERFLAGS variable +# for each GIR target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_DEFUN([AX_COMPILER_FLAGS_GIR],[ + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + + # Variable names + m4_define([ax_warn_scannerflags_variable], + [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))]) + + # Base flags + AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_FLAG([ dnl + --warn-all dnl + $4 dnl + $5 dnl + $6 dnl + $7 dnl + ],ax_warn_scannerflags_variable) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags + AX_APPEND_FLAG([ dnl + --warn-error dnl + ],ax_warn_scannerflags_variable) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_scannerflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_ldflags.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_ldflags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags_ldflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags_ldflags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,111 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS]) +# +# DESCRIPTION +# +# Add warning flags for the linker to VARIABLE, which defaults to +# WARN_LDFLAGS. VARIABLE is AC_SUBST-ed by this macro, but must be +# manually added to the LDFLAGS variable for each target in the code base. +# +# This macro depends on the environment set up by AX_COMPILER_FLAGS. +# Specifically, it uses the value of $ax_enable_compile_warnings to decide +# which flags to enable. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# Copyright (c) 2017, 2018 Reini Urban +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[ + AX_REQUIRE_DEFINED([AX_APPEND_LINK_FLAGS]) + AX_REQUIRE_DEFINED([AX_APPEND_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) + AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) + + # Variable names + m4_define([ax_warn_ldflags_variable], + [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))]) + + # Always pass -Werror=unknown-warning-option to get Clang to fail on bad + # flags, otherwise they are always appended to the warn_ldflags variable, + # and Clang warns on them for every compilation unit. + # If this is passed to GCC, it will explode, so the flag must be enabled + # conditionally. + AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[ + ax_compiler_flags_test="-Werror=unknown-warning-option" + ],[ + ax_compiler_flags_test="" + ]) + + AX_CHECK_LINK_FLAG([-Wl,--as-needed], [ + AX_APPEND_LINK_FLAGS([-Wl,--as-needed], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + AX_CHECK_LINK_FLAG([-Wl,-z,relro], [ + AX_APPEND_LINK_FLAGS([-Wl,-z,relro], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + AX_CHECK_LINK_FLAG([-Wl,-z,now], [ + AX_APPEND_LINK_FLAGS([-Wl,-z,now], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [ + AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack], + [AM_LDFLAGS],[$ax_compiler_flags_test]) + ]) + # textonly, retpolineplt not yet + + # macOS and cygwin linker do not have --as-needed + AX_CHECK_LINK_FLAG([-Wl,--no-as-needed], [ + ax_compiler_flags_as_needed_option="-Wl,--no-as-needed" + ], [ + ax_compiler_flags_as_needed_option="" + ]) + + # macOS linker speaks with a different accent + ax_compiler_flags_fatal_warnings_option="" + AX_CHECK_LINK_FLAG([-Wl,--fatal-warnings], [ + ax_compiler_flags_fatal_warnings_option="-Wl,--fatal-warnings" + ]) + AX_CHECK_LINK_FLAG([-Wl,-fatal_warnings], [ + ax_compiler_flags_fatal_warnings_option="-Wl,-fatal_warnings" + ]) + + # Base flags + AX_APPEND_LINK_FLAGS([ dnl + $ax_compiler_flags_as_needed_option dnl + $3 dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + + AS_IF([test "$ax_enable_compile_warnings" != "no"],[ + # "yes" flags + AX_APPEND_LINK_FLAGS([$4 $5 $6 $7], + ax_warn_ldflags_variable, + [$ax_compiler_flags_test]) + ]) + AS_IF([test "$ax_enable_compile_warnings" = "error"],[ + # "error" flags; -Werror has to be appended unconditionally because + # it's not possible to test for + # + # suggest-attribute=format is disabled because it gives too many false + # positives + AX_APPEND_LINK_FLAGS([ dnl + $ax_compiler_flags_fatal_warnings_option dnl + ],ax_warn_ldflags_variable,[$ax_compiler_flags_test]) + ]) + + # Substitute the variables + AC_SUBST(ax_warn_ldflags_variable) +])dnl AX_COMPILER_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,158 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [IS-RELEASE], [EXTRA-BASE-CFLAGS], [EXTRA-YES-CFLAGS], [UNUSED], [UNUSED], [UNUSED], [EXTRA-BASE-LDFLAGS], [EXTRA-YES-LDFLAGS], [UNUSED], [UNUSED], [UNUSED]) +# +# DESCRIPTION +# +# Check for the presence of an --enable-compile-warnings option to +# configure, defaulting to "error" in normal operation, or "yes" if +# IS-RELEASE is equal to "yes". Return the value in the variable +# $ax_enable_compile_warnings. +# +# Depending on the value of --enable-compile-warnings, different compiler +# warnings are checked to see if they work with the current compiler and, +# if so, are appended to CFLAGS-VARIABLE and LDFLAGS-VARIABLE. This +# allows a consistent set of baseline compiler warnings to be used across +# a code base, irrespective of any warnings enabled locally by individual +# developers. By standardising the warnings used by all developers of a +# project, the project can commit to a zero-warnings policy, using -Werror +# to prevent compilation if new warnings are introduced. This makes +# catching bugs which are flagged by warnings a lot easier. +# +# By providing a consistent --enable-compile-warnings argument across all +# projects using this macro, continuous integration systems can easily be +# configured the same for all projects. Automated systems or build +# systems aimed at beginners may want to pass the --disable-Werror +# argument to unconditionally prevent warnings being fatal. +# +# --enable-compile-warnings can take the values: +# +# * no: Base compiler warnings only; not even -Wall. +# * yes: The above, plus a broad range of useful warnings. +# * error: The above, plus -Werror so that all warnings are fatal. +# Use --disable-Werror to override this and disable fatal +# warnings. +# +# The set of base and enabled flags can be augmented using the +# EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables, which are tested and +# appended to the output variable if --enable-compile-warnings is not +# "no". Flags should not be disabled using these arguments, as the entire +# point of AX_COMPILER_FLAGS is to enforce a consistent set of useful +# compiler warnings on code, using warnings which have been chosen for low +# false positive rates. If a compiler emits false positives for a +# warning, a #pragma should be used in the code to disable the warning +# locally. See: +# +# https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas +# +# The EXTRA-* variables should only be used to supply extra warning flags, +# and not general purpose compiler flags, as they are controlled by +# configure options such as --disable-Werror. +# +# IS-RELEASE can be used to disable -Werror when making a release, which +# is useful for those hairy moments when you just want to get the release +# done as quickly as possible. Set it to "yes" to disable -Werror. By +# default, it uses the value of $ax_is_release, so if you are using the +# AX_IS_RELEASE macro, there is no need to pass this parameter. For +# example: +# +# AX_IS_RELEASE([git-directory]) +# AX_COMPILER_FLAGS() +# +# CFLAGS-VARIABLE defaults to WARN_CFLAGS, and LDFLAGS-VARIABLE defaults +# to WARN_LDFLAGS. Both variables are AC_SUBST-ed by this macro, but must +# be manually added to the CFLAGS and LDFLAGS variables for each target in +# the code base. +# +# If C++ language support is enabled with AC_PROG_CXX, which must occur +# before this macro in configure.ac, warning flags for the C++ compiler +# are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the +# CXXFLAGS variables for each target in the code base. EXTRA-*-CFLAGS can +# be used to augment the base and enabled flags. +# +# Warning flags for g-ir-scanner (from GObject Introspection) are +# AC_SUBST-ed as WARN_SCANNERFLAGS. This variable must be manually added +# to the SCANNERFLAGS variable for each GIR target in the code base. If +# extra g-ir-scanner flags need to be enabled, the AX_COMPILER_FLAGS_GIR +# macro must be invoked manually. +# +# AX_COMPILER_FLAGS may add support for other tools in future, in addition +# to the compiler and linker. No extra EXTRA-* variables will be added +# for those tools, and all extra support will still use the single +# --enable-compile-warnings configure option. For finer grained control +# over the flags for individual tools, use AX_COMPILER_FLAGS_CFLAGS, +# AX_COMPILER_FLAGS_LDFLAGS and AX_COMPILER_FLAGS_* for new tools. +# +# The UNUSED variables date from a previous version of this macro, and are +# automatically appended to the preceding non-UNUSED variable. They should +# be left empty in new uses of the macro. +# +# LICENSE +# +# Copyright (c) 2014, 2015 Philip Withnall +# Copyright (c) 2015 David King +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +# _AX_COMPILER_FLAGS_LANG([LANGNAME]) +m4_defun([_AX_COMPILER_FLAGS_LANG], +[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [], + [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl + AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl +]) + +AC_DEFUN([AX_COMPILER_FLAGS],[ + # C support is enabled by default. + _AX_COMPILER_FLAGS_LANG([C]) + # Only enable C++ support if AC_PROG_CXX is called. The redefinition of + # AC_PROG_CXX is so that a fatal error is emitted if this macro is called + # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be + # checked. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AX_COMPILER_FLAGS_LANG([CXX])], + [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])]) + AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS]) + + # Default value for IS-RELEASE is $ax_is_release + ax_compiler_flags_is_release=m4_tolower(m4_normalize(ifelse([$3],, + [$ax_is_release], + [$3]))) + + AC_ARG_ENABLE([compile-warnings], + AS_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], + [Enable compiler warnings and errors]),, + [AS_IF([test "$ax_compiler_flags_is_release" = "yes"], + [enable_compile_warnings="yes"], + [enable_compile_warnings="error"])]) + AC_ARG_ENABLE([Werror], + AS_HELP_STRING([--disable-Werror], + [Unconditionally make all compiler warnings non-fatal]),, + [enable_Werror=maybe]) + + # Return the user's chosen warning level + AS_IF([test "$enable_Werror" = "no" -a \ + "$enable_compile_warnings" = "error"],[ + enable_compile_warnings="yes" + ]) + + ax_enable_compile_warnings=$enable_compile_warnings + + AX_COMPILER_FLAGS_CFLAGS([$1],[$ax_compiler_flags_is_release], + [$4],[$5 $6 $7 $8]) + m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled], + [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS], + [$ax_compiler_flags_is_release], + [$4],[$5 $6 $7 $8])]) + AX_COMPILER_FLAGS_LDFLAGS([$2],[$ax_compiler_flags_is_release], + [$9],[$10 $11 $12 $13]) + AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$ax_compiler_flags_is_release]) +])dnl AX_COMPILER_FLAGS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_vendor.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_vendor.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_vendor.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_vendor.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,87 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VENDOR +# +# DESCRIPTION +# +# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, +# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, +# watcom, etc. The vendor is returned in the cache variable +# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AC_DEFUN([AX_COMPILER_VENDOR], +[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, + dnl Please add if possible support to ax_compiler_version.m4 + [# note: don't check for gcc first since some other compilers define __GNUC__ + vendors="intel: __ICC,__ECC,__INTEL_COMPILER + ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__ + pathscale: __PATHCC__,__PATHSCALE__ + clang: __clang__ + cray: _CRAYC + fujitsu: __FUJITSU + gnu: __GNUC__ + sun: __SUNPRO_C,__SUNPRO_CC + hp: __HP_cc,__HP_aCC + dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER + borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ + comeau: __COMO__ + kai: __KCC + lcc: __LCC__ + sgi: __sgi,sgi + microsoft: _MSC_VER + metrowerks: __MWERKS__ + watcom: __WATCOMC__ + portland: __PGI + tcc: __TINYC__ + unknown: UNKNOWN" + for ventest in $vendors; do + case $ventest in + *:) vendor=$ventest; continue ;; + *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; + esac + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ + #if !($vencpp) + thisisanerror; + #endif + ])], [break]) + done + ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1` + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_compiler_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compiler_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compiler_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,492 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VERSION +# +# DESCRIPTION +# +# This macro retrieves the compiler version and returns it in the cache +# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version +# for C++. +# +# Version is returned as epoch:major.minor.patchversion +# +# Epoch is used in order to have an increasing version number in case of +# marketing change. +# +# Epoch use: * borland compiler use chronologically 0turboc for turboc +# era, +# +# 1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era, +# 3borlancpp for return of BORLANDC++ (after version 5.5), +# 4cppbuilder for cppbuilder with year version, +# and 5xe for XE era. +# +# An empty string is returned otherwise. +# +# LICENSE +# +# Copyright (c) 2014 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +# for intel +AC_DEFUN([_AX_COMPILER_VERSION_INTEL], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__INTEL_COMPILER/100],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__INTEL_COMPILER%100)/10],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [(__INTEL_COMPILER%10)],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for IBM +AC_DEFUN([_AX_COMPILER_VERSION_IBM], + [ dnl + dnl check between z/OS C/C++ and XL C/C++ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([], + [ + #if defined(__COMPILER_VER__) + choke me; + #endif + ])], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__xlC__/100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__xlC__%100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC_ver__/0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + [__xlC_ver__%0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC__%1000],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__xlC__/10000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__xlC__/100000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +# for pathscale +AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PATHCC__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PATHCC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PATHCC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for clang +AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __clang_major__,, + AC_MSG_FAILURE([[[$0]] unknown clang major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __clang_minor__,, + AC_MSG_FAILURE([[[$0]] unknown clang minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__clang_patchlevel__],,0) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for crayc +AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + _RELEASE,, + AC_MSG_FAILURE([[[$0]] unknown crayc release])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _RELEASE_MINOR,, + AC_MSG_FAILURE([[[$0]] unknown crayc minor])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for fujitsu +AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ + AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + __FCC_VERSION,, + AC_MSG_FAILURE([[[$0]]unknown fujitsu release])) + ]) + +# for GNU +AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __GNUC__,, + AC_MSG_FAILURE([[[$0]] unknown gcc major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __GNUC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown gcc minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__GNUC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# For sun +AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ + m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], + [ + #if defined(__SUNPRO_CC) + __SUNPRO_CC + #else + __SUNPRO_C + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, + !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" +]) + +AC_DEFUN([_AX_COMPILER_VERSION_HP],[ + m4_define([_AX_COMPILER_VERSION_HP_NUMBER], + [ + #if defined(__HP_cc) + __HP_cc + #else + __HP_aCC + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, + !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], + [dnl By default output last version with this behavior. + dnl it is so old + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_HP_NUMBER % 100),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl + m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], + [ + #if defined(__DECC_VER) + __DECC_VER + #else + __DECCXX_VER + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, + AC_MSG_FAILURE([[[$0]] unknown dec release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# borland +AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl + m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], + [ + #if defined(__TURBOC__) + __TURBOC__ + #else + choke me + #endif + ]) + m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], + [ + #if defined(__BORLANDC__) + __BORLANDC__ + #else + __CODEGEARC__ + #endif + ]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(, + _AX_COMPILER_VERSION_TURBOC_NUMBER)], + [dnl TURBOC + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, + _AX_COMPILER_VERSION_TURBOC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown turboc version])) + AS_IF( + [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], + [dnl compute normal version + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], + [dnl special version + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], + [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], + [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], + [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], + [ + AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" + ]) + ]) + ], + # borlandc + [ + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, + _AX_COMPILER_VERSION_BORLANDC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown borlandc version])) + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], + dnl BORLANDC++ before 5.5 + [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], + [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], + [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], + [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], + dnl C++ Builder era + [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], + [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], + dnl BORLANDC++ after 5.5 + [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], + [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], + [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], + dnl C++ Builder with year number + [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], + [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], + [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], + [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], + dnl XE version + [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], + [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], + [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], + [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], + [ + AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) + ]) + ]) + ]) + +# COMO +AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__COMO_VERSION__%100],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__COMO_VERSION__/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# KAI +AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__KCC_VERSION%100],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__KCC_VERSION/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__KCC_VERSION/1000)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +dnl LCC +dnl LCC does not output version... + +# SGI +AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ + m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], + [ + #if defined(_COMPILER_VERSION) + _COMPILER_VERSION + #else + _SGI_COMPILER_VERSION + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [_AX_COMPILER_VERSION_SGI_NUMBER%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# microsoft +AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _MSC_VER%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_MSC_VER/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) + dnl could be overridden + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 + _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 + # special case for version 6 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) + # for version 7 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + # for version > 8 + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%10000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + _MSC_BUILD,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ]) + +# for metrowerks +AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + __MWERKS__%0x100,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (__MWERKS__/0x100)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__MWERKS__/0x1000)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for watcom +AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __WATCOMC__%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__WATCOMC__/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for PGI +AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PGIC__,, + AC_MSG_FAILURE([[[$0]] unknown pgi major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PGIC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pgi minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PGIC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# tcc +AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+\([0-9.]\+\).*/\1/g'`] + ]) +# main entry point +AC_DEFUN([AX_COMPILER_VERSION],[dnl + AC_REQUIRE([AX_COMPILER_VENDOR]) + AC_REQUIRE([AC_PROG_SED]) + AC_CACHE_CHECK([for _AC_LANG compiler version], + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + [ dnl + AS_CASE([$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor], + [intel],[_AX_COMPILER_VERSION_INTEL], + [ibm],[_AX_COMPILER_VERSION_IBM], + [pathscale],[_AX_COMPILER_VERSION_PATHSCALE], + [clang],[_AX_COMPILER_VERSION_CLANG], + [cray],[_AX_COMPILER_VERSION_CRAY], + [fujitsu],[_AX_COMPILER_VERSION_FUJITSU], + [gnu],[_AX_COMPILER_VERSION_GNU], + [sun],[_AX_COMPILER_VERSION_SUN], + [hp],[_AX_COMPILER_VERSION_HP], + [dec],[_AX_COMPILER_VERSION_DEC], + [borland],[_AX_COMPILER_VERSION_BORLAND], + [comeau],[_AX_COMPILER_VERSION_COMEAU], + [kai],[_AX_COMPILER_VERSION_KAI], + [sgi],[_AX_COMPILER_VERSION_SGI], + [microsoft],[_AX_COMPILER_VERSION_MICROSOFT], + [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], + [watcom],[_AX_COMPILER_VERSION_WATCOM], + [portland],[_AX_COMPILER_VERSION_PORTLAND], + [tcc],[_AX_COMPILER_VERSION_TCC], + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compute_relative_paths.m4 projectm-3.1.0/m4/autoconf-archive/ax_compute_relative_paths.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compute_relative_paths.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compute_relative_paths.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,173 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compute_relative_paths.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_COMPUTE_RELATIVE_PATHS(PATH_LIST) +# +# DESCRIPTION +# +# PATH_LIST is a space-separated list of colon-separated triplets of the +# form 'FROM:TO:RESULT'. This function iterates over these triplets and +# set $RESULT to the relative path from $FROM to $TO. Note that $FROM and +# $TO needs to be absolute filenames for this macro to success. +# +# For instance, +# +# first=/usr/local/bin +# second=/usr/local/share +# AX_COMPUTE_RELATIVE_PATHS([first:second:fs second:first:sf]) +# # $fs is set to ../share +# # $sf is set to ../bin +# +# $FROM and $TO are both eval'ed recursively and normalized, this means +# that you can call this macro with autoconf's dirnames like `prefix' or +# `datadir'. For example: +# +# AX_COMPUTE_RELATIVE_PATHS([bindir:datadir:bin_to_data]) +# +# AX_COMPUTE_RELATIVE_PATHS should also works with DOS filenames. +# +# You may want to use this macro in order to make your package +# relocatable. Instead of hardcoding $datadir into your programs just +# encode $bin_to_data and try to determine $bindir at run-time. +# +# This macro requires AX_NORMALIZE_PATH and AX_RECURSIVE_EVAL. +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 12 + +AU_ALIAS([ADL_COMPUTE_RELATIVE_PATHS], [AX_COMPUTE_RELATIVE_PATHS]) +AC_DEFUN([AX_COMPUTE_RELATIVE_PATHS], +[for _lcl_i in $1; do + _lcl_from=\[$]`echo "[$]_lcl_i" | sed 's,:.*$,,'` + _lcl_to=\[$]`echo "[$]_lcl_i" | sed 's,^[[^:]]*:,,' | sed 's,:[[^:]]*$,,'` + _lcl_result_var=`echo "[$]_lcl_i" | sed 's,^.*:,,'` + AX_RECURSIVE_EVAL([[$]_lcl_from], [_lcl_from]) + AX_RECURSIVE_EVAL([[$]_lcl_to], [_lcl_to]) + _lcl_notation="$_lcl_from$_lcl_to" + AX_NORMALIZE_PATH([_lcl_from],['/']) + AX_NORMALIZE_PATH([_lcl_to],['/']) + AX_COMPUTE_RELATIVE_PATH([_lcl_from], [_lcl_to], [_lcl_result_tmp]) + AX_NORMALIZE_PATH([_lcl_result_tmp],["[$]_lcl_notation"]) + eval $_lcl_result_var='[$]_lcl_result_tmp' +done]) + +## Note: +## ***** +## The following helper macros are too fragile to be used out +## of AX_COMPUTE_RELATIVE_PATHS (mainly because they assume that +## paths are normalized), that's why I'm keeping them in the same file. +## Still, some of them maybe worth to reuse. + +dnl AX_COMPUTE_RELATIVE_PATH(FROM, TO, RESULT) +dnl =========================================== +dnl Compute the relative path to go from $FROM to $TO and set the value +dnl of $RESULT to that value. This function work on raw filenames +dnl (for instead it will considerate /usr//local and /usr/local as +dnl two distinct paths), you should really use AX_COMPUTE_RELATIVE_PATHS +dnl instead to have the paths sanitized automatically. +dnl +dnl For instance: +dnl first_dir=/somewhere/on/my/disk/bin +dnl second_dir=/somewhere/on/another/disk/share +dnl AX_COMPUTE_RELATIVE_PATH(first_dir, second_dir, first_to_second) +dnl will set $first_to_second to '../../../another/disk/share'. +AC_DEFUN([AX_COMPUTE_RELATIVE_PATH], +[AX_COMPUTE_COMMON_PATH([$1], [$2], [_lcl_common_prefix]) +AX_COMPUTE_BACK_PATH([$1], [_lcl_common_prefix], [_lcl_first_rel]) +AX_COMPUTE_SUFFIX_PATH([$2], [_lcl_common_prefix], [_lcl_second_suffix]) +$3="[$]_lcl_first_rel[$]_lcl_second_suffix"]) + +dnl AX_COMPUTE_COMMON_PATH(LEFT, RIGHT, RESULT) +dnl ============================================ +dnl Compute the common path to $LEFT and $RIGHT and set the result to $RESULT. +dnl +dnl For instance: +dnl first_path=/somewhere/on/my/disk/bin +dnl second_path=/somewhere/on/another/disk/share +dnl AX_COMPUTE_COMMON_PATH(first_path, second_path, common_path) +dnl will set $common_path to '/somewhere/on'. +AC_DEFUN([AX_COMPUTE_COMMON_PATH], +[$3='' +_lcl_second_prefix_match='' +while test "[$]_lcl_second_prefix_match" != 0; do + _lcl_first_prefix=`expr "x[$]$1" : "x\([$]$3/*[[^/]]*\)"` + _lcl_second_prefix_match=`expr "x[$]$2" : "x[$]_lcl_first_prefix"` + if test "[$]_lcl_second_prefix_match" != 0; then + if test "[$]_lcl_first_prefix" != "[$]$3"; then + $3="[$]_lcl_first_prefix" + else + _lcl_second_prefix_match=0 + fi + fi +done]) + +dnl AX_COMPUTE_SUFFIX_PATH(PATH, SUBPATH, RESULT) +dnl ============================================== +dnl Subtract $SUBPATH from $PATH, and set the resulting suffix +dnl (or the empty string if $SUBPATH is not a subpath of $PATH) +dnl to $RESULT. +dnl +dnl For instance: +dnl first_path=/somewhere/on/my/disk/bin +dnl second_path=/somewhere/on +dnl AX_COMPUTE_SUFFIX_PATH(first_path, second_path, common_path) +dnl will set $common_path to '/my/disk/bin'. +AC_DEFUN([AX_COMPUTE_SUFFIX_PATH], +[$3=`expr "x[$]$1" : "x[$]$2/*\(.*\)"`]) + +dnl AX_COMPUTE_BACK_PATH(PATH, SUBPATH, RESULT) +dnl ============================================ +dnl Compute the relative path to go from $PATH to $SUBPATH, knowing that +dnl $SUBPATH is a subpath of $PATH (any other words, only repeated '../' +dnl should be needed to move from $PATH to $SUBPATH) and set the value +dnl of $RESULT to that value. If $SUBPATH is not a subpath of PATH, +dnl set $RESULT to the empty string. +dnl +dnl For instance: +dnl first_path=/somewhere/on/my/disk/bin +dnl second_path=/somewhere/on +dnl AX_COMPUTE_BACK_PATH(first_path, second_path, back_path) +dnl will set $back_path to '../../../'. +AC_DEFUN([AX_COMPUTE_BACK_PATH], +[AX_COMPUTE_SUFFIX_PATH([$1], [$2], [_lcl_first_suffix]) +$3='' +_lcl_tmp='xxx' +while test "[$]_lcl_tmp" != ''; do + _lcl_tmp=`expr "x[$]_lcl_first_suffix" : "x[[^/]]*/*\(.*\)"` + if test "[$]_lcl_first_suffix" != ''; then + _lcl_first_suffix="[$]_lcl_tmp" + $3="../[$]$3" + fi +done]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compute_standard_relative_paths.m4 projectm-3.1.0/m4/autoconf-archive/ax_compute_standard_relative_paths.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_compute_standard_relative_paths.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_compute_standard_relative_paths.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,129 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_compute_standard_relative_paths.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_COMPUTE_STANDARD_RELATIVE_PATHS +# +# DESCRIPTION +# +# Here is the standard hierarchy of paths, as defined by the GNU Coding +# Standards: +# +# prefix +# exec_prefix +# bindir +# libdir +# libexecdir +# sbindir +# datarootdir +# docdir +# infodir +# htmldir +# dvidir +# psdir +# pdfdir +# localedir +# datadir (only for autoconf >= 2.59c) +# infodir (only for autoconf >= 2.59c) +# mandir (only for autoconf >= 2.59c) +# lispdir (only for autoconf >= 2.59c) +# datadir (only for autoconf < 2.59c) +# infodir (only for autoconf < 2.59c) +# mandir (only for autoconf < 2.59c) +# lispdir (only for autoconf < 2.59c) +# sysconfdir +# sharedstatedir +# localstatedir +# runstatedir (only for autoconf >= 2.70) +# includedir +# oldincludedir +# +# This macro will setup a set of variables of the form +# 'xxx_forward_relative_path' and 'xxx_backward_relative_path' where xxx +# is one of the above directories. The latter variable is set to the +# relative path to go from xxx to its parent directory, while the former +# hold the other way. +# +# For instance `bindir_relative_path' will contains the value to add to +# $exec_prefix to reach the $bindir directory (usually 'bin'), and +# `bindir_backward_relative_path' the value to append to $bindir to reach +# the $exec_prefix directory (usually '..'). +# +# This macro requires AX_COMPUTE_RELATIVE_PATHS which itself requires +# AX_NORMALIZE_PATH. +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# Copyright (c) 2015 Bastien Roucaries +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 12 + +AU_ALIAS([ADL_COMPUTE_STANDARD_RELATIVE_PATHS], [AX_COMPUTE_STANDARD_RELATIVE_PATHS]) +AC_DEFUN([AX_COMPUTE_STANDARD_RELATIVE_PATHS], +## These calls need to be on separate lines for aclocal to work! +[AX_COMPUTE_RELATIVE_PATHS(dnl +AX_STANDARD_RELATIVE_PATH_LIST)]) + +dnl AX_STANDARD_RELATIVE_PATH_LIST +dnl =============================== +dnl A list of standard paths, ready to supply to AX_COMPUTE_RELATIVE_PATHS. +AC_DEFUN([AX_STANDARD_RELATIVE_PATH_LIST], +[dnl +pushdef([TRIPLET],dnl +[$][1:$][2:$][2_forward_relative_path $]dnl +[2:$][1:$][2_backward_relative_path])dnl +dnl +TRIPLET(prefix, exec_prefix) dnl + TRIPLET(exec_prefix, bindir) dnl + TRIPLET(exec_prefix, libdir) dnl + TRIPLET(exec_prefix, libexecdir) dnl + TRIPLET(exec_prefix, sbindir) dnl +TRIPLET(prefix, datarootdir) dnl + TRIPLET(datarootdir, docdir) dnl + TRIPLET(datarootdir, infodir) dnl + TRIPLET(datarootdir, htmldir) dnl + TRIPLET(datarootdir, dvidir) dnl + TRIPLET(datarootdir, psdir) dnl + TRIPLET(datarootdir, pdfdir) dnl + TRIPLET(datarootdir, localedir) dnl +m4_version_prereq([2.59c],[TRIPLET(datarootdir,datadir)],[TRIPLET(prefix,datadir)]) dnl +m4_version_prereq([2.59c],[TRIPLET(datarootdir,infodir)],[TRIPLET(prefix,infodir)]) dnl +m4_version_prereq([2.59c],[TRIPLET(datarootdir,mandir)],[TRIPLET(prefix,mandir)]) dnl +m4_version_prereq([2.59c],[TRIPLET(datarootdir,lispdir)],[TRIPLET(prefix,lispdir)]) dnl +TRIPLET(prefix, sysconfdir) dnl +TRIPLET(prefix, sharedstatedir) dnl +TRIPLET(prefix, localstatedir) dnl + dnl only available for >=2.70 + m4_version_prereq([2.70],[TRIPLET(localstatedir,runstatedir)],[[]]) dnl +TRIPLET(prefix, includedir) dnl +TRIPLET(prefix, oldincludedir) dnl +popdef([TRIPLET])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cond_with_level.m4 projectm-3.1.0/m4/autoconf-archive/ax_cond_with_level.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cond_with_level.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cond_with_level.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,176 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cond_with_level.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COND_WITH_LEVEL(PACKAGE [,DEFAULT [,YESLEVEL]]) +# +# DESCRIPTION +# +# Actually used after an AC_ARG_WITH(PKG,...) option-directive, where +# AC_ARG_WITH is a part of the standard autoconf to define a `configure` +# --with-PKG option. +# +# This macros works almost like AC_COND_WITH(PACKAGE [,DEFAULT]), but the +# definition is set to a numeric value. The level of a simple "yes" is +# given (or assumed "2" if absent), otherwise the level can be given in +# mnemonic names, being: +# +# 1 = some +# 2 = many +# 3 = all +# 4 = extra +# 5 = extrasome more +# 6 = extramany muchmore much +# 7 = super everything +# 8 = ultra experimental +# 9 = insane +# +# this macro is most handily it making Makefile.in/Makefile.am that have a +# set of with-level declarations, especially optimization-levels +# +# the $withval shell-variable is set for further examination (it carries +# the numeric value of the various mnemonics above) +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([AC_COND_WITH_LEVEL], [AX_COND_WITH_LEVEL]) +AC_DEFUN([AX_COND_WITH_LEVEL], +[dnl the names to be defined... +pushdef([WITH_VAR], patsubst(with_$1, -, _))dnl +pushdef([VAR_WITH], patsubst(translit(with_$1, [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHOUT], patsubst(translit(without_$1, [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHVAL], patsubst(translit(withval_$1, [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHDEF], patsubst(translit(withdef_$1, [a-z], [A-Z]), -, _))dnl +AC_SUBST(VAR_WITH) +AC_SUBST(VAR_WITHOUT) +AC_SUBST(VAR_WITHVAL) +AC_SUBST(VAR_WITHDEF) +if test -z "$WITH_VAR" + then WITH_VAR=`echo ifelse([$2], , no, [$2])` +fi +if test "$WITH_VAR" = "yes" + then WITH_VAR=`echo ifelse([$3], , some, [$3])` +fi +if test "$WITH_VAR" != "no"; then + VAR_WITH= ; VAR_WITHOUT='#' + case "$WITH_VAR" in + 9|9,*|ultrasome|ultrasome,*|insane) withval=9 + VAR_WITHVAL=9 ; VAR_WITHDEF="-D""VAR_WITH=9" ;; + 8|8,*|ultra|ultra,*|experimental) withval=8 + VAR_WITHVAL=8 ; VAR_WITHDEF="-D""VAR_WITH=8" ;; + 7|7,*|muchmore|somemanymore|somemanymore,*|all) withval=7 + VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;; + 6|6,*|manymore|manymore,*|most) withval=6 + VAR_WITHVAL=6 ; VAR_WITHDEF="-D""VAR_WITH=6" ;; + 5|5,*|somemore|somemore,*|almost) withval=5 + VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;; + 4|4,*|more|more,*) withval=4 + VAR_WITHVAL=4 ; VAR_WITHDEF="-D""VAR_WITH=4" ;; + 3|3,*|much|somemany,*) withval=3 + VAR_WITHVAL=3 ; VAR_WITHDEF="-D""VAR_WITH=3" ;; + 2|2,*|many|many,*) withval=2 + VAR_WITHVAL=2 ; VAR_WITHDEF="-D""VAR_WITH=2" ;; + 1|1,*|some|some,*) withval=1 + VAR_WITHVAL=1 ; VAR_WITHDEF="-D""VAR_WITH=1" ;; + *) withval=- + AC_MSG_ERROR([dnl + bad value of --with-$1 option, choose a number or some|many|more|all... ]) + esac +else withval=0 + VAR_WITH='#' ; VAR_WITHOUT="" + VAR_WITHVAL=0 ; VAR_WITHDEF="" +fi +popdef([VAR_WITH])dnl +popdef([VAR_WITHOUT])dnl +popdef([VAR_WITHVAL])dnl +popdef([VAR_WITHDEF])dnl +popdef([WITH_VAR])dnl +]) + +dnl and the same as AX_COND_WITH_LEVEL with an AC_DEFINE in the end... +AC_DEFUN([AX_COND_WITH_LEVEL_DEFINE], +[dnl the names to be defined... +pushdef([WITH_VAR], patsubst(with_$1, -, _))dnl +pushdef([VAR_WITH], patsubst(translit(with_$1, [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHOUT], patsubst(translit(without_$1, [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHVAL], patsubst(translit(withval_$1, [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHDEF], patsubst(translit(withdef_$1, [a-z], [A-Z]), -, _))dnl +AC_SUBST(VAR_WITH) +AC_SUBST(VAR_WITHOUT) +AC_SUBST(VAR_WITHVAL) +AC_SUBST(VAR_WITHDEF) +if test -z "$WITH_VAR" + then WITH_VAR=`echo ifelse([$2], , no, [$2])` +fi +if test "$WITH_VAR" = "yes" + then WITH_VAR=`echo ifelse([$3], , some, [$3])` +fi +if test "$WITH_VAR" != "no"; then + VAR_WITH= ; VAR_WITHOUT='#' + case "$WITH_VAR" in + 9|9,*|ultrasome|ultrasome,*|insane) withval=9 + VAR_WITHVAL=9 ; VAR_WITHDEF="-D""VAR_WITH=9" ;; + 8|8,*|ultra|ultra,*|experimental) withval=8 + VAR_WITHVAL=8 ; VAR_WITHDEF="-D""VAR_WITH=8" ;; + 7|7,*|muchmore|somemanymore|somemanymore,*|all) withval=7 + VAR_WITHVAL=7 ; VAR_WITHDEF="-D""VAR_WITH=7" ;; + 6|6,*|manymore|manymore,*|most) withval=6 + VAR_WITHVAL=6 ; VAR_WITHDEF="-D""VAR_WITH=6" ;; + 5|5,*|somemore|somemore,*|almost) withval=5 + VAR_WITHVAL=5 ; VAR_WITHDEF="-D""VAR_WITH=5" ;; + 4|4,*|more|more,*) withval=4 + VAR_WITHVAL=4 ; VAR_WITHDEF="-D""VAR_WITH=4" ;; + 3|3,*|much|somemany,*) withval=3 + VAR_WITHVAL=3 ; VAR_WITHDEF="-D""VAR_WITH=3" ;; + 2|2,*|many|many,*) withval=2 + VAR_WITHVAL=2 ; VAR_WITHDEF="-D""VAR_WITH=2" ;; + 1|1,*|some|some,*) withval=1 + VAR_WITHVAL=1 ; VAR_WITHDEF="-D""VAR_WITH=1" ;; + *) withval=- + AC_MSG_ERROR([dnl + bad value of --with-$1 option, choose a number or some|many|more|all... ]) + esac +dnl -- the additional line is here -- + AC_DEFINE_UNQUOTED(VAR_WITH,$VAR_WITHVAL,"--with-$1=level") +else withval=0 + VAR_WITH='#' ; VAR_WITHOUT="" + VAR_WITHVAL=0 ; VAR_WITHDEF="" +fi +popdef([VAR_WITH])dnl +popdef([VAR_WITHOUT])dnl +popdef([VAR_WITHVAL])dnl +popdef([VAR_WITHDEF])dnl +popdef([WITH_VAR])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_config_feature.m4 projectm-3.1.0/m4/autoconf-archive/ax_config_feature.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_config_feature.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_config_feature.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,156 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_config_feature.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CONFIG_FEATURE(FEATURE-NAME, FEATURE-DESCRIPTION, DEFINE, DEFINE-DESCRIPTION, [ACTION-IF-ENABLED [, ACTION-IF-NOT-ENABLED]]) +# +# DESCRIPTION +# +# AX_CONFIG_FEATURE is a simple wrapper for AC_ARG_ENABLE, it enables the +# feature FEATURE-NAME and AC_DEFINEs the passed DEFINE, depending on the +# user choice. DESCRIPTION will be used for AC_DEFINEs. ACTION-IF-ENABLED +# and ACTION-IF-NOT-ENABLED are the actions that will be run. A feature is +# enabled by default, in order to change this behaviour use the +# AX_CONFIG_FEATURE_DEFAULT_ENABLED and AX_CONFIG_FEATURE_DEFAULT_DISABLED +# macros. +# +# A simple example: +# +# AX_CONFIG_FEATURE_DEFAULT_ENABLED +# AX_CONFIG_FEATURE(feature_xxxxx, [turns on/off XXXXX support], +# HAVE_XXXXX, [Define if you want XXXXX support]) +# +# ... +# +# AX_CONFIG_FEATURE_DEFAULT_DISABLED +# AX_CONFIG_FEATURE(feature_yyyyy, [turns on/off YYYYY support], +# HAVE_YYYYY, [Define if you want YYYYY support], +# [enable_yyyyy="yes"], [enable_yyyyy="no"]) +# AM_CONDITIONAL(YYYYY, [test "$enable_yyyyy" = "yes"]) +# +# AX_CONFIG_FEATURE_DEFAULT_ENABLED +# AX_CONFIG_FEATURE(...) +# +# ... +# +# If you have lot of features and you want a verbose dumping of each user +# selection use AX_CONFIG_FEATURE_VERBOSE. Use AX_CONFIG_FEATURE_SILENT in +# order to remove a previously AX_CONFIG_FEATURE_VERBOSE. By default +# features are silent. +# +# Use AX_CONFIG_FEATURE_ENABLE or AX_CONFIG_FEATURE_DISABLE in order to +# enable or disable a specific feature. +# +# Another simple example: +# +# AS_IF([some_test_here],[AX_CONFIG_FEATURE_ENABLE(feature_xxxxx)],[]) +# +# AX_CONFIG_FEATURE(feature_xxxxx, [turns on/off XXXXX support], +# HAVE_XXXXX, [Define if you want XXXXX support]) +# AX_CONFIG_FEATURE(feature_yyyyy, [turns on/off YYYYY support], +# HAVE_YYYYY, [Define if you want YYYYY support], +# [enable_yyyyy="yes"], [enable_yyyyy="no"]) +# +# ... +# +# NOTE: AX_CONFIG_FEATURE_ENABLE() must be placed first of the relative +# AX_CONFIG_FEATURE() macro ... +# +# LICENSE +# +# Copyright (c) 2008 Francesco Salvestrini +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AC_DEFUN([AX_CONFIG_FEATURE],[ dnl +m4_pushdef([FEATURE], patsubst([$1], -, _))dnl + +AC_ARG_ENABLE([$1],AS_HELP_STRING([--enable-$1],[$2]),[ +case "${enableval}" in + yes) + ax_config_feature_[]FEATURE[]="yes" + ;; + no) + ax_config_feature_[]FEATURE[]="no" + ;; + *) + AC_MSG_ERROR([bad value ${enableval} for feature --$1]) + ;; +esac +]) + +AS_IF([test "$ax_config_feature_[]FEATURE[]" = yes],[ dnl + AC_DEFINE([$3]) + $5 + AS_IF([test "$ax_config_feature_verbose" = yes],[ dnl + AC_MSG_NOTICE([Feature $1 is enabled]) + ]) +],[ dnl + $6 + AS_IF([test "$ax_config_feature_verbose" = yes],[ dnl + AC_MSG_NOTICE([Feature $1 is disabled]) + ]) +]) + +AH_TEMPLATE([$3],[$4]) + +m4_popdef([FEATURE])dnl +]) + +dnl Feature global +AC_DEFUN([AX_CONFIG_FEATURE_VERBOSE],[ dnl + ax_config_feature_verbose=yes +]) + +dnl Feature global +AC_DEFUN([AX_CONFIG_FEATURE_SILENT],[ dnl + ax_config_feature_verbose=no +]) + +dnl Feature specific +AC_DEFUN([AX_CONFIG_FEATURE_DEFAULT_ENABLED], [ + ax_config_feature_[]FEATURE[]_default=yes +]) + +dnl Feature specific +AC_DEFUN([AX_CONFIG_FEATURE_DEFAULT_DISABLED], [ + ax_config_feature_[]FEATURE[]_default=no +]) + +dnl Feature specific +AC_DEFUN([AX_CONFIG_FEATURE_ENABLE],[ dnl + ax_config_feature_[]patsubst([$1], -, _)[]=yes +]) + +dnl Feature specific +AC_DEFUN([AX_CONFIG_FEATURE_DISABLE],[ dnl + ax_config_feature_[]patsubst([$1], -, _)[]=no +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_configure_args.m4 projectm-3.1.0/m4/autoconf-archive/ax_configure_args.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_configure_args.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_configure_args.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_configure_args.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CONFIGURE_ARGS +# +# DESCRIPTION +# +# Helper macro for AX_ENABLE_BUILDDIR. +# +# The traditional way of starting a subdir-configure is running the script +# with ${1+"$@"} but since autoconf 2.60 this is broken. Instead we have +# to rely on eval'ing $ac_configure_args however some old autoconf +# versions do not provide that. To ensure maximum portability of autoconf +# extension macros this helper can be AC_REQUIRE'd so that +# $ac_configure_args will always be present. +# +# Sadly, the traditional "exec $SHELL" of the enable_builddir macros is +# spoiled now and must be replaced by "eval + exit $?". +# +# Example: +# +# AC_DEFUN([AX_ENABLE_SUBDIR],[dnl +# AC_REQUIRE([AX_CONFIGURE_ARGS])dnl +# eval $SHELL $ac_configure_args || exit $? +# ...]) +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 13 + +AC_DEFUN([AX_CONFIGURE_ARGS],[ + # [$]@ is unusable in 2.60+ but earlier autoconf had no ac_configure_args + if test "${ac_configure_args+set}" != "set" ; then + ac_configure_args= + for ac_arg in ${1+"[$]@"}; do + ac_configure_args="$ac_configure_args '$ac_arg'" + done + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_count_cpus.m4 projectm-3.1.0/m4/autoconf-archive/ax_count_cpus.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_count_cpus.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_count_cpus.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,101 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_count_cpus.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COUNT_CPUS([ACTION-IF-DETECTED],[ACTION-IF-NOT-DETECTED]) +# +# DESCRIPTION +# +# Attempt to count the number of logical processor cores (including +# virtual and HT cores) currently available to use on the machine and +# place detected value in CPU_COUNT variable. +# +# On successful detection, ACTION-IF-DETECTED is executed if present. If +# the detection fails, then ACTION-IF-NOT-DETECTED is triggered. The +# default ACTION-IF-NOT-DETECTED is to set CPU_COUNT to 1. +# +# LICENSE +# +# Copyright (c) 2014,2016 Karlson2k (Evgeny Grin) +# Copyright (c) 2012 Brian Aker +# Copyright (c) 2008 Michael Paul Bailey +# Copyright (c) 2008 Christophe Tournayre +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 22 + + AC_DEFUN([AX_COUNT_CPUS],[dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_EGREP])dnl + AC_MSG_CHECKING([the number of available CPUs]) + CPU_COUNT="0" + + # Try generic methods + + # 'getconf' is POSIX utility, but '_NPROCESSORS_ONLN' and + # 'NPROCESSORS_ONLN' are platform-specific + command -v getconf >/dev/null 2>&1 && \ + CPU_COUNT=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null` || CPU_COUNT="0" + AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v nproc >/dev/null 2>&1]],[[: # empty]],[dnl + # 'nproc' is part of GNU Coreutils and is widely available + CPU_COUNT=`OMP_NUM_THREADS='' nproc 2>/dev/null` || CPU_COUNT=`nproc 2>/dev/null` || CPU_COUNT="0" + ])dnl + + AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl + # Try platform-specific preferred methods + AS_CASE([[$host_os]],dnl + [[*linux*]],[[CPU_COUNT=`lscpu -p 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+,' -c` || CPU_COUNT="0"]],dnl + [[*darwin*]],[[CPU_COUNT=`sysctl -n hw.logicalcpu 2>/dev/null` || CPU_COUNT="0"]],dnl + [[freebsd*]],[[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n kern.smp.cpus 2>/dev/null` || CPU_COUNT="0"]],dnl + [[netbsd*]], [[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n hw.ncpuonline 2>/dev/null` || CPU_COUNT="0"]],dnl + [[solaris*]],[[command -v psrinfo >/dev/null 2>&1 && CPU_COUNT=`psrinfo 2>/dev/null | $EGREP -e '^@<:@0-9@:>@.*on-line' -c 2>/dev/null` || CPU_COUNT="0"]],dnl + [[mingw*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl + [[msys*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl + [[cygwin*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]]dnl + )dnl + ])dnl + + AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v sysctl >/dev/null 2>&1]],[[: # empty]],[dnl + # Try less preferred generic method + # 'hw.ncpu' exist on many platforms, but not on GNU/Linux + CPU_COUNT=`sysctl -n hw.ncpu 2>/dev/null` || CPU_COUNT="0" + ])dnl + + AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl + # Try platform-specific fallback methods + # They can be less accurate and slower then preferred methods + AS_CASE([[$host_os]],dnl + [[*linux*]],[[CPU_COUNT=`$EGREP -e '^processor' -c /proc/cpuinfo 2>/dev/null` || CPU_COUNT="0"]],dnl + [[*darwin*]],[[CPU_COUNT=`system_profiler SPHardwareDataType 2>/dev/null | $EGREP -i -e 'number of cores:'|cut -d : -f 2 -s|tr -d ' '` || CPU_COUNT="0"]],dnl + [[freebsd*]],[[CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+: '|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl + [[netbsd*]], [[CPU_COUNT=`command -v cpuctl >/dev/null 2>&1 && cpuctl list 2>/dev/null| $EGREP -e '^@<:@0-9@:>@+ .* online ' -c` || \ + CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+ at'|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl + [[solaris*]],[[command -v kstat >/dev/null 2>&1 && CPU_COUNT=`kstat -m cpu_info -s state -p 2>/dev/null | $EGREP -c -e 'on-line'` || \ + CPU_COUNT=`kstat -m cpu_info 2>/dev/null | $EGREP -c -e 'module: cpu_info'` || CPU_COUNT="0"]],dnl + [[mingw*]],[AS_IF([[CPU_COUNT=`reg query 'HKLM\\Hardware\\Description\\System\\CentralProcessor' 2>/dev/null | $EGREP -e '\\\\@<:@0-9@:>@+$' -c`]],dnl + [[: # empty]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]])],dnl + [[msys*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]],dnl + [[cygwin*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]]dnl + )dnl + ])dnl + + AS_IF([[test "x$CPU_COUNT" != "x0" && test "$CPU_COUNT" -gt 0 2>/dev/null]],[dnl + AC_MSG_RESULT([[$CPU_COUNT]]) + m4_ifvaln([$1],[$1],)dnl + ],[dnl + m4_ifval([$2],[dnl + AS_UNSET([[CPU_COUNT]]) + AC_MSG_RESULT([[unable to detect]]) + $2 + ], [dnl + CPU_COUNT="1" + AC_MSG_RESULT([[unable to detect (assuming 1)]]) + ])dnl + ])dnl + ])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cpu_freq.m4 projectm-3.1.0/m4/autoconf-archive/ax_cpu_freq.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cpu_freq.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cpu_freq.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,94 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cpu_freq.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CPU_FREQ +# +# DESCRIPTION +# +# Compute the CPU frequency and define CPU_FREQ accordingly. +# +# LICENSE +# +# Copyright (c) 2008 Christophe Tournayre +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_CPU_FREQ], +[AC_REQUIRE([AC_PROG_CC]) + AC_LANG_PUSH([C++]) + AC_CACHE_CHECK(your cpu frequency, ax_cpu_freq, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([ +#include +#include +#include +using namespace std; + +static __inline__ unsigned long long int rdtsc() +{ + unsigned long long int x; + __asm__ volatile (".byte 0x0f, 0x31":"=A" (x)); + return x; +} + +static float estimate_MHz(long sleeptime = 250000) +{ + struct timezone tz; + struct timeval tvstart, tvstop; + unsigned long long int cycles[[2]]; + float microseconds; + double freq = 1.0f; + + memset(&tz, 0, sizeof(tz)); + + gettimeofday(&tvstart, &tz); + cycles[[0]] = rdtsc(); + gettimeofday(&tvstart, &tz); + + usleep(sleeptime); + + gettimeofday(&tvstop, &tz); + cycles[[1]] = rdtsc(); + gettimeofday(&tvstop, &tz); + + microseconds = (tvstop.tv_sec - tvstart.tv_sec) * 1000000 + + (tvstop.tv_usec - tvstart.tv_usec); + + return (float) (cycles[[1]] - cycles[[0]]) / (microseconds / freq); +} + +static float average_MHz(int tries = 2) +{ + float frequency = 0; + + for (int i = 1; i <= tries; i++) + frequency += estimate_MHz(i * 150000); + + if (tries > 0) + return frequency / (float) tries; + else + return 0; +} +], [ + ofstream of("conftest_cpufreq"); + if(of.is_open()) + of << average_MHz(); + else + return 1; + + of.close() +])], + [ax_cpu_freq=`cat conftest_cpufreq`; rm -f conftest_cpufreq], + [ax_cpu_freq=unknow; rm -f conftest_cpufreq] + )]) +AC_LANG_POP([C++]) + + AC_DEFINE_UNQUOTED([CPU_FREQ], ${ax_cpu_freq}, [The cpu frequency (in MHz)]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cpu_vendor.m4 projectm-3.1.0/m4/autoconf-archive/ax_cpu_vendor.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cpu_vendor.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cpu_vendor.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cpu_vendor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CPU_VENDOR +# +# DESCRIPTION +# +# Find your CPU's vendor by requesting cpuid and define "ax_cpu_vendor" +# accordingly. This macro depends on AX_GCC_X86_CPUID. +# +# LICENSE +# +# Copyright (c) 2008 Christophe Tournayre +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_CPU_VENDOR], +[ + AC_REQUIRE([AX_GCC_X86_CPUID]) + AX_GCC_X86_CPUID(0x0) + + AC_CACHE_CHECK(for the processor vendor, ax_cpu_vendor, + [ + vendor=`echo $ax_cv_gcc_x86_cpuid_0x0 | cut -d ":" -f 2` + + case $vendor in + 756e6547*) + ax_cpu_vendor="Intel" + ;; + 68747541*) + ax_cpu_vendor="AMD" + ;; + 69727943*) + ax_cpu_vendor="Cyrix" + ;; + 746e6543*) + ax_cpu_vendor="IDT" + ;; + 646f6547*) + ax_cpu_vendor="Natsemi Geode" + ;; + 52697365*) + ax_cpu_vendor="Rise" + ;; + 65736952*) + ax_cpu_vendor="Rise" + ;; + 20536953*) + ax_cpu_vendor="SiS" + ;; + *) + ax_cpu_vendor="Unknown" + ;; + esac + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_generic_config.m4 projectm-3.1.0/m4/autoconf-archive/ax_create_generic_config.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_generic_config.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_create_generic_config.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,195 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_create_generic_config.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CREATE_GENERIC_CONFIG [(PACKAGEnlibs [, VERSION])] +# +# DESCRIPTION +# +# Creates a generic PACKAGE-config file that has all the things that you +# want, hmm, well, at least it has --cflags, --version, --libs. Ahhm, did +# you see ax_path_generic in the autoconf-archive? ;-) +# +# this macros saves you all the typing for a pkg-config.in script, you +# don't even need to distribute one along. Place this macro in your +# configure.ac, et voila, you got one that you want to install. +# +# oh, btw, if the first arg looks like "mylib -lwhat' then it will go to +# be added to the --libs, and mylib is extracted. +# +# the defaults: $1 = $PACKAGE $LIBS $2 = $VERSION there is also an +# AC_SUBST(GENERIC_CONFIG) that will be set to the name of the file that +# we did output in this macro. Use as: +# +# install-exec-local: install-generic-config +# +# install-generic-config: +# $(mkinstalldirs) $(DESTDIR)$(bindir) +# $(INSTALL_SCRIPT) @GENERIC_CONFIG@ $(DESTDIR)$(bindir) +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AU_ALIAS([AC_CREATE_GENERIC_CONFIG], [AX_CREATE_GENERIC_CONFIG]) +AC_DEFUN([AX_CREATE_GENERIC_CONFIG],[# create a generic PACKAGE-config file +L=`echo ifelse($1, , $PACKAGE $LIBS, $1)` +P=`echo $L | sed -e 's/ -.*//'` +P=`echo $P` +V=`echo ifelse($2, , $VERSION, $2)` +F=`echo $P-config` +L=`echo -l$L | sed -e 's/^-llib/-l/'` +AC_MSG_RESULT(creating $F - generic $V for $L) +test "x$prefix" = xNONE && prefix="$ac_default_prefix" +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +echo '#! /bin/sh' >$F +echo ' ' >>$F +echo 'package="'$P'"' >>$F +echo 'version="'$V'"' >>$F +echo 'libs="'$L'"' >>$F +echo ' ' >>$F +# in the order of occurence a standard automake Makefile +echo 'prefix="'$prefix'"' >>$F +echo 'exec_prefix="'$exec_prefix'"' >>$F +echo 'bindir="'$bindir'"' >>$F +echo 'sbindir="'$sbindir'"' >>$F +echo 'libexecdir="'$libexecdir'"' >>$F +echo 'datadir="'$datadir'"' >>$F +echo 'sysconfdir="'$sysconfdir'"' >>$F +echo 'sharedstatedir="'$sharedstatedir'"' >>$F +echo 'localstatedir="'$localstatedir'"' >>$F +echo 'libdir="'$libdir'"' >>$F +echo 'infodir="'$infodir'"' >>$F +echo 'mandir="'$mandir'"' >>$F +echo 'includedir="'$includedir'"' >>$F +echo 'target="'$target'"' >>$F +echo 'host="'$host'"' >>$F +echo 'build="'$build'"' >>$F +echo ' ' >>$F +echo 'if test "'"\$""#"'" -eq 0; then' >>$F +echo ' cat <>$F +echo 'Usage: $package-config [OPTIONS]' >>$F +echo 'Options:' >>$F +echo ' --prefix[=DIR]) : \$prefix' >>$F +echo ' --package) : \$package' >>$F +echo ' --version) : \$version' >>$F +echo ' --cflags) : -I\$includedir' >>$F +echo ' --libs) : -L\$libdir -l\$package' >>$F +echo ' --help) print all the options (not just these)' >>$F +echo 'EOF' >>$F +echo 'fi' >>$F +echo ' ' >>$F +echo 'o=""' >>$F +echo 'h=""' >>$F +echo 'for i in "[$]@"; do' >>$F +echo ' case $i in' >>$F +echo ' --prefix=*) prefix=`echo $i | sed -e "s/--prefix=//"` ;;' >>$F +echo ' --prefix) o="$o $prefix" ;;' >>$F +echo ' --package) o="$o $package" ;;' >>$F +echo ' --version) o="$o $version" ;;' >>$F +echo ' --cflags) if test "_$includedir" != "_/usr/include"' >>$F +echo ' then o="$o -I$includedir" ; fi' >>$F +echo ' ;;' >>$F +echo ' --libs) o="$o -L$libdir $libs" ;;' >>$F +echo ' --exec_prefix|--eprefix) o="$o $exec_prefix" ;;' >>$F +echo ' --bindir) o="$o $bindir" ;;' >>$F +echo ' --sbindir) o="$o $sbindir" ;;' >>$F +echo ' --libexecdir) o="$o $libexecdir" ;;' >>$F +echo ' --datadir) o="$o $datadir" ;;' >>$F +echo ' --datainc) o="$o -I$datadir" ;;' >>$F +echo ' --datalib) o="$o -L$datadir" ;;' >>$F +echo ' --sysconfdir) o="$o $sysconfdir" ;;' >>$F +echo ' --sharedstatedir) o="$o $sharedstatedir" ;;' >>$F +echo ' --localstatedir) o="$o $localstatedir" ;;' >>$F +echo ' --libdir) o="$o $libdir" ;;' >>$F +echo ' --libadd) o="$o -L$libdir" ;;' >>$F +echo ' --infodir) o="$o $infodir" ;;' >>$F +echo ' --mandir) o="$o $mandir" ;;' >>$F +echo ' --target) o="$o $target" ;;' >>$F +echo ' --host) o="$o $host" ;;' >>$F +echo ' --build) o="$o $build" ;;' >>$F +echo ' --data) o="$o -I$datadir/$package" ;;' >>$F +echo ' --pkgdatadir) o="$o $datadir/$package" ;;' >>$F +echo ' --pkgdatainc) o="$o -I$datadir/$package" ;;' >>$F +echo ' --pkgdatalib) o="$o -L$datadir/$package" ;;' >>$F +echo ' --pkglibdir) o="$o $libdir/$package" ;;' >>$F +echo ' --pkglibinc) o="$o -I$libinc/$package" ;;' >>$F +echo ' --pkglibadd) o="$o -L$libadd/$package" ;;' >>$F +echo ' --pkgincludedir) o="$o $includedir/$package" ;;' >>$F +echo ' --help) h="1" ;;' >>$F +echo ' -?//*|-?/*//*|-?./*//*|//*|/*//*|./*//*) ' >>$F +echo ' v=`echo $i | sed -e s://:\$:g`' >>$F +echo ' v=`eval "echo $v"` ' >>$F +echo ' o="$o $v" ;; ' >>$F +echo ' esac' >>$F +echo 'done' >>$F +echo ' ' >>$F +echo 'o=`eval "echo $o"`' >>$F +echo 'o=`eval "echo $o"`' >>$F +echo 'eval "echo $o"' >>$F +echo ' ' >>$F +echo 'if test ! -z "$h" ; then ' >>$F +echo 'cat <>$F +echo ' --prefix=xxx) (what is that for anyway?)' >>$F +echo ' --prefix) \$prefix $prefix' >>$F +echo ' --package) \$package $package' >>$F +echo ' --version) \$version $version' >>$F +echo ' --cflags) -I\$includedir unless it is /usr/include' >>$F +echo ' --libs) -L\$libdir -l\$PACKAGE \$LIBS' >>$F +echo ' --exec_prefix) or... ' >>$F +echo ' --eprefix) \$exec_prefix $exec_prefix' >>$F +echo ' --bindir) \$bindir $bindir' >>$F +echo ' --sbindir) \$sbindir $sbindir' >>$F +echo ' --libexecdir) \$libexecdir $libexecdir' >>$F +echo ' --datadir) \$datadir $datadir' >>$F +echo ' --sysconfdir) \$sysconfdir $sysconfdir' >>$F +echo ' --sharedstatedir) \$sharedstatedir$sharedstatedir' >>$F +echo ' --localstatedir) \$localstatedir $localstatedir' >>$F +echo ' --libdir) \$libdir $libdir' >>$F +echo ' --infodir) \$infodir $infodir' >>$F +echo ' --mandir) \$mandir $mandir' >>$F +echo ' --target) \$target $target' >>$F +echo ' --host) \$host $host' >>$F +echo ' --build) \$build $build' >>$F +echo ' --data) -I\$datadir/\$package' >>$F +echo ' --pkgdatadir) \$datadir/\$package' >>$F +echo ' --pkglibdir) \$libdir/\$package' >>$F +echo ' --pkgincludedir) \$includedir/\$package' >>$F +echo ' --help) generated by ax_create_generic_config.m4' >>$F +echo ' -I//varname and other inc-targets like --pkgdatainc supported' >>$F +echo ' -L//varname and other lib-targets, e.g. --pkgdatalib or --libadd' >>$F +echo 'EOF' >>$F +echo 'fi' >>$F +GENERIC_CONFIG="$F" +AC_SUBST(GENERIC_CONFIG) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_pkgconfig_info.m4 projectm-3.1.0/m4/autoconf-archive/ax_create_pkgconfig_info.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_pkgconfig_info.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_create_pkgconfig_info.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,351 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_create_pkgconfig_info.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CREATE_PKGCONFIG_INFO [(outputfile, [requires [,libs [,summary [,cflags [, ldflags]]]]])] +# +# DESCRIPTION +# +# Defaults: +# +# $1 = $PACKAGE_NAME.pc +# $2 = (empty) +# $3 = $PACKAGE_LIBS $LIBS (as set at that point in configure.ac) +# $4 = $PACKAGE_SUMMARY (or $1 Library) +# $5 = $PACKAGE_CFLAGS (as set at the point in configure.ac) +# $6 = $PACKAGE_LDFLAGS (as set at the point in configure.ac) +# +# PACKAGE_NAME defaults to $PACKAGE if not set. +# PACKAGE_LIBS defaults to -l$PACKAGE_NAME if not set. +# +# The resulting file is called $PACKAGE.pc.in / $PACKAGE.pc +# +# You will find this macro most useful in conjunction with +# ax_spec_defaults that can read good initializers from the .spec file. In +# consequence, most of the generatable installable stuff can be made from +# information being updated in a single place for the whole project. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2008 Sven Verdoolaege +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AC_DEFUN([AX_CREATE_PKGCONFIG_INFO],[dnl +AS_VAR_PUSHDEF([PKGCONFIG_suffix],[ax_create_pkgconfig_suffix])dnl +AS_VAR_PUSHDEF([PKGCONFIG_libdir],[ax_create_pkgconfig_libdir])dnl +AS_VAR_PUSHDEF([PKGCONFIG_libfile],[ax_create_pkgconfig_libfile])dnl +AS_VAR_PUSHDEF([PKGCONFIG_libname],[ax_create_pkgconfig_libname])dnl +AS_VAR_PUSHDEF([PKGCONFIG_version],[ax_create_pkgconfig_version])dnl +AS_VAR_PUSHDEF([PKGCONFIG_description],[ax_create_pkgconfig_description])dnl +AS_VAR_PUSHDEF([PKGCONFIG_requires],[ax_create_pkgconfig_requires])dnl +AS_VAR_PUSHDEF([PKGCONFIG_pkglibs],[ax_create_pkgconfig_pkglibs])dnl +AS_VAR_PUSHDEF([PKGCONFIG_libs],[ax_create_pkgconfig_libs])dnl +AS_VAR_PUSHDEF([PKGCONFIG_ldflags],[ax_create_pkgconfig_ldflags])dnl +AS_VAR_PUSHDEF([PKGCONFIG_cppflags],[ax_create_pkgconfig_cppflags])dnl +AS_VAR_PUSHDEF([PKGCONFIG_generate],[ax_create_pkgconfig_generate])dnl +AS_VAR_PUSHDEF([PKGCONFIG_src_libdir],[ax_create_pkgconfig_src_libdir])dnl +AS_VAR_PUSHDEF([PKGCONFIG_src_headers],[ax_create_pkgconfig_src_headers])dnl + +# we need the expanded forms... +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +AC_MSG_CHECKING(our pkgconfig libname) +test ".$PKGCONFIG_libname" != "." || \ +PKGCONFIG_libname="ifelse($1,,${PACKAGE_NAME},`basename $1 .pc`)" +test ".$PKGCONFIG_libname" != "." || \ +PKGCONFIG_libname="$PACKAGE" +PKGCONFIG_libname=`eval echo "$PKGCONFIG_libname"` +PKGCONFIG_libname=`eval echo "$PKGCONFIG_libname"` +AC_MSG_RESULT($PKGCONFIG_libname) + +AC_MSG_CHECKING(our pkgconfig version) +test ".$PKGCONFIG_version" != "." || \ +PKGCONFIG_version="${PACKAGE_VERSION}" +test ".$PKGCONFIG_version" != "." || \ +PKGCONFIG_version="$VERSION" +PKGCONFIG_version=`eval echo "$PKGCONFIG_version"` +PKGCONFIG_version=`eval echo "$PKGCONFIG_version"` +AC_MSG_RESULT($PKGCONFIG_version) + +AC_MSG_CHECKING(our pkgconfig_libdir) +test ".$pkgconfig_libdir" = "." && \ +pkgconfig_libdir='${libdir}/pkgconfig' +PKGCONFIG_libdir=`eval echo "$pkgconfig_libdir"` +PKGCONFIG_libdir=`eval echo "$PKGCONFIG_libdir"` +PKGCONFIG_libdir=`eval echo "$PKGCONFIG_libdir"` +AC_MSG_RESULT($pkgconfig_libdir) +test "$pkgconfig_libdir" != "$PKGCONFIG_libdir" && ( +AC_MSG_RESULT(expanded our pkgconfig_libdir... $PKGCONFIG_libdir)) +AC_SUBST([pkgconfig_libdir]) + +AC_MSG_CHECKING(our pkgconfig_libfile) +test ".$pkgconfig_libfile" != "." || \ +pkgconfig_libfile="ifelse($1,,$PKGCONFIG_libname.pc,`basename $1`)" +PKGCONFIG_libfile=`eval echo "$pkgconfig_libfile"` +PKGCONFIG_libfile=`eval echo "$PKGCONFIG_libfile"` +AC_MSG_RESULT($pkgconfig_libfile) +test "$pkgconfig_libfile" != "$PKGCONFIG_libfile" && ( +AC_MSG_RESULT(expanded our pkgconfig_libfile... $PKGCONFIG_libfile)) +AC_SUBST([pkgconfig_libfile]) + +AC_MSG_CHECKING(our package / suffix) +PKGCONFIG_suffix="$program_suffix" +test ".$PKGCONFIG_suffix" != .NONE || PKGCONFIG_suffix="" +AC_MSG_RESULT(${PACKAGE_NAME} / ${PKGCONFIG_suffix}) + +AC_MSG_CHECKING(our pkgconfig description) +PKGCONFIG_description="ifelse($4,,$PACKAGE_SUMMARY,$4)" +test ".$PKGCONFIG_description" != "." || \ +PKGCONFIG_description="$PKGCONFIG_libname Library" +PKGCONFIG_description=`eval echo "$PKGCONFIG_description"` +PKGCONFIG_description=`eval echo "$PKGCONFIG_description"` +AC_MSG_RESULT($PKGCONFIG_description) + +AC_MSG_CHECKING(our pkgconfig requires) +PKGCONFIG_requires="ifelse($2,,$PACKAGE_REQUIRES,$2)" +PKGCONFIG_requires=`eval echo "$PKGCONFIG_requires"` +PKGCONFIG_requires=`eval echo "$PKGCONFIG_requires"` +AC_MSG_RESULT($PKGCONFIG_requires) + +AC_MSG_CHECKING(our pkgconfig ext libs) +PKGCONFIG_pkglibs="$PACKAGE_LIBS" +test ".$PKGCONFIG_pkglibs" != "." || PKGCONFIG_pkglibs="-l$PKGCONFIG_libname" +PKGCONFIG_libs="ifelse($3,,$PKGCONFIG_pkglibs $LIBS,$3)" +PKGCONFIG_libs=`eval echo "$PKGCONFIG_libs"` +PKGCONFIG_libs=`eval echo "$PKGCONFIG_libs"` +AC_MSG_RESULT($PKGCONFIG_libs) + +AC_MSG_CHECKING(our pkgconfig cppflags) +PKGCONFIG_cppflags="ifelse($5,,$PACKAGE_CFLAGS,$5)" +PKGCONFIG_cppflags=`eval echo "$PKGCONFIG_cppflags"` +PKGCONFIG_cppflags=`eval echo "$PKGCONFIG_cppflags"` +AC_MSG_RESULT($PKGCONFIG_cppflags) + +AC_MSG_CHECKING(our pkgconfig ldflags) +PKGCONFIG_ldflags="ifelse($6,,$PACKAGE_LDFLAGS,$6)" +PKGCONFIG_ldflags=`eval echo "$PKGCONFIG_ldflags"` +PKGCONFIG_ldflags=`eval echo "$PKGCONFIG_ldflags"` +AC_MSG_RESULT($PKGCONFIG_ldflags) + +test ".$PKGCONFIG_generate" != "." || \ +PKGCONFIG_generate="ifelse($1,,$PKGCONFIG_libname.pc,$1)" +PKGCONFIG_generate=`eval echo "$PKGCONFIG_generate"` +PKGCONFIG_generate=`eval echo "$PKGCONFIG_generate"` +test "$pkgconfig_libfile" != "$PKGCONFIG_generate" && ( +AC_MSG_RESULT(generate the pkgconfig later... $PKGCONFIG_generate)) + +if test ".$PKGCONFIG_src_libdir" = "." ; then +PKGCONFIG_src_libdir=`pwd` +PKGCONFIG_src_libdir=`AS_DIRNAME("$PKGCONFIG_src_libdir/$PKGCONFIG_generate")` +test ! -d $PKGCONFIG_src_libdir/src || \ +PKGCONFIG_src_libdir="$PKGCONFIG_src_libdir/src" +case ".$objdir" in +*libs) PKGCONFIG_src_libdir="$PKGCONFIG_src_libdir/$objdir" ;; esac +AC_MSG_RESULT(noninstalled pkgconfig -L $PKGCONFIG_src_libdir) +fi + +if test ".$PKGCONFIG_src_headers" = "." ; then +PKGCONFIG_src_headers=`pwd` +v="$ac_top_srcdir" ; +test ".$v" != "." || v="$ax_spec_dir" +test ".$v" != "." || v="$srcdir" +case "$v" in /*) PKGCONFIG_src_headers="" ;; esac +PKGCONFIG_src_headers=`AS_DIRNAME("$PKGCONFIG_src_headers/$v/x")` +test ! -d $PKGCONFIG_src_headers/incl[]ude || \ +PKGCONFIG_src_headers="$PKGCONFIG_src_headers/incl[]ude" +AC_MSG_RESULT(noninstalled pkgconfig -I $PKGCONFIG_src_headers) +fi + + +dnl AC_CONFIG_COMMANDS crap disallows to use $PKGCONFIG_libfile here... +AC_CONFIG_COMMANDS([$ax_create_pkgconfig_generate],[ +pkgconfig_generate="$ax_create_pkgconfig_generate" +if test ! -f "$pkgconfig_generate.in" +then generate="true" +elif grep ' generated by configure ' $pkgconfig_generate.in >/dev/null +then generate="true" +else generate="false"; +fi +if $generate ; then +AC_MSG_NOTICE(creating $pkgconfig_generate.in) +cat > $pkgconfig_generate.in <conftest.sed < $pkgconfig_generate +if test ! -s $pkgconfig_generate ; then + AC_MSG_ERROR([$pkgconfig_generate is empty]) +fi ; rm conftest.sed # DONE generate $pkgconfig_generate +pkgconfig_uninstalled=`echo $pkgconfig_generate |sed 's/.pc$/-uninstalled.pc/'` +AC_MSG_NOTICE(creating $pkgconfig_uninstalled) +cat >conftest.sed < $pkgconfig_uninstalled +if test ! -s $pkgconfig_uninstalled ; then + AC_MSG_ERROR([$pkgconfig_uninstalled is empty]) +fi ; rm conftest.sed # DONE generate $pkgconfig_uninstalled + pkgconfig_requires_add=`echo ${pkgconfig_requires}` +if test ".$pkgconfig_requires_add" != "." ; then + pkgconfig_requires_add="pkg-config $pkgconfig_requires_add" + else pkgconfig_requires_add=":" ; fi +pkgconfig_uninstalled=`echo $pkgconfig_generate |sed 's/.pc$/-uninstalled.sh/'` +AC_MSG_NOTICE(creating $pkgconfig_uninstalled) +cat >conftest.sed <Name:>for option\\; do case \"\$option\" in --list-all|--name) echo > +s>Description: *>\\;\\; --help) pkg-config --help \\; echo Buildscript Of > +s>Version: *>\\;\\; --modversion|--version) echo > +s>Requires:>\\;\\; --requires) echo $pkgconfig_requires_add> +s>Libs: *>\\;\\; --libs) echo > +s>Cflags: *>\\;\\; --cflags) echo > +/--libs)/a\\ + $pkgconfig_requires_add +/--cflags)/a\\ + $pkgconfig_requires_add\\ +;; --variable=*) eval echo '\$'\`echo \$option | sed -e 's/.*=//'\`\\ +;; --uninstalled) exit 0 \\ +;; *) ;; esac done +AXEOF +sed -f conftest.sed $pkgconfig_generate.in > $pkgconfig_uninstalled +if test ! -s $pkgconfig_uninstalled ; then + AC_MSG_ERROR([$pkgconfig_uninstalled is empty]) +fi ; rm conftest.sed # DONE generate $pkgconfig_uninstalled +],[ +dnl AC_CONFIG_COMMANDS crap, the AS_PUSHVAR defines are invalid here... +ax_create_pkgconfig_generate="$ax_create_pkgconfig_generate" +pkgconfig_prefix='$prefix' +pkgconfig_execprefix='$exec_prefix' +pkgconfig_bindir='$bindir' +pkgconfig_libdir='$libdir' +pkgconfig_includedir='$includedir' +pkgconfig_datarootdir='$datarootdir' +pkgconfig_datadir='$datadir' +pkgconfig_sysconfdir='$sysconfdir' +pkgconfig_suffix='$ax_create_pkgconfig_suffix' +pkgconfig_package='$PACKAGE_NAME' +pkgconfig_libname='$ax_create_pkgconfig_libname' +pkgconfig_description='$ax_create_pkgconfig_description' +pkgconfig_version='$ax_create_pkgconfig_version' +pkgconfig_requires='$ax_create_pkgconfig_requires' +pkgconfig_libs='$ax_create_pkgconfig_libs' +pkgconfig_ldflags='$ax_create_pkgconfig_ldflags' +pkgconfig_cppflags='$ax_create_pkgconfig_cppflags' +pkgconfig_src_libdir='$ax_create_pkgconfig_src_libdir' +pkgconfig_src_headers='$ax_create_pkgconfig_src_headers' +])dnl +AS_VAR_POPDEF([PKGCONFIG_suffix])dnl +AS_VAR_POPDEF([PKGCONFIG_libdir])dnl +AS_VAR_POPDEF([PKGCONFIG_libfile])dnl +AS_VAR_POPDEF([PKGCONFIG_libname])dnl +AS_VAR_POPDEF([PKGCONFIG_version])dnl +AS_VAR_POPDEF([PKGCONFIG_description])dnl +AS_VAR_POPDEF([PKGCONFIG_requires])dnl +AS_VAR_POPDEF([PKGCONFIG_pkglibs])dnl +AS_VAR_POPDEF([PKGCONFIG_libs])dnl +AS_VAR_POPDEF([PKGCONFIG_ldflags])dnl +AS_VAR_POPDEF([PKGCONFIG_cppflags])dnl +AS_VAR_POPDEF([PKGCONFIG_generate])dnl +AS_VAR_POPDEF([PKGCONFIG_src_libdir])dnl +AS_VAR_POPDEF([PKGCONFIG_src_headers])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_stdint_h.m4 projectm-3.1.0/m4/autoconf-archive/ax_create_stdint_h.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_stdint_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_create_stdint_h.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,727 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_create_stdint_h.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CREATE_STDINT_H [( HEADER-TO-GENERATE [, HEDERS-TO-CHECK])] +# +# DESCRIPTION +# +# the "ISO C9X: 7.18 Integer types " section requires the +# existence of an include file that defines a set of typedefs, +# especially uint8_t,int32_t,uintptr_t. Many older installations will not +# provide this file, but some will have the very same definitions in +# . In other environments we can use the inet-types in +# which would define the typedefs int8_t and u_int8_t +# respectively. +# +# This macros will create a local "_stdint.h" or the headerfile given as +# an argument. In many cases that file will just "#include " or +# "#include ", while in other environments it will provide the +# set of basic 'stdint's definitions/typedefs: +# +# int8_t,uint8_t,int16_t,uint16_t,int32_t,uint32_t,intptr_t,uintptr_t +# int_least32_t.. int_fast32_t.. intmax_t +# +# which may or may not rely on the definitions of other files, or using +# the AC_CHECK_SIZEOF macro to determine the actual sizeof each type. +# +# if your header files require the stdint-types you will want to create an +# installable file mylib-int.h that all your other installable header may +# include. So if you have a library package named "mylib", just use +# +# AX_CREATE_STDINT_H(mylib-int.h) +# +# in configure.ac and go to install that very header file in Makefile.am +# along with the other headers (mylib.h) - and the mylib-specific headers +# can simply use "#include " to obtain the stdint-types. +# +# Remember, if the system already had a valid , the generated +# file will include it directly. No need for fuzzy HAVE_STDINT_H things... +# (oops, GCC 4.2.x has deliberately disabled its stdint.h for non-c99 +# compilation and the c99-mode is not the default. Therefore this macro +# will not use the compiler's stdint.h - please complain to the GCC +# developers). +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 19 + +AC_DEFUN([AX_CHECK_DATA_MODEL],[ + AC_CHECK_SIZEOF(char) + AC_CHECK_SIZEOF(short) + AC_CHECK_SIZEOF(int) + AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(void*) + ac_cv_char_data_model="" + ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_char" + ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_short" + ac_cv_char_data_model="$ac_cv_char_data_model$ac_cv_sizeof_int" + ac_cv_long_data_model="" + ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_int" + ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_long" + ac_cv_long_data_model="$ac_cv_long_data_model$ac_cv_sizeof_voidp" + AC_MSG_CHECKING([data model]) + case "$ac_cv_char_data_model/$ac_cv_long_data_model" in + 122/242) ac_cv_data_model="IP16" ; n="standard 16bit machine" ;; + 122/244) ac_cv_data_model="LP32" ; n="standard 32bit machine" ;; + 122/*) ac_cv_data_model="i16" ; n="unusual int16 model" ;; + 124/444) ac_cv_data_model="ILP32" ; n="standard 32bit unixish" ;; + 124/488) ac_cv_data_model="LP64" ; n="standard 64bit unixish" ;; + 124/448) ac_cv_data_model="LLP64" ; n="unusual 64bit unixish" ;; + 124/*) ac_cv_data_model="i32" ; n="unusual int32 model" ;; + 128/888) ac_cv_data_model="ILP64" ; n="unusual 64bit numeric" ;; + 128/*) ac_cv_data_model="i64" ; n="unusual int64 model" ;; + 222/*2) ac_cv_data_model="DSP16" ; n="strict 16bit dsptype" ;; + 333/*3) ac_cv_data_model="DSP24" ; n="strict 24bit dsptype" ;; + 444/*4) ac_cv_data_model="DSP32" ; n="strict 32bit dsptype" ;; + 666/*6) ac_cv_data_model="DSP48" ; n="strict 48bit dsptype" ;; + 888/*8) ac_cv_data_model="DSP64" ; n="strict 64bit dsptype" ;; + 222/*|333/*|444/*|666/*|888/*) : + ac_cv_data_model="iDSP" ; n="unusual dsptype" ;; + *) ac_cv_data_model="none" ; n="very unusual model" ;; + esac + AC_MSG_RESULT([$ac_cv_data_model ($ac_cv_long_data_model, $n)]) +]) + +dnl AX_CHECK_HEADER_STDINT_X([HEADERLIST][,ACTION-IF]) +AC_DEFUN([AX_CHECK_HEADER_STDINT_X],[ +AC_CACHE_CHECK([for stdint uintptr_t], [ac_cv_header_stdint_x],[ + ac_cv_header_stdint_x="" # the 1997 typedefs (inttypes.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[stdint.h inttypes.h sys/inttypes.h sys/types.h]) + do + unset ac_cv_type_uintptr_t + unset ac_cv_type_uint64_t + AC_CHECK_TYPE(uintptr_t,[ac_cv_header_stdint_x=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$2],[$2]) break + done + AC_MSG_CHECKING([for stdint uintptr_t]) + ]) +]) + +AC_DEFUN([AX_CHECK_HEADER_STDINT_O],[ +AC_CACHE_CHECK([for stdint uint32_t], [ac_cv_header_stdint_o],[ + ac_cv_header_stdint_o="" # the 1995 typedefs (sys/inttypes.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[inttypes.h sys/inttypes.h sys/types.h stdint.h]) + do + unset ac_cv_type_uint32_t + unset ac_cv_type_uint64_t + AC_CHECK_TYPE(uint32_t,[ac_cv_header_stdint_o=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(uint64_t,[and64="/uint64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$2],[$2]) break + break; + done + AC_MSG_CHECKING([for stdint uint32_t]) + ]) +]) + +AC_DEFUN([AX_CHECK_HEADER_STDINT_U],[ +AC_CACHE_CHECK([for stdint u_int32_t], [ac_cv_header_stdint_u],[ + ac_cv_header_stdint_u="" # the BSD typedefs (sys/types.h) + AC_MSG_RESULT([(..)]) + for i in m4_ifval([$1],[$1],[sys/types.h inttypes.h sys/inttypes.h]) ; do + unset ac_cv_type_u_int32_t + unset ac_cv_type_u_int64_t + AC_CHECK_TYPE(u_int32_t,[ac_cv_header_stdint_u=$i],continue,[#include <$i>]) + AC_CHECK_TYPE(u_int64_t,[and64="/u_int64_t"],[and64=""],[#include<$i>]) + m4_ifvaln([$2],[$2]) break + break; + done + AC_MSG_CHECKING([for stdint u_int32_t]) + ]) +]) + +AC_DEFUN([AX_CREATE_STDINT_H], +[# ------ AX CREATE STDINT H ------------------------------------- +AC_MSG_CHECKING([for stdint types]) +ac_stdint_h=`echo ifelse($1, , _stdint.h, $1)` +# try to shortcircuit - if the default include path of the compiler +# can find a "stdint.h" header then we assume that all compilers can. +AC_CACHE_VAL([ac_cv_header_stdint_t],[ +old_CXXFLAGS="$CXXFLAGS" ; CXXFLAGS="" +old_CPPFLAGS="$CPPFLAGS" ; CPPFLAGS="" +old_CFLAGS="$CFLAGS" ; CFLAGS="" +AC_TRY_COMPILE([#include ],[int_least32_t v = 0;], +[ac_cv_stdint_result="(assuming C99 compatible system)" + ac_cv_header_stdint_t="stdint.h"; ], +[ac_cv_header_stdint_t=""]) +if test "$GCC" = "yes" && test ".$ac_cv_header_stdint_t" = "."; then +CFLAGS="-std=c99" +AC_TRY_COMPILE([#include ],[int_least32_t v = 0;], +[AC_MSG_WARN(your GCC compiler has a defunct stdint.h for its default-mode)]) +fi +CXXFLAGS="$old_CXXFLAGS" +CPPFLAGS="$old_CPPFLAGS" +CFLAGS="$old_CFLAGS" ]) + +v="... $ac_cv_header_stdint_h" +if test "$ac_stdint_h" = "stdint.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./stdint.h?)]) +elif test "$ac_stdint_h" = "inttypes.h" ; then + AC_MSG_RESULT([(are you sure you want them in ./inttypes.h?)]) +elif test "_$ac_cv_header_stdint_t" = "_" ; then + AC_MSG_RESULT([(putting them into $ac_stdint_h)$v]) +else + ac_cv_header_stdint="$ac_cv_header_stdint_t" + AC_MSG_RESULT([$ac_cv_header_stdint (shortcircuit)]) +fi + +if test "_$ac_cv_header_stdint_t" = "_" ; then # cannot shortcircuit.. + +dnl .....intro message done, now do a few system checks..... +dnl btw, all old CHECK_TYPE macros do automatically "DEFINE" a type, +dnl therefore we use the autoconf implementation detail CHECK_TYPE_NEW +dnl instead that is triggered with 3 or more arguments (see types.m4) + +inttype_headers=`echo $2 | sed -e 's/,/ /g'` + +ac_cv_stdint_result="(no helpful system typedefs seen)" +AX_CHECK_HEADER_STDINT_X(dnl + stdint.h inttypes.h sys/inttypes.h $inttype_headers, + ac_cv_stdint_result="(seen uintptr_t$and64 in $i)") + +if test "_$ac_cv_header_stdint_x" = "_" ; then +AX_CHECK_HEADER_STDINT_O(dnl, + inttypes.h sys/inttypes.h stdint.h $inttype_headers, + ac_cv_stdint_result="(seen uint32_t$and64 in $i)") +fi + +if test "_$ac_cv_header_stdint_x" = "_" ; then +if test "_$ac_cv_header_stdint_o" = "_" ; then +AX_CHECK_HEADER_STDINT_U(dnl, + sys/types.h inttypes.h sys/inttypes.h $inttype_headers, + ac_cv_stdint_result="(seen u_int32_t$and64 in $i)") +fi fi + +dnl if there was no good C99 header file, do some typedef checks... +if test "_$ac_cv_header_stdint_x" = "_" ; then + AC_MSG_CHECKING([for stdint datatype model]) + AC_MSG_RESULT([(..)]) + AX_CHECK_DATA_MODEL +fi + +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_x" +elif test "_$ac_cv_header_stdint_o" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_o" +elif test "_$ac_cv_header_stdint_u" != "_" ; then + ac_cv_header_stdint="$ac_cv_header_stdint_u" +else + ac_cv_header_stdint="stddef.h" +fi + +AC_MSG_CHECKING([for extra inttypes in chosen header]) +AC_MSG_RESULT([($ac_cv_header_stdint)]) +dnl see if int_least and int_fast types are present in _this_ header. +unset ac_cv_type_int_least32_t +unset ac_cv_type_int_fast32_t +AC_CHECK_TYPE(int_least32_t,,,[#include <$ac_cv_header_stdint>]) +AC_CHECK_TYPE(int_fast32_t,,,[#include<$ac_cv_header_stdint>]) +AC_CHECK_TYPE(intmax_t,,,[#include <$ac_cv_header_stdint>]) + +fi # shortcircuit to system "stdint.h" +# ------------------ PREPARE VARIABLES ------------------------------ +if test "$GCC" = "yes" ; then +ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1` +else +ac_cv_stdint_message="using $CC" +fi + +AC_MSG_RESULT([make use of $ac_cv_header_stdint in $ac_stdint_h dnl +$ac_cv_stdint_result]) + +dnl ----------------------------------------------------------------- +# ----------------- DONE inttypes.h checks START header ------------- +AC_CONFIG_COMMANDS([$ac_stdint_h],[ +AC_MSG_NOTICE(creating $ac_stdint_h : $_ac_stdint_h) +ac_stdint=$tmp/_stdint.h + +echo "#ifndef" $_ac_stdint_h >$ac_stdint +echo "#define" $_ac_stdint_h "1" >>$ac_stdint +echo "#ifndef" _GENERATED_STDINT_H >>$ac_stdint +echo "#define" _GENERATED_STDINT_H '"'$PACKAGE $VERSION'"' >>$ac_stdint +echo "/* generated $ac_cv_stdint_message */" >>$ac_stdint +if test "_$ac_cv_header_stdint_t" != "_" ; then +echo "#define _STDINT_HAVE_STDINT_H" "1" >>$ac_stdint +echo "#include " >>$ac_stdint +echo "#endif" >>$ac_stdint +echo "#endif" >>$ac_stdint +else + +cat >>$ac_stdint < +#else +#include + +/* .................... configured part ............................ */ + +STDINT_EOF + +echo "/* whether we have a C99 compatible stdint header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_x" != "_" ; then + ac_header="$ac_cv_header_stdint_x" + echo "#define _STDINT_HEADER_INTPTR" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_INTPTR */" >>$ac_stdint +fi + +echo "/* whether we have a C96 compatible inttypes header file */" >>$ac_stdint +if test "_$ac_cv_header_stdint_o" != "_" ; then + ac_header="$ac_cv_header_stdint_o" + echo "#define _STDINT_HEADER_UINT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_UINT32 */" >>$ac_stdint +fi + +echo "/* whether we have a BSD compatible inet types header */" >>$ac_stdint +if test "_$ac_cv_header_stdint_u" != "_" ; then + ac_header="$ac_cv_header_stdint_u" + echo "#define _STDINT_HEADER_U_INT32" '"'"$ac_header"'"' >>$ac_stdint +else + echo "/* #undef _STDINT_HEADER_U_INT32 */" >>$ac_stdint +fi + +echo "" >>$ac_stdint + +if test "_$ac_header" != "_" ; then if test "$ac_header" != "stddef.h" ; then + echo "#include <$ac_header>" >>$ac_stdint + echo "" >>$ac_stdint +fi fi + +echo "/* which 64bit typedef has been found */" >>$ac_stdint +if test "$ac_cv_type_uint64_t" = "yes" ; then +echo "#define _STDINT_HAVE_UINT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_UINT64_T */" >>$ac_stdint +fi +if test "$ac_cv_type_u_int64_t" = "yes" ; then +echo "#define _STDINT_HAVE_U_INT64_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_U_INT64_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* which type model has been detected */" >>$ac_stdint +if test "_$ac_cv_char_data_model" != "_" ; then +echo "#define _STDINT_CHAR_MODEL" "$ac_cv_char_data_model" >>$ac_stdint +echo "#define _STDINT_LONG_MODEL" "$ac_cv_long_data_model" >>$ac_stdint +else +echo "/* #undef _STDINT_CHAR_MODEL // skipped */" >>$ac_stdint +echo "/* #undef _STDINT_LONG_MODEL // skipped */" >>$ac_stdint +fi +echo "" >>$ac_stdint + +echo "/* whether int_least types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_least32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_LEAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_LEAST32_T */" >>$ac_stdint +fi +echo "/* whether int_fast types were detected */" >>$ac_stdint +if test "$ac_cv_type_int_fast32_t" = "yes"; then +echo "#define _STDINT_HAVE_INT_FAST32_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INT_FAST32_T */" >>$ac_stdint +fi +echo "/* whether intmax_t type was detected */" >>$ac_stdint +if test "$ac_cv_type_intmax_t" = "yes"; then +echo "#define _STDINT_HAVE_INTMAX_T" "1" >>$ac_stdint +else +echo "/* #undef _STDINT_HAVE_INTMAX_T */" >>$ac_stdint +fi +echo "" >>$ac_stdint + + cat >>$ac_stdint <= 199901L +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; + +#elif !defined __STRICT_ANSI__ +#if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__ +#define _HAVE_UINT64_T +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; + +#elif defined __GNUC__ || defined __MWERKS__ || defined __ELF__ +/* note: all ELF-systems seem to have loff-support which needs 64-bit */ +#if !defined _NO_LONGLONG +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef long long int64_t; +typedef unsigned long long uint64_t; +#endif + +#elif defined __alpha || (defined __mips && defined _ABIN32) +#if !defined _NO_LONGLONG +typedef long int64_t; +typedef unsigned long uint64_t; +#endif + /* compiler/cpu type to define int64_t */ +#endif +#endif +#endif + +#if defined _STDINT_HAVE_U_INT_TYPES +/* int8_t int16_t int32_t defined by inet code, redeclare the u_intXX types */ +typedef u_int8_t uint8_t; +typedef u_int16_t uint16_t; +typedef u_int32_t uint32_t; + +/* glibc compatibility */ +#ifndef __int8_t_defined +#define __int8_t_defined +#endif +#endif + +#ifdef _STDINT_NEED_INT_MODEL_T +/* we must guess all the basic types. Apart from byte-addressable system, */ +/* there a few 32-bit-only dsp-systems that we guard with BYTE_MODEL 8-} */ +/* (btw, those nibble-addressable systems are way off, or so we assume) */ + +dnl /* have a look at "64bit and data size neutrality" at */ +dnl /* http://unix.org/version2/whatsnew/login_64bit.html */ +dnl /* (the shorthand "ILP" types always have a "P" part) */ + +#if defined _STDINT_BYTE_MODEL +#if _STDINT_LONG_MODEL+0 == 242 +/* 2:4:2 = IP16 = a normal 16-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned long uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef long int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL == 444 +/* 2:4:4 = LP32 = a 32-bit system derived from a 16-bit */ +/* 4:4:4 = ILP32 = a normal 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 484 || _STDINT_LONG_MODEL+0 == 488 +/* 4:8:4 = IP32 = a 32-bit system prepared for 64-bit */ +/* 4:8:8 = LP64 = a normal 64-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* this system has a "long" of 64bit */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +typedef unsigned long uint64_t; +typedef long int64_t; +#endif +#elif _STDINT_LONG_MODEL+0 == 448 +/* LLP64 a 64-bit system derived from a 32-bit system */ +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +#ifndef __int8_t_defined +#define __int8_t_defined +typedef char int8_t; +typedef short int16_t; +typedef int int32_t; +#endif +/* assuming the system has a "long long" */ +#ifndef _HAVE_UINT64_T +#define _HAVE_UINT64_T +#define _HAVE_LONGLONG_UINT64_T +typedef unsigned long long uint64_t; +typedef long long int64_t; +#endif +#else +#define _STDINT_NO_INT32_T +#endif +#else +#define _STDINT_NO_INT8_T +#define _STDINT_NO_INT32_T +#endif +#endif + +/* + * quote from SunOS-5.8 sys/inttypes.h: + * Use at your own risk. As of February 1996, the committee is squarely + * behind the fixed sized types; the "least" and "fast" types are still being + * discussed. The probability that the "fast" types may be removed before + * the standard is finalized is high enough that they are not currently + * implemented. + */ + +#if defined _STDINT_NEED_INT_LEAST_T +typedef int8_t int_least8_t; +typedef int16_t int_least16_t; +typedef int32_t int_least32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_least64_t; +#endif + +typedef uint8_t uint_least8_t; +typedef uint16_t uint_least16_t; +typedef uint32_t uint_least32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_least64_t; +#endif + /* least types */ +#endif + +#if defined _STDINT_NEED_INT_FAST_T +typedef int8_t int_fast8_t; +typedef int int_fast16_t; +typedef int32_t int_fast32_t; +#ifdef _HAVE_UINT64_T +typedef int64_t int_fast64_t; +#endif + +typedef uint8_t uint_fast8_t; +typedef unsigned uint_fast16_t; +typedef uint32_t uint_fast32_t; +#ifdef _HAVE_UINT64_T +typedef uint64_t uint_fast64_t; +#endif + /* fast types */ +#endif + +#ifdef _STDINT_NEED_INTMAX_T +#ifdef _HAVE_UINT64_T +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; +#else +typedef long intmax_t; +typedef unsigned long uintmax_t; +#endif +#endif + +#ifdef _STDINT_NEED_INTPTR_T +#ifndef __intptr_t_defined +#define __intptr_t_defined +/* we encourage using "long" to store pointer values, never use "int" ! */ +#if _STDINT_LONG_MODEL+0 == 242 || _STDINT_LONG_MODEL+0 == 484 +typedef unsigned int uintptr_t; +typedef int intptr_t; +#elif _STDINT_LONG_MODEL+0 == 244 || _STDINT_LONG_MODEL+0 == 444 +typedef unsigned long uintptr_t; +typedef long intptr_t; +#elif _STDINT_LONG_MODEL+0 == 448 && defined _HAVE_UINT64_T +typedef uint64_t uintptr_t; +typedef int64_t intptr_t; +#else /* matches typical system types ILP32 and LP64 - but not IP16 or LLP64 */ +typedef unsigned long uintptr_t; +typedef long intptr_t; +#endif +#endif +#endif + +/* The ISO C99 standard specifies that in C++ implementations these + should only be defined if explicitly requested. */ +#if !defined __cplusplus || defined __STDC_CONSTANT_MACROS +#ifndef UINT32_C + +/* Signed. */ +# define INT8_C(c) c +# define INT16_C(c) c +# define INT32_C(c) c +# ifdef _HAVE_LONGLONG_UINT64_T +# define INT64_C(c) c ## L +# else +# define INT64_C(c) c ## LL +# endif + +/* Unsigned. */ +# define UINT8_C(c) c ## U +# define UINT16_C(c) c ## U +# define UINT32_C(c) c ## U +# ifdef _HAVE_LONGLONG_UINT64_T +# define UINT64_C(c) c ## UL +# else +# define UINT64_C(c) c ## ULL +# endif + +/* Maximal type. */ +# ifdef _HAVE_LONGLONG_UINT64_T +# define INTMAX_C(c) c ## L +# define UINTMAX_C(c) c ## UL +# else +# define INTMAX_C(c) c ## LL +# define UINTMAX_C(c) c ## ULL +# endif + + /* literalnumbers */ +#endif +#endif + +/* These limits are merrily those of a two complement byte-oriented system */ + +/* Minimum of signed integral types. */ +# define INT8_MIN (-128) +# define INT16_MIN (-32767-1) +# define INT32_MIN (-2147483647-1) +# define INT64_MIN (-__INT64_C(9223372036854775807)-1) +/* Maximum of signed integral types. */ +# define INT8_MAX (127) +# define INT16_MAX (32767) +# define INT32_MAX (2147483647) +# define INT64_MAX (__INT64_C(9223372036854775807)) + +/* Maximum of unsigned integral types. */ +# define UINT8_MAX (255) +# define UINT16_MAX (65535) +# define UINT32_MAX (4294967295U) +# define UINT64_MAX (__UINT64_C(18446744073709551615)) + +/* Minimum of signed integral types having a minimum size. */ +# define INT_LEAST8_MIN INT8_MIN +# define INT_LEAST16_MIN INT16_MIN +# define INT_LEAST32_MIN INT32_MIN +# define INT_LEAST64_MIN INT64_MIN +/* Maximum of signed integral types having a minimum size. */ +# define INT_LEAST8_MAX INT8_MAX +# define INT_LEAST16_MAX INT16_MAX +# define INT_LEAST32_MAX INT32_MAX +# define INT_LEAST64_MAX INT64_MAX + +/* Maximum of unsigned integral types having a minimum size. */ +# define UINT_LEAST8_MAX UINT8_MAX +# define UINT_LEAST16_MAX UINT16_MAX +# define UINT_LEAST32_MAX UINT32_MAX +# define UINT_LEAST64_MAX UINT64_MAX + + /* shortcircuit*/ +#endif + /* once */ +#endif +#endif +STDINT_EOF +fi + if cmp -s $ac_stdint_h $ac_stdint 2>/dev/null; then + AC_MSG_NOTICE([$ac_stdint_h is unchanged]) + else + ac_dir=`AS_DIRNAME(["$ac_stdint_h"])` + AS_MKDIR_P(["$ac_dir"]) + rm -f $ac_stdint_h + mv $ac_stdint $ac_stdint_h + fi +],[# variables for create stdint.h replacement +PACKAGE="$PACKAGE" +VERSION="$VERSION" +ac_stdint_h="$ac_stdint_h" +_ac_stdint_h=AS_TR_CPP(_$PACKAGE-$ac_stdint_h) +ac_cv_stdint_message="$ac_cv_stdint_message" +ac_cv_header_stdint_t="$ac_cv_header_stdint_t" +ac_cv_header_stdint_x="$ac_cv_header_stdint_x" +ac_cv_header_stdint_o="$ac_cv_header_stdint_o" +ac_cv_header_stdint_u="$ac_cv_header_stdint_u" +ac_cv_type_uint64_t="$ac_cv_type_uint64_t" +ac_cv_type_u_int64_t="$ac_cv_type_u_int64_t" +ac_cv_char_data_model="$ac_cv_char_data_model" +ac_cv_long_data_model="$ac_cv_long_data_model" +ac_cv_type_int_least32_t="$ac_cv_type_int_least32_t" +ac_cv_type_int_fast32_t="$ac_cv_type_int_fast32_t" +ac_cv_type_intmax_t="$ac_cv_type_intmax_t" +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_target_h.m4 projectm-3.1.0/m4/autoconf-archive/ax_create_target_h.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_create_target_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_create_target_h.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,529 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_create_target_h.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CREATE_TARGET_H [(HEADER-FILE [,PREFIX)] +# +# DESCRIPTION +# +# Create the header-file and let it contain '#defines' for the target +# platform. This macro is used for libraries that have platform-specific +# quirks. Instead of inventing a target-specific target.h.in files, just +# let it create a header file from the definitions of AC_CANONICAL_SYSTEM +# and put only ifdef's in the installed header-files. +# +# if the HEADER-FILE is absent, [target.h] is used. +# if the PREFIX is absent, [TARGET] is used. +# the prefix can be the packagename. (y:a-z-:A-Z_:) +# +# The defines look like... +# +# #ifndef TARGET_CPU_M68K +# #define TARGET_CPU_M68K "m68k" +# #endif +# +# #ifndef TARGET_OS_LINUX +# #define TARGET_OS_LINUX "linux-gnu" +# #endif +# +# #ifndef TARGET_OS_TYPE /* the string itself */ +# #define TARGET_OS_TYPE "linux-gnu" +# #endif +# +# Detail: in the case of hppa1.1, the three idents "hppa1_1" "hppa1" and +# "hppa" are derived, for an m68k it just two, "m68k" and "m". +# +# The CREATE_TARGET_H__ variant is almost the same function, but +# everything is lowercased instead of uppercased, and there is a "__" in +# front of each prefix, so it looks like... +# +# #ifndef __target_os_linux +# #define __target_os_linux "linux-gnulibc2" +# #endif +# +# #ifndef __target_os__ /* the string itself */ +# #define __target_os__ "linux-gnulibc2" +# #endif +# +# #ifndef __target_cpu_i586 +# #define __target_cpu_i586 "i586" +# #endif +# +# #ifndef __target_arch_i386 +# #define __target_arch_i386 "i386" +# #endif +# +# #ifndef __target_arch__ /* cpu family arch */ +# #define __target_arch__ "i386" +# #endif +# +# Other differences: the default string-define is "__" instead of "_TYPE". +# +# Personally, I prefer the second variant (which had been the first in the +# devprocess of this file but I assume people will often fallback to the +# primary variant presented herein). +# +# NOTE: CREATE_TARGET_H does also fill HOST_OS-defines Functionality has +# been split over functions called CREATE_TARGET_H_UPPER, +# CREATE_TARGET_H_LOWER, CREATE_TARGET_HOST_UPPER, and +# CREATE_TARGET_HOST_LOWER. +# +# CREATE_TARGET_H uses CREATE_TARGET_H_UPPER CREATE_TARGET_HOST_UPPER +# CREATE_TARGET_H_ uses CREATE_TARGET_H_LOWER CREATE_TARGET_HOST_LOWER +# +# There is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for +# PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever +# created (the prefix is a bit different, since we add an extra -target- +# and -host-). +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CREATE_TARGET_H], [AX_CREATE_TARGET_H]) +AC_DEFUN([AX_CREATE_TARGET_H], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AX_CREATE_TARGET_H_UPPER($1,$2) +AX_CREATE_TARGET_HOST_UPPER($1,$2) +]) + +AC_DEFUN([AC_CREATE_TARGET_OS_H], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AX_CREATE_TARGET_H_LOWER($1,$2) +AX_CREATE_TARGET_HOST_LOWER($1,$2) +]) + +AC_DEFUN([AX_CREATE_TARGET_H__], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AX_CREATE_TARGET_H_LOWER($1,$2) +AX_CREATE_TARGET_HOST_LOWER($1,$2) +]) + +dnl [(OUT-FILE [, PREFIX])] defaults: PREFIX=$PACKAGE OUTFILE=$PREFIX-target.h +AC_DEFUN([AC_CREATE_PREFIX_TARGET_H],[dnl +ac_prefix_conf_PKG=`echo ifelse($2, , $PACKAGE, $2)` +ac_prefix_conf_OUT=`echo ifelse($1, , $ac_prefix_conf_PKG-target.h, $1)` +ac_prefix_conf_PRE=`echo $ac_prefix_conf_PKG-target | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:'` +AX_CREATE_TARGET_H_UPPER($ac_prefix_conf_PRE,$ac_perfix_conf_OUT) +ac_prefix_conf_PRE=`echo __$ac_prefix_conf_PKG-host | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:'` +AX_CREATE_TARGET_HOST_UPPER($ac_prefix_conf_PRE,$ac_perfix_conf_OUT) +]) + +dnl [(OUT-FILE[, PREFIX])] defaults: PREFIX=$PACKAGE OUTFILE=$PREFIX-target.h +AC_DEFUN([AC_CREATE_PREFIX_TARGET_H_],[dnl +ac_prefix_conf_PKG=`echo ifelse($2, , $PACKAGE, $2)` +ac_prefix_conf_OUT=`echo ifelse($1, , $ac_prefix_conf_PKG-target.h, $1)` +ac_prefix_conf_PRE=`echo __$ac_prefix_conf_PKG-target | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'` +AX_CREATE_TARGET_H_LOWER($ac_prefix_conf_PRE,$ac_perfix_conf_OUT) +ac_prefix_conf_PRE=`echo __$ac_prefix_conf_PKG-host | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:'` +AX_CREATE_TARGET_HOST_LOWER($ac_prefix_conf_PRE,$ac_perfix_conf_OUT) +]) + +AC_DEFUN([AX_CREATE_TARGET_H_FILE],[dnl +ac_need_target_h_file_new=true +]) + +AC_DEFUN([AX_CREATE_TARGET_H_UPPER], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AC_REQUIRE([AX_CREATE_TARGET_H_FILE]) +changequote({, })dnl +ac_need_target_h_file=`echo ifelse($1, , target.h, $1)` +ac_need_target_h_prefix=`echo ifelse($2, , target, $2) | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'` +# +target_os0=`echo "$target_os" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'` +target_os1=`echo "$target_os0" | sed -e 's:\([^0-9]*\).*:\1:' ` +target_os2=`echo "$target_os0" | sed -e 's:\([^_]*\).*:\1:' ` +target_os3=`echo "$target_os2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +target_cpu0=`echo "$target_cpu" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'` +target_cpu1=`echo "$target_cpu0" | sed -e 's:\([^0-9]*\).*:\1:' ` +target_cpu2=`echo "$target_cpu0" | sed -e 's:\([^_]*\).*:\1:' ` +target_cpu3=`echo "$target_cpu2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +target_cpu_arch0=`echo "$target_cpu_arch" | sed -e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:'` +# +changequote([, ])dnl +# +if $ac_need_target_h_file_new ; then +AC_MSG_RESULT(creating $ac_need_target_h_file - canonical system defines) +echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file +echo /'*' on `date` '*'/ >>$ac_need_target_h_file +ac_need_target_h_file_new=false +fi +echo /'*' target uppercase defines '*'/ >>$ac_need_target_h_file +dnl +old1="" +old2="" +for i in $target_os0 $target_os1 $target_os2 $target_os3 "TYPE" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef "$ac_need_target_h_prefix"_OS_"$i >>$ac_need_target_h_file + echo "#define "$ac_need_target_h_prefix"_OS_"$i '"'"$target_os"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $target_cpu0 $target_cpu1 $target_cpu2 $target_cpu3 "TYPE" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef "$ac_need_target_h_prefix"_CPU_"$i >>$ac_need_target_h_file + echo "#define "$ac_need_target_h_prefix"_CPU_"$i '"'"$target_cpu"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $target_cpu_arch0 "TYPE" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef "$ac_need_target_h_prefix"_ARCH_"$i >>$ac_need_target_h_file + echo "#define "$ac_need_target_h_prefix"_ARCH_"$i '"'"$target_cpu_arch"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +]) + +dnl +dnl ... the lowercase variant ... +dnl +AC_DEFUN([AX_CREATE_TARGET_H_LOWER], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AC_REQUIRE([AX_CREATE_TARGET_H_FILE]) +changequote({, })dnl +ac_need_target_h_file=`echo ifelse($1, , target-os.h, $1)` +ac_need_target_h_prefix=`echo ifelse($2, , target, $2) | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:' -e 's:[^a-z0-9_]::g'` +# +target_os0=`echo "$target_os" | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ.-:abcdefghijklmnopqrstuvwxyz__:' -e 's:[^a-z0-9_]::g'` +target_os1=`echo "$target_os0" | sed -e 's:\([^0-9]*\).*:\1:' ` +target_os2=`echo "$target_os0" | sed -e 's:\([^_]*\).*:\1:' ` +target_os3=`echo "$target_os2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +target_cpu0=`echo "$target_cpu" | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ.-:abcdefghijklmnopqrstuvwxyz__:' -e 's:[^a-z0-9_]::g'` +target_cpu1=`echo "$target_cpu0" | sed -e 's:\([^0-9]*\).*:\1:' ` +target_cpu2=`echo "$target_cpu0" | sed -e 's:\([^_]*\).*:\1:' ` +target_cpu3=`echo "$target_cpu2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +target_cpu_arch0=`echo "$target_cpu_arch" | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ:abcdefghijklmnopqrstuvwxyz:'` +# +changequote([, ])dnl +# +if $ac_need_target_h_file_new ; then +AC_MSG_RESULT(creating $ac_need_target_h_file - canonical system defines) +echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file +echo /'*' on `date` '*'/ >>$ac_need_target_h_file +ac_need_target_h_file_new=false +fi +echo /'*' target lowercase defines '*'/ >>$ac_need_target_h_file +dnl +old1="" +old2="" +for i in $target_os0 $target_os1 $target_os2 $target_os3 "_"; +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef __"$ac_need_target_h_prefix"_os_"$i >>$ac_need_target_h_file + echo "#define __"$ac_need_target_h_prefix"_os_"$i '"'"$target_os"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $target_cpu0 $target_cpu1 $target_cpu2 $target_cpu3 "_" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef __"$ac_need_target_h_prefix"_cpu_"$i >>$ac_need_target_h_file + echo "#define __"$ac_need_target_h_prefix"_cpu_"$i '"'"$target_cpu"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $target_cpu_arch0 "_" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef __"$ac_need_target_h_prefix"_arch_"$i >>$ac_need_target_h_file + echo "#define __"$ac_need_target_h_prefix"_arch_"$i '"'"$target_cpu_arch"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +]) + +dnl ------------------------------------------------------------------- +dnl +dnl ... the uppercase variant for the host ... +dnl +AC_DEFUN([AX_CREATE_TARGET_HOST_UPPER], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AC_REQUIRE([AX_CREATE_TARGET_H_FILE]) +changequote({, })dnl +ac_need_target_h_file=`echo ifelse($1, , target.h, $1)` +ac_need_target_h_prefix=`echo ifelse($2, , host, $2) | sed -e 'y:abcdefghijklmnopqrstuvwxyz-:ABCDEFGHIJKLMNOPQRSTUVWXYZ_:' -e 's:[^A-Z0-9_]::g'` +# +host_os0=`echo "$host_os" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9_]::g'` +host_os1=`echo "$host_os0" | sed -e 's:\([^0-9]*\).*:\1:' ` +host_os2=`echo "$host_os0" | sed -e 's:\([^_]*\).*:\1:' ` +host_os3=`echo "$host_os2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +host_cpu0=`echo "$host_cpu" | sed -e 'y:abcdefghijklmnopqrstuvwxyz.-:ABCDEFGHIJKLMNOPQRSTUVWXYZ__:' -e 's:[^A-Z0-9]::g'` +host_cpu1=`echo "$host_cpu0" | sed -e 's:\([^0-9]*\).*:\1:' ` +host_cpu2=`echo "$host_cpu0" | sed -e 's:\([^_]*\).*:\1:' ` +host_cpu3=`echo "$host_cpu2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +host_cpu_arch0=`echo "$host_cpu_arch" | sed -e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:'` +# +changequote([, ])dnl +# +if $ac_need_target_h_file_new ; then +AC_MSG_RESULT(creating $ac_need_target_h_file - canonical system defines) +echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file +echo /'*' on `date` '*'/ >>$ac_need_target_h_file +ac_need_target_h_file_new=false +fi +echo /'*' host uppercase defines '*'/ >>$ac_need_target_h_file +dnl +old1="" +old2="" +for i in $host_os0 $host_os1 $host_os2 $host_os3 "TYPE" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef "$ac_need_target_h_prefix"_OS_"$i >>$ac_need_target_h_file + echo "#define "$ac_need_target_h_prefix"_OS_"$i '"'"$host_os"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $host_cpu0 $host_cpu1 $host_cpu2 $host_cpu3 "TYPE" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef "$ac_need_target_h_prefix"_CPU_"$i >>$ac_need_target_h_file + echo "#define "$ac_need_target_h_prefix"_CPU_"$i '"'"$host_cpu"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $host_cpu_arch0 "TYPE" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef "$ac_need_target_h_prefix"_ARCH_"$i >>$ac_need_target_h_file + echo "#define "$ac_need_target_h_prefix"_ARCH_"$i '"'"$host_cpu_arch"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +]) + +dnl --------------------------------------------------------------------- +dnl +dnl ... the lowercase variant for the host ... +dnl +AC_DEFUN([AX_CREATE_TARGET_HOST_LOWER], +[AC_REQUIRE([AC_CANONICAL_CPU_ARCH]) +AC_REQUIRE([AX_CREATE_TARGET_H_FILE]) +changequote({, })dnl +ac_need_target_h_file=`echo ifelse($1, , target.h, $1)` +ac_need_target_h_prefix=`echo ifelse($2, , host, $2) | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:' -e 's:[^a-z0-9_]::g'` +# +host_os0=`echo "$host_os" | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ.-:abcdefghijklmnopqrstuvwxyz__:' -e 's:[^a-z0-9_]::g'` +host_os1=`echo "$host_os0" | sed -e 's:\([^0-9]*\).*:\1:' ` +host_os2=`echo "$host_os0" | sed -e 's:\([^_]*\).*:\1:' ` +host_os3=`echo "$host_os2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +host_cpu0=`echo "$host_cpu" | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ.-:abcdefghijklmnopqrstuvwxyz__:' -e 's:[^a-z0-9_]::g'` +host_cpu1=`echo "$host_cpu0" | sed -e 's:\([^0-9]*\).*:\1:' ` +host_cpu2=`echo "$host_cpu0" | sed -e 's:\([^_]*\).*:\1:' ` +host_cpu3=`echo "$host_cpu2" | sed -e 's:\([^0-9]*\).*:\1:' ` +# +host_cpu_arch0=`echo "$host_cpu_arch" | sed -e 'y:ABCDEFGHIJKLMNOPQRSTUVWXYZ:abcdefghijklmnopqrstuvwxyz:'` +# +changequote([, ])dnl +# +if $ac_need_target_h_file_new ; then +AC_MSG_RESULT(creating $ac_need_target_h_file - canonical system defines) +echo /'*' automatically generated by $PACKAGE configure '*'/ >$ac_need_target_h_file +echo /'*' on `date` '*'/ >>$ac_need_target_h_file +ac_need_target_h_file_new=false +fi +echo /'*' host lowercase defines '*'/ >>$ac_need_target_h_file +dnl +old1="" +old2="" +for i in $host_os0 $host_os1 $host_os2 $host_os3 "_"; +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef __"$ac_need_target_h_prefix"_os_"$i >>$ac_need_target_h_file + echo "#define __"$ac_need_target_h_prefix"_os_"$i '"'"$host_os"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $host_cpu0 $host_cpu1 $host_cpu2 $host_cpu3 "_" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef __"$ac_need_target_h_prefix"_cpu_"$i >>$ac_need_target_h_file + echo "#define __"$ac_need_target_h_prefix"_cpu_"$i '"'"$host_cpu"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +# +old1="" +old2="" +for i in $host_cpu_arch0 "_" +do + if test "$old1" != "$i"; then + if test "$old2" != "$i"; then + echo " " >>$ac_need_target_h_file + echo "#ifndef __"$ac_need_target_h_prefix"_arch_"$i >>$ac_need_target_h_file + echo "#define __"$ac_need_target_h_prefix"_arch_"$i '"'"$host_cpu_arch"'"' >>$ac_need_target_h_file + echo "#endif" >>$ac_need_target_h_file + fi + fi + old2="$old1" + old1="$i" +done +]) + +dnl ------------------------------------------------------------------- + +dnl +dnl the instruction set architecture (ISA) has evolved for a small set +dnl of cpu types. So they often have specific names, e.g. sparclite, +dnl yet they share quite a few similarities. This macro will set the +dnl shell-var $target_cpu_arch to the basic type. Note that these +dnl names are often in conflict with their original 32-bit type name +dnl of these processors, just use them for directory-handling or add +dnl a prefix/suffix to distinguish them from $target_cpu +dnl +dnl this macros has been invented since config.guess is sometimes +dnl too specific about the cpu-type. I chose the names along the lines +dnl of linux/arch/ which is modelled after widespread arch-naming, IMHO. +dnl +AC_DEFUN([AC_CANONICAL_CPU_ARCH], +[AC_REQUIRE([AC_CANONICAL_SYSTEM]) +target_cpu_arch="unknown" +case $target_cpu in + i386*|i486*|i586*|i686*|i786*) target_cpu_arch=i386 ;; + power*) target_cpu_arch=ppc ;; + arm*) target_cpu_arch=arm ;; + sparc64*) target_cpu_arch=sparc64 ;; + sparc*) target_cpu_arch=sparc ;; + mips64*) target_cpu_arch=mips64 ;; + mips*) target_cpu_arch=mips ;; + alpha*) target_cpu_arch=alpha ;; + hppa1*) target_cpu_arch=hppa1 ;; + hppa2*) target_cpu_arch=hppa2 ;; + arm*) target_cpu_arch=arm ;; + m68???|mcf54??) target_cpu_arch=m68k ;; + *) target_cpu_arch="$target_cpu" ;; +esac + +host_cpu_arch="unknown" +case $host_cpu in + i386*|i486*|i586*|i686*|i786*) host_cpu_arch=i386 ;; + power*) host_cpu_arch=ppc ;; + arm*) host_cpu_arch=arm ;; + sparc64*) host_cpu_arch=sparc64 ;; + sparc*) host_cpu_arch=sparc ;; + mips64*) host_cpu_arch=mips64 ;; + mips*) host_cpu_arch=mips ;; + alpha*) host_cpu_arch=alpha ;; + hppa1*) host_cpu_arch=hppa1 ;; + hppa2*) host_cpu_arch=hppa2 ;; + arm*) host_cpu_arch=arm ;; + m68???|mcf54??) host_cpu_arch=m68k ;; + *) host_cpu_arch="$target_cpu" ;; +esac +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_referenceable_passed_va_list.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_referenceable_passed_va_list.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_referenceable_passed_va_list.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_referenceable_passed_va_list.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,97 @@ +# ====================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_referenceable_passed_va_list.html +# ====================================================================================== +# +# SYNOPSIS +# +# AX_C_REFERENCEABLE_PASSED_VA_LIST +# +# DESCRIPTION +# +# Checks whether f(va_list va){ &va; } works as expected. +# +# This macro uses compile-time detection and so is cross-compile ready. +# +# C99 mentioned passing a pointer to va_list to other functions (footnote +# 212 of "7.15 Variable arguments "). However, f(va_list va) { +# &va; } produces broken pointer on some environments such as gcc on +# x86_64, although { va_list va; &va; } works as expected. See the +# detection code of this file and any of pages +# https://www.gnu.org/software/autoconf/manual/html_node/Function-Portability.html, +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14557, and +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20951 for further +# information. +# +# Although C99 does not define the operations f(va_list va) { &va; } and +# &va itself as standard (footnotes are declared as "normative part, +# information only"), certain situations need it. This macro provides a +# type detection about va_list implementation to deal with the operation. +# +# Following workaround will probably work on such environments although it +# does not ensure to be safe and portable. At least it is working on +# x86_64-unknown-linux-gnu: +# +# f(va_list va) +# { +# va_list *vap; +# +# #if HAVE_REFERENCEABLE_PASSED_VA_LIST +# vap = &va; +# #else +# vap = (va_list *)va; +# #endif +# } +# +# LICENSE +# +# Copyright (c) 2008 YAMAMOTO Kengo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_C_REFERENCEABLE_PASSED_VA_LIST], [ + AC_CACHE_CHECK([whether f(va_list va){ &va; } works as expected], + [ax_cv_c_referenceable_passed_va_list], + [AC_LINK_IFELSE([[ +#include + +volatile va_list g_va; + +void +vf(va_list callee_va) +{ + /* typeof(callee_va) differs from typeof(caller_va) by a compiler trick, if + * va_list is implemented as an array. On such environment, this copy + * operation fails. */ + g_va = callee_va; +} + +void +f(int last, ...) +{ + va_list caller_va; + + va_start(caller_va, last); + vf(caller_va); /* passed as &caller_va[0] if va_list is an array type */ + va_end(caller_va); +} + +int +main(int argc, char *argv[]) +{ + f(0xdeadbeef, 0xfedbeef, 0xfeedee); + + return 0; +} + ]], + [ax_cv_c_referenceable_passed_va_list=yes], + [ax_cv_c_referenceable_passed_va_list=no])]) + if test "x$ax_cv_c_referenceable_passed_va_list" = xyes; then + AC_DEFINE([HAVE_REFERENCEABLE_PASSED_VA_LIST], [1], + [Define to 1 if f(va_list va){ &va; } works as expected.]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_var_func.m4 projectm-3.1.0/m4/autoconf-archive/ax_c_var_func.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_c_var_func.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_c_var_func.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,67 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_c_var_func.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_C_VAR_FUNC +# +# DESCRIPTION +# +# This macro tests if the C complier supports the C9X standard __func__ +# identifier. +# +# The new C9X standard for the C language stipulates that the identifier +# __func__ shall be implicitly declared by the compiler as if, immediately +# following the opening brace of each function definition, the declaration +# +# static const char __func__[] = "function-name"; +# +# appeared, where function-name is the name of the function where the +# __func__ identifier is used. +# +# LICENSE +# +# Copyright (c) 2008 Christopher Currie +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_C_VAR_FUNC], [AX_C_VAR_FUNC]) +AC_DEFUN([AX_C_VAR_FUNC], +[AC_REQUIRE([AC_PROG_CC]) +AC_CACHE_CHECK(whether $CC recognizes __func__, ac_cv_c_var_func, +AC_TRY_COMPILE(, +[int main() { +char *s = __func__; +}], ac_cv_c_var_func=yes, +ac_cv_c_var_func=no) ) +if test "x$ac_cv_c_var_func" = xyes; then + AC_DEFINE(HAVE_FUNC,,[Define if the C complier supports __func__]) +fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cvs.m4 projectm-3.1.0/m4/autoconf-archive/ax_cvs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cvs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cvs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,477 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cvs.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CVS([ANON_CVSROOT]) +# +# DESCRIPTION +# +# Adds support cvs targets within your Makefile. +# +# Branching and releasing relies on you using the following version +# format: +# +# MAJOR.MINOR.POINT +# +# where MAJOR is the major version number, MINOR is the minor version +# number and POINT is the point release number. +# +# make update +# +# performs a cvs update +# +# make commitlog +# +# Generates a ChangeLog template with the modified, added +# and removed files and opens it up for editing. This is +# not normally used directly, but is instead called by +# commit. It is useful however if you want to document +# the work you have done, but don't want to commit just +# yet. +# +# make commit +# +# performs a cvs commit after first performing a cvs +# update and generating a commit log. +# +# make cvs-rm FILES="file1 file2 ..." +# +# removes a file or files specified by the FILES +# variable from the file system and from cvs. It will +# interactively ask you to confirm the file removal, +# unless the file does not exist on the file system. +# +# make cvs-add FILES="file1 file2 ..." +# +# adds a file or files specified by the FILES variable +# to cvs. +# +# make branch-major +# +# creates a branch based on the major version number, +# increments the major version number, sets the minor +# and point versions to zero and checks out the branch +# into a new directory. +# +# make branch-minor +# +# creates a branch based on the minor version number, +# increments the minor version, sets the point version +# to zero number and checks out the branch into a new +# directory. +# +# make release +# +# performs a cvs update, followed by a distcheck, then +# creates a release for the current version, increments +# the point release number and checks out the release +# into a new directory +# +# make quick-release +# +# same as release, but distcheck is not performed +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 21 + +AC_DEFUN([AX_CVS], +[ +AC_REQUIRE([AX_SPLIT_VERSION]) + +AC_SUBST([ANON_CVSROOT], [$1]) +AC_MSG_CHECKING([ANON_CVSROOT]) +if test "x$ANON_CVSROOT" != "x"; then + AC_MSG_RESULT([$ANON_CVSROOT]) +else + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([An anonymous CVSROOT must be specified to enable CVS support]) +fi + + +AC_ARG_ENABLE(cvs-support, + AS_HELP_STRING(--enable-cvs-support[=ARG], + [enable cvs support. Used by the $PACKAGE developers. + ARG can be "yes" or "no". If the CVSROOT is found, + then the default is yes, + otherwise the default is no.]), + AX_USING_CVS=$enableval ) + +if test "x$AX_USING_CVS" != "xno"; then + AC_ARG_VAR(CVS, [cvs executable to use]) + if test "x$CVS" = "x"; then + AC_CHECK_PROGS(CVS,[cvs]) + fi + if test "x$CVS" = "x"; then + if test "x$AX_USING_CVS" = "x"; then + AX_USING_CVS=no + else + AC_MSG_ERROR([CVS support cannot be enabled: cvs executable not found]) + fi + fi + AC_SUBST([CVS]) +fi + +if test "x$AX_USING_CVS" != "xno"; then + AC_ARG_VAR(GAWK, [gawk executable to use]) + if test "x$GAWK" = "x"; then + AC_CHECK_PROGS(GAWK,[gawk]) + fi + if test "x$GAWK" = "x"; then + if test "x$AX_USING_CVS" = "x"; then + AX_USING_CVS=no + else + AC_MSG_ERROR([CVS support cannot be enabled: gawk could not be found]) + fi + fi + AC_SUBST([GAWK]) +fi + +if test "x$AX_USING_CVS" != "xno"; then + AC_ARG_VAR(CVSEDITOR, [text editor to use for cvs]) + if test "x$CVSEDITOR" = "x"; then + if test "x$EDITOR" = "x"; then + AC_CHECK_PROGS(CVSEDITOR,[vim vi emacs]) + else + AC_CHECK_PROGS(CVSEDITOR,[$EDITOR vim vi emacs]) + fi + fi + if test "x$CVSEDITOR" = "x"; then + if test "x$AX_USING_CVS" = "x"; then + AX_USING_CVS=no + else + AC_MSG_ERROR([CVS support cannot be enabled: CVSEDITOR not set and editor not found]) + fi + fi + AC_SUBST([CVSEDITOR]) +fi + +if test "x$AX_USING_CVS" != "xno"; then + AC_ARG_VAR(CVSROOT, [the CVSROOT to use]) + AC_MSG_CHECKING([CVSROOT]) + if test -e "$srcdir/CVS/Root"; then + CVSROOT=`cat $srcdir/CVS/Root`; + AC_MSG_RESULT([$CVSROOT]) + else + AC_MSG_RESULT([not found]) + if test "x$AX_USING_CVS" = "x"; then + AX_USING_CVS=no + else + AC_MSG_ERROR([CVS support cannot be enabled: CVSROOT not found. Did you check out from CVS?]) + fi + fi + AC_SUBST([CVSROOT]) +fi + +if test "x$AX_USING_CVS" != "xno"; then + AC_MSG_CHECKING([USERNAME]) + if test "x$USERNAME" != "x"; then + AC_MSG_RESULT([$USERNAME]) + else + AC_MSG_RESULT([not set]) + if test "x$AX_USING_CVS" = "x"; then + AX_USING_CVS=no + else + AC_MSG_ERROR([CVS support cannot be enabled: USERNAME environment variable not set]) + fi + fi + AC_SUBST([USERNAME]) +fi + +if test "x$AX_USING_CVS" != "xno"; then + AC_MSG_CHECKING([USEREMAIL]) + if test "x$USERNAME" != "x"; then + AC_MSG_RESULT([$USEREMAIL]) + else + AC_MSG_RESULT([not set]) + if test "x$AX_USING_CVS" = "x"; then + AX_USING_CVS=no + else + AC_MSG_ERROR([CVS support cannot be enabled: USEREMAIL environment variable not set]) + fi + fi + AC_SUBST([USEREMAIL]) +fi + + +if test "x$AX_USING_CVS" != "xno"; then + AC_MSG_NOTICE([cvs support enabled]) + m4_pattern_allow([AC_INIT]) + AX_PRINT_TO_FILE([ax_cvs_rel.awk],[[ + +BEGIN { + if( change <= 0 ) + exit -1; +} + +/AC_INIT/ { + if( ${AX_DOLLAR}2 ~ /\\)${AX_DOLLAR}/ ) + { + ver = substr( ${AX_DOLLAR}2, 0, length( ${AX_DOLLAR}2 ) - 1 ); + tail=\")\"; + } + else + ver = ${AX_DOLLAR}2; + + if( ${AX_DOLLAR}2 ~ /${AX_BS}${AX_SRB}${AX_DOLLAR}/ ) + { + ver = substr( ${AX_DOLLAR}2, 0, length( ${AX_DOLLAR}2 ) - 1 ); + tail=\"${AX_SRB}\"; + } + else + ver = ${AX_DOLLAR}2; + + if( ${AX_DOLLAR}2 ~ /\\,${AX_DOLLAR}/ ) + { + ver = substr( ${AX_DOLLAR}2, 0, length( ${AX_DOLLAR}2 ) - 1 ); + tail=\",\"; + } + else + ver = ${AX_DOLLAR}2; + + n = split( ver, ver_array, \".\" ); + + while( change > n ) + ver_array[ ++n ] = 0; + + ver_array[ change ]++; + + while( ++change <= n ) + ver_array[ change ] = 0; + + ${AX_DOLLAR}2 = \"\"; + for( i = 1; i < n; ++i ) + ${AX_DOLLAR}2 = ${AX_DOLLAR}2 ver_array[ i ] \".\"; + ${AX_DOLLAR}2 = ${AX_DOLLAR}2 ver_array[ n ]; + if( tail ) + ${AX_DOLLAR}2 = ${AX_DOLLAR}2 tail; +} + +{ print ${AX_DOLLAR}0; } + +]]) +fi +AM_CONDITIONAL([ax_cvs_enabled],[test "x$AX_USING_CVS" != "xno"]) +AX_ADD_AM_MACRO_STATIC([ +if ax_cvs_enabled +update: + @cd \"${AX_DOLLAR}(srcdir)\" && \$(CVS) -z9 update + +cvsalways: + +${AX_DOLLAR}(top_builddir)/commitlog: cvsalways + @(CURR=\`pwd\`; cd \"${AX_DOLLAR}(top_srcdir)\"; \$(CVS) -z9 diff -u --brief 2>&1 | \\ + \$(GAWK) \\ + \'/^Index/ { print \"\\\\t* ./\" ${AX_DOLLAR}${AX_DOLLAR}2; } \\ + /^cvs diff: .* was removed/ { print \"\\\\t* ./\" ${AX_DOLLAR}${AX_DOLLAR}3 \" (removed)\"; } \\ + /^cvs diff: .* is a new entry/ { print \"\\\\t* ./\" ${AX_DOLLAR}${AX_DOLLAR}3 \" (added)\"; }\' \\ + > \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog.tmp\") + @if test -s commitlog.tmp; then \\ + echo \"\" >> commitlog.tmp; \\ + if test -f ${AX_DOLLAR}(top_builddir)/commitlog; then \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog >> commitlog.tmp; \\ + fi; \\ + echo \"/* -*-change-log-*- */\" > ${AX_DOLLAR}(top_builddir)/commitlog; \\ + DATE=\`date +\"%%Y-%%m-%%d\"\`; \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}DATE ${USERNAME} <${USEREMAIL}>\" >> ${AX_DOLLAR}(top_builddir)/commitlog; \\ + echo \"\" >> ${AX_DOLLAR}(top_builddir)/commitlog; \\ + cat commitlog.tmp >> ${AX_DOLLAR}(top_builddir)/commitlog; \\ + rm -f commitlog.tmp; \\ + \$(CVSEDITOR) ${AX_DOLLAR}(top_builddir)/commitlog; \\ + \$(GAWK) \'BEGIN { blank=0; } \\ + /\\\\/\\\\* -\\\\*-change-log-\\\\*- \\\\*\\\\// { getline; } \\ + /^[[:blank:]]*\$\$/ { if( !blank ) { blank = 1; print; } } \\ + /[[:alnum:]]/ { print; blank = 0; } \\ + END{ if( !blank ) print \"\"; }\' \\ + ${AX_DOLLAR}(top_builddir)/commitlog > commitlog.tmp; \\ + mv commitlog.tmp ${AX_DOLLAR}(top_builddir)/commitlog; \\ + else \\ + echo \"no changes found\";\\ + fi + +commit: update ${AX_DOLLAR}(top_builddir)/commitlog + @if test -f ${AX_DOLLAR}(top_builddir)/commitlog; then \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog \"\$(top_srcdir)/ChangeLog\" > ChangeLog.tmp; \\ + mv ChangeLog.tmp \"\$(top_srcdir)/ChangeLog\"; \\ + CURR=\`(cd \"${AX_DOLLAR}(top_builddir)\"; pwd )\`; \\ + (cd \"\$(top_srcdir)\"; \$(CVS) -z9 commit -F \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog\" ); \\ + rm -f ${AX_DOLLAR}(top_builddir)/commitlog; \\ + fi + +cvs-rm: + @echo \"Removing files from CVS\" + @if test \"x\$(FILES)\" != \"x\"; then \\ + NEWFILES=\"\"; \\ + for FILE in \$(FILES); do \\ + if test -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\ + rm -i \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\ + fi; \\ + if test ! -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\ + if test \"\$(srcdir)\" != \".\"; then \\ + FILE=\`echo \"${AX_DOLLAR}${AX_DOLLAR}FILE\" | \$(SED) -e \'s|^\$(srcdir)|.|\'\`; \\ + fi; \\ + NEWFILES=\"${AX_DOLLAR}${AX_DOLLAR}NEWFILES ${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\ + fi; \\ + done; \\ + if test \"x${AX_DOLLAR}${AX_DOLLAR}NEWFILES\" != \"x\"; then \\ + (cd \"\$(srddir)\"; \$(CVS) remove ${AX_DOLLAR}${AX_DOLLAR}NEWFILES; ); \\ + fi; \\ + else \\ + echo \"You must specify the file(s) you want to remove from cvs by using\"; \\ + echo \"the FILES environment variable. For example:\"; \\ + echo \" make cvs-rm FILES=\'foo bar\'\"; \\ + echo \"\"; \\ + exit 1; \\ + fi + +cvs-add: + @echo \"Adding files to CVS\" + @if test \"x${AX_DOLLAR}(FILES)\" != \"x\"; then \\ + NEWFILES=\"\"; \\ + for FILE in ${AX_DOLLAR}(FILES); do \\ + if test -e \"${AX_DOLLAR}${AX_DOLLAR}FILE\"; then \\ + if test \"${AX_DOLLAR}(srcdir)\" != \".\"; then \\ + FILE=\`echo \"${AX_DOLLAR}${AX_DOLLAR}FILE\" | sed -e \'s|^${AX_DOLLAR}(srcdir)|.|\'\`; \\ + fi; \\ + fi; \\ + NEWFILES=\"${AX_DOLLAR}${AX_DOLLAR}NEWFILES ${AX_DOLLAR}${AX_DOLLAR}FILE\"; \\ + done; \\ + if test \"x${AX_DOLLAR}${AX_DOLLAR}NEWFILES\" != \"x\"; then \\ + cd \"${AX_DOLLAR}(srcdir)\"; \$(CVS) add ${AX_DOLLAR}${AX_DOLLAR}NEWFILES; \\ + fi; \\ + else \\ + echo \"You must specify the file(s) you want to add to cvs by using\"; \\ + echo \"the FILES environment variable. For example:\"; \\ + echo \" make cvs-add FILES=\'foo bar\'\"; \\ + echo \"\"; \\ + exit 1; \\ + fi + +branch-major: + @tag=\"\$(PACKAGE)-${AX_MAJOR_VERSION}\"; \\ + echo \"\"; \\ + echo \"Creating major brach: ${AX_DOLLAR}${AX_DOLLAR}tag\"; \\ + (cd \"${AX_DOLLAR}(top_srcdir)\"; \$(CVS) tag -b \"${AX_DOLLAR}${AX_DOLLAR}tag\"; ); \\ + \$(GAWK) -f ax_cvs_rel.awk -v change=1 \"${AX_DOLLAR}(top_srcdir)/configure.ac\" > configure.tmp; \\ + touch ${AX_DOLLAR}(top_builddir)/commitlog; \\ + DATE=\`date +\"%%Y-%%m-%%d\"\`; \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}DATE \$(USERNAME) <\$(USEREMAIL)>\" > commitlog.tmp ; \\ + echo \"\" >> commitlog.tmp; \\ + echo \" * ./configure.ac\" >> commitlog.tmp; \\ + echo \" Created major branch: ${AX_DOLLAR}${AX_DOLLAR}tag\" >> commitlog.tmp; \\ + echo \" Use:\" >> commitlog.tmp; \\ + echo \" \\\\\`cvs -d\$(ANON_CVSROOT) login\\\\\`\" >> commitlog.tmp; \\ + echo \" \\\\\`cvs -d\$(ANON_CVSROOT) co -r ${AX_DOLLAR}${AX_DOLLAR}tag \$(PACKAGE)\\\\\`\" >> commitlog.tmp; \\ + echo \" to access the branch\" >> commitlog.tmp; \\ + echo \"\" >> commitlog.tmp; \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog >> commitlog.tmp; \\ + mv commitlog.tmp ${AX_DOLLAR}(top_builddir)/commitlog; \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog \"${AX_DOLLAR}(top_srcdir)/ChangeLog\" > ChangeLog.tmp; \\ + mv ChangeLog.tmp \"${AX_DOLLAR}(top_srcdir)/ChangeLog\"; \\ + mv configure.tmp \"${AX_DOLLAR}(top_srcdir)/configure.ac\"; \\ + CURR=\`(cd \"${AX_DOLLAR}(top_builddir)\"; pwd )\`; \\ + (cd \"${AX_DOLLAR}(top_srcdir)\"; \$(CVS) -z9 commit -F \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog\"; ); \\ + rm -f ${AX_DOLLAR}(top_builddir)/commitlog; \\ + \$(CVS) -z9 -d${AX_DOLLAR}(CVSROOT) co -r ${AX_DOLLAR}${AX_DOLLAR}tag -d ${AX_DOLLAR}${AX_DOLLAR}tag \$(PACKAGE); \\ + echo \"The branch is now available in the ${AX_DOLLAR}${AX_DOLLAR}tag directory\"; \\ + echo \"\" + + +branch-minor: + @tag=\"\$(PACKAGE)-${AX_MAJOR_VERSION}_${AX_MINOR_VERSION}\"; \\ + echo \"\"; \\ + echo \"Creating minor brach: ${AX_DOLLAR}${AX_DOLLAR}tag\"; \\ + (cd \"${AX_DOLLAR}(top_srcdir)\"; \$(CVS) tag -b \"${AX_DOLLAR}${AX_DOLLAR}tag\"; ); \\ + \$(GAWK) -f ax_cvs_rel.awk -v change=1 \"${AX_DOLLAR}(top_srcdir)/configure.ac\" > configure.tmp; \\ + touch ${AX_DOLLAR}(top_builddir)/commitlog; \\ + DATE=\`date +\"%%Y-%%m-%%d\"\`; \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}DATE \$(USERNAME) <\$(USEREMAIL)>\" > commitlog.tmp ; \\ + echo \"\" >> commitlog.tmp; \\ + echo \" * ./configure.ac\" >> commitlog.tmp; \\ + echo \" Created minor branch: ${AX_DOLLAR}${AX_DOLLAR}tag\" >> commitlog.tmp; \\ + echo \" Use:\" >> commitlog.tmp; \\ + echo \" \\\\\`cvs -d\$(ANON_CVSROOT) login\\\\\`\" >> commitlog.tmp; \\ + echo \" \\\\\`cvs -d\$(ANON_CVSROOT) co -r ${AX_DOLLAR}${AX_DOLLAR}tag \$(PACKAGE)\\\\\`\" >> commitlog.tmp; \\ + echo \" to access the branch\" >> commitlog.tmp; \\ + echo \"\" >> commitlog.tmp; \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog >> commitlog.tmp; \\ + mv commitlog.tmp ${AX_DOLLAR}(top_builddir)/commitlog; \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog \"${AX_DOLLAR}(top_srcdir)/ChangeLog\" > ChangeLog.tmp; \\ + mv ChangeLog.tmp \"${AX_DOLLAR}(top_srcdir)/ChangeLog\"; \\ + mv configure.tmp \"${AX_DOLLAR}(top_srcdir)/configure.ac\"; \\ + CURR=\`(cd \"${AX_DOLLAR}(top_builddir)\"; pwd )\`; \\ + (cd \"${AX_DOLLAR}(top_srcdir)\"; \$(CVS) -z9 commit -F \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog\"; ); \\ + rm -f ${AX_DOLLAR}(top_builddir)/commitlog; \\ + \$(CVS) -z9 -d${AX_DOLLAR}(CVSROOT) co -r ${AX_DOLLAR}${AX_DOLLAR}tag -d ${AX_DOLLAR}${AX_DOLLAR}tag \$(PACKAGE); \\ + echo \"The branch is now available in the ${AX_DOLLAR}${AX_DOLLAR}tag directory\"; \\ + echo \"\" + +add_rel: + @touch \"${AX_DOLLAR}(top_builddir)/commitlog\" + @DATE=\`date +\"%%Y-%%m-%%d\"\`; \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}DATE \$(USERNAME) <\$(USEREMAIL)>\" > commitlog.tmp + @echo \"\" >> commitlog.tmp + @echo \" * ./configure.ac\" >> commitlog.tmp + @echo \" Released \$(PACKAGE)-\$(VERSION)\" >> commitlog.tmp + @echo \" You can access this release by running:\" >> commitlog.tmp + @echo \" \\\\\`cvs -d\$(ANON_CVSROOT) login\\\\\`\" >> commitlog.tmp + @tag=\"\$(PACKAGE)-${AX_MAJOR_VERSION}_${AX_MINOR_VERSION}_${AX_POINT_VERSION}\"; \\ + echo \" \\\\\`cvs -d\$(ANON_CVSROOT) co -r ${AX_DOLLAR}${AX_DOLLAR}tag -d \$(PACKAGE)-\$(VERSION) \$(PACKAGE)\\\\\`\" >> commitlog.tmp + @echo \" The release will then be available in the \$(PACKAGE)-\$(VERSION) directory\" >> commitlog.tmp + @echo \"\" >> commitlog.tmp + @cat \"${AX_DOLLAR}(top_builddir)/commitlog\" >> commitlog.tmp + @mv commitlog.tmp \"${AX_DOLLAR}(top_builddir)/commitlog\" + @cat \"${AX_DOLLAR}(top_builddir)/commitlog\" \"\$(top_srcdir)/ChangeLog\" > ChangeLog.tmp + @mv ChangeLog.tmp \"\$(top_srcdir)/ChangeLog\" + @CURR=\`(cd \"${AX_DOLLAR}(top_builddir)\"; pwd )\`; \\ + (cd \"\$(top_srcdir)\"; \$(CVS) -z9 commit -F \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog\"; ) + @rm -f ${AX_DOLLAR}(top_builddir)/commitlog + +do_tag: + @tag=\"\$(PACKAGE)-${AX_MAJOR_VERSION}_${AX_MINOR_VERSION}_${AX_POINT_VERSION}\"; \\ + echo \"tagging release with ${AX_DOLLAR}${AX_DOLLAR}tag\"; \\ + (cd \"\$(top_srcdir)\"; \$(CVS) tag -b \"${AX_DOLLAR}${AX_DOLLAR}tag\"; ); \\ + \$(CVS) -z9 -d\$(CVSROOT) co -r ${AX_DOLLAR}${AX_DOLLAR}tag -d ${AX_DOLLAR}${AX_DOLLAR}tag \$(PACKAGE); \\ + echo \"The release is now available in the ${AX_DOLLAR}${AX_DOLLAR}tag directory\"; \\ + echo \"\" + +inc_rel: + @\$(GAWK) -f ax_cvs_rel.awk -v change=3 \"\$(top_srcdir)/configure.ac\" > configure.tmp; + @mv configure.tmp \"\$(top_srcdir)/configure.ac\" + @touch \"\$(top_builddir)/commitlog\" + @DATE=\`date +\"%%Y-%%m-%%d\"\`; \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}DATE \$(USERNAME) <\$(USEREMAIL)>\" > commitlog.tmp ; \\ + echo \"\" >> commitlog.tmp; \\ + echo \" * ./configure.ac\" >> commitlog.tmp; \\ + echo \" Update version number\" >> commitlog.tmp; \\ + echo \"\" >> commitlog.tmp; \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog >> commitlog.tmp; \\ + mv commitlog.tmp ${AX_DOLLAR}(top_builddir)/commitlog; \\ + cat ${AX_DOLLAR}(top_builddir)/commitlog \"${AX_DOLLAR}(top_srcdir)/ChangeLog\" > ChangeLog.tmp; \\ + mv ChangeLog.tmp \"${AX_DOLLAR}(top_srcdir)/ChangeLog\"; \\ + CURR=\`(cd \"${AX_DOLLAR}(top_builddir)\"; pwd )\`; \\ + (cd \"${AX_DOLLAR}(top_srcdir)\"; \$(CVS) -z9 commit -F \"${AX_DOLLAR}${AX_DOLLAR}CURR/commitlog\"; ); \\ + rm -f ${AX_DOLLAR}(top_builddir)/commitlog; + +tag: do_tag inc_rel + +# creates a release for the current version, increments the point +# release number and checkout the release into a new directory +release: update distcheck add_rel tag + +# same as release, but distcheck is not performed before releasing +quick-release: update add_rel tag + +endif # ax_cvs_enabled +]) + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_bool.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_bool.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_bool.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_bool.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,45 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_bool.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_BOOL +# +# DESCRIPTION +# +# If the compiler recognizes bool as a separate built-in type, define +# HAVE_BOOL. Note that a typedef is not a separate type since you cannot +# overload a function such that it accepts either the basic type or the +# typedef. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_BOOL], [AX_CXX_BOOL]) +AC_DEFUN([AX_CXX_BOOL], +[dnl + AC_CACHE_CHECK(whether the compiler recognizes bool as a built-in type, + ax_cv_cxx_bool, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([dnl + AC_LANG_PROGRAM([int f(int x){return 1;} + int f(char x){return 1;} + int f(bool x){return 1;}], + [bool b = true; return f(b);])], + ax_cv_cxx_bool=yes, ax_cv_cxx_bool=no) + AC_LANG_POP([C++]) + ]) + AS_IF([test "X$ax_cv_cxx_bool" = Xyes], + [AC_DEFINE(HAVE_BOOL,,[define if bool is a built-in type])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_0x.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_0x.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_0x.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_0x.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,111 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_0x.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_0X +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++0x +# standard. +# +# This macro is deprecated and has been superseded by the +# AX_CXX_COMPILE_STDCXX_11 macro which should be used instead. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AU_ALIAS([AC_CXX_COMPILE_STDCXX_0X], [AX_CXX_COMPILE_STDCXX_0X]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX_0X], [ + AC_OBSOLETE([$0], [; use AX_CXX_COMPILE_STDCXX_11 instead]) + AC_CACHE_CHECK(if g++ supports C++0x features without additional flags, + ax_cv_cxx_compile_cxx0x_native, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c);],, + ax_cv_cxx_compile_cxx0x_native=yes, ax_cv_cxx_compile_cxx0x_native=no) + AC_LANG_RESTORE + ]) + + AC_CACHE_CHECK(if g++ supports C++0x features with -std=c++0x, + ax_cv_cxx_compile_cxx0x_cxx, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXX="$CXX" + CXX="$CXX -std=c++0x" + AC_TRY_COMPILE([ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c);],, + ax_cv_cxx_compile_cxx0x_cxx=yes, ax_cv_cxx_compile_cxx0x_cxx=no) + CXX="$ac_save_CXX" + AC_LANG_RESTORE + ]) + + AC_CACHE_CHECK(if g++ supports C++0x features with -std=gnu++0x, + ax_cv_cxx_compile_cxx0x_gxx, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXX="$CXX" + CXX="$CXX -std=gnu++0x" + AC_TRY_COMPILE([ + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + typedef check> right_angle_brackets; + + int a; + decltype(a) b; + + typedef check check_type; + check_type c; + check_type&& cr = static_cast(c);],, + ax_cv_cxx_compile_cxx0x_gxx=yes, ax_cv_cxx_compile_cxx0x_gxx=no) + CXX="$ac_save_CXX" + AC_LANG_RESTORE + ]) + + if test "$ax_cv_cxx_compile_cxx0x_native" = yes || + test "$ax_cv_cxx_compile_cxx0x_cxx" = yes || + test "$ax_cv_cxx_compile_cxx0x_gxx" = yes; then + AC_DEFINE(HAVE_STDCXX_0X,,[Define if g++ supports C++0x features. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_11.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_11.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_11.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_11.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++11 +# standard; if necessary, add switches to CXX and CXXCPP to enable +# support. +# +# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX +# macro with the version set to C++11. The two optional arguments are +# forwarded literally as the second and third argument respectively. +# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for +# more information. If you want to use this macro, you also need to +# download the ax_cxx_compile_stdcxx.m4 file. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 18 + +AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_14.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_14.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_14.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_14.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,34 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_14.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_14([ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++14 +# standard; if necessary, add switches to CXX and CXXCPP to enable +# support. +# +# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX +# macro with the version set to C++14. The two optional arguments are +# forwarded literally as the second and third argument respectively. +# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for +# more information. If you want to use this macro, you also need to +# download the ax_cxx_compile_stdcxx.m4 file. +# +# LICENSE +# +# Copyright (c) 2015 Moritz Klammler +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [AX_CXX_COMPILE_STDCXX([14], [$1], [$2])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_17.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_17.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx_17.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx_17.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_17.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX_17([ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the C++17 +# standard; if necessary, add switches to CXX and CXXCPP to enable +# support. +# +# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX +# macro with the version set to C++17. The two optional arguments are +# forwarded literally as the second and third argument respectively. +# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for +# more information. If you want to use this macro, you also need to +# download the ax_cxx_compile_stdcxx.m4 file. +# +# LICENSE +# +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016 Krzesimir Nowak +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX_17], [AX_CXX_COMPILE_STDCXX([17], [$1], [$2])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_compile_stdcxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_compile_stdcxx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,982 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) +# or '14' (for the C++14 standard). +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# Copyright (c) 2012 Zack Weinberg +# Copyright (c) 2013 Roy Stogner +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov +# Copyright (c) 2015 Paul Norman +# Copyright (c) 2015 Moritz Klammler +# Copyright (c) 2016 Krzesimir Nowak +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AX_REQUIRE_DEFINED([AC_MSG_WARN]) +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + ax_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [ax_cv_cxx_compile_cxx$1=yes], + [ax_cv_cxx_compile_cxx$1=no])]) + if test x$ax_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) + m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])]) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check single_type; + typedef check> double_type; + typedef check>> triple_type; + typedef check>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == true, ""); + static_assert(is_same::value == false, ""); + static_assert(is_same::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template + struct sum; + + template + struct sum + { + static constexpr auto value = N0 + sum::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template + using member = typename T::member_type; + + template + void func(...) {} + + template + void func(member*) {} + + void test(); + + void test() { func(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same::value, ""); + static_assert(is_same::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus <= 201402L + +#error "This is not a C++17 compiler" + +#else + +#if defined(__clang__) + #define REALLY_CLANG +#else + #if defined(__GNUC__) + #define REALLY_GCC + #endif +#endif + +#include +#include +#include + +namespace cxx17 +{ + +#if !defined(REALLY_CLANG) + namespace test_constexpr_lambdas + { + + // TODO: test it with clang++ from git + + constexpr int foo = [](){return 42;}(); + + } +#endif // !defined(REALLY_CLANG) + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template + int multiply(Args... args) + { + return (args * ... * 1); + } + + template + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same, decltype(foo)>::value); + static_assert(std::is_same::value); + } + + namespace test_typename_in_template_template_parameter + { + + template typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + +#if !defined(REALLY_CLANG) + namespace test_template_argument_deduction_for_class_templates + { + + // TODO: test it with clang++ from git + + template + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } +#endif // !defined(REALLY_CLANG) + + namespace test_non_type_auto_template_parameters + { + + template + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + +#if !defined(REALLY_CLANG) + namespace test_structured_bindings + { + + // TODO: test it with clang++ from git + + int arr[2] = { 1, 2 }; + std::pair pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } +#endif // !defined(REALLY_CLANG) + +#if !defined(REALLY_CLANG) + namespace test_exception_spec_type_system + { + + // TODO: test it with clang++ from git + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template + Bad + f(T*, T*); + + template + Good + f(T1*, T2*); + + static_assert (std::is_same_v); + + } +#endif // !defined(REALLY_CLANG) + + namespace test_inline_variables + { + + template void f(T) + {} + + template inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus <= 201402L + +]]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_complex_math_in_namespace_std.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_complex_math_in_namespace_std.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_complex_math_in_namespace_std.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_complex_math_in_namespace_std.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,59 @@ +# ========================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_complex_math_in_namespace_std.html +# ========================================================================================= +# +# SYNOPSIS +# +# AX_CXX_COMPLEX_MATH_IN_NAMESPACE_STD +# +# DESCRIPTION +# +# If the C math functions are in the cmath header file and std:: +# namespace, define HAVE_MATH_FN_IN_NAMESPACE_STD. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_COMPLEX_MATH_IN_NAMESPACE_STD], [AX_CXX_COMPLEX_MATH_IN_NAMESPACE_STD]) +AC_DEFUN([AX_CXX_COMPLEX_MATH_IN_NAMESPACE_STD], +[dnl + AC_CACHE_CHECK([whether complex math functions are in std::], + ax_cv_cxx_complex_math_in_namespace_std, + [AC_REQUIRE([AX_CXX_NAMESPACE_STD]) + AS_IF([test "X$ax_cv_cxx_have_std_namespace" = Xyes], + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([dnl + AC_LANG_PROGRAM([ + #include + namespace S { + using namespace std; + complex pow(complex x, complex y) + { + return std::pow(x,y); + } + };], + [dnl + using namespace S; + complex x = 1.0, y = 1.0; S::pow(x,y); + return 0; + ])], + ax_cv_cxx_complex_math_in_namespace_std=yes, + ax_cv_cxx_complex_math_in_namespace_std=no) + AC_LANG_POP([C++]) + ], + [ax_cv_cxx_complex_math_in_namespace_std=no]) + ]) + AS_IF([test "X$ax_cv_cxx_complex_math_in_namespace_std" = Xyes], + [AC_DEFINE(HAVE_COMPLEX_MATH_IN_NAMESPACE_STD,,dnl + [define if complex math functions are in std::])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_const_cast.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_const_cast.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_const_cast.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_const_cast.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_const_cast.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_CONST_CAST +# +# DESCRIPTION +# +# If the compiler supports const_cast<>, define HAVE_CONST_CAST. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_CONST_CAST], [AX_CXX_CONST_CAST]) +AC_DEFUN([AX_CXX_CONST_CAST], +[dnl + AC_CACHE_CHECK([whether the compiler supports const_cast<>], + ax_cv_cxx_const_cast, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([dnl + AC_LANG_PROGRAM([], + [int x = 0; + const int& y = x; + int& z = const_cast(y); + return z;])], + ax_cv_cxx_const_cast=yes, + ax_cv_cxx_const_cast=no) + AC_LANG_POP([C++]) + ]) + AS_IF([test "X$ax_cv_cxx_const_cast" = Xyes], + [AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_cppflags_std_lang.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_cppflags_std_lang.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_cppflags_std_lang.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_cppflags_std_lang.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_cppflags_std_lang.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_CPPFLAGS_STD_LANG(CPP-FLAGS) +# +# DESCRIPTION +# +# Append to CPP-FLAGS the set of flags that should be passed to the C++ +# preprocessor in order to enable use of C++ features as defined in the +# ANSI C++ standard (eg. use of standard iostream classes in the `std' +# namespace, etc.). +# +# LICENSE +# +# Copyright (c) 2008 Ludovic Courtes +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([AC_CXX_CPPFLAGS_STD_LANG], [AX_CXX_CPPFLAGS_STD_LANG]) +AC_DEFUN([AX_CXX_CPPFLAGS_STD_LANG], + [AC_LANG_ASSERT([C++]) + AC_REQUIRE([AX_COMPILER_VENDOR]) + case "$ax_cv_cxx_compiler_vendor" in + dec|compaq) + # By default, Compaq CXX has an iostream classes implementation + # that is _not_ in the `std' namespace. + $1="$$1 -D__USE_STD_IOSTREAM=1";; + hp) + # When `configure' looks for a C++ header (eg. ) it invokes + # `aCC -E $CPPFLAGS'. However, including standard C++ headers like + # fails if `-AA' is not supplied. + $1="$$1 -AA";; + esac]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_cxxflags_std_lang.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_cxxflags_std_lang.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_cxxflags_std_lang.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_cxxflags_std_lang.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,36 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_cxxflags_std_lang.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_CXXFLAGS_STD_LANG(CXX-FLAGS) +# +# DESCRIPTION +# +# Append to variable CXX-FLAGS the set of compile-time flags that should +# be passed to the C++ compiler in order to enable use of C++ features as +# defined in the ANSI C++ standard (eg. use of standard iostream classes +# in the `std' namespace, etc.). Note that if you use GNU Libtool you may +# need to prefix each of those flags with `-Xcompiler' so that Libtool +# doesn't discard them (see Libtool's manual and `AC_LIBTOOLIZE_CFLAGS'). +# +# LICENSE +# +# Copyright (c) 2008 Ludovic Courtes +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_CXXFLAGS_STD_LANG], [AX_CXX_CXXFLAGS_STD_LANG]) +AC_DEFUN([AX_CXX_CXXFLAGS_STD_LANG], + [AC_LANG_ASSERT([C++]) + AC_REQUIRE([AX_COMPILER_VENDOR]) + case "$ax_cv_cxx_compiler_vendor" in + sgi) $1="$$1 -LANG:std -exceptions";; + hp) $1="$$1 -AA";; + esac]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_default_template_parameters.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_default_template_parameters.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_default_template_parameters.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_default_template_parameters.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_default_template_parameters.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_CXX_DEFAULT_TEMPLATE_PARAMETERS +# +# DESCRIPTION +# +# If the compiler supports default template parameters, define +# HAVE_DEFAULT_TEMPLATE_PARAMETERS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_DEFAULT_TEMPLATE_PARAMETERS], [AX_CXX_DEFAULT_TEMPLATE_PARAMETERS]) +AC_DEFUN([AX_CXX_DEFAULT_TEMPLATE_PARAMETERS], +[dnl + AC_REQUIRE([AX_CXX_TEMPLATES]) + AC_CACHE_CHECK([whether the compiler supports default template parameters], + [ax_cv_cxx_default_template_parameters], + [dnl + AS_IF([test "X$ax_cv_cxx_templates" = "Xyes"], + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([dnl + AC_LANG_PROGRAM([ + template class A { + public: int f() {return 0;} + }; + ], + [A a; return a.f();])], + ax_cv_cxx_default_template_parameters=yes, + ax_cv_cxx_default_template_parameters=no) + AC_LANG_POP([C++]) + ], + [ax_cv_cxx_default_template_parameters=no]) + ]) + AS_IF([test "X$ax_cv_cxx_default_template_parameters" = "Xyes"], + [AC_DEFINE(HAVE_DEFAULT_TEMPLATE_PARAMETERS,, + [define if the compiler supports default template parameters])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_delete_method.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_delete_method.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_delete_method.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_delete_method.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,78 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_delete_method.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_DELETE_METHOD +# +# DESCRIPTION +# +# Check whether the C++11 '= delete' syntax, for suppressing undesired +# implicit methods, is supported. If it is, the macro DELETE_METHOD is +# defined to '= delete'; otherwise it is defined to nothing. Thus, you +# can write +# +# class foo { +# ... +# private: +# foo(foo const&) DELETE_METHOD; +# }; +# +# to delete the 'foo' copy constructor or fall back to the idiom of a +# private undefined method if the compiler doesn't support this. +# +# Does not test '= delete' on a template specialization. Does not ensure +# that the compiler is in C++11 mode. +# +# LICENSE +# +# Copyright (c) 2012 Zack Weinberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_CXX_DELETE_METHOD], [dnl + AC_LANG_ASSERT([C++]) + # This compilation should succeed... + AC_CACHE_CHECK(whether $CXX accepts method deletion, + ax_cv_cxx_delete_method_syntax, [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + struct foo { + foo(double); + foo(int) = delete; + }; + extern void t(foo const&); + void tt(double n) { t(n); } + ]])], + [ax_cv_cxx_delete_method_syntax=yes], + [ax_cv_cxx_delete_method_syntax=no])]) + # ... and this one should fail. + AC_CACHE_CHECK(whether $CXX enforces method deletion, + ax_cv_cxx_delete_method_enforced, [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + struct foo { + foo(double); + foo(int) = delete; + }; + extern void t(foo const&); + void tt(int n) { t(n); } + ]])], + [ax_cv_cxx_delete_method_enforced=no], + [ax_cv_cxx_delete_method_enforced=yes])]) + if test $ax_cv_cxx_delete_method_syntax = yes && + test $ax_cv_cxx_delete_method_enforced = yes + then + AC_DEFINE([DELETE_METHOD], [= delete], + [Define as `= delete' if your compiler supports C++11 method + deletion, as nothing otherwise.]) + else + AC_DEFINE([DELETE_METHOD], [], + [Define as `= delete' if your compiler supports C++11 method + deletion, as nothing otherwise.]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_dtor_after_atexit.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_dtor_after_atexit.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_dtor_after_atexit.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_dtor_after_atexit.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,73 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_dtor_after_atexit.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_DTOR_AFTER_ATEXIT +# +# DESCRIPTION +# +# If the C++ compiler calls global destructors after atexit functions, +# define HAVE_DTOR_AFTER_ATEXIT. +# +# Conformant behavior is to have global destructors after atexit +# +# Per Paragraph 3.6.3/1 of the C++11 Standard: +# +# Destructors (12.4) for initialized objects [..] with static storage +# duration are called as a result of returning from main and as a result +# of calling std::exit (18.5). +# +# And per Paragraph 3.6.3/3: +# +# If the completion of the initialization of an object with static storage +# duration is sequenced before a call to std::atexit [..], the call to the +# function passed to std::atexit is sequenced before the call to the +# destructor for the object. +# +# WARNING: If cross-compiling, the test cannot be performed, the default +# action is to define HAVE_DTOR_AFTER_ATEXIT. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_CXX_DTOR_AFTER_ATEXIT], [AX_CXX_DTOR_AFTER_ATEXIT]) +AC_DEFUN([AX_CXX_DTOR_AFTER_ATEXIT], +[dnl + AC_CACHE_CHECK(whether the compiler calls global destructors after functions registered through atexit, + [ax_cv_cxx_dtor_after_atexit], + [AC_LANG_PUSH([C++]) + AC_RUN_IFELSE([ + AC_LANG_PROGRAM(dnl + [ + #include + #include + + static int dtor_called = 0; + class A { public : ~A () { dtor_called = 1; } }; + static A a; + + void f() { _exit(dtor_called); }], + [ + atexit (f); + return 0; + ])], + ax_cv_cxx_dtor_after_atexit=yes, + ax_cv_cxx_dtor_after_atexit=no, + ax_cv_cxx_dtor_after_atexit=yes) + AC_LANG_POP([C++]) + ]) + AS_IF([test "X$ax_cv_cxx_dtor_after_atexit" = Xyes], + [AC_DEFINE(HAVE_DTOR_AFTER_ATEXIT,, + [define if the compiler calls global destructors after functions registered through atexit])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_dynamic_cast.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_dynamic_cast.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_dynamic_cast.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_dynamic_cast.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_dynamic_cast.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_DYNAMIC_CAST +# +# DESCRIPTION +# +# If the compiler supports dynamic_cast<>, define HAVE_DYNAMIC_CAST. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_DYNAMIC_CAST], [AX_CXX_DYNAMIC_CAST]) +AC_DEFUN([AX_CXX_DYNAMIC_CAST], +[AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>, +ax_cv_cxx_dynamic_cast, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +class Base { public : Base () {} virtual void f () = 0;}; +class Derived : public Base { public : Derived () {} virtual void f () {} };],[ +Derived d; Base& b=d; return dynamic_cast(&b) ? 0 : 1;], + ax_cv_cxx_dynamic_cast=yes, ax_cv_cxx_dynamic_cast=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_dynamic_cast" = yes; then + AC_DEFINE(HAVE_DYNAMIC_CAST,,[define if the compiler supports dynamic_cast<>]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_enum_computations.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_enum_computations.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_enum_computations.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_enum_computations.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_enum_computations.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_ENUM_COMPUTATIONS +# +# DESCRIPTION +# +# If the compiler handle computations inside an enum, define +# HAVE_ENUM_COMPUTATIONS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_ENUM_COMPUTATIONS], [AX_CXX_ENUM_COMPUTATIONS]) +AC_DEFUN([AX_CXX_ENUM_COMPUTATIONS], +[AC_CACHE_CHECK(whether the compiler handle computations inside an enum, +ax_cv_cxx_enum_computations, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +struct A { enum { a = 5, b = 7, c = 2 }; }; +struct B { enum { a = 1, b = 6, c = 9 }; }; +template struct Z +{ enum { a = (T1::a > T2::a) ? T1::a : T2::b, + b = T1::b + T2::b, + c = (T1::c * T2::c + T2::a + T1::a) + }; +};],[ +return (((int)Z::a == 5) + && ((int)Z::b == 13) + && ((int)Z::c == 24)) ? 0 : 1;], + ax_cv_cxx_enum_computations=yes, ax_cv_cxx_enum_computations=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_enum_computations" = yes; then + AC_DEFINE(HAVE_ENUM_COMPUTATIONS,, + [define if the compiler handle computations inside an enum]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_enum_computations_with_cast.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_enum_computations_with_cast.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_enum_computations_with_cast.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_enum_computations_with_cast.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_enum_computations_with_cast.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_CXX_ENUM_COMPUTATIONS_WITH_CAST +# +# DESCRIPTION +# +# If the compiler handle (int) casts in enum computations, define +# HAVE_ENUM_COMPUTATIONS_WITH_CAST. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_ENUM_COMPUTATIONS_WITH_CAST], [AX_CXX_ENUM_COMPUTATIONS_WITH_CAST]) +AC_DEFUN([AX_CXX_ENUM_COMPUTATIONS_WITH_CAST], +[AC_CACHE_CHECK(whether the compiler handles (int) casts in enum computations, +ax_cv_cxx_enum_computations_with_cast, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +struct A { enum { a = 5, b = 7, c = 2 }; }; +struct B { enum { a = 1, b = 6, c = 9 }; }; +template struct Z +{ enum { a = ((int)T1::a > (int)T2::a) ? (int)T1::a : (int)T2::b, + b = (int)T1::b + (int)T2::b, + c = ((int)T1::c * (int)T2::c + (int)T2::a + (int)T1::a) + }; +};],[ +return (((int)Z::a == 5) + && ((int)Z::b == 13) + && ((int)Z::c == 24)) ? 0 : 1;], + ax_cv_cxx_enum_computations_with_cast=yes, ax_cv_cxx_enum_computations_with_cast=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_enum_computations_with_cast" = yes; then + AC_DEFINE(HAVE_ENUM_COMPUTATIONS_WITH_CAST,, + [define if the compiler handles (int) casts in enum computations]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_erase_iterator_type.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_erase_iterator_type.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_erase_iterator_type.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_erase_iterator_type.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_erase_iterator_type.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_CXX_ERASE_ITERATOR_TYPE +# +# DESCRIPTION +# +# If the compiler supports define erase with constant iterator or with +# classical iterator. +# +# Define autoconfigured_erase_iterator to const_iterator if supported and +# iterator if not supported. +# +# Define HAVE_ERASE_CONSTANT_ITERATOR if supported +# +# LICENSE +# +# Copyright (c) 2015 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_ERASE_ITERATOR_TYPE], +[dnl + AC_CACHE_CHECK([the type of iterator inside erase function], + ax_cv_cxx_erase_iterator_type, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([dnl + AC_LANG_PROGRAM([ + #include + + typedef std::vector intvector; + + struct myvector { + myvector() { v.push_back(1); } + typedef intvector::const_iterator const_iterator; + typedef intvector::iterator iterator; + iterator erase (const_iterator position) + { return v.erase(position); }; + iterator erase (const_iterator first, const_iterator last) + { return v.erase(first,last); }; + intvector v; + }; + ], + [myvector v; + v.erase(v.v.begin(),v.v.end()); + return 1; + ])], + ax_cv_cxx_erase_iterator_type="const_iterator", + ax_cv_cxx_erase_iterator_type="iterator") + AC_LANG_POP([C++]) + ]) + AS_IF([test "X$ax_cv_cxx_erase_iterator_type" = Xconst_iterator], + [AC_DEFINE(HAVE_ERASE_CONSTANT_ITERATOR,,[define if the compiler supports iterator erase(const_iterator position)])]) + AH_VERBATIM([autoconfigured_erase_iterator], + [/* Define to the keyword(s) used to specify the type of the + erase iterator. Define to const_iterator if constant + or iterator if not constant. */ + #undef autoconfigured_erase_iterator + ]) + AC_DEFINE_UNQUOTED([autoconfigured_erase_iterator], + [$ax_cv_cxx_erase_iterator_type], + [iterator type for erase]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_exceptions.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_exceptions.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_exceptions.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_exceptions.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_exceptions.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_EXCEPTIONS +# +# DESCRIPTION +# +# If the C++ compiler supports exceptions handling (try, throw and catch), +# define HAVE_EXCEPTIONS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_EXCEPTIONS], [AX_CXX_EXCEPTIONS]) +AC_DEFUN([AX_CXX_EXCEPTIONS], +[AC_CACHE_CHECK(whether the compiler supports exceptions, +ax_cv_cxx_exceptions, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE(,[try { throw 1; } catch (int i) { return i; }], + ax_cv_cxx_exceptions=yes, ax_cv_cxx_exceptions=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_exceptions" = yes; then + AC_DEFINE(HAVE_EXCEPTIONS,,[define if the compiler supports exceptions]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_explicit_instantiations.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_explicit_instantiations.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_explicit_instantiations.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_explicit_instantiations.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,40 @@ +# =================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_explicit_instantiations.html +# =================================================================================== +# +# SYNOPSIS +# +# AX_CXX_EXPLICIT_INSTANTIATIONS +# +# DESCRIPTION +# +# If the C++ compiler supports explicit instantiations syntax, define +# HAVE_INSTANTIATIONS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_CXX_EXPLICIT_INSTANTIATIONS], [AX_CXX_EXPLICIT_INSTANTIATIONS]) +AC_DEFUN([AX_CXX_EXPLICIT_INSTANTIATIONS], +[AC_CACHE_CHECK(whether the compiler supports explicit instantiations, +ax_cv_cxx_explinst, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([template class A { T t; }; template class A;], + [], ax_cv_cxx_explinst=yes, ax_cv_cxx_explinst=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_explinst" = yes; then + AC_DEFINE(HAVE_INSTANTIATIONS,, + [define if the compiler supports explicit instantiations]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_explicit.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_explicit.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_explicit.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_explicit.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_explicit.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_EXPLICIT +# +# DESCRIPTION +# +# If the compiler can be asked to prevent using implicitly one argument +# constructors as converting constructors with the explicit keyword, +# define HAVE_EXPLICIT. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_EXPLICIT], [AX_CXX_EXPLICIT]) +AC_DEFUN([AX_CXX_EXPLICIT], +[AC_CACHE_CHECK(whether the compiler supports the explicit keyword, +ax_cv_cxx_explicit, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([class A{public:explicit A(double){}};], +[double c = 5.0;A x(c);return 0;], + ax_cv_cxx_explicit=yes, ax_cv_cxx_explicit=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_explicit" = yes; then + AC_DEFINE(HAVE_EXPLICIT,,[define if the compiler supports the explicit keyword]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_explicit_template_function_qualification.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_explicit_template_function_qualification.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_explicit_template_function_qualification.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_explicit_template_function_qualification.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# ==================================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_explicit_template_function_qualification.html +# ==================================================================================================== +# +# SYNOPSIS +# +# AX_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION +# +# DESCRIPTION +# +# If the compiler supports explicit template function qualification, +# define HAVE_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION], [AX_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION]) +AC_DEFUN([AX_CXX_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION], +[AC_CACHE_CHECK(whether the compiler supports explicit template function qualification, +ax_cv_cxx_explicit_template_function_qualification, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class A { public : A() {} }; +template A to (const A&) { return A(); } +],[A x; A y = to(x); return 0;], + ax_cv_cxx_explicit_template_function_qualification=yes, ax_cv_cxx_explicit_template_function_qualification=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_explicit_template_function_qualification" = yes; then + AC_DEFINE(HAVE_EXPLICIT_TEMPLATE_FUNCTION_QUALIFICATION,, + [define if the compiler supports explicit template function qualification]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_extern_template.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_extern_template.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_extern_template.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_extern_template.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_extern_template.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_EXTERN_TEMPLATE +# +# DESCRIPTION +# +# Test whether the C++ compiler supports "extern template". +# +# LICENSE +# +# Copyright (c) 2008 Patrick Mauritz +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_EXTERN_TEMPLATE], [AX_CXX_EXTERN_TEMPLATE]) +AC_DEFUN([AX_CXX_EXTERN_TEMPLATE],[ +AC_CACHE_CHECK(whether the compiler supports extern template, +ax_cv_cxx_extern_template, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([template void foo(T); extern template void foo(int);], + [], + ax_cv_cxx_extern_template=yes, ax_cv_cxx_extern_template=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_extern_template" = yes; then + AC_DEFINE(HAVE_EXTERN_TEMPLATE,,[define if the compiler supports extern template]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_full_specialization_syntax.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_full_specialization_syntax.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_full_specialization_syntax.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_full_specialization_syntax.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# ====================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_full_specialization_syntax.html +# ====================================================================================== +# +# SYNOPSIS +# +# AX_CXX_FULL_SPECIALIZATION_SYNTAX +# +# DESCRIPTION +# +# If the compiler recognizes the full specialization syntax, define +# HAVE_FULL_SPECIALIZATION_SYNTAX. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_FULL_SPECIALIZATION_SYNTAX], [AX_CXX_FULL_SPECIALIZATION_SYNTAX]) +AC_DEFUN([AX_CXX_FULL_SPECIALIZATION_SYNTAX], +[AC_CACHE_CHECK(whether the compiler recognizes the full specialization syntax, +ax_cv_cxx_full_specialization_syntax, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class A { public : int f () const { return 1; } }; +template<> class A { public: int f () const { return 0; } };],[ +A a; return a.f();], + ax_cv_cxx_full_specialization_syntax=yes, ax_cv_cxx_full_specialization_syntax=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_full_specialization_syntax" = yes; then + AC_DEFINE(HAVE_FULL_SPECIALIZATION_SYNTAX,, + [define if the compiler recognizes the full specialization syntax]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_function_nontype_parameters.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_function_nontype_parameters.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_function_nontype_parameters.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_function_nontype_parameters.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_function_nontype_parameters.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_CXX_FUNCTION_NONTYPE_PARAMETERS +# +# DESCRIPTION +# +# If the compiler supports function templates with non-type parameters, +# define HAVE_FUNCTION_NONTYPE_PARAMETERS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_FUNCTION_NONTYPE_PARAMETERS], [AX_CXX_FUNCTION_NONTYPE_PARAMETERS]) +AC_DEFUN([AX_CXX_FUNCTION_NONTYPE_PARAMETERS], +[AC_CACHE_CHECK(whether the compiler supports function templates with non-type parameters, +ax_cv_cxx_function_nontype_parameters, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class A {}; +template int f(const A& x) { return 0; } +],[A z; return f(z);], + ax_cv_cxx_function_nontype_parameters=yes, ax_cv_cxx_function_nontype_parameters=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_function_nontype_parameters" = yes; then + AC_DEFINE(HAVE_FUNCTION_NONTYPE_PARAMETERS,, + [define if the compiler supports function templates with non-type parameters]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_function_try_blocks.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_function_try_blocks.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_function_try_blocks.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_function_try_blocks.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_function_try_blocks.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_CXX_FUNCTION_TRY_BLOCKS +# +# DESCRIPTION +# +# If the C++ compiler supports function try blocks, define +# `HAVE_FUNCTION_TRY_BLOCKS'. +# +# LICENSE +# +# Copyright (c) 2008 Matthew D. Langston +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AU_ALIAS([MDL_CXX_FUNCTION_TRY_BLOCKS], [AX_CXX_FUNCTION_TRY_BLOCKS]) +AC_DEFUN([AX_CXX_FUNCTION_TRY_BLOCKS], +[ +AC_REQUIRE([AC_PROG_CXX]) +changequote(,)dnl +AC_MSG_CHECKING(whether ${CXX} supports function try blocks) +changequote([,])dnl +AC_CACHE_VAL(ax_cv_have_function_try_blocks, +[ +AC_LANG_SAVE +AC_LANG_CPLUSPLUS +AC_TRY_COMPILE([void foo() try{} catch( ... ){}], +[foo();], +ax_cv_have_function_try_blocks=yes, +ax_cv_have_function_try_blocks=no) +AC_LANG_RESTORE +]) +AC_MSG_RESULT($ax_cv_have_function_try_blocks) +if test "$ax_cv_have_function_try_blocks" = yes; then +AC_DEFINE(HAVE_FUNCTION_TRY_BLOCKS) +fi]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_gcc_abi_demangle.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_gcc_abi_demangle.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_gcc_abi_demangle.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_gcc_abi_demangle.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,57 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_gcc_abi_demangle.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_GCC_ABI_DEMANGLE +# +# DESCRIPTION +# +# If the compiler supports GCC C++ ABI name demangling (has header +# cxxabi.h and abi::__cxa_demangle() function), define +# HAVE_GCC_ABI_DEMANGLE +# +# Adapted from AX_CXX_RTTI by Luc Maisonobe +# +# LICENSE +# +# Copyright (c) 2008 Neil Ferguson +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_CXX_GCC_ABI_DEMANGLE], +[AC_CACHE_CHECK(whether the compiler supports GCC C++ ABI name demangling, +ax_cv_cxx_gcc_abi_demangle, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#include +#include + +template +class A {}; +],[A instance; +int status = 0; +char* c_name = 0; + +c_name = abi::__cxa_demangle(typeid(instance).name(), 0, 0, &status); + +std::string name(c_name); +free(c_name); + +return name == "A"; +], + ax_cv_cxx_gcc_abi_demangle=yes, ax_cv_cxx_gcc_abi_demangle=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_gcc_abi_demangle" = yes; then + AC_DEFINE(HAVE_GCC_ABI_DEMANGLE,1, + [define if the compiler supports GCC C++ ABI name demangling]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_gnucxx_hashmap.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_gnucxx_hashmap.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_gnucxx_hashmap.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_gnucxx_hashmap.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_gnucxx_hashmap.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_GNUCXX_HASHMAP +# +# DESCRIPTION +# +# Test for the presence of GCC's hashmap STL extension. +# +# LICENSE +# +# Copyright (c) 2008 Patrick Mauritz +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_GNUCXX_HASHMAP], [AX_CXX_GNUCXX_HASHMAP]) +AC_DEFUN([AX_CXX_GNUCXX_HASHMAP],[ +AC_CACHE_CHECK(whether the compiler supports __gnu_cxx::hash_map, +ax_cv_cxx_gnucxx_hashmap, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +using __gnu_cxx::hash_map;], + [], + ax_cv_cxx_gnucxx_hashmap=yes, ax_cv_cxx_gnucxx_hashmap=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_gnucxx_hashmap" = yes; then + AC_DEFINE(HAVE_GNUCXX_HASHMAP,,[define if the compiler supports __gnu_cxx::hash_map]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bad_function_call.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bad_function_call.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bad_function_call.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bad_function_call.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_bad_function_call.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_BAD_FUNCTION_CALL() +# +# DESCRIPTION +# +# This macro checks if std::bad_function_call, added in C++11, is defined +# in the header. +# +# If it is, define the ax_cv_cxx_have_bad_function_call environment +# variable to "yes" and define HAVE_CXX_BAD_FUNCTION_CALL. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_BAD_FUNCTION_CALL], + [AC_CACHE_CHECK( + [for std::bad_function_call in functional], + ax_cv_cxx_have_bad_function_call, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::bad_function_call;] + ], + [] + )], + [ax_cv_cxx_have_bad_function_call=yes], + [ax_cv_cxx_have_bad_function_call=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_bad_function_call" = "xyes" + then + AC_DEFINE(HAVE_CXX_BAD_FUNCTION_CALL, + 1, + [Define if functional defines the std::bad_function_call class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bind.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bind.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bind.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bind.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,55 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_bind.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_BIND() +# +# DESCRIPTION +# +# This macro checks if std::bind, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_bind environment variable to "yes" +# and define HAVE_CXX_BIND. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_BIND], + [AC_CACHE_CHECK( + [for std::bind in functional], + ax_cv_cxx_have_bind, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using namespace std;] + [int fn(int x, int y) { return x + y; }] + ], + [ + [auto bound_fn = bind(fn,1,2);] + [bound_fn();] + ] + )], + [ax_cv_cxx_have_bind=yes], + [ax_cv_cxx_have_bind=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_bind" = "xyes" + then + AC_DEFINE(HAVE_CXX_BIND, + 1, + [Define if functional defines the std::bind class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bit_and.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bit_and.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bit_and.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bit_and.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_bit_and.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_BIT_AND() +# +# DESCRIPTION +# +# This macro checks if std::bit_and, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_bit_and environment variable to +# "yes" and define HAVE_CXX_BIT_AND. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_BIT_AND], + [AC_CACHE_CHECK( + [for std::bit_and in functional], + ax_cv_cxx_have_bit_and, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::bit_and;] + ], + [] + )], + [ax_cv_cxx_have_bit_and=yes], + [ax_cv_cxx_have_bit_and=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_bit_and" = "xyes" + then + AC_DEFINE(HAVE_CXX_BIT_AND, + 1, + [Define if functional defines the std::bit_and class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bit_or.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bit_or.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bit_or.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bit_or.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_bit_or.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_BIT_OR() +# +# DESCRIPTION +# +# This macro checks if std::bit_or, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_bit_or environment variable to "yes" +# and define HAVE_CXX_BIT_OR. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_BIT_OR], + [AC_CACHE_CHECK( + [for std::bit_or in functional], + ax_cv_cxx_have_bit_or, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::bit_or;] + ], + [] + )], + [ax_cv_cxx_have_bit_or=yes], + [ax_cv_cxx_have_bit_or=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_bit_or" = "xyes" + then + AC_DEFINE(HAVE_CXX_BIT_OR, + 1, + [Define if functional defines the std::bit_or class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bit_xor.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bit_xor.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_bit_xor.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_bit_xor.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_bit_xor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_BIT_XOR() +# +# DESCRIPTION +# +# This macro checks if std::bit_xor, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_bit_xor environment variable to +# "yes" and define HAVE_CXX_BIT_XOR. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_BIT_XOR], + [AC_CACHE_CHECK( + [for std::bit_xor in functional], + ax_cv_cxx_have_bit_xor, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::bit_xor;] + ], + [] + )], + [ax_cv_cxx_have_bit_xor=yes], + [ax_cv_cxx_have_bit_xor=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_bit_xor" = "xyes" + then + AC_DEFINE(HAVE_CXX_BIT_XOR, + 1, + [Define if functional defines the std::bit_xor class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_complex.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_complex.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_complex.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_complex.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_complex.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_COMPLEX +# +# DESCRIPTION +# +# If the compiler has complex, define HAVE_COMPLEX. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_COMPLEX], [AX_CXX_HAVE_COMPLEX]) +AC_DEFUN([AX_CXX_HAVE_COMPLEX], +[AC_CACHE_CHECK(whether the compiler has complex, +ax_cv_cxx_have_complex, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[complex a; complex b; return 0;], + ax_cv_cxx_have_complex=yes, ax_cv_cxx_have_complex=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_complex" = yes; then + AC_DEFINE(HAVE_COMPLEX,,[define if the compiler has complex]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_complex_math1.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_complex_math1.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_complex_math1.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_complex_math1.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_complex_math1.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_COMPLEX_MATH1 +# +# DESCRIPTION +# +# If the compiler has the complex math functions cos, cosh, exp, log, pow, +# sin, sinh, sqrt, tan and tanh, define HAVE_COMPLEX_MATH1. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_COMPLEX_MATH1], [AX_CXX_HAVE_COMPLEX_MATH1]) +AC_DEFUN([AX_CXX_HAVE_COMPLEX_MATH1], +[AC_CACHE_CHECK(whether the compiler has complex math functions, +ax_cv_cxx_have_complex_math1, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_TRY_LINK([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[complex x(1.0, 1.0), y(1.0, 1.0); +cos(x); cosh(x); exp(x); log(x); pow(x,1); pow(x,double(2.0)); +pow(x, y); pow(double(2.0), x); sin(x); sinh(x); sqrt(x); tan(x); tanh(x); +return 0;], + ax_cv_cxx_have_complex_math1=yes, ax_cv_cxx_have_complex_math1=no) + LIBS="$ac_save_LIBS" + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_complex_math1" = yes; then + AC_DEFINE(HAVE_COMPLEX_MATH1,,[define if the compiler has complex math functions]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_complex_math2.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_complex_math2.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_complex_math2.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_complex_math2.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,48 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_complex_math2.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_COMPLEX_MATH2 +# +# DESCRIPTION +# +# If the compiler has the complex math functions acos, asin, atan, atan2 +# and log10, define HAVE_COMPLEX_MATH2. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_COMPLEX_MATH2], [AX_CXX_HAVE_COMPLEX_MATH2]) +AC_DEFUN([AX_CXX_HAVE_COMPLEX_MATH2], +[AC_CACHE_CHECK(whether the compiler has more complex math functions, +ax_cv_cxx_have_complex_math2, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_TRY_LINK([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[complex x(1.0, 1.0), y(1.0, 1.0); +acos(x); asin(x); atan(x); atan2(x,y); atan2(x, double(3.0)); +atan2(double(3.0), x); log10(x); return 0;], + ax_cv_cxx_have_complex_math2=yes, ax_cv_cxx_have_complex_math2=no) + LIBS="$ac_save_LIBS" + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_complex_math2" = yes; then + AC_DEFINE(HAVE_COMPLEX_MATH2,,[define if the compiler has more complex math functions]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_cref.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_cref.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_cref.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_cref.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,54 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_cref.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_CREF() +# +# DESCRIPTION +# +# This macro checks if std::cref, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_cref environment variable to "yes" +# and define HAVE_CXX_CREF. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_CREF], + [AC_CACHE_CHECK( + [for std::cref in functional], + ax_cv_cxx_have_cref, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using namespace std;] + ], + [ + [int x(1);] + [auto crefd = cref(x);] + ] + )], + [ax_cv_cxx_have_cref=yes], + [ax_cv_cxx_have_cref=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_cref" = "xyes" + then + AC_DEFINE(HAVE_CXX_CREF, + 1, + [Define if functional defines the std::cref class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_empty_iostream.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_empty_iostream.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_empty_iostream.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_empty_iostream.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_empty_iostream.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_EMPTY_IOSTREAM +# +# DESCRIPTION +# +# Check if the compiler allow the empty iostream constructor. Ok before +# gcc3, not after. +# +# LICENSE +# +# Copyright (c) 2008 Alain BARBET +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CXX_HAVE_EMPTY_IOSTREAM], [AX_CXX_HAVE_EMPTY_IOSTREAM]) +AC_DEFUN([AX_CXX_HAVE_EMPTY_IOSTREAM], +[AC_CACHE_CHECK(whether the compiler allow empty iostream, +ax_cv_cxx_have_empty_iostream, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[iostream iostr; return 0;], + ax_cv_cxx_have_empty_iostream=yes, ax_cv_cxx_have_empty_iostream=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_empty_iostream" = yes; then + AC_DEFINE(HAVE_EMPTY_IOSTREAM,,[define if the compiler allow empty +iostream]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ext_hash_map.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ext_hash_map.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ext_hash_map.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ext_hash_map.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,75 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_ext_hash_map.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_HAVE_EXT_HASH_MAP +# +# DESCRIPTION +# +# Check if the compiler has ext/hash_map Eg: +# +# #if defined(HAVE_EXT_HASH_MAP) +# #include +# #else +# #if defined(HAVE_STL) +# #include +# #else +# # Can't find hash_map header ! +# #endif +# #endif +# +# This file is Alain BARBET's AC_CXX_HAVE_EXT_HASH_SET 1.1 with +# s/set/map/g :) +# +# LICENSE +# +# Copyright (c) 2008 Perceval ANICHINI +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CXX_HAVE_EXT_HASH_MAP], [AX_CXX_HAVE_EXT_HASH_MAP]) +AC_DEFUN([AX_CXX_HAVE_EXT_HASH_MAP], +[AC_CACHE_CHECK(whether the compiler has ext/hash_map, +ax_cv_cxx_have_ext_hash_map, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[hash_map t; return 0;], + ax_cv_cxx_have_ext_hash_map=yes, ax_cv_cxx_have_ext_hash_map=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_ext_hash_map" = yes; then + AC_DEFINE(HAVE_EXT_HASH_MAP,,[define if the compiler has ext/hash_map]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ext_hash_set.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ext_hash_set.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ext_hash_set.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ext_hash_set.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_ext_hash_set.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_HAVE_EXT_HASH_SET +# +# DESCRIPTION +# +# Check if the compiler has ext/hash_set Eg: +# +# #if defined(HAVE_EXT_HASH_SET) +# #include +# #else +# #if defined(HAVE_STL) +# #include +# #else +# # Can't find hash_set header ! +# #endif +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Alain BARBET +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CXX_HAVE_EXT_HASH_SET], [AX_CXX_HAVE_EXT_HASH_SET]) +AC_DEFUN([AX_CXX_HAVE_EXT_HASH_SET], +[AC_CACHE_CHECK(whether the compiler has ext/hash_set, +ax_cv_cxx_have_ext_hash_set, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[hash_set t; return 0;], + ax_cv_cxx_have_ext_hash_set=yes, ax_cv_cxx_have_ext_hash_set=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_ext_hash_set" = yes; then + AC_DEFINE(HAVE_EXT_HASH_SET,,[define if the compiler has ext/hash_set]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ext_slist.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ext_slist.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ext_slist.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ext_slist.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_ext_slist.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_EXT_SLIST +# +# DESCRIPTION +# +# Check if the compiler has ext/slist. Eg: +# +# #if defined(HAVE_EXT_SLIST) +# #include +# #else +# #if defined(HAVE_STL) +# #include +# #else +# # Can't find slist header ! +# #endif +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Alain BARBET +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CXX_HAVE_EXT_SLIST], [AX_CXX_HAVE_EXT_SLIST]) +AC_DEFUN([AX_CXX_HAVE_EXT_SLIST], +[AC_CACHE_CHECK(whether the compiler has ext/slist, +ax_cv_cxx_have_ext_slist, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[slist s; return 0;], + ax_cv_cxx_have_ext_slist=yes, ax_cv_cxx_have_ext_slist=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_ext_slist" = yes; then + AC_DEFINE(HAVE_EXT_SLIST,,[define if the compiler has ext/slist]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_freeze_sstream.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_freeze_sstream.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_freeze_sstream.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_freeze_sstream.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,87 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_freeze_sstream.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_FREEZE_SSTREAM +# +# DESCRIPTION +# +# Check if the compiler has (need) freeze method call in stringstream/ +# strstream. Seems that Win32 and STLPort have it, libstdc++ not ... +# +# Eg: +# +# #include +# #ifdef HAVE_NAMESPACES +# using namespace std; +# #endif +# #ifdef HAVE_SSTREAM +# stringstream message; +# #else +# strstream message; +# #endif +# message << "Hello"; +# #ifdef HAVE_FREEZE_SSTREAM +# message.freeze(0); +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Alain BARBET +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CXX_HAVE_FREEZE_SSTREAM], [AX_CXX_HAVE_FREEZE_SSTREAM]) +AC_DEFUN([AX_CXX_HAVE_FREEZE_SSTREAM], +[AC_CACHE_CHECK(whether the compiler has freeze in stringstream, +ax_cv_cxx_have_freeze_sstream, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_REQUIRE([AX_CXX_HAVE_SSTREAM]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif], +[#ifdef HAVE_SSTREAM +stringstream message; +#else +strstream message; +#endif +message << "Hello"; message.freeze(0); return 0;], + ax_cv_cxx_have_freeze_sstream=yes, ax_cv_cxx_have_freeze_sstream=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_freeze_sstream" = yes; then + AC_DEFINE(HAVE_FREEZE_SSTREAM,,[define if the compiler has freeze in +stringstream]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_function.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_function.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_function.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_function.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_function.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_FUNCTION() +# +# DESCRIPTION +# +# This macro checks if std::function, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_function environment variable to +# "yes" and define HAVE_CXX_FUNCTION. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_FUNCTION], + [AC_CACHE_CHECK( + [for std::bad_function_call in functional], + ax_cv_cxx_have_function, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::bad_function_call;] + ], + [] + )], + [ax_cv_cxx_have_function=yes], + [ax_cv_cxx_have_function=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_function" = "xyes" + then + AC_DEFINE(HAVE_CXX_FUNCTION, + 1, + [Define if functional defines the std::bad_function_call class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_hash.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_hash.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_hash.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_hash.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_hash.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_HASH() +# +# DESCRIPTION +# +# This macro checks if std::hash, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_hash environment variable to "yes" +# and define HAVE_CXX_HASH. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_HASH], + [AC_CACHE_CHECK( + [for std::hash in functional], + ax_cv_cxx_have_hash, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [#include ] + [using std::hash;] + ], + [] + )], + [ax_cv_cxx_have_hash=yes], + [ax_cv_cxx_have_hash=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_hash" = "xyes" + then + AC_DEFINE(HAVE_CXX_HASH, + 1, + [Define if functional defines the std::hash class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ieee_math.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ieee_math.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ieee_math.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ieee_math.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_ieee_math.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_IEEE_MATH +# +# DESCRIPTION +# +# If the compiler has the double math functions acosh, asinh, atanh, cbrt, +# expm1, erf, erfc, isnan, j0, j1, jn, gamma, lgamma, ilogb, logb, log1p, +# rint, y0, y1, yn, hypot, nextafter, remainder and scalb, define +# HAVE_IEEE_MATH. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_IEEE_MATH], [AX_CXX_HAVE_IEEE_MATH]) +AC_DEFUN([AX_CXX_HAVE_IEEE_MATH], +[AC_CACHE_CHECK(whether the compiler supports IEEE math library, +ax_cv_cxx_have_ieee_math, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_TRY_LINK([ +#ifndef _ALL_SOURCE + #define _ALL_SOURCE +#endif +#ifndef _XOPEN_SOURCE + #define _XOPEN_SOURCE +#endif +#ifndef _XOPEN_SOURCE_EXTENDED + #define _XOPEN_SOURCE_EXTENDED 1 +#endif +#include ],[double x = 1.0; double y = 1.0; int i = 1; +acosh(x); asinh(x); atanh(x); cbrt(x); expm1(x); erf(x); erfc(x); isnan(x); +j0(x); j1(x); jn(i,x); ilogb(x); logb(x); log1p(x); rint(x); +y0(x); y1(x); yn(i,x); +#ifdef _THREAD_SAFE +gamma_r(x,&i); +lgamma_r(x,&i); +#else +gamma(x); +lgamma(x); +#endif +hypot(x,y); nextafter(x,y); remainder(x,y); scalb(x,y); +return 0;], + ax_cv_cxx_have_ieee_math=yes, ax_cv_cxx_have_ieee_math=no) + LIBS="$ac_save_LIBS" + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_ieee_math" = yes; then + AC_DEFINE(HAVE_IEEE_MATH,,[define if the compiler supports IEEE math library]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_is_bind_expression.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_is_bind_expression.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_is_bind_expression.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_is_bind_expression.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_is_bind_expression.html +# =================================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_IS_BIND_EXPRESSION() +# +# DESCRIPTION +# +# This macro checks if std::is_bind_expression, added in C++11, is defined +# in the header. +# +# If it is, define the ax_cv_cxx_have_is_bind_expression environment +# variable to "yes" and define HAVE_CXX_IS_BIND_EXPRESSION. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_IS_BIND_EXPRESSION], + [AC_CACHE_CHECK( + [for std::is_bind_expression in functional], + ax_cv_cxx_have_is_bind_expression, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::is_bind_expression;] + ], + [] + )], + [ax_cv_cxx_have_is_bind_expression=yes], + [ax_cv_cxx_have_is_bind_expression=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_is_bind_expression" = "xyes" + then + AC_DEFINE(HAVE_CXX_IS_BIND_EXPRESSION, + 1, + [Define if functional defines the std::is_bind_expression class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_is_placeholder.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_is_placeholder.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_is_placeholder.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_is_placeholder.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_is_placeholder.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_IS_PLACEHOLDER() +# +# DESCRIPTION +# +# This macro checks if std::is_placeholder, added in C++11, is defined in +# the header. +# +# If it is, define the ax_cv_cxx_have_is_placeholder environment variable +# to "yes" and define HAVE_CXX_IS_PLACEHOLDER. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_IS_PLACEHOLDER], + [AC_CACHE_CHECK( + [for std::is_placeholder in functional], + ax_cv_cxx_have_is_placeholder, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::is_placeholder;] + ], + [] + )], + [ax_cv_cxx_have_is_placeholder=yes], + [ax_cv_cxx_have_is_placeholder=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_is_placeholder" = "xyes" + then + AC_DEFINE(HAVE_CXX_IS_PLACEHOLDER, + 1, + [Define if functional defines the std::is_placeholder class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_koenig_lookup.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_koenig_lookup.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_koenig_lookup.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_koenig_lookup.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_koenig_lookup.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_KOENIG_LOOKUP +# +# DESCRIPTION +# +# Define CXX_HAVE_KOENIG_LOOKUP if the C++ compiler has argument-dependent +# name lookup (a.k.a. Koenig lookup). +# +# LICENSE +# +# Copyright (c) 2008 Steve M. Robbins +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([MNI_CXX_HAVE_KOENIG_LOOKUP], [AX_CXX_HAVE_KOENIG_LOOKUP]) +AC_DEFUN([AX_CXX_HAVE_KOENIG_LOOKUP], + [AC_CACHE_CHECK(whether the compiler implements Koenig lookup, + ax_cv_cxx_have_koenig_lookup, + [AC_LANG_PUSH(C++) + AC_TRY_COMPILE([ + namespace N1 { + class C {}; + void f1(const C& c) {} + } + + namespace N2 { + void f2() { + N1::C x; + f1(x); // resolves to N1::f1() if we have Koenig lookup, + // otherwise this will fail to compile. + } + } + ],[], + ax_cv_cxx_have_koenig_lookup=yes, + ax_cv_cxx_have_koenig_lookup=no) + AC_LANG_POP]) + if test "$ax_cv_cxx_have_koenig_lookup" = yes; then + AC_DEFINE(CXX_HAVE_KOENIG_LOOKUP,1, + [define to 1 if the compiler implements Koenig lookup]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_long_long_for_iostream.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_long_long_for_iostream.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_long_long_for_iostream.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_long_long_for_iostream.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,88 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_long_long_for_iostream.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_CXX_HAVE_LONG_LONG_FOR_IOSTREAM +# +# DESCRIPTION +# +# Check if the compiler allow long long for [i|o]stream Seems that OpenBSD +# / gcc-3 don't have it. +# +# Eg: +# +# #include +# #ifdef HAVE_SSTREAM +# #include +# #else +# #include +# #endif +# #ifdef HAVE_NAMESPACES +# using namespace std; +# #endif +# ostream str((streambuf *)0); +# long long lo=1; +# str << +# #ifdef HAVE_LONG_LONG_FOR_IOSTREAM +# (long int) +# #endif +# lo; +# +# LICENSE +# +# Copyright (c) 2008 Alain BARBET +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_CXX_HAVE_LONG_LONG_FOR_IOSTREAM], [AX_CXX_HAVE_LONG_LONG_FOR_IOSTREAM]) +AC_DEFUN([AX_CXX_HAVE_LONG_LONG_FOR_IOSTREAM], +[AC_CACHE_CHECK(whether the compiler allow long long for [i|o]stream, +ax_cv_cxx_have_ll_for_iostream, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_REQUIRE([AX_CXX_HAVE_SSTREAM]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_SSTREAM +#include +#else +#include +#endif +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[ ostream str((streambuf *)0); long long l=1; str << l; return 0;], + ax_cv_cxx_have_ll_for_iostream=yes, ax_cv_cxx_have_ll_for_iostream=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_ll_for_iostream" = yes; then + AC_DEFINE(HAVE_LONG_LONG_FOR_IOSTREAM,,[define if the compiler allow long long for [i|o]stream]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_mem_fn.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_mem_fn.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_mem_fn.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_mem_fn.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_mem_fn.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_MEM_FN() +# +# DESCRIPTION +# +# This macro checks if std::mem_fn, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_mem_fn environment variable to "yes" +# and define HAVE_CXX_MEM_FN. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_MEM_FN], + [AC_CACHE_CHECK( + [for std::mem_fn in functional], + ax_cv_cxx_have_mem_fn, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using namespace std;] + [struct st { int x; int fn() { return x; } };] + ], + [ + [st one {1};] + [auto mem_fned = mem_fn(&st::fn);] + [mem_fned(one);] + ] + )], + [ax_cv_cxx_have_mem_fn=yes], + [ax_cv_cxx_have_mem_fn=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_mem_fn" = "xyes" + then + AC_DEFINE(HAVE_CXX_MEM_FN, + 1, + [Define if functional defines the std::mem_fn class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_numeric_limits.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_numeric_limits.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_numeric_limits.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_numeric_limits.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_numeric_limits.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_NUMERIC_LIMITS +# +# DESCRIPTION +# +# If the compiler has numeric_limits, define HAVE_NUMERIC_LIMITS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_NUMERIC_LIMITS], [AX_CXX_HAVE_NUMERIC_LIMITS]) +AC_DEFUN([AX_CXX_HAVE_NUMERIC_LIMITS], +[AC_CACHE_CHECK(whether the compiler has numeric_limits, +ax_cv_cxx_have_numeric_limits, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[double e = numeric_limits::epsilon(); return 0;], + ax_cv_cxx_have_numeric_limits=yes, ax_cv_cxx_have_numeric_limits=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_numeric_limits" = yes; then + AC_DEFINE(HAVE_NUMERIC_LIMITS,,[define if the compiler has numeric_limits]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_placeholders.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_placeholders.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_placeholders.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_placeholders.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_placeholders.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_HAVE_PLACEHOLDERS() +# +# DESCRIPTION +# +# This macro checks if std::placeholders, added in C++11, is defined in +# the header. +# +# If it is, define the ax_cv_cxx_have_placeholders environment variable to +# "yes" and define HAVE_CXX_PLACEHOLDERS. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_CXX_HAVE_PLACEHOLDERS], + [AC_CACHE_CHECK( + [for std::placeholders in functional], + ax_cv_cxx_have_placeholders, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using namespace std;] + [using namespace std::placeholders;] + [int fn(int x, int y) { return x + y; }] + ], + [ + [auto bound_function = bind (fn, 10, _1);] + [bound_function(20);] + ] + )], + [ax_cv_cxx_have_placeholders=yes], + [ax_cv_cxx_have_placeholders=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_placeholders" = "xyes" + then + AC_DEFINE(HAVE_CXX_PLACEHOLDERS, + 1, + [Define if functional defines the std::placeholders namespace.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_reference_wrapper.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_reference_wrapper.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_reference_wrapper.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_reference_wrapper.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_reference_wrapper.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_REFERENCE_WRAPPER() +# +# DESCRIPTION +# +# This macro checks if std::reference_wrapper, added in C++11, is defined +# in the header. +# +# If it is, define the ax_cv_cxx_have_reference_wrapper environment +# variable to "yes" and define HAVE_CXX_REFERENCE_WRAPPER. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_REFERENCE_WRAPPER], + [AC_CACHE_CHECK( + [for std::reference_wrapper in functional], + ax_cv_cxx_have_reference_wrapper, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using std::reference_wrapper;] + ], + [] + )], + [ax_cv_cxx_have_reference_wrapper=yes], + [ax_cv_cxx_have_reference_wrapper=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_reference_wrapper" = "xyes" + then + AC_DEFINE(HAVE_CXX_REFERENCE_WRAPPER, + 1, + [Define if functional defines the std::reference_wrapper class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ref.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ref.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_ref.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_ref.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,55 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_ref.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_REF() +# +# DESCRIPTION +# +# This macro checks if std::ref, added in C++11, is defined in the +# header. +# +# If it is, define the ax_cv_cxx_have_ref environment variable to "yes" +# and define HAVE_CXX_REF. +# +# LICENSE +# +# Copyright (c) 2014 Enrico M. Crisostomo +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CXX_HAVE_REF], + [AC_CACHE_CHECK( + [for std::ref in functional], + ax_cv_cxx_have_ref, + [dnl + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + [#include ] + [using namespace std;] + ], + [ + [int one(1);] + [auto refed = ref(one);] + [++refed;] + ] + )], + [ax_cv_cxx_have_ref=yes], + [ax_cv_cxx_have_ref=no] + ) + AC_LANG_POP([C++])]) + if test x"$ax_cv_cxx_have_ref" = "xyes" + then + AC_DEFINE(HAVE_CXX_REF, + 1, + [Define if functional defines the std::ref class.]) + fi + ]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_sstream.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_sstream.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_sstream.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_sstream.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_sstream.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_SSTREAM +# +# DESCRIPTION +# +# If the C++ library has a working stringstream, define HAVE_SSTREAM. +# +# LICENSE +# +# Copyright (c) 2008 Ben Stanley +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_SSTREAM], [AX_CXX_HAVE_SSTREAM]) +AC_DEFUN([AX_CXX_HAVE_SSTREAM], +[AC_CACHE_CHECK(whether the compiler has stringstream, +ax_cv_cxx_have_sstream, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[stringstream message; message << "Hello"; return 0;], + ax_cv_cxx_have_sstream=yes, ax_cv_cxx_have_sstream=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_sstream" = yes; then + AC_DEFINE(HAVE_SSTREAM,,[define if the compiler has stringstream]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_std.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_std.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_std.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_std.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,46 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_std.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_STD +# +# DESCRIPTION +# +# If the compiler supports ISO C++ standard library (i.e., can include the +# files iostream, map, iomanip and cmath), define HAVE_STD. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_STD], [AX_CXX_HAVE_STD]) +AC_DEFUN([AX_CXX_HAVE_STD], +[AC_CACHE_CHECK(whether the compiler supports ISO C++ standard library, +ax_cv_cxx_have_std, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#include +#include +#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[return 0;], + ax_cv_cxx_have_std=yes, ax_cv_cxx_have_std=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_std" = yes; then + AC_DEFINE(HAVE_STD,,[define if the compiler supports ISO C++ standard library]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_stl.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_stl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_stl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_stl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_stl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_STL +# +# DESCRIPTION +# +# If the compiler supports the Standard Template Library, define HAVE_STL. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_STL], [AX_CXX_HAVE_STL]) +AC_DEFUN([AX_CXX_HAVE_STL], +[AC_CACHE_CHECK(whether the compiler supports Standard Template Library, +ax_cv_cxx_have_stl, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[list x; x.push_back(5); +list::iterator iter = x.begin(); if (iter != x.end()) ++iter; return 0;], + ax_cv_cxx_have_stl=yes, ax_cv_cxx_have_stl=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_stl" = yes; then + AC_DEFINE(HAVE_STL,,[define if the compiler supports Standard Template Library]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_string_push_back.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_string_push_back.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_string_push_back.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_string_push_back.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_string_push_back.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_CXX_HAVE_STRING_PUSH_BACK +# +# DESCRIPTION +# +# If the implementation of the C++ library provides the method +# std::string::push_back (char), define HAVE_STRING_PUSH_BACK. +# +# LICENSE +# +# Copyright (c) 2008 Jan Langer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_STRING_PUSH_BACK], [AX_CXX_HAVE_STRING_PUSH_BACK]) +AC_DEFUN([AX_CXX_HAVE_STRING_PUSH_BACK], +[AC_CACHE_CHECK(whether the compiler has std::string::push_back (char), +ax_cv_cxx_have_string_push_back, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[string message; message.push_back ('a'); return 0;], + ax_cv_cxx_have_string_push_back=yes, ax_cv_cxx_have_string_push_back=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_string_push_back" = yes; then + AC_DEFINE(HAVE_STRING_PUSH_BACK,,[define if the compiler has the method +std::string::push_back (char)]) +fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_system_v_math.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_system_v_math.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_system_v_math.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_system_v_math.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_system_v_math.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_SYSTEM_V_MATH +# +# DESCRIPTION +# +# If the compiler has the double math functions _class, trunc, itrunc, +# nearest, rsqrt, uitrunc, copysign, drem, finite, and unordered, define +# HAVE_SYSTEM_V_MATH. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_SYSTEM_V_MATH], [AX_CXX_HAVE_SYSTEM_V_MATH]) +AC_DEFUN([AX_CXX_HAVE_SYSTEM_V_MATH], +[AC_CACHE_CHECK(whether the compiler supports System V math library, +ax_cv_cxx_have_system_v_math, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lm" + AC_TRY_LINK([ +#ifndef _ALL_SOURCE + #define _ALL_SOURCE +#endif +#ifndef _XOPEN_SOURCE + #define _XOPEN_SOURCE +#endif +#ifndef _XOPEN_SOURCE_EXTENDED + #define _XOPEN_SOURCE_EXTENDED 1 +#endif +#include ],[double x = 1.0; double y = 1.0; +_class(x); trunc(x); finite(x); itrunc(x); nearest(x); rsqrt(x); uitrunc(x); +copysign(x,y); drem(x,y); unordered(x,y); +return 0;], + ax_cv_cxx_have_system_v_math=yes, ax_cv_cxx_have_system_v_math=no) + LIBS="$ac_save_LIBS" + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_system_v_math" = yes; then + AC_DEFINE(HAVE_SYSTEM_V_MATH,,[define if the compiler supports System V math library]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_valarray.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_valarray.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_valarray.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_valarray.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_valarray.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_VALARRAY +# +# DESCRIPTION +# +# If the compiler has valarray, define HAVE_VALARRAY. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_VALARRAY], [AX_CXX_HAVE_VALARRAY]) +AC_DEFUN([AX_CXX_HAVE_VALARRAY], +[AC_CACHE_CHECK(whether the compiler has valarray, +ax_cv_cxx_have_valarray, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[valarray x(100); return 0;], + ax_cv_cxx_have_valarray=yes, ax_cv_cxx_have_valarray=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_valarray" = yes; then + AC_DEFINE(HAVE_VALARRAY,,[define if the compiler has valarray]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_vector_at.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_vector_at.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_have_vector_at.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_have_vector_at.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_have_vector_at.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_HAVE_VECTOR_AT +# +# DESCRIPTION +# +# If the implementation of the C++ library provides the method +# std::vector::at(std::size_t), define HAVE_VECTOR_AT. +# +# LICENSE +# +# Copyright (c) 2008 Jan Langer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HAVE_VECTOR_AT], [AX_CXX_HAVE_VECTOR_AT]) +AC_DEFUN([AX_CXX_HAVE_VECTOR_AT], +[AC_CACHE_CHECK(whether the compiler has std::vector::at (std::size_t), +ax_cv_cxx_have_vector_at, +[AC_REQUIRE([AX_CXX_NAMESPACES]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +#ifdef HAVE_NAMESPACES +using namespace std; +#endif],[vector v (1); v.at (0); return 0;], + ax_cv_cxx_have_vector_at=yes, ax_cv_cxx_have_vector_at=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_have_vector_at" = yes; then + AC_DEFINE(HAVE_VECTOR_AT,,[define if the compiler has the method +std::vector::at (std::size_t)]) +fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_pre_stdcxx.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_pre_stdcxx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_pre_stdcxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_pre_stdcxx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,76 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_pre_stdcxx.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_HEADER_PRE_STDCXX +# +# DESCRIPTION +# +# Check whether pre-ISO-C++ headers exist. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_PRE_STDCXX], [AX_CXX_HEADER_PRE_STDCXX]) +AC_DEFUN([AX_CXX_HEADER_PRE_STDCXX], [ + AC_CACHE_CHECK(for pre-ISO C++ include files, + ax_cv_cxx_pre_stdcxx, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -Wno-deprecated" + + # Omit defalloc.h, as compilation with newer compilers is problematic. + AC_TRY_COMPILE([ + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + ],, + ax_cv_cxx_pre_stdcxx=yes, ax_cv_cxx_pre_stdcxx=no) + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_pre_stdcxx" = yes; then + AC_DEFINE(PRE_STDCXX_HEADERS,,[Define if pre-ISO C++ header files are present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_stdcxx_0x.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_stdcxx_0x.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_stdcxx_0x.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_stdcxx_0x.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,120 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_stdcxx_0x.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_HEADER_STDCXX_0X +# +# DESCRIPTION +# +# Check for library coverage of the C++0x standard. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_HEADER_STDCXX_0X], [AX_CXX_HEADER_STDCXX_0X]) +AC_DEFUN([AX_CXX_HEADER_STDCXX_0X], [ + AC_CACHE_CHECK(for ISO C++ 0x include files, + ax_cv_cxx_stdcxx_0x, + [AC_REQUIRE([AC_COMPILE_STDCXX_0X]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=gnu++0x" + + AC_TRY_COMPILE([ + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + ],, + ax_cv_cxx_stdcxx_0x=yes, ax_cv_cxx_stdcxx_0x=no) + AC_LANG_RESTORE + CXXFLAGS="$ac_save_CXXFLAGS" + ]) + if test "$ax_cv_cxx_stdcxx_0x" = yes; then + AC_DEFINE(STDCXX_0X_HEADERS,,[Define if ISO C++ 0x header files are present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_stdcxx_98.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_stdcxx_98.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_stdcxx_98.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_stdcxx_98.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,87 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_stdcxx_98.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_HEADER_STDCXX_98 +# +# DESCRIPTION +# +# Check for complete library coverage of the C++1998/2003 standard. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_STDCXX_98], [AX_CXX_HEADER_STDCXX_98]) +AC_DEFUN([AX_CXX_HEADER_STDCXX_98], [ + AC_CACHE_CHECK(for ISO C++ 98 include files, + ax_cv_cxx_stdcxx_98, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + ],, + ax_cv_cxx_stdcxx_98=yes, ax_cv_cxx_stdcxx_98=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_stdcxx_98" = yes; then + AC_DEFINE(STDCXX_98_HEADERS,,[Define if ISO C++ 1998 header files are present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_stdcxx_tr1.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_stdcxx_tr1.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_stdcxx_tr1.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_stdcxx_tr1.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,65 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_stdcxx_tr1.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_HEADER_STDCXX_TR1 +# +# DESCRIPTION +# +# Check for library coverage of the TR1 standard. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_STDCXX_TR1], [AX_CXX_HEADER_STDCXX_TR1]) +AC_DEFUN([AX_CXX_HEADER_STDCXX_TR1], [ + AC_CACHE_CHECK(for ISO C++ TR1 include files, + ax_cv_cxx_stdcxx_tr1, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + #include + ],, + ax_cv_cxx_stdcxx_tr1=yes, ax_cv_cxx_stdcxx_tr1=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_stdcxx_tr1" = yes; then + AC_DEFINE(STDCXX_TR1_HEADERS,,[Define if ISO C++ TR1 header files are present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_tr1_unordered_map.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_tr1_unordered_map.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_tr1_unordered_map.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_tr1_unordered_map.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# ==================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_tr1_unordered_map.html +# ==================================================================================== +# +# SYNOPSIS +# +# AX_CXX_HEADER_TR1_UNORDERED_MAP +# +# DESCRIPTION +# +# Check whether the TR1 include exists and define +# HAVE_TR1_UNORDERED_MAP if it does. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_TR1_UNORDERED_MAP], [AX_CXX_HEADER_TR1_UNORDERED_MAP]) +AC_DEFUN([AX_CXX_HEADER_TR1_UNORDERED_MAP], [ + AC_CACHE_CHECK(for tr1/unordered_map, + ax_cv_cxx_tr1_unordered_map, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include ], [using std::tr1::unordered_map;], + ax_cv_cxx_tr1_unordered_map=yes, ax_cv_cxx_tr1_unordered_map=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_tr1_unordered_map" = yes; then + AC_DEFINE(HAVE_TR1_UNORDERED_MAP,,[Define if tr1/unordered_map is present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_tr1_unordered_set.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_tr1_unordered_set.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_tr1_unordered_set.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_tr1_unordered_set.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# ==================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_tr1_unordered_set.html +# ==================================================================================== +# +# SYNOPSIS +# +# AX_CXX_HEADER_TR1_UNORDERED_SET +# +# DESCRIPTION +# +# Check whether the TR1 include exists and define +# HAVE_TR1_UNORDERED_SET if it does. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_TR1_UNORDERED_SET], [AX_CXX_HEADER_TR1_UNORDERED_SET]) +AC_DEFUN([AX_CXX_HEADER_TR1_UNORDERED_SET], [ + AC_CACHE_CHECK(for tr1/unordered_set, + ax_cv_cxx_tr1_unordered_set, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include ], [using std::tr1::unordered_set;], + ax_cv_cxx_tr1_unordered_set=yes, ax_cv_cxx_tr1_unordered_set=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_tr1_unordered_set" = yes; then + AC_DEFINE(HAVE_TR1_UNORDERED_SET,,[Define if tr1/unordered_set is present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_unordered_map.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_unordered_map.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_unordered_map.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_unordered_map.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# ================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_unordered_map.html +# ================================================================================ +# +# SYNOPSIS +# +# AX_CXX_HEADER_UNORDERED_MAP +# +# DESCRIPTION +# +# Check whether the C++ include exists and define +# HAVE_UNORDERED_MAP if it does. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_UNORDERED_MAP], [AX_CXX_HEADER_UNORDERED_MAP]) +AC_DEFUN([AX_CXX_HEADER_UNORDERED_MAP], [ + AC_CACHE_CHECK(for unordered_map, + ax_cv_cxx_unordered_map, + [AC_REQUIRE([AC_COMPILE_STDCXX_0X]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=gnu++0x" + AC_TRY_COMPILE([#include ], [using std::unordered_map;], + ax_cv_cxx_unordered_map=yes, ax_cv_cxx_unordered_map=no) + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_unordered_map" = yes; then + AC_DEFINE(HAVE_UNORDERED_MAP,,[Define if unordered_map is present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_unordered_set.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_unordered_set.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_header_unordered_set.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_header_unordered_set.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# ================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_header_unordered_set.html +# ================================================================================ +# +# SYNOPSIS +# +# AX_CXX_HEADER_UNORDERED_SET +# +# DESCRIPTION +# +# Check whether the C++ include exists and define +# HAVE_UNORDERED_SET if it does. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_HEADER_UNORDERED_SET], [AX_CXX_HEADER_UNORDERED_SET]) +AC_DEFUN([AX_CXX_HEADER_UNORDERED_SET], [ + AC_CACHE_CHECK(for unordered_set, + ax_cv_cxx_unordered_set, + [AC_REQUIRE([AC_COMPILE_STDCXX_0X]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=gnu++0x" + AC_TRY_COMPILE([#include ], [using std::unordered_set;], + ax_cv_cxx_unordered_set=yes, ax_cv_cxx_unordered_set=no) + CXXFLAGS="$ac_save_CXXFLAGS" + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_unordered_set" = yes; then + AC_DEFINE(HAVE_UNORDERED_SET,,[Define if unordered_set is present. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_ldflags_std_lang.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_ldflags_std_lang.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_ldflags_std_lang.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_ldflags_std_lang.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,36 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_ldflags_std_lang.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_LDFLAGS_STD_LANG(LD-FLAGS) +# +# DESCRIPTION +# +# Append to LD-FLAGS the set of link-time flags that should be passed to +# the C++ compiler in order to enable use of C++ features as defined in +# the ANSI C++ standard (eg. use of standard iostream classes in the `std' +# namespace, etc.). Note that if you use GNU Libtool you may need to +# prefix each of those switches with `-Xlinker' so that Libtool doesn't +# discard them (see Libtool's manual and `AC_LIBTOOLIZE_LDFLAGS'). +# +# LICENSE +# +# Copyright (c) 2008 Ludovic Courtes +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_LDFLAGS_STD_LANG], [AX_CXX_LDFLAGS_STD_LANG]) +AC_DEFUN([AX_CXX_LDFLAGS_STD_LANG], + [AC_LANG_ASSERT([C++]) + AC_REQUIRE([AX_COMPILER_VENDOR]) + case "$ax_cv_cxx_compiler_vendor" in + sgi) $1="$$1 -LANG:std -exceptions";; + hp) $1="$$1 -AA";; + esac]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_member_constants.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_member_constants.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_member_constants.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_member_constants.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_member_constants.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_MEMBER_CONSTANTS +# +# DESCRIPTION +# +# If the compiler supports member constants, define HAVE_MEMBER_CONSTANTS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_MEMBER_CONSTANTS], [AX_CXX_MEMBER_CONSTANTS]) +AC_DEFUN([AX_CXX_MEMBER_CONSTANTS], +[AC_CACHE_CHECK(whether the compiler supports member constants, +ax_cv_cxx_member_constants, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([class C {public: static const int i = 0;}; const int C::i;], +[return C::i;], + ax_cv_cxx_member_constants=yes, ax_cv_cxx_member_constants=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_member_constants" = yes; then + AC_DEFINE(HAVE_MEMBER_CONSTANTS,,[define if the compiler supports member constants]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_member_templates.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_member_templates.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_member_templates.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_member_templates.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_member_templates.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_MEMBER_TEMPLATES +# +# DESCRIPTION +# +# If the compiler supports member templates, define HAVE_MEMBER_TEMPLATES. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_MEMBER_TEMPLATES], [AX_CXX_MEMBER_TEMPLATES]) +AC_DEFUN([AX_CXX_MEMBER_TEMPLATES], +[AC_CACHE_CHECK(whether the compiler supports member templates, +ax_cv_cxx_member_templates, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class A +{ public: + template A operator=(const A& z) { return A(); } +};],[A x; A y; x = y; return 0;], + ax_cv_cxx_member_templates=yes, ax_cv_cxx_member_templates=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_member_templates" = yes; then + AC_DEFINE(HAVE_MEMBER_TEMPLATES,,[define if the compiler supports member templates]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_member_templates_outside_class.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_member_templates_outside_class.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_member_templates_outside_class.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_member_templates_outside_class.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,47 @@ +# ========================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_member_templates_outside_class.html +# ========================================================================================== +# +# SYNOPSIS +# +# AX_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS +# +# DESCRIPTION +# +# If the compiler supports member templates outside the class declaration, +# define HAVE_MEMBER_TEMPLATES_OUTSIDE_CLASS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS], [AX_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS]) +AC_DEFUN([AX_CXX_MEMBER_TEMPLATES_OUTSIDE_CLASS], +[AC_CACHE_CHECK(whether the compiler supports member templates outside the class declaration, +ax_cv_cxx_member_templates_outside_class, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class A +{ public : + template A operator=(const A& z); +}; +template template +A A::operator=(const A& z){ return A(); }],[ +A x; A y; x = y; return 0;], + ax_cv_cxx_member_templates_outside_class=yes, ax_cv_cxx_member_templates_outside_class=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_member_templates_outside_class" = yes; then + AC_DEFINE(HAVE_MEMBER_TEMPLATES_OUTSIDE_CLASS,, + [define if the compiler supports member templates outside the class declaration]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_mutable.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_mutable.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_mutable.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_mutable.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,45 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_mutable.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_MUTABLE +# +# DESCRIPTION +# +# If the compiler allows modifying class data members flagged with the +# mutable keyword even in const objects (for example in the body of a +# const member function), define HAVE_MUTABLE. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_MUTABLE], [AX_CXX_MUTABLE]) +AC_DEFUN([AX_CXX_MUTABLE], +[AC_CACHE_CHECK(whether the compiler supports the mutable keyword, +ax_cv_cxx_mutable, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +class A { mutable int i; + public: + int f (int n) const { i = n; return i; } + }; +],[A a; return a.f (1);], + ax_cv_cxx_mutable=yes, ax_cv_cxx_mutable=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_mutable" = yes; then + AC_DEFINE(HAVE_MUTABLE,,[define if the compiler supports the mutable keyword]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_namespaces.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_namespaces.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_namespaces.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_namespaces.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,40 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_namespaces.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_NAMESPACES +# +# DESCRIPTION +# +# If the compiler can prevent names clashes using namespaces, define +# HAVE_NAMESPACES. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# Copyright (c) 2013 Bastien Roucaries +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_CXX_NAMESPACES], [AX_CXX_NAMESPACES]) +AC_DEFUN([AX_CXX_NAMESPACES], +[AC_CACHE_CHECK(whether the compiler implements namespaces, +ax_cv_cxx_namespaces, +[AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([namespace Outer { namespace Inner { int i = 0; }} + using namespace Outer::Inner; int foo(void) { return i;} ])], + ax_cv_cxx_namespaces=yes, ax_cv_cxx_namespaces=no) + AC_LANG_POP +]) +if test "$ax_cv_cxx_namespaces" = yes; then + AC_DEFINE(HAVE_NAMESPACES,,[define if the compiler implements namespaces]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_namespace_std.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_namespace_std.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_namespace_std.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_namespace_std.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_namespace_std.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_NAMESPACE_STD +# +# DESCRIPTION +# +# If the compiler supports namespace std, define HAVE_NAMESPACE_STD. +# +# LICENSE +# +# Copyright (c) 2009 Todd Veldhuizen +# Copyright (c) 2009 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_NAMESPACE_STD], [AX_CXX_NAMESPACE_STD]) +AC_DEFUN([AX_CXX_NAMESPACE_STD], [ + AC_CACHE_CHECK(if g++ supports namespace std, + ax_cv_cxx_have_std_namespace, + [AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include + std::istream& is = std::cin;],, + ax_cv_cxx_have_std_namespace=yes, ax_cv_cxx_have_std_namespace=no) + AC_LANG_RESTORE + ]) + if test "$ax_cv_cxx_have_std_namespace" = yes; then + AC_DEFINE(HAVE_NAMESPACE_STD,,[Define if g++ supports namespace std. ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_new_for_scoping.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_new_for_scoping.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_new_for_scoping.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_new_for_scoping.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,46 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_new_for_scoping.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_NEW_FOR_SCOPING +# +# DESCRIPTION +# +# If the compiler accepts the new for scoping rules (the scope of a +# variable declared inside the parentheses is restricted to the for-body), +# define HAVE_NEW_FOR_SCOPING. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_NEW_FOR_SCOPING], [AX_CXX_NEW_FOR_SCOPING]) +AC_DEFUN([AX_CXX_NEW_FOR_SCOPING], +[AC_CACHE_CHECK(whether the compiler accepts the new for scoping rules, +ax_cv_cxx_new_for_scoping, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE(,[ + int z = 0; + for (int i = 0; i < 10; ++i) + z = z + i; + for (int i = 0; i < 10; ++i) + z = z - i; + return z;], + ax_cv_cxx_new_for_scoping=yes, ax_cv_cxx_new_for_scoping=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_new_for_scoping" = yes; then + AC_DEFINE(HAVE_NEW_FOR_SCOPING,,[define if the compiler accepts the new for scoping rules]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_old_for_scoping.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_old_for_scoping.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_old_for_scoping.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_old_for_scoping.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_old_for_scoping.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_OLD_FOR_SCOPING +# +# DESCRIPTION +# +# If the compiler accepts the old for scoping rules (the scope of a +# variable declared inside the parentheses extends outside the for-body), +# define HAVE_OLD_FOR_SCOPING. Note that some compilers (notably g++ and +# egcs) support both new and old rules since they accept the old rules and +# only generate a warning. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_OLD_FOR_SCOPING], [AX_CXX_OLD_FOR_SCOPING]) +AC_DEFUN([AX_CXX_OLD_FOR_SCOPING], +[AC_CACHE_CHECK(whether the compiler accepts the old for scoping rules, +ax_cv_cxx_old_for_scoping, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE(,[int z;for (int i=0; i < 10; ++i)z=z+i;z=i;return z;], + ax_cv_cxx_old_for_scoping=yes, ax_cv_cxx_old_for_scoping=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_old_for_scoping" = yes; then + AC_DEFINE(HAVE_OLD_FOR_SCOPING,,[define if the compiler accepts the old for scoping rules]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_partial_ordering.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_partial_ordering.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_partial_ordering.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_partial_ordering.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,45 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_partial_ordering.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_PARTIAL_ORDERING +# +# DESCRIPTION +# +# If the compiler supports partial ordering, define HAVE_PARTIAL_ORDERING. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_PARTIAL_ORDERING], [AX_CXX_PARTIAL_ORDERING]) +AC_DEFUN([AX_CXX_PARTIAL_ORDERING], +[AC_CACHE_CHECK(whether the compiler supports partial ordering, +ax_cv_cxx_partial_ordering, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template struct I {}; +template struct A +{ int r; + template int operator() (T1, T2) { r = 0; return r; } + template int operator() (I, I) { r = 1; return r; } +};],[A x, y; I<0> a; I<1> b; return x (a,b) + y (float(), double());], + ax_cv_cxx_partial_ordering=yes, ax_cv_cxx_partial_ordering=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_partial_ordering" = yes; then + AC_DEFINE(HAVE_PARTIAL_ORDERING,, + [define if the compiler supports partial ordering]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_partial_specialization.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_partial_specialization.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_partial_specialization.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_partial_specialization.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_partial_specialization.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_CXX_PARTIAL_SPECIALIZATION +# +# DESCRIPTION +# +# If the compiler supports partial specialization, define +# HAVE_PARTIAL_SPECIALIZATION. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_PARTIAL_SPECIALIZATION], [AX_CXX_PARTIAL_SPECIALIZATION]) +AC_DEFUN([AX_CXX_PARTIAL_SPECIALIZATION], +[AC_CACHE_CHECK(whether the compiler supports partial specialization, +ax_cv_cxx_partial_specialization, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class A { public : enum e { z = 0 }; }; +template class A { public : enum e { z = 1 }; }; +template class A { public : enum e { z = 2 }; }; +],[return (A::z == 0) && (A::z == 1) && (A::z == 2);], + ax_cv_cxx_partial_specialization=yes, ax_cv_cxx_partial_specialization=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_partial_specialization" = yes; then + AC_DEFINE(HAVE_PARTIAL_SPECIALIZATION,, + [define if the compiler supports partial specialization]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_reinterpret_cast.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_reinterpret_cast.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_reinterpret_cast.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_reinterpret_cast.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,45 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_cxx_reinterpret_cast.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_CXX_REINTERPRET_CAST +# +# DESCRIPTION +# +# If the compiler supports reinterpret_cast<>, define +# HAVE_REINTERPRET_CAST. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_REINTERPRET_CAST], [AX_CXX_REINTERPRET_CAST]) +AC_DEFUN([AX_CXX_REINTERPRET_CAST], +[AC_CACHE_CHECK(whether the compiler supports reinterpret_cast<>, +ax_cv_cxx_reinterpret_cast, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +class Base { public : Base () {} virtual void f () = 0;}; +class Derived : public Base { public : Derived () {} virtual void f () {} }; +class Unrelated { public : Unrelated () {} }; +int g (Unrelated&) { return 0; }],[ +Derived d;Base& b=d;Unrelated& e=reinterpret_cast(b);return g(e);], + ax_cv_cxx_reinterpret_cast=yes, ax_cv_cxx_reinterpret_cast=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_reinterpret_cast" = yes; then + AC_DEFINE(HAVE_REINTERPRET_CAST,, + [define if the compiler supports reinterpret_cast<>]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_restrict_this.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_restrict_this.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_restrict_this.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_restrict_this.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,83 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_restrict_this.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_RESTRICT_THIS +# +# DESCRIPTION +# +# Determine whether the C++ compiler supports qualifying a member function +# with a restricted "this" pointer. Define "restrict_this" to the correct +# spelling; use like this: +# +# T::fn() restrict_this { /* code */ } +# +# Otherwise, define "restrict_this" to be empty. +# +# Note: the syntax above is a GCC extension. If your C++ compiler has a +# different way of applying the 'restricted' qualifier to the "this" +# pointer, please consider reporting it. +# +# LICENSE +# +# Copyright (c) 2010 Riccardo Murri +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# Under Section 7 of GPL version 3, you are granted additional permissions +# described in the Autoconf Configure Script Exception, version 3.0, as +# published by the Free Software Foundation. +# +# You should have received a copy of the GNU General Public License and a +# copy of the Autoconf Configure Script Exception along with this program; +# see the files COPYINGv3 and COPYING.EXCEPTION respectively. If not, see +# . + +#serial 2 + +AC_DEFUN([AX_CXX_RESTRICT_THIS], +[AC_CACHE_CHECK([whether C++ supports GCC's restrict "this" syntax], ax_cv_cxx_restrict_this, + [ax_cv_cxx_restrict_this=no + AC_LANG_PUSH([C++]) + # The order here caters to the fact that C++ does not require restrict. + for ac_kw in __restrict __restrict__ _Restrict restrict; do + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [[#define restrict_this $ac_kw +class Foo { + private: + int x_; + public: + Foo(int x) : x_(x) { }; + int bar(Foo* other); +}; +int Foo::bar(Foo* other) restrict_this { return this->x_ + other->x_; } + ]], + [[ +Foo a(3), b(5); +return (8 == a.bar(&b)); + ]])], + [ax_cv_cxx_restrict_this=$ac_kw]) + test "$ax_cv_cxx_restrict_this" != no && break + done + AC_LANG_POP([C++]) + ]) + AH_VERBATIM([restrict_this], +[/* Define to the keyword(s) used to specify that a member function's + "this" pointer is unaliased. Define to nothing if this is not + supported. */ +#undef restrict_this]) + case $ax_cv_cxx_restrict_this in + no) AC_DEFINE([restrict_this], []) ;; + *) AC_DEFINE_UNQUOTED([restrict_this], [$ax_cv_cxx_restrict_this]) ;; + esac +])# AC_C_RESTRICT diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_rtti.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_rtti.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_rtti.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_rtti.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_rtti.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_RTTI +# +# DESCRIPTION +# +# If the compiler supports Run-Time Type Identification (typeinfo header +# and typeid keyword), define HAVE_RTTI. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_RTTI], [AX_CXX_RTTI]) +AC_DEFUN([AX_CXX_RTTI], +[AC_CACHE_CHECK(whether the compiler supports Run-Time Type Identification, +ax_cv_cxx_rtti, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +class Base { public : + Base () {} + virtual int f () { return 0; } + }; +class Derived : public Base { public : + Derived () {} + virtual int f () { return 1; } + }; +],[Derived d; +Base *ptr = &d; +return typeid (*ptr) == typeid (Derived); +], + ax_cv_cxx_rtti=yes, ax_cv_cxx_rtti=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_rtti" = yes; then + AC_DEFINE(HAVE_RTTI,, + [define if the compiler supports Run-Time Type Identification]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_rvalue_references.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_rvalue_references.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_rvalue_references.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_rvalue_references.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_rvalue_references.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_CXX_RVALUE_REFERENCES +# +# DESCRIPTION +# +# Check whether C++11 rvalue references are supported. If they are, the +# macro HAVE_RVALUE_REFERENCES is defined. +# +# Does not ensure that the compiler is in C++11 mode. +# +# LICENSE +# +# Copyright (c) 2012 Tudor Bosman +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_CXX_RVALUE_REFERENCES], [dnl + AC_LANG_ASSERT([C++]) + # This compilation should succeed... + AC_CACHE_CHECK(whether $CXX supports rvalue references, + ax_cv_cxx_rvalue_references_supported, [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ + #include + struct foo { + foo(foo&& other) { } + foo& operator=(foo&& other) { + if (&other == this) return *this; + std::move(other); // make sure this compiles + return *this; + } + }; + ]])], + [ax_cv_cxx_rvalue_references_supported=yes], + [ax_cv_cxx_rvalue_references_supported=no])]) + if test $ax_cv_cxx_rvalue_references_supported = yes + then + AC_DEFINE([HAVE_RVALUE_REFERENCES], [], + [define if the compiler supports rvalue references]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_static_cast.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_static_cast.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_static_cast.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_static_cast.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_static_cast.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_STATIC_CAST +# +# DESCRIPTION +# +# If the compiler supports static_cast<>, define HAVE_STATIC_CAST. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_STATIC_CAST], [AX_CXX_STATIC_CAST]) +AC_DEFUN([AX_CXX_STATIC_CAST], +[AC_CACHE_CHECK(whether the compiler supports static_cast<>, +ax_cv_cxx_static_cast, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +class Base { public : Base () {} virtual void f () = 0; }; +class Derived : public Base { public : Derived () {} virtual void f () {} }; +int g (Derived&) { return 0; }],[ +Derived d; Base& b = d; Derived& s = static_cast (b); return g (s);], + ax_cv_cxx_static_cast=yes, ax_cv_cxx_static_cast=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_static_cast" = yes; then + AC_DEFINE(HAVE_STATIC_CAST,, + [define if the compiler supports static_cast<>]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_stlport_hashmap.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_stlport_hashmap.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_stlport_hashmap.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_stlport_hashmap.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_stlport_hashmap.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_STLPORT_HASHMAP +# +# DESCRIPTION +# +# Test for the presence of STLport's hashmap extension. +# +# LICENSE +# +# Copyright (c) 2008 Patrick Mauritz +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_STLPORT_HASHMAP], [AX_CXX_STLPORT_HASHMAP]) +AC_DEFUN([AX_CXX_STLPORT_HASHMAP],[ +AC_CACHE_CHECK(whether the compiler supports std::hash_map, +ax_cv_cxx_stlport_hashmap, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include +using std::hash_map;], + [], + ax_cv_cxx_stlport_hashmap=yes, ax_cv_cxx_stlport_hashmap=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_stlport_hashmap" = yes; then + AC_DEFINE(HAVE_STLPORT_HASHMAP,,[define if the compiler supports std::hash_map]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_keyword_qualifier.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_keyword_qualifier.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_keyword_qualifier.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_keyword_qualifier.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,53 @@ +# ====================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_template_keyword_qualifier.html +# ====================================================================================== +# +# SYNOPSIS +# +# AX_CXX_TEMPLATE_KEYWORD_QUALIFIER +# +# DESCRIPTION +# +# If the compiler supports use of the template keyword as a qualifier, +# define HAVE_TEMPLATE_KEYWORD_QUALIFIER. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Bernardo Innocenti +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_TEMPLATE_KEYWORD_QUALIFIER], [AX_CXX_TEMPLATE_KEYWORD_QUALIFIER]) +AC_DEFUN([AX_CXX_TEMPLATE_KEYWORD_QUALIFIER], +[AC_CACHE_CHECK(whether the compiler supports use of the template keyword as a qualifier, +ax_cv_cxx_template_keyword_qualifier, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ + class X + { + public: + template void member() {} + template static void static_member() {} + }; + template void f(T* p) + { + p->template member<200>(); // OK: < starts template argument + T::template static_member<100>(); // OK: < starts explicit qualification + } +],[X x; f(&x); return 0;], + ax_cv_cxx_template_keyword_qualifier=yes, ax_cv_cxx_template_keyword_qualifier=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_template_keyword_qualifier" = yes; then + AC_DEFINE(HAVE_TEMPLATE_KEYWORD_QUALIFIER,, + [define if the compiler supports use of the template keyword as a qualifier]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_qualified_base_class.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_qualified_base_class.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_qualified_base_class.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_qualified_base_class.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# ========================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_template_qualified_base_class.html +# ========================================================================================= +# +# SYNOPSIS +# +# AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS +# +# DESCRIPTION +# +# If the compiler supports template-qualified base class specifiers, +# define HAVE_TEMPLATE_QUALIFIED_BASE_CLASS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_TEMPLATE_QUALIFIED_BASE_CLASS], [AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS]) +AC_DEFUN([AX_CXX_TEMPLATE_QUALIFIED_BASE_CLASS], +[AC_CACHE_CHECK(whether the compiler supports template-qualified base class specifiers, +ax_cv_cxx_template_qualified_base_class, +[AC_REQUIRE([AX_CXX_TYPENAME]) + AC_REQUIRE([AX_CXX_FULL_SPECIALIZATION_SYNTAX]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +#ifndef HAVE_TYPENAME + #define typename +#endif +class Base1 { public : int f () const { return 1; } }; +class Base2 { public : int f () const { return 0; } }; +template struct base_trait { typedef Base1 base; }; +#ifdef HAVE_FULL_SPECIALIZATION_SYNTAX +template<> struct base_trait { typedef Base2 base; }; +#else + struct base_trait { typedef Base2 base; }; +#endif +template class Weird : public base_trait::base +{ public : + typedef typename base_trait::base base; + int g () const { return base::f (); } +};],[ Weird z; return z.g ();], + ax_cv_cxx_template_qualified_base_class=yes, ax_cv_cxx_template_qualified_base_class=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_template_qualified_base_class" = yes; then + AC_DEFINE(HAVE_TEMPLATE_QUALIFIED_BASE_CLASS,, + [define if the compiler supports template-qualified base class specifiers]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_qualified_return_type.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_qualified_return_type.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_qualified_return_type.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_qualified_return_type.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# ========================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_template_qualified_return_type.html +# ========================================================================================== +# +# SYNOPSIS +# +# AX_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE +# +# DESCRIPTION +# +# If the compiler supports template-qualified return types, define +# HAVE_TEMPLATE_QUALIFIED_RETURN_TYPE. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE], [AX_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE]) +AC_DEFUN([AX_CXX_TEMPLATE_QUALIFIED_RETURN_TYPE], +[AC_CACHE_CHECK(whether the compiler supports template-qualified return types, +ax_cv_cxx_template_qualified_return_type, +[AC_REQUIRE([AX_CXX_TYPENAME]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +#ifndef HAVE_TYPENAME + #define typename +#endif +template struct promote_trait { typedef X T; }; +template<> struct promote_trait { typedef float T; }; +template class A { public : A () {} }; +template +A::T> operator+ (const A&, const A&) +{ return A::T>(); } +],[A x; A y; A z = x + y; return 0;], + ax_cv_cxx_template_qualified_return_type=yes, ax_cv_cxx_template_qualified_return_type=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_template_qualified_return_type" = yes; then + AC_DEFINE(HAVE_TEMPLATE_QUALIFIED_RETURN_TYPE,, + [define if the compiler supports template-qualified return types]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_templates_as_template_arguments.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_templates_as_template_arguments.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_templates_as_template_arguments.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_templates_as_template_arguments.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_templates_as_template_arguments.html +# =========================================================================================== +# +# SYNOPSIS +# +# AX_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS +# +# DESCRIPTION +# +# If the compiler supports templates as template arguments, define +# HAVE_TEMPLATES_AS_TEMPLATE_ARGUMENTS. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS], [AX_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS]) +AC_DEFUN([AX_CXX_TEMPLATES_AS_TEMPLATE_ARGUMENTS], +[AC_CACHE_CHECK(whether the compiler supports templates as template arguments, +ax_cv_cxx_templates_as_template_arguments, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +template class allocator { public : allocator() {}; }; +template class T_alloc> +class A { public : A() {} private : T_alloc alloc_; }; +],[A x; return 0;], + ax_cv_cxx_templates_as_template_arguments=yes, ax_cv_cxx_templates_as_template_arguments=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_templates_as_template_arguments" = yes; then + AC_DEFINE(HAVE_TEMPLATES_AS_TEMPLATE_ARGUMENTS,, + [define if the compiler supports templates as template arguments]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_scoped_argument_matching.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_scoped_argument_matching.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_template_scoped_argument_matching.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_template_scoped_argument_matching.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,48 @@ +# ============================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_cxx_template_scoped_argument_matching.html +# ============================================================================================= +# +# SYNOPSIS +# +# AX_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING +# +# DESCRIPTION +# +# If the compiler supports function matching with argument types which are +# template scope-qualified, define HAVE_TEMPLATE_SCOPED_ARGUMENT_MATCHING. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING], [AX_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING]) +AC_DEFUN([AX_CXX_TEMPLATE_SCOPED_ARGUMENT_MATCHING], +[AC_CACHE_CHECK(whether the compiler supports function matching with argument types which are template scope-qualified, +ax_cv_cxx_template_scoped_argument_matching, +[AC_REQUIRE([AX_CXX_TYPENAME]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +#ifndef HAVE_TYPENAME + #define typename +#endif +template class A { public : typedef X W; }; +template class B {}; +template void operator+(B d1, typename Y::W d2) {} +],[B > z; z + 0.5f; return 0;], + ax_cv_cxx_template_scoped_argument_matching=yes, ax_cv_cxx_template_scoped_argument_matching=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_template_scoped_argument_matching" = yes; then + AC_DEFINE(HAVE_TEMPLATE_SCOPED_ARGUMENT_MATCHING,, + [define if the compiler supports function matching with argument types which are template scope-qualified]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_templates.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_templates.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_templates.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_templates.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_templates.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_TEMPLATES +# +# DESCRIPTION +# +# If the compiler supports basic templates, define HAVE_TEMPLATES. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_CXX_TEMPLATES], [AX_CXX_TEMPLATES]) +AC_DEFUN([AX_CXX_TEMPLATES], +[dnl + AC_CACHE_CHECK([whether the compiler supports basic templates], + [ax_cv_cxx_templates], + [AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([dnl + AC_LANG_PROGRAM([ + template class A {public:A(){};}; + template void f(const A& ){}; + ], + [A d; A i; f(d); f(i); return 0;])], + [ax_cv_cxx_templates=yes], + [ax_cv_cxx_templates=no]) + AC_LANG_POP([C++]) + ]) + AS_IF([test "X$ax_cv_cxx_templates" = "Xyes"], + [AC_DEFINE(HAVE_TEMPLATES,,[define if the compiler supports basic templates])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_typename.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_typename.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_typename.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_typename.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_typename.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_TYPENAME +# +# DESCRIPTION +# +# If the compiler recognizes the typename keyword, define HAVE_TYPENAME. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_TYPENAME], [AX_CXX_TYPENAME]) +AC_DEFUN([AX_CXX_TYPENAME], +[AC_CACHE_CHECK(whether the compiler recognizes typename, +ax_cv_cxx_typename, +[AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([templateclass X {public:X(){}};], +[X z; return 0;], + ax_cv_cxx_typename=yes, ax_cv_cxx_typename=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_typename" = yes; then + AC_DEFINE(HAVE_TYPENAME,,[define if the compiler recognizes typename]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_use_numtrait.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_use_numtrait.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_use_numtrait.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_use_numtrait.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_use_numtrait.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_USE_NUMTRAIT +# +# DESCRIPTION +# +# If the compiler supports numeric traits promotions, define +# HAVE_USE_NUMTRAIT. +# +# LICENSE +# +# Copyright (c) 2008 Todd Veldhuizen +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_CXX_USE_NUMTRAIT], [AX_CXX_USE_NUMTRAIT]) +AC_DEFUN([AX_CXX_USE_NUMTRAIT], +[AC_CACHE_CHECK(whether the compiler supports numeric traits promotions, +ax_cv_cxx_use_numtrait, +[AC_REQUIRE([AX_CXX_TYPENAME]) + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([ +#ifndef HAVE_TYPENAME + #define typename +#endif +template class SumType { public : typedef T_numtype T_sumtype; }; +template<> class SumType { public : typedef int T_sumtype; }; +template class A {}; +template A::T_sumtype> sum(A) +{ return A::T_sumtype>(); } +],[A x; sum(x); return 0;], + ax_cv_cxx_use_numtrait=yes, ax_cv_cxx_use_numtrait=no) + AC_LANG_RESTORE +]) +if test "$ax_cv_cxx_use_numtrait" = yes; then + AC_DEFINE(HAVE_USE_NUMTRAIT,,[define if the compiler supports numeric traits promotions]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_var_prettyfunc.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_var_prettyfunc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_var_prettyfunc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_var_prettyfunc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,91 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_var_prettyfunc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_VAR_PRETTYFUNC +# +# DESCRIPTION +# +# This function tries to determine the best C++ macro/identifier that +# contains the current function name. Depending on the compiler, this may +# be __PRETTY_FUNCTION__ (GCC), __FUNCSIG__ (MSVC), __func__ (C++ +# standard), __FUNCTION__ (fallback). +# +# The function will define HAVE_PRETTYFUNC if a macro exists, and define +# __PRETTYFUNC__ to the best possible macro. When HAVE_PRETTYFUNC is not +# defined, __PRETTYFUNC__ will contain the constant string "<>". +# +# LICENSE +# +# Copyright (c) 2014 Olaf Lenz +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_CXX_VAR_PRETTYFUNC], +[ +# try to find best __FUNCTION__ variant + +AC_CACHE_CHECK([whether $CXX can get a pretty function name], ac_cv_cxx_var_prettyfunc, + ac_cv_cxx_var_prettyfunc=no + + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(,[const char *s = __PRETTY_FUNCTION__])], + [ ac_cv_cxx_var_prettyfunc=__PRETTY_FUNCTION__ ]) + + AS_IF([test "x$ac_cv_cxx_var_prettyfunc" = "xno"], [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(,[const char *s = __FUNCSIG__])], + [ ac_cv_cxx_var_prettyfunc=__FUNCSIG__ ]) + ]) + + AS_IF([test "x$ac_cv_cxx_var_prettyfunc" = "xno"], [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(,[const char *s = __func__])], + [ ac_cv_cxx_var_prettyfunc=__func__ ]) + ]) + + AS_IF([test "x$ac_cv_cxx_var_prettyfunc" = "xno"], [ + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(,[const char *s = __FUNCTION__])], + [ ac_cv_cxx_var_prettyfunc=__FUNCTION__ ]) + ]) +) + + +AS_IF([test "x$ac_cv_cxx_var_prettyfunc" != "xno"], [ + AC_DEFINE(HAVE_PRETTYFUNC,, [Whether __PRETTY_FUNCTION__ has a useful value.]) + AC_DEFINE_UNQUOTED(__PRETTYFUNC__,$ac_cv_cxx_var_prettyfunc, + [contains the function wherein the macro is called]) +],[ + AC_DEFINE(__PRETTYFUNC__,"<>") +]) + +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_verbose_terminate_handler.m4 projectm-3.1.0/m4/autoconf-archive/ax_cxx_verbose_terminate_handler.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_cxx_verbose_terminate_handler.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_cxx_verbose_terminate_handler.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,77 @@ +# ===================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_verbose_terminate_handler.html +# ===================================================================================== +# +# SYNOPSIS +# +# AX_CXX_VERBOSE_TERMINATE_HANDLER +# +# DESCRIPTION +# +# Check if the terminate handler for the current compiler/standard library +# prints useful information to stdout/stderr (i.e. the type of the +# uncaught exception and/or the what() string). +# +# The intended use case for this check is to help program authors decide +# if they need to add a top-level try-catch or custom terminate handler to +# print useful information if an uncaught exception occurs, or if this +# task can be left to the standard library implementation. Alternatively, +# it can be used to detect if such output needs to be silenced with a +# custom terminate handler. +# +# Output: +# +# Define HAVE_VERBOSE_TERMINATE_HANDLER if useful information is printed. +# +# LICENSE +# +# Copyright (c) 2009 Kevin Locke +# Copyright (c) 2008 Lapo Luchini +# +# Copying and distribution of this file, with or without modification, is +# permitted in any medium, without royalty, provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. This file is offered as-is, without any warranty. + +#serial 8 + +AC_DEFUN([AX_CXX_VERBOSE_TERMINATE_HANDLER], +[AC_CACHE_CHECK([whether the terminate function prints useful information], +[ax_cv_cxx_verbose_terminate_handler], +[ + AC_LANG_PUSH([C++]) + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [#include ], + [throw std::runtime_error("Test of unhandled exception AABBCCDDEE");])], + + dnl The test should never return 0, since it aborts + [ax_cv_cxx_verbose_terminate_handler=no], + + dnl If the compilation was successful, run it and capture the output + [AS_IF([test -x conftest$EXEEXT], + [_output="$(./conftest$EXEEXT 2>&1)"], + [_output=""]) + + dnl Check that the output contains the what() string + AS_CASE("$_output", + [*AABBCCDDEE*], + + dnl Check that the output also contains the exception type + [AS_CASE("$_output", + [*runtime_error*], + [ax_cv_cxx_verbose_terminate_handler=yes], + [ax_cv_cxx_verbose_terminate_handler=no])], + [ax_cv_cxx_verbose_terminate_handler=no]) + + ], + + dnl When cross-compiling, assume messages are not verbose + [ax_cv_cxx_verbose_terminate_handler=no]) + AC_LANG_POP([C++]) +]) +if test "$ax_cv_cxx_verbose_terminate_handler" = yes; then + AC_DEFINE([HAVE_VERBOSE_TERMINATE_HANDLER], 1, + [define if the terminate function prints useful information]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_czmq.m4 projectm-3.1.0/m4/autoconf-archive/ax_czmq.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_czmq.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_czmq.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_czmq.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CZMQ([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the CZMQ libraries of a particular version (or newer). The +# default version tested for is 3.0.0. +# +# The macro tests for CZMQ libraries in the library/include path, and, +# when provided, also in the path given by --with-czmq. +# +# This macro calls: +# +# AC_SUBST(CZMQ_CPPFLAGS) / AC_SUBST(CZMQ_LDFLAGS) / AC_SUBST(CZMQ_LIBS) +# +# And sets: +# +# HAVE_CZMQ +# +# LICENSE +# +# Copyright (c) 2016 Jeroen Meijer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_CZMQ], [ + AC_ARG_WITH([czmq], [AS_HELP_STRING([--with-czmq=],[CZMQ prefix directory])], [ + CZMQ_LDFLAGS="-L${with_czmq}/lib" + CZMQ_CPPFLAGS="-I${with_czmq}/include" + ]) + + HAVE_CZMQ=0 + if test "$with_czmq" != "no"; then + + LD_FLAGS="$LDFLAGS $CZMQ_LDFLAGS" + CPPFLAGS="$CPPFLAGS $CZMQ_CPPFLAGS" + + AC_LANG_SAVE + AC_LANG_C + AC_CHECK_HEADER(czmq.h, [czmq_h=yes], [czmq_h=no]) + AC_LANG_RESTORE + + if test "$czmq_h" = "yes"; then + version=ifelse([$1], ,3.0.0,$1) + AC_MSG_CHECKING([for CZMQ version >= $version]) + version=$(echo $version | tr '.' ',') + AC_EGREP_CPP([version_ok], [ +#include +#if defined(CZMQ_VERSION) && CZMQ_VERSION >= CZMQ_MAKE_VERSION($version) + version_ok +#endif + ],[ + AC_MSG_RESULT(yes) + HAVE_CZMQ=1 + CZMQ_LIBS="-lczmq" + AC_SUBST(CZMQ_LDFLAGS) + AC_SUBST(CZMQ_CPPFLAGS) + AC_SUBST(CZMQ_LIBS) + ], AC_MSG_RESULT([no valid CZMQ version was found])) + else + AC_MSG_WARN([no valid CZMQ installation was found]) + fi + + if test $HAVE_CZMQ = 1; then + # execute ACTION-IF-FOUND (if present): + ifelse([$2], , :, [$2]) + else + # execute ACTION-IF-NOT-FOUND (if present): + ifelse([$3], , :, [$3]) + fi + else + AC_MSG_NOTICE([not checking for CZMQ]) + fi + + AC_DEFINE(HAVE_CZMQ,,[define if the CZMQ library is available]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_decl_wchar_max.m4 projectm-3.1.0/m4/autoconf-archive/ax_decl_wchar_max.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_decl_wchar_max.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_decl_wchar_max.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_decl_wchar_max.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_DECL_WCHAR_MAX +# +# DESCRIPTION +# +# Checks whether the system headers define WCHAR_MAX or not. If it is +# already defined, does nothing. Otherwise checks the size and signedness +# of `wchar_t', and defines WCHAR_MAX to the maximum value that can be +# stored in a variable of type `wchar_t'. +# +# LICENSE +# +# Copyright (c) 2008 Ville Laurikari +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([VL_DECL_WCHAR_MAX], [AX_DECL_WCHAR_MAX]) +AC_DEFUN([AX_DECL_WCHAR_MAX], [ + AC_CACHE_CHECK([whether WCHAR_MAX is defined], ax_cv_decl_wchar_max, [ + AC_TRY_COMPILE([ +#ifdef HAVE_WCHAR_H +#include +#endif +],[WCHAR_MAX],[ax_cv_decl_wchar_max="yes"],[ax_cv_decl_wchar_max="no"])]) + if test $ax_cv_decl_wchar_max = "no"; then + AX_CHECK_SIGN([wchar_t], + [ wc_signed="yes" + AC_DEFINE(WCHAR_T_SIGNED, 1, [Define if wchar_t is signed]) ], + [ wc_signed="no" + AC_DEFINE(WCHAR_T_UNSIGNED, 1, [Define if wchar_t is unsigned])], [ +#ifdef HAVE_WCHAR_H +#include +#endif +]) + if test "$wc_signed" = "yes"; then + AC_DEFINE(WCHAR_MAX, [(1L << (sizeof(wchar_t) * 8 - 1) - 1)], [ +Define to the maximum value of wchar_t if not already defined elsewhere]) + elif test "$wc_signed" = "no"; then + AC_DEFINE(WCHAR_MAX, [(1L << (sizeof(wchar_t) * 8) - 1)]) + fi + fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_define_integer_bits.m4 projectm-3.1.0/m4/autoconf-archive/ax_define_integer_bits.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_define_integer_bits.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_define_integer_bits.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_define_integer_bits.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_DEFINE_INTEGER_BITS (TYPE [, CANDIDATE-TYPE]...) +# +# DESCRIPTION +# +# Given a TYPE of the form "int##_t" or "uint##_t", see if the datatype +# TYPE is predefined. If not, then define TYPE -- both with AC_DEFINE and +# as a shell variable -- to the first datatype of exactly ## bits in a +# list of CANDIDATE-TYPEs. If none of the CANDIDATE-TYPEs contains exactly +# ## bits, then set the TYPE shell variable to "no". +# +# For example, the following ensures that uint64_t is defined as a 64-bit +# datatype: +# +# AX_DEFINE_INTEGER_BITS(uint64_t, unsigned long long, unsigned __int64, long) +# if test "$uint64_t" = no; then +# AC_MSG_ERROR([unable to continue without a 64-bit datatype]) +# fi +# +# You should then put the following in your C code to ensure that all +# datatypes defined by AX_DEFINE_INTEGER_BITS are visible to your program: +# +# #include "config.h" +# +# #if HAVE_INTTYPES_H +# # include +# #else +# # if HAVE_STDINT_H +# # include +# # endif +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Scott Pakin +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_DEFINE_INTEGER_BITS], [AX_DEFINE_INTEGER_BITS]) +AC_DEFUN([AX_DEFINE_INTEGER_BITS], +[m4_define([ac_datatype_bits], [m4_translit($1, [a-zA-Z_])]) +m4_define([ac_datatype_bytes], [m4_eval(ac_datatype_bits/8)]) +AC_CHECK_TYPE($1, , + [ + AC_MSG_NOTICE([trying to find a suitable ]ac_datatype_bytes[-byte replacement for $1]) + $1=no + find_$1 () + { + _AX_DEFINE_INTEGER_BITS_HELPER($@) + : + } + find_$1 + AC_DEFINE_UNQUOTED($1, $$1, + [If not already defined, then define as a datatype of *exactly* ]ac_datatype_bits[ bits.]) + ]) +]) + +dnl Iterate over arguments $2..$N, trying to find a good match for $1. +m4_define([_AX_DEFINE_INTEGER_BITS_HELPER], +[ifelse($2, , , + [m4_define([ac_datatype_bits], [m4_translit($1, [a-zA-Z_])]) + m4_define([ac_datatype_bytes], [m4_eval(ac_datatype_bits/8)]) + AC_CHECK_SIZEOF($2) + if test "$AS_TR_SH(ac_cv_sizeof_$2)" -eq ac_datatype_bytes; then + $1="$2" + return + fi + _AX_DEFINE_INTEGER_BITS_HELPER($1, m4_shift(m4_shift($@))) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_define_sub_path.m4 projectm-3.1.0/m4/autoconf-archive/ax_define_sub_path.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_define_sub_path.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_define_sub_path.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,108 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_define_sub_path.html +# =========================================================================== +# +# OBSOLETE MACRO +# +# This macro is obsolete because its been completely broken for several +# years without anybody noticing, so apparently it's not used very much. +# +# SYNOPSIS +# +# AX_DEFINE_SUB_PATH(DEFNAME, varname, description) +# +# DESCRIPTION +# +# Look at varname and detect the subpath that it contains relative to +# $prefix/$exec_prefix. If the path is indeed relative to +# $prefix/$exec_prefix, then a single "./" (dotslash) is prepended, +# otherwise it can be seen as an absolute path that cannot be moved, which +# you possibly do for "/etc" files, or even those ending up in +# "/lib/modules" or "/winnt/system". +# +# This macro is not very intelligent, it's just a first try in this +# direction. It does currently just look into the current patterns, and +# replaces a ${prefix} with a simple dot. Amazingly, it works quite well +# for most packages. +# +# Example (configure.ac): +# +# AX_DEFINE_DIR([EPREFIX], [exec_prefix], [--exec-prefix or default]) +# AX_DEFINE_SUB_PATH([PATH_LIBDIR], [libdir], [--bindir subdir]) +# AC_DEFINE_UNQUOTED([PACKAGE],"$PACKAGE", [Name of package]) +# +# Example (in C): +# +# static const char _libdir[] = PATH_LIBDIR; /* configure default */ +# char* libdir; +# char* eprefix = getenv (PACKAGE "DIR"); +# if (! eprefix) eprefix = EPREFIX; /* default */ +# if (*_libdir != '.') libdir = strdup(_libdir); +# else { +# libdir = malloc(strlen(eprefix) + strlen(_libdir) + 2); +# strcpy(libdir, eprefix); +# strcat(libdir, PATH_DELIMITER_STRING); +# strcat(libdir, _libdir); +# } +# ... +# free (libdir); +# +# The AX_DEFINE_SUB_PATHS(varnames) macro looks for the given various +# install-paths that largely depend on either ${prefix} or ${exec_prefix}. +# Just cut out the prefix and ac_define the value. The value is uppercased +# and PATH_ prepended ie. ax_define_sub_paths(bindir libdir pkgdatadir) +# will create the defines PATH_BINDIR PATH_LIBDIR PATH_PKGDATADIR - see +# posix' include/paths.h that creates _PATH_DEV and friends. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([AC_DEFINE_SUB_PATH], [AX_DEFINE_SUB_PATH]) +AC_DEFUN([AX_DEFINE_SUB_PATH], +[dnl + test "_$prefix" = _NONE && prefix="$ac_default_prefix" + test "_$exec_prefix" = _NONE && exec_prefix='${prefix}' + P=`echo ifelse( $2, , [$]$1, [$]$2) | sed -e 's:^\${[a-z_]*prefix}:.:'` + ifelse($3, , + AC_DEFINE($1, $P, [sub path $2]), + AC_DEFINE($1, $P, $3)) +]) + +AC_DEFUN([AX_DEFINE_SUB_PATHS], +[dnl + test "_$prefix" = _NONE && prefix="$ac_default_prefix" + test "_$exec_prefix" = _NONE && exec_prefix='${prefix}' + for i in $1 ; do + P=`echo \$$i | sed -e 's:^\${[a-z_]*prefix}:.:'` + V=`echo path_$i | sed -e 'y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:'` + AC_DEFINE($V, $P, [sub path $i]), +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dirname.m4 projectm-3.1.0/m4/autoconf-archive/ax_dirname.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dirname.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_dirname.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_dirname.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_DIRNAME(PATHNAME) +# +# DESCRIPTION +# +# Parts of the implementation have been taken from AS_DIRNAME from the +# main autoconf package in generation 2.5x. However, we do only use "sed" +# to cut out the dirname, and we do additionally clean up some dir/.. +# parts in the resulting pattern. +# +# this macro may be used in autoconf 2.13 scripts as well. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_DIRNAME], +[echo X[]$1 | + sed ['s/\/[^\/:][^\/:]*\/..\//\//g + s/\/[^\/:][^\/:]*\/..\//\//g + s/\/[^\/:][^\/:]*\/..\//\//g + s/\/[^\/:][^\/:]*\/..\//\//g + /^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q']]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dist_msi.m4 projectm-3.1.0/m4/autoconf-archive/ax_dist_msi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dist_msi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_dist_msi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,114 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_dist_msi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_DIST_MSI([File]) +# +# DESCRIPTION +# +# Adds support for a msi (Microsoft Installer) dist target. +# +# You must manually build the msi file yourself (probably from another +# computer). But it will be added to the list of extra bin dists and +# flagged for uploading (see ax_extra_dist.m4 and ax_upload.m4 for +# details). +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 15 + +AC_DEFUN([AX_DIST_MSI], +[ +AC_REQUIRE([AX_INSTALL_FILES]) +AC_MSG_NOTICE([adding dist-msi support]) +MSI_SETUP_FILE="$1" +AC_SUBST(MSI_SETUP_FILE) +if test "x$MSI_SETUP_FILE" != "x"; then + AC_MSG_NOTICE([setting msi file... $MSI_SETUP_FILE]) + AC_SUBST(USING_DIST_MSI) + AC_ARG_ENABLE(dist-msi, + AS_HELP_STRING(--enable-dist-msi[=ARG], + [enable support for msi (Microsoft Installer) + dist target. ARG can be + "yes" or "no". The default is "yes"]), + if test "x$enableval" != "x"; then + if test "x$enableval" = "xyes"; then + USING_DIST_MSI=true + AC_MSG_NOTICE([dist-msi support enabled]) + elif test "x$enableval" = "xno"; then + USING_DIST_MSI=false + AC_MSG_NOTICE([dist-msi support disabled]) + fi + fi, + USING_DIST_MSI=true + AC_MSG_NOTICE([dist-msi support enabled])) +else + AC_MSG_NOTICE([setting msi file... not set]) + AC_MSG_ERROR([a file must be specified when addind msi support]) +fi +AM_CONDITIONAL([ax_dist_msi_enabled],[test "x$USING_DIST_MSI" = "xtrue"]) +AX_ADD_AM_MACRO_STATIC([ + +if ax_dist_msi_enabled +msi dist-msi: \$(top_builddir)/\$(PACKAGE)-\$(VERSION).msi + +\$(top_builddir)/\$(PACKAGE)-\$(VERSION).msi: \$(top_builddir)/\$(MSI_SETUP_FILE) + @cp -f \"\$(top_builddir)/\$(MSI_SETUP_FILE)\" \"${AX_DOLLAR}@\" + +]) +AM_CONDITIONAL([ax_dist_msi_have_install_files],[test "x$AX_HAVE_INSTALL_FILES" = "xtrue"]) +AX_ADD_AM_MACRO_STATIC([ + +if ax_dist_msi_have_install_files +\$(top_builddir)/\$(MSI_SETUP_FILE): \$(top_builddir)/install_files + @echo \"the msi file (\$(MSI_SETUP_FILE)) must be (re)created\"; \\ + echo \"by building it with VC++\"; \\ + exit -1 +else +\$(top_builddir)/\$(MSI_SETUP_FILE): msi_up_to_date_notice + @if test ! -f \"\$(top_builddir)/\$(MSI_SETUP_FILE)\"; then \\ + echo \"the msi file (\$(MSI_SETUP_FILE)) must be created\"; \\ + echo \"by building it with VC++\"; \\ + exit -1; \\ + fi + +msi_up_to_date_notice: + @if test -f \"\$(top_builddir)/\$(MSI_SETUP_FILE)\"; then \\ + echo \"Warning: Dependency tracking cannot be enabled\"; \\ + echo \"Warning: the msi file (\$(MSI_SETUP_FILE))\"; \\ + echo \"Warning: Please make sure it is up to date.\"; \\ + exit -1; \\ + fi +endif # ax_dist_msi_have_install_files +]) + +AM_CONDITIONAL([ax_dist_msi_using_ax_extra_dist],[test "x$USING_AX_EXTRA_DIST" != "x"]) +AX_ADD_AM_MACRO_STATIC([ + +if ax_dist_msi_using_ax_extra_dist +EXTRA_BIN_DISTS += msi +endif # ax_dist_msi_using_ax_extra_dist + +]) + +AM_CONDITIONAL([ax_dist_msi_using_ax_upload],[test "x$USING_AX_UPLOAD" != "x"]) +AX_ADD_AM_MACRO_STATIC([ + +if ax_dist_msi_using_ax_upload +UPLOAD_BIN += upload-msi +UPLOAD_TARGETS += {msi=>\$(PACKAGE)-\$(VERSION).msi} +endif # ax_dist_msi_using_ax_upload + +endif # ax_dist_msi_enabled + +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dist_rpm.m4 projectm-3.1.0/m4/autoconf-archive/ax_dist_rpm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dist_rpm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_dist_rpm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,329 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_dist_rpm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_DIST_RPM([SPEC]) +# +# DESCRIPTION +# +# Adds support for a rpm dist target. +# +# You will need to create a spec template with everything except the files +# and the Changelog. Use @PACKAGE@ and @VERSION@ to refer to the package +# name and version respectively. The files and ChangeLog will be filled +# in automatically. For instance: +# +# Summary: Foobar +# Name: @PACKAGE@ +# Version: @VERSION@ +# Release: 0 +# License: GPL +# Group: Productivity/Networking +# Source0: http://somewhere/Foobar/%{name}-%{version}.tar.gz +# URL: http://somewhere +# BuildRoot: %{_tmppath}/%{name}-root +# Prefix: %{_prefix} +# +# %description +# Foobar does something +# +# %prep +# %setup +# +# %build +# %configure +# make +# +# %install +# %makeinstall +# +# %clean +# rm -rf $RPM_BUILD_ROOT +# +# %files +# %defattr(-,root,root) +# +# %doc AUTHORS BUGS COPYING INSTALL NEWS README +# +# %changelog +# +# Make sure ax_upload.am is added to aminclude.am and you have 'include +# aminclude.am' in your toplevel Makefile.am +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 22 + +AC_DEFUN([AX_DIST_RPM], +[ +AC_REQUIRE([AX_INSTALL_FILES]) +AC_MSG_NOTICE([adding rpm support]) +AM_CONDITIONAL([ax_dist_rpm_enable_upload],[test "x$USING_AX_UPLOAD" != "x"]) +AM_CONDITIONAL([ax_dist_rpm_using_ax_extra_dist],[test "x$USING_AX_EXTRA_DIST" != "x"]) +ax_dist_rpm_enabled=false +if test "x$AX_HAVE_INSTALL_FILES" = "xtrue"; then + AC_MSG_CHECKING([rpm spec template]) + if test -f "$srcdir/$1.in"; then + AC_MSG_RESULT([$1.in]) + AX_RPM_SPEC_FILE="$1"; + AC_SUBST(AX_RPM_SPEC_FILE) + AC_CONFIG_FILES([$1]) + AC_ARG_VAR(EDITOR, [default text editor]) + if test "x$EDITOR" = "x"; then + AC_CHECK_PROGS(EDITOR,[vim vi emacs]) + fi + AC_ARG_VAR(RPM, [rpm executable to use]) + if test "x$RPM" = "x"; then + AC_CHECK_PROGS(RPM,[rpmbuild rpm echo]) + fi + if test "x$RPM" != "x"; then + AC_ARG_VAR(PLATFORM_SUFFIX, [A short name for your platform that will be added to the name of the binary RPMs you may choose to create (by running make rpm). e.g. rh71 for RedHat 7.1, lsb1.3 for a LSB 1.3 compliant system (SuSE 8.2 or RedHat 9), osx103 for OS X 10.3.x, etc]) + AC_MSG_CHECKING([rpm platform suffix]) + if test "x$PLATFORM_SUFFIX" != "x"; then + AC_MSG_RESULT([$PLATFORM_SUFFIX]) + AC_SUBST([PLATFORM_SUFFIX]) + ax_dist_rpm_enabled=true + else + AC_MSG_RESULT([$PLATFORM_SUFFIX]) + AC_MSG_WARN([rpm support disabled... PLATFORM_SUFFIX not set]) + fi + else + AC_MSG_NOTICE([rpm support disabled... neither rpmbuild or rpm was found]) + fi + else + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([rpm spec template "$1.in" could not be found]) + fi +else + AC_MSG_NOTICE([rpm support disabled... install_files not available]) +fi +AM_CONDITIONAL([ax_dist_rpm_enabled], [test x"$ax_dist_rpm_enabled" = x"true"]) + +AX_ADD_AM_MACRO_STATIC([ +if ax_dist_rpm_enabled + +AX_DIST_RPM_CLEANFILES = \$(top_builddir)/RPMChangeLog \$(AX_INSTALL_FILES_CLEANFILES) + +\$(top_builddir)/RPMChangeLog: \$(top_srcdir)/ChangeLog + \$(GAWK) '/^[^0-9]/ { \\ + if( \$${AX_DOLLAR}1 == \"*\" ) \$${AX_DOLLAR}1 = \"-\"; print; } \\ + /^\$\$/ { \\ + print; } \\ + /^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/ { \\ + if( stop ) exit; \\ + split( \$${AX_DOLLAR}1, date, \"-\" ); \\ + \$${AX_DOLLAR}1 = strftime( \"%%a %%b %%d %%Y\", \\ + mktime( date[ 1 ] \" \" date[ 2 ] \" \" date [ 3 ] \" 00 00 00\" ) ); \\ + print \"* \" \$${AX_DOLLAR}0; } \\ + /Released \$(PACKAGE)-/ { \\ + gsub( /\$(PACKAGE)-/, \"\", \$${AX_DOLLAR}2 ); \\ + split( \$${AX_DOLLAR}2, ver, \".\" ); \\ + split( \"\$(VERSION)\", curr_ver, \".\" ); \\ + if( ver[ 1 ] != curr_ver[ 1 ] || ver[ 2 ] != curr_ver[ 2 ] ) stop = 1; } \\ + END { \\ + print \"[Please see the ChangeLog file for older changes] - Ed.\"; }' \\ + \$(top_srcdir)/ChangeLog > \$(top_builddir)/RPMChangeLog + +AX_DIST_RPM_CLEANFILES += \$(top_builddir)/\$(PACKAGE)-\$(VERSION).spec +AX_DIST_RPM_EXTRA_DIST = \$(top_builddir)/\$(PACKAGE)-\$(VERSION).spec \$(top_builddir)/\$(AX_RPM_SPEC_FILE).in + +spec: \$(top_builddir)/\$(PACKAGE)-\$(VERSION).spec + +\$(top_builddir)/\$(PACKAGE)-\$(VERSION).spec: \$(top_builddir)/\$(AX_RPM_SPEC_FILE) \$(top_builddir)/install_files \$(top_builddir)/RPMChangeLog + @cat \"\$(top_builddir)/\$(AX_RPM_SPEC_FILE)\" \\ + | \$(GAWK) -v files=\"\$\$files\" \\ + '{ print; } \\ + /%%defattr/ { while((getline < \"install_files\" ) > 0 ) { print; } }' \\ + > \"\$(top_builddir)/\$(PACKAGE)-\$(VERSION).spec\" + @cat \"\$(top_builddir)/RPMChangeLog\" >> \"\$(top_builddir)/\$(PACKAGE)-\$(VERSION).spec\" + +AX_DIST_RPM_CLEANFILES += \\ +\$(top_builddir)/*.rpm \\ +\$(top_builddir)/rpmmacros + +~/.rpmmacros: + @echo \"~/.rpmmacros not found. Creating one like the following:\"; \\ + echo \"\"; \\ + echo \"%%packager \"; \\ + echo \"\"; \\ + echo \"%%distribution \"; \\ + echo \"%%vendor \"; \\ + echo \"\"; \\ + echo \"%%_topdir \$\$HOME/\"; \\ + echo \"%%_tmppath /tmp/\"; \\ + echo \"\"; \\ + echo \"%%_rpmtopdir %%{_topdir}rpm/\"; \\ + echo \"%%_builddir %%{_tmppath}\"; \\ + echo \"%%_rpmdir %%{_rpmtopdir}RPMS/\"; \\ + echo \"%%_sourcedir %%{_rpmtopdir}SOURCES/\"; \\ + echo \"%%_specdir %%{_rpmtopdir}SPECS/\"; \\ + echo \"%%_srcrpmdir %%{_rpmtopdir}SRPMS/\"; \\ + echo \"\"; \\ + echo \"Where is your name and is the\"; \\ + echo \"distribution you are building on (e.g. SuSE Linux 8.2 or\"; \\ + echo \"RedHat Linux 7.1). and is the organisation\"; \\ + echo \"you are associated with.\"; \\ + echo \"\"; \\ + echo \"Running 'make create-rpmmacros' will create a ~/.rpmmacros file\"; \\ + echo \"for you and try to open it in an editor\"; \\ + exit -1 + +create-rpmmacros: + @if test -e ~/.rpmmacros; then \\ + echo \"Error: ~/.rpmmacros already exists\"; \\ + echo \"Please remove it if you want to use\"; \\ + echo \"this command to replace it\"; \\ + exit -1; \\ + else \\ + echo \"%%packager \" > ~/.rpmmacros; \\ + echo \"\" >> ~/.rpmmacros; \\ + echo \"%%distribution \" >> ~/.rpmmacros; \\ + echo \"%%vendor \" >> ~/.rpmmacros; \\ + echo \"\" >> ~/.rpmmacros; \\ + echo \"%%_topdir \$\$HOME/\" >> ~/.rpmmacros; \\ + echo \"%%_tmppath /tmp/\" >> ~/.rpmmacros; \\ + echo \"\" >> ~/.rpmmacros; \\ + echo \"%%_rpmtopdir %%{_topdir}rpm/\" >> ~/.rpmmacros; \\ + echo \"%%_builddir %%{_tmppath}\" >> ~/.rpmmacros; \\ + echo \"%%_rpmdir %%{_rpmtopdir}RPMS/\" >> ~/.rpmmacros; \\ + echo \"%%_sourcedir %%{_rpmtopdir}SOURCES/\" >> ~/.rpmmacros; \\ + echo \"%%_specdir %%{_rpmtopdir}SPECS/\" >> ~/.rpmmacros; \\ + echo \"%%_srcrpmdir %%{_rpmtopdir}SRPMS/\" >> ~/.rpmmacros; \\ + if test \"x$EDITOR\" = "x"; then \\ + echo \"Error: no editor specified or found.\"; \\ + echo \"Please edit ~/.rpmmacros manually\"; \\ + else \\ + $EDITOR ~/.rpmmacros; \\ + exit \$\$?; \\ + fi \\ + fi + +rpmmacros: ~/.rpmmacros + @cp -f ~/.rpmmacros rpmmacros; + +dist-rpm: rpm +dist-srpm: srpm + +rpm: \$(PACKAGE)-\$(VERSION)-0.i*.$PLATFORM_SUFFIX.rpm +srpm: \$(PACKAGE)-\$(VERSION)-0.src.rpm + +\$(top_builddir)/\$(PACKAGE)-\$(VERSION)-0.i*.$PLATFORM_SUFFIX.rpm: \$(top_builddir)/rpmmacros \$(top_builddir)/\$(PACKAGE)-\$(VERSION).tar.gz + @\$(RPM) -tb \$(top_builddir)/\$(PACKAGE)-\$(VERSION).tar.gz + @RPMDIR=\`cat \$(top_builddir)/rpmmacros | \$(GAWK) '/%%_rpmdir/ { print \$${AX_DOLLAR}2; }'\`; \\ + echo \"\$\$RPMDIR\" | \$(EGREP) \"%%{.*}\" > /dev/null 2>&1; \\ + EXIT=\$\$?; \\ + while test \"\$\$EXIT\" == \"0\"; do \\ + RPMDIR=\`echo \"\$\$RPMDIR\" | \$(GAWK) '/%%{.*}/ \\ + { match( \$${AX_DOLLAR}0, /%%{.*}/, macro ); \\ + suffix = substr( \$${AX_DOLLAR}0, RSTART + RLENGTH ); \\ + gsub( /{|}/, \"\", macro[ 0 ] ); \\ + while( ( getline < \"\$(top_builddir)/rpmmacros\" ) > 0 ) \\ + { if( \$${AX_DOLLAR}1 == macro[ 0 ] ) { print \$${AX_DOLLAR}2 suffix; exit; } } \\ + exit 1; \\ + }'\`; \\ + if test \"\$${AX_DOLLAR}?\" == \"0\"; then \\ + echo \"\$\$RPMDIR\" | \$(EGREP) \"%%{.*}\" > /dev/null 2>&1; \\ + EXIT=\"\$${AX_DOLLAR}?\"; \\ + else \\ + EXIT=\"1\"; \\ + fi; \\ + done; \\ + if test -d \"\$\$RPMDIR\"; then \\ + for dir in \`ls \"\$\$RPMDIR\"\`; do \\ + ls \"\$\${RPMDIR}\$\${dir}/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.rpm\" > /dev/null 2>&1; \\ + if test \"\$${AX_DOLLAR}?\" == \"0\"; then \\ + cp \"\$\${RPMDIR}\$\${dir}/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.rpm\" \"\$(top_builddir)/\$(PACKAGE)-\$(VERSION)-0.\$\${dir}.$PLATFORM_SUFFIX.rpm\"; \\ + found=true; \\ + fi; \\ + done; \\ + if ! \$\$found; then \\ + echo \"RPM built but not found.\"; \\ + echo \"Please copy it to \$(top_builddir) manually.\"; \\ + exit 1; \\ + fi; \\ + else \\ + echo \"RPM built but I cannot find RPM directory.\"; \\ + echo \"Please copy it to \$(top_builddir) manually.\"; \\ + exit 1; \\ + fi; + +\$(top_builddir)/\$(PACKAGE)-\$(VERSION).tar.gz: \$(top_builddir)/install_files + cd \"\$(top_builddir)\" && \$(MAKE) \$(AM_MAKEFLAGS) dist-gzip + + + + +\$(PACKAGE)-\$(VERSION)-0.src.rpm: \$(top_builddir)/rpmmacros \$(top_builddir)/\$(PACKAGE)-\$(VERSION).tar.gz + @\$(RPM) -ts \$(top_builddir)/\$(PACKAGE)-\$(VERSION).tar.gz + @SRPMDIR=\`cat rpmmacros | \$(GAWK) '/%%_srcrpmdir/ { print ${AX_DOLLAR}${AX_DOLLAR}2; }'\`; \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}SRPMDIR\" | \$(EGREP) \"%%{.*}\" > /dev/null 2>&1; \\ + EXIT=${AX_DOLLAR}${AX_DOLLAR}?; \\ + while test \"${AX_DOLLAR}${AX_DOLLAR}EXIT\" == \"0\"; do \\ + SRPMDIR=\`echo \"${AX_DOLLAR}${AX_DOLLAR}SRPMDIR\" | \$(GAWK) '/%%{.*}/ \\ + { match( ${AX_DOLLAR}${AX_DOLLAR}0, /%%{.*}/, macro ); \\ + suffix = substr( ${AX_DOLLAR}${AX_DOLLAR}0, RSTART + RLENGTH ); \\ + gsub( /{|}/, \"\", macro[ 0 ] ); \\ + while( ( getline < \"rpmmacros\" ) > 0 ) \\ + { if( ${AX_DOLLAR}${AX_DOLLAR}1 == macro[ 0 ] ) { print ${AX_DOLLAR}${AX_DOLLAR}2 suffix; exit; } } \\ + exit 1; \\ + }'\`; \\ + if test \"${AX_DOLLAR}${AX_DOLLAR}?\" == \"0\"; then \\ + echo \"${AX_DOLLAR}${AX_DOLLAR}SRPMDIR\" | \$(EGREP) \"%%{.*}\" > /dev/null 2>&1; \\ + EXIT=\"${AX_DOLLAR}${AX_DOLLAR}?\"; \\ + else \\ + EXIT=\"1\"; \\ + fi; \\ + done; \\ + if test -d \"${AX_DOLLAR}${AX_DOLLAR}SRPMDIR\"; then \\ + ls \"${AX_DOLLAR}${AX_DOLLAR}{SRPMDIR}/\$(PACKAGE)-\$(VERSION)-0.src.rpm\" > /dev/null 2>&1; \\ + if test \"${AX_DOLLAR}${AX_DOLLAR}?\" == \"0\"; then \\ + cp \"\$${AX_DOLLAR}{SRPMDIR}/\$(PACKAGE)-\$(VERSION)-0.src.rpm\" \"${AX_DOLLAR}(top_builddir)/.\"; \\ + found=true; \\ + fi; \\ + if ! ${AX_DOLLAR}${AX_DOLLAR}found; then \\ + echo \"SRPM built but not found.\"; \\ + echo \"Please copy it to ${AX_DOLLAR}(top_builddir) manually.\"; \\ + exit 1; \\ + fi; \\ + else \\ + echo \"SRPM built but I cannot find SRPM directory.\"; \\ + echo \"Please copy it to ${AX_DOLLAR}(top_builddir) directory manually.\"; \\ + exit 1; \\ + fi; + + +AX_DIST_RPM_EXTRA_BIN_DISTS = rpm +AX_DIST_RPM_EXTRA_SRC_DISTS = srpm + +if ax_dist_rpm_enable_upload +AX_DIST_RPM_UPLOAD_BIN = upload-rpm +AX_DIST_RPM_UPLOAD_SRC = upload-srpm + +AX_DIST_RPM_UPLOAD_TARGETS = \\ +{rpm=>$PACKAGE-$VERSION-0.i*.$PLATFORM_SUFFIX.rpm} \\ +{srpm=>$PACKAGE-$VERSION-0.src.rpm} +endif # ax_dist_rpm_enable_upload + +endif # ax_dist_rpm_enabled + +# These rules are included unconditionally since we cannot conditionally add +# dependencies. +clean-local: clean-ax-dist-rpm +clean-ax-dist-rpm: + -test -z \"\$(AX_DIST_RPM_CLEANFILES)\" || rm -f \$(AX_DIST_RPM_CLEANFILES) + +dist-hook: dist-hook-ax-dist-rpm +dist-hook-ax-dist-rpm: \$(AX_DIST_RPM_EXTRA_DIST) + -test -z \"\$(AX_DIST_RPM_EXTRA_DIST)\" || cp \$(AX_DIST_RPM_EXTRA_DIST) \$(distdir) + +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dll_string.m4 projectm-3.1.0/m4/autoconf-archive/ax_dll_string.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_dll_string.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_dll_string.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,90 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_dll_string.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_DLL_STRING +# +# DESCRIPTION +# +# Tests for a bug currently in g++ 3.4.4 on Cygwin (maybe other targets +# with statically linked libstdc++?) where passing an empty std::string to +# a dll will cause a crash on destruction due to incorrect memory +# handling. See bug 24196 in gcc's bugzilla for more details: +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24196 +# +# LICENSE +# +# Copyright (c) 2008 Steven Brown +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +dnl Plan: compile conftest-dll.cc, conftest-exe.cc. It has a 'crash' param +dnl that can be passed. Verify the compile worked and we can run it normally +dnl ok. Then, pass 'crash', test if it crashed, fail. + +AC_DEFUN([AX_DLL_STRING], +[ + AC_MSG_CHECKING(if the dll string test can be compiled) + cat << EOF > conftest-dll.cc +[ +#include +using namespace std; + +void testit(std::string (*contentGet)()) { + contentGet(); +} +] +EOF + cat << EOF > conftest-exe.cc +[ +#include +#include +using namespace std; + +extern void testit(std::string (*contentGet)()); + +std::string contentGet() { + return string(""); // Anything other than empty string works. +} + +int main(int argc, char *argv[]) { + if(argc == 2 && strcmp(argv[1], "crash") == 0) { + testit(&contentGet); + } + return 0; +} +] +EOF + $CXX -shared $CFLAGS $CPPFLAGS conftest-dll.cc -o conftest-dll.dll >&AS_MESSAGE_LOG_FD && $CXX $CFLAGS $CPPFLAGS conftest-exe.cc conftest-dll.dll -o conftest-exe.exe >& AS_MESSAGE_LOG_FD + if test x"$?" = x"0"; then + AC_MSG_RESULT(yes) + + dnl Make sure it runs normally first. + AC_MSG_CHECKING(if the dll string test is usable) + if /bin/sh -c "(LD_LIBRARY_PATH=\"$PWD\" ./conftest-exe.exe)" >& AS_MESSAGE_LOG_FD 2>&1; then + AC_MSG_RESULT(yes) + + dnl Now we can check for the bug. + AC_MSG_CHECKING(if the dll string test is affected by gcc bug 24196) + if ! /bin/sh -c "(LD_LIBRARY_PATH=\"$PWD\" ./conftest-exe.exe crash)" >& AS_MESSAGE_LOG_FD 2>&1; then + AC_MSG_RESULT(yes) + + dnl We have the bug, user'll need to fix it. + AC_MSG_ERROR([*** This toolchain is affected by gcc bug 24196. For Cygwin as of 4/8/2006, you can downgrade to gcc/g++ 3.3.3 or check if there is a newer compiler available that's fixed.]) + else + AC_MSG_RESULT(no) + fi + else + AC_MSG_RESULT(no) + fi + else + AC_MSG_RESULT(no) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_elisp.m4 projectm-3.1.0/m4/autoconf-archive/ax_elisp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_elisp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_elisp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,170 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_elisp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ELISP_CONFIG_FILE(FILENAME) +# AX_ELISP_CHECK(SYMBOL,DESCRIPTION,BODY,SUCCESS-EXPR) +# AX_ELISP_CHECK_FEATURE(SYMBOL) +# AX_ELISP_CHECK_FBOUNDP(SYMBOL,[FEATURE [...]]) +# AX_ELISP_CHECK_BOUNDP(SYMBOL,[FEATURE [...]]) +# +# DESCRIPTION +# +# This is a simple library to check the Emacs reality by way of Emacs Lisp +# forms evaluated under $EMACS --batch -Q. This means you MUST have the +# shell variable EMACS set to a valid Emacs executable prior to the first +# call to any of the AX_ELISP_CHECK et al macros. Those work by saving +# their results to the file defined by calling AX_ELISP_CONFIG_FILE so you +# MUST call that prior, too. For example: +# +# dnl Arrange to save config answers in $top_builddir/lisp/config.el. +# AX_ELISP_CONFIG_FILE([lisp/config.el]) +# +# dnl Set shell variable EMACS and AC_SUBST it, too. +# dnl (NB: This is a separate Autoconf Archive macro.) +# AX_PROG_EMACS +# +# In the following detailed descriptions, SYMBOL stands for an Emacs Lisp +# symbol, which may contain hyphens, e.g., 'define-error' or 'org-src'. +# Likewise, FEATURE is an Emacs Lisp symbol (naming a feature). BODY and +# SUCCESS-EXPR are Emacs Lisp forms, zero or more for BODY and exactly one +# for SUCCESS-EXPR. In these forms you must take care to avoid apostrophe +# (U+27). Instead of 'foo, write (quote foo). +# +# * AX_ELISP_CONFIG_FILE(FILENAME) +# +# This arranges for future AX_ELISP_CHECK (et al) calls to save their +# results in FILENAME. May be called multiple times. FILENAME should be +# relative to the top build dir. +# +# * AX_ELISP_CHECK(SYMBOL,DESCRIPTION,BODY,SUCCESS-EXPR) +# +# This is the general macro that the other AX_ELISP_CHECK* macros use. It +# constructs a short Emacs Lisp file comprising BODY and evaluates it via +# $EMACS --batch -Q. The exit value of this script depends on the result +# of evaluating SUCCESS-EXPR: non-nil is success and nil is failure. On +# success, append SYMBOL on a line of its own to the config file. This +# macro uses AC_CACHE_CHECK and passes DESCRIPTION to it. +# +# * AX_ELISP_CHECK_FEATURE(FEATURE) +# +# This checks if (require (quote FEATURE)) is successful. If so, add +# featurep-FEATURE to the config file (NB the "featurep-" prefix). +# +# * AX_ELISP_CHECK_FBOUNDP(SYMBOL,[FEATURE [...]]) +# +# This checks if (fboundp (quote SYMBOL)) is successful. If so, append +# SYMBOL to the config file. Optional 2nd arg is a space-separated list of +# features to require prior to the fboundp check. +# +# * AX_ELISP_CHECK_BOUNDP(SYMBOL,[FEATURE [...]]) +# +# This checks if (boundp (quote SYMBOL)) is successful. If so, append +# SYMBOL to the config file. Optional 2nd arg is a space-separated list of +# features to require prior to the boundp check. +# +# LICENSE +# +# Copyright (c) 2016-2017 Thien-Thi Nguyen +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_ELISP_CONFIG_FILE],[dnl +dnl 1 -- relative filename (from 'top_srcdir') +m4_define([AX_ELISP__CONFIG_FILENAME],[$1])dnl +])dnl + + +AC_DEFUN([AX_ELISP__PREP],[dnl +AS_IF([AS_VAR_TEST_SET([EMACS])],,dnl + [AC_MSG_ERROR([No value for EMACS])]) +dnl FIXME: Check at autoconf-time that AX_ELISP__CONFIG_FILENAME is set. +dnl (If not, or if the value is unsuitable, throw fatal error.) +rm -f AX_ELISP__CONFIG_FILENAME +touch AX_ELISP__CONFIG_FILENAME +])dnl + + +AC_DEFUN([AX_ELISP_CHECK],[dnl +dnl 1 -- Emacs Lisp symbol to add to config file if "success" +dnl 2 -- description +dnl 3 -- Emacs Lisp body (zero or more forms) +dnl 4 -- Emacs Lisp expression for "success" +AC_REQUIRE([AX_ELISP__PREP])dnl +AS_VAR_PUSHDEF([CV],[elisp_cv_$1])dnl +AC_CACHE_CHECK([$2],[CV],[dnl +cat >conftest.el <&5 2>&5],[CV=yes],[CV=no])]) +AS_IF([test yes = $[]CV],[echo "$1" >> AX_ELISP__CONFIG_FILENAME]) +AS_VAR_POPDEF([CV])dnl +])dnl + + +AC_DEFUN([AX_ELISP_CHECK_FEATURE],[dnl +dnl 1 -- Emacs Lisp symbol (a feature name) +AC_REQUIRE([AX_ELISP__PREP])dnl +AX_ELISP_CHECK([featurep-$1],[if $EMACS supports feature '$1'],[dnl +(require (quote $1)) +],[dnl +(featurep (quote $1)) +])]) + + +AC_DEFUN([AX_ELISP_CHECK_FBOUNDP],[dnl +dnl 1 -- Emacs Lisp symbol +dnl 2 -- (optional) space-separated list of features to 'require' +AX_ELISP_CHECK([$1],[if '$1' is defined],[dnl +m4_foreach([FEATURE],m4_split(m4_normalize($2)),[dnl +(require 'FEATURE) +])],[(fboundp '$1)])])dnl + + +AC_DEFUN([AX_ELISP_CHECK_BOUNDP],[dnl +dnl 1 -- Emacs Lisp symbol +dnl 2 -- (optional) space-separated list of features to 'require' +AX_ELISP_CHECK([$1],[if '$1' is defined],[dnl +m4_foreach([FEATURE],m4_split(m4_normalize($2)),[dnl +(require 'FEATURE) +])],[(boundp '$1)])])dnl + + +dnl TODO: +dnl - Add error checking (see FIXME in code). +dnl - Validate m4 mumblings -- is this the right crazy?! +dnl - Add customization of $EMACS invocation. +dnl +dnl Local variables: +dnl mode: autoconf +dnl End: +dnl ax_elisp.m4 ends here diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_enable_builddir.m4 projectm-3.1.0/m4/autoconf-archive/ax_enable_builddir.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_enable_builddir.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_enable_builddir.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,302 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_enable_builddir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ENABLE_BUILDDIR [(dirstring-or-command [,Makefile.mk [,-all]])] +# +# DESCRIPTION +# +# If the current configure was run within the srcdir then we move all +# configure-files into a subdir and let the configure steps continue +# there. We provide an option --disable-builddir to suppress the move into +# a separate builddir. +# +# Defaults: +# +# $1 = $host (overridden with $HOST) +# $2 = Makefile.mk +# $3 = -all +# +# This macro must be called before AM_INIT_AUTOMAKE. It creates a default +# toplevel srcdir Makefile from the information found in the created +# toplevel builddir Makefile. It just copies the variables and +# rule-targets, each extended with a default rule-execution that recurses +# into the build directory of the current "HOST". You can override the +# auto-detection through `config.guess` and build-time of course, as in +# +# make HOST=i386-mingw-cross +# +# which can of course set at configure time as well using +# +# configure --host=i386-mingw-cross +# +# After the default has been created, additional rules can be appended +# that will not just recurse into the subdirectories and only ever exist +# in the srcdir toplevel makefile - these parts are read from the $2 = +# Makefile.mk file +# +# The automatic rules are usually scanning the toplevel Makefile for lines +# like '#### $host |$builddir' to recognize the place where to recurse +# into. Usually, the last one is the only one used. However, almost all +# targets have an additional "*-all" rule which makes the script to +# recurse into _all_ variants of the current HOST (!!) setting. The "-all" +# suffix can be overridden for the macro as well. +# +# a special rule is only given for things like "dist" that will copy the +# tarball from the builddir to the sourcedir (or $(PUB)) for reason of +# convenience. +# +# LICENSE +# +# Copyright (c) 2009 Guido U. Draheim +# Copyright (c) 2009 Alan Jenkins +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 30 + +AC_DEFUN([AX_ENABLE_BUILDDIR],[ +AC_REQUIRE([AC_CANONICAL_HOST])[]dnl +AC_REQUIRE([AC_CANONICAL_TARGET])[]dnl +AC_REQUIRE([AX_CONFIGURE_ARGS])[]dnl +AC_REQUIRE([AM_AUX_DIR_EXPAND])[]dnl +AC_BEFORE([$0],[AM_INIT_AUTOMAKE])dnl +AS_VAR_PUSHDEF([SUB],[ax_enable_builddir])dnl +AS_VAR_PUSHDEF([AUX],[ax_enable_builddir_auxdir])dnl +AS_VAR_PUSHDEF([SED],[ax_enable_builddir_sed])dnl +SUB="." +AC_ARG_ENABLE([builddir], AS_HELP_STRING( + [--disable-builddir],[disable automatic build in subdir of sources]) + ,[SUB="$enableval"], [SUB="auto"]) +if test ".$ac_srcdir_defaulted" != ".no" ; then +if test ".$srcdir" = ".." ; then + if test -f config.status ; then + AC_MSG_NOTICE(toplevel srcdir already configured... skipping subdir build) + else + test ".$SUB" = "." && SUB="." + test ".$SUB" = ".no" && SUB="." + test ".$TARGET" = "." && TARGET="$target" + test ".$SUB" = ".auto" && SUB="m4_ifval([$1], [$1],[$TARGET])" + if test ".$SUB" != ".." ; then # we know where to go and + AS_MKDIR_P([$SUB]) + echo __.$SUB.__ > $SUB/conftest.tmp + cd $SUB + if grep __.$SUB.__ conftest.tmp >/dev/null 2>/dev/null ; then + rm conftest.tmp + AC_MSG_RESULT([continue configure in default builddir "./$SUB"]) + else + AC_MSG_ERROR([could not change to default builddir "./$SUB"]) + fi + srcdir=`echo "$SUB" | + sed -e 's,^\./,,;s,[[^/]]$,&/,;s,[[^/]]*/,../,g;s,[[/]]$,,;'` + # going to restart from subdirectory location + test -f $srcdir/config.log && mv $srcdir/config.log . + test -f $srcdir/confdefs.h && mv $srcdir/confdefs.h . + test -f $srcdir/conftest.log && mv $srcdir/conftest.log . + test -f $srcdir/$cache_file && mv $srcdir/$cache_file . + AC_MSG_RESULT(....exec $SHELL $srcdir/[$]0 "--srcdir=$srcdir" "--enable-builddir=$SUB" ${1+"[$]@"}) + case "[$]0" in # restart + [[\\/]]* | ?:[[\\/]]*) # Absolute name + eval $SHELL "'[$]0'" "'--srcdir=$srcdir'" "'--enable-builddir=$SUB'" $ac_configure_args ;; + *) eval $SHELL "'$srcdir/[$]0'" "'--srcdir=$srcdir'" "'--enable-builddir=$SUB'" $ac_configure_args ;; + esac ; exit $? + fi + fi +fi fi +test ".$SUB" = ".auto" && SUB="." +dnl ac_path_prog uses "set dummy" to override $@ which would defeat the "exec" +AC_PATH_PROG(SED,gsed sed, sed) +AUX="$am_aux_dir" +AS_VAR_POPDEF([SED])dnl +AS_VAR_POPDEF([AUX])dnl +AS_VAR_POPDEF([SUB])dnl +AC_CONFIG_COMMANDS([buildir],[dnl .............. config.status .............. +AS_VAR_PUSHDEF([SUB],[ax_enable_builddir])dnl +AS_VAR_PUSHDEF([TOP],[top_srcdir])dnl +AS_VAR_PUSHDEF([SRC],[ac_top_srcdir])dnl +AS_VAR_PUSHDEF([AUX],[ax_enable_builddir_auxdir])dnl +AS_VAR_PUSHDEF([SED],[ax_enable_builddir_sed])dnl +pushdef([END],[Makefile.mk])dnl +pushdef([_ALL],[ifelse([$3],,[-all],[$3])])dnl + SRC="$ax_enable_builddir_srcdir" + if test ".$SUB" = ".." ; then + if test -f "$TOP/Makefile" ; then + AC_MSG_NOTICE([skipping TOP/Makefile - left untouched]) + else + AC_MSG_NOTICE([skipping TOP/Makefile - not created]) + fi + else + if test -f "$SRC/Makefile" ; then + a=`grep "^VERSION " "$SRC/Makefile"` ; b=`grep "^VERSION " Makefile` + test "$a" != "$b" && rm "$SRC/Makefile" + fi + if test -f "$SRC/Makefile" ; then + echo "$SRC/Makefile : $SRC/Makefile.in" > $tmp/conftemp.mk + echo " []@ echo 'REMOVED,,,' >\$[]@" >> $tmp/conftemp.mk + eval "${MAKE-make} -f $tmp/conftemp.mk 2>/dev/null >/dev/null" + if grep '^REMOVED,,,' "$SRC/Makefile" >/dev/null + then rm $SRC/Makefile ; fi + cp $tmp/conftemp.mk $SRC/makefiles.mk~ ## DEBUGGING + fi + if test ! -f "$SRC/Makefile" ; then + AC_MSG_NOTICE([create TOP/Makefile guessed from local Makefile]) + x='`' ; cat >$tmp/conftemp.sed <<_EOF +/^\$/n +x +/^\$/bS +x +/\\\\\$/{H;d;} +{H;s/.*//;x;} +bM +:S +x +/\\\\\$/{h;d;} +{h;s/.*//;x;} +:M +s/\\(\\n\\) /\\1 /g +/^ /d +/^[[ ]]*[[\\#]]/d +/^VPATH *=/d +s/^srcdir *=.*/srcdir = ./ +s/^top_srcdir *=.*/top_srcdir = ./ +/[[:=]]/!d +/^\\./d +dnl Now handle rules (i.e. lines containing ":" but not " = "). +/ = /b +/ .= /b +/:/!b +s/:.*/:/ +s/ / /g +s/ \\([[a-z]][[a-z-]]*[[a-zA-Z0-9]]\\)\\([[ :]]\\)/ \\1 \\1[]_ALL\\2/g +s/^\\([[a-z]][[a-z-]]*[[a-zA-Z0-9]]\\)\\([[ :]]\\)/\\1 \\1[]_ALL\\2/ +s/ / /g +/^all all[]_ALL[[ :]]/i\\ +all-configured : all[]_ALL +dnl dist-all exists... and would make for dist-all-all +s/ [[a-zA-Z0-9-]]*[]_ALL [[a-zA-Z0-9-]]*[]_ALL[]_ALL//g +/[]_ALL[]_ALL/d +a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ + ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ + ; use=$x basename "\$\@" _ALL $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\ + ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\ + ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ + ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\ + ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; (cd "\$\$i" && test ! -f configure && \$(MAKE) \$\$use) || exit; done +dnl special rule add-on: "dist" copies the tarball to $(PUB). (source tree) +/dist[]_ALL *:/a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ + ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ + ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\ + ; if test "\$\$found" -eq "0" ; then : \\\\\\ + ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ + ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\ + ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done +dnl special rule add-on: "dist-foo" copies all the archives to $(PUB). (source tree) +/dist-[[a-zA-Z0-9]]*[]_ALL *:/a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh ./config.guess $x \\\\\\ + ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ + ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\ + ; if test "\$\$found" -eq "0" ; then : \\\\\\ + ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ + ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\ + ; do test -f "\$\$f" && mv "\$\$f" \$(PUB). ; done ; break ; done +dnl special rule add-on: "distclean" removes all local builddirs completely +/distclean[]_ALL *:/a\\ + @ HOST="\$(HOST)\" \\\\\\ + ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ + ; BUILD=$x grep "^#### .*|" Makefile | sed -e 's/.*|//' $x \\\\\\ + ; use=$x basename "\$\@" _ALL $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ + ; echo "MAKE \$\$HOST : \$\$n * \$\@ (all local builds)" \\\\\\ + ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ + ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; echo "# rm -r \$\$i"; done ; echo "# (sleep 3)" ; sleep 3 \\\\\\ + ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ + ; echo "\$\$i" | grep "^/" > /dev/null && continue \\\\\\ + ; echo "\$\$i" | grep "^../" > /dev/null && continue \\\\\\ + ; echo "rm -r \$\$i"; (rm -r "\$\$i") ; done ; rm Makefile +_EOF + cp "$tmp/conftemp.sed" "$SRC/makefile.sed~" ## DEBUGGING + $SED -f $tmp/conftemp.sed Makefile >$SRC/Makefile + if test -f "$SRC/m4_ifval([$2],[$2],[END])" ; then + AC_MSG_NOTICE([extend TOP/Makefile with TOP/m4_ifval([$2],[$2],[END])]) + cat $SRC/END >>$SRC/Makefile + fi ; xxxx="####" + echo "$xxxx CONFIGURATIONS FOR TOPLEVEL MAKEFILE: " >>$SRC/Makefile + # sanity check + if grep '^; echo "MAKE ' $SRC/Makefile >/dev/null ; then + AC_MSG_NOTICE([buggy sed found - it deletes tab in "a" text parts]) + $SED -e '/^@ HOST=/s/^/ /' -e '/^; /s/^/ /' $SRC/Makefile \ + >$SRC/Makefile~ + (test -s $SRC/Makefile~ && mv $SRC/Makefile~ $SRC/Makefile) 2>/dev/null + fi + else + xxxx="\\#\\#\\#\\#" + # echo "/^$xxxx *$ax_enable_builddir_host /d" >$tmp/conftemp.sed + echo "s!^$xxxx [[^|]]* | *$SUB *\$!$xxxx ...... $SUB!" >$tmp/conftemp.sed + $SED -f "$tmp/conftemp.sed" "$SRC/Makefile" >$tmp/mkfile.tmp + cp "$tmp/conftemp.sed" "$SRC/makefiles.sed~" ## DEBUGGING + cp "$tmp/mkfile.tmp" "$SRC/makefiles.out~" ## DEBUGGING + if cmp -s "$SRC/Makefile" "$tmp/mkfile.tmp" 2>/dev/null ; then + AC_MSG_NOTICE([keeping TOP/Makefile from earlier configure]) + rm "$tmp/mkfile.tmp" + else + AC_MSG_NOTICE([reusing TOP/Makefile from earlier configure]) + mv "$tmp/mkfile.tmp" "$SRC/Makefile" + fi + fi + AC_MSG_NOTICE([build in $SUB (HOST=$ax_enable_builddir_host)]) + xxxx="####" + echo "$xxxx" "$ax_enable_builddir_host" "|$SUB" >>$SRC/Makefile + fi +popdef([END])dnl +AS_VAR_POPDEF([SED])dnl +AS_VAR_POPDEF([AUX])dnl +AS_VAR_POPDEF([SRC])dnl +AS_VAR_POPDEF([TOP])dnl +AS_VAR_POPDEF([SUB])dnl +],[dnl +ax_enable_builddir_srcdir="$srcdir" # $srcdir +ax_enable_builddir_host="$HOST" # $HOST / $host +ax_enable_builddir_version="$VERSION" # $VERSION +ax_enable_builddir_package="$PACKAGE" # $PACKAGE +ax_enable_builddir_auxdir="$ax_enable_builddir_auxdir" # $AUX +ax_enable_builddir_sed="$ax_enable_builddir_sed" # $SED +ax_enable_builddir="$ax_enable_builddir" # $SUB +])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_execinfo.m4 projectm-3.1.0/m4/autoconf-archive/ax_execinfo.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_execinfo.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_execinfo.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,67 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_execinfo.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXECINFO([ACTION-IF-EXECINFO-H-IS-FOUND], [ACTION-IF-EXECINFO-H-IS-NOT-FOUND], [ADDITIONAL-TYPES-LIST]) +# +# DESCRIPTION +# +# Checks for execinfo.h header and if the len parameter/return type can be +# found from a list, also define backtrace_size_t to that type. +# +# By default the list of types to try contains int and size_t, but should +# some yet undiscovered system use e.g. unsigned, the 3rd argument can be +# used for extensions. I'd like to hear of further suggestions. +# +# Executes ACTION-IF-EXECINFO-H-IS-FOUND when present and the execinfo.h +# header is found or ACTION-IF-EXECINFO-H-IS-NOT-FOUND in case the header +# seems unavailable. +# +# Also adds -lexecinfo to LIBS on BSD if needed. +# +# LICENSE +# +# Copyright (c) 2014 Thomas Jahns +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_EXECINFO], + [AC_CHECK_HEADERS([execinfo.h]) + AS_IF([test x"$ac_cv_header_execinfo_h" = xyes], + [AC_CACHE_CHECK([size parameter type for backtrace()], + [ax_cv_proto_backtrace_type], + [AC_LANG_PUSH([C]) + for ax_cv_proto_backtrace_type in size_t int m4_ifnblank([$3],[$3 ])none; do + AS_IF([test "${ax_cv_proto_backtrace_type}" = none], + [ax_cv_proto_backtrace_type= ; break]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +#include +extern +${ax_cv_proto_backtrace_type} backtrace(void **addrlist, ${ax_cv_proto_backtrace_type} len); +char **backtrace_symbols(void *const *buffer, ${ax_cv_proto_backtrace_type} size); +])], + [break]) + done + AC_LANG_POP([C])])]) + AS_IF([test x${ax_cv_proto_backtrace_type} != x], + [AC_DEFINE_UNQUOTED([backtrace_size_t], [$ax_cv_proto_backtrace_type], + [Defined to return type of backtrace().])]) + AC_SEARCH_LIBS([backtrace],[execinfo]) + AS_IF([test x"${ax_cv_proto_backtrace_type}" != x -a x"$ac_cv_header_execinfo_h" = xyes -a x"$ac_cv_search_backtrace" != xno], + [AC_DEFINE([HAVE_BACKTRACE],[1], + [Defined if backtrace() could be fully identified.]) + ]m4_ifnblank([$1],[$1 +]),m4_ifnblank([$2],[$2 +]))]) +dnl +dnl Local Variables: +dnl mode: autoconf +dnl End: +dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_expand_prefix.m4 projectm-3.1.0/m4/autoconf-archive/ax_expand_prefix.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_expand_prefix.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_expand_prefix.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_expand_prefix.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXPAND_PREFIX +# +# DESCRIPTION +# +# When $prefix and $exec_prefix are still set to NONE then set them to the +# usual default values - being based on $ac_default_prefix. - this macro +# can be AC_REQUIREd by other macros that need to compute values for +# installation directories. It has been observed that it was done wrong +# over and over again, so this is a bit more safe to do. +# +# remember - setting exec_prefix='${prefix}' needs you interpolate +# directories multiple times, it is not sufficient to just say +# MYVAR="${datadir}/putter" but you do have to run `eval` a few times, +# sth. like MYVAR=`eval "echo \"$MYVAR\""` done at least two times. +# +# The implementation of this macro simply picks up the lines that would be +# run at the start of AC_OUTPUT anyway to set the prefix/exec_prefix +# defaults. Between AC_INIT and the first command to AC_REQUIRE this macro +# you can set the two variables to something explicit instead. Probably, +# any command to compute installation directories should be run _after_ +# AM_INIT_AUTOMAKE +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_EXPAND_PREFIX],[dnl + # The prefix default can be set in configure.ac (otherwise it is /usr/local) + test "x$prefix" = xNONE && prefix=$ac_default_prefix + # Let make expand exec_prefix. Allows to override the makevar 'prefix' later + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ext_check_header.m4 projectm-3.1.0/m4/autoconf-archive/ax_ext_check_header.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ext_check_header.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ext_check_header.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ext_check_header.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXT_CHECK_HEADER(
, ). +# +# DESCRIPTION +# +# Check for
with -I for each path in if need be. +# The first sucecssful path is chosen (eg if you say +# AX_EXT_CHECK_HEADER(foo.h, bar baz qux) and -Ibaz works then -Iqux will +# not be tested. +# +# Any -I flags that locate a header are added to CFLAGS and CPPFLAGS. AS +# with AC_CHECK_HEADERS it causes HAVE_
_H to be defined as 1. +# +# Example: +# +# AX_EXT_HAVE_HEADER(openssl/rsa.h, /usr/local/include /usr/local/ssl/include /usr/local/openssl/include) +# +# LICENSE +# +# Copyright (c) 2008 Duncan Simpson +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_EXT_HAVE_HEADER], +[AC_LANG_PUSH(C) + AC_CHECK_HEADER($1, [$3 got="yes"], [$4 got="no"], $5) + hdr=`echo $1 | $as_tr_sh` + for dir in $2; do + if test "x${got}" = "xno"; then + ext_hashdr_cvdir=`echo $dir | $as_tr_sh` + AC_CACHE_CHECK([for $1 library with -I$dir], + [ext_cv${ext_hashdr_cvdir}_hashdr_${hdr}], + [ext_have_hdr_save_cflags=${CFLAGS} + CFLAGS="${CFLAGS} -I${dir}" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([#inc[]lude <$1>])], + [got="yes"; eval "ext_cv${ext_hashdr_cvdir}_hashdr_${hdr}"="yes"], + [got="no"; eval "ext_cv${ext_hashdr_cvdir}_hashdr_${hdr}"="no"]) + CFLAGS=$ext_have_hdr_save_cflags]) + if eval `echo 'test x${'ext_cv${ext_hashdr_cvdir}_hashdr_${hdr}'}' = "xyes"`; then + CFLAGS="${CFLAGS} -I${dir}" + CPPFLAGS="${CPPFLAGS} -I${dir}" + got="yes"; + hdr=`echo $1 | $as_tr_cpp` + AC_DEFINE_UNQUOTED(HAVE_${hdr}, 1, + [Define this if you have the $1 header]) + fi; fi; done +AC_LANG_POP]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_extend_srcdir.m4 projectm-3.1.0/m4/autoconf-archive/ax_extend_srcdir.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_extend_srcdir.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_extend_srcdir.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_extend_srcdir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXTEND_SRCDIR +# +# DESCRIPTION +# +# The AX_EXTEND_SRCDIR macro extends $srcdir by one path component. +# +# As an example, when working in /home/michael/i3-4.12/build and calling +# ../configure, your $srcdir is "..". After calling AX_EXTEND_SRCDIR, +# $srcdir will be set to "../../i3-4.12". +# +# The result of extending $srcdir is that filenames (e.g. in the output of +# the "backtrace" gdb command) will include one more path component of the +# absolute source path. The additional path component makes it easy for +# users to recognize which files belong to the PACKAGE, and -- provided a +# dist tarball was unpacked -- which version of PACKAGE was used. +# +# As an example, in "backtrace", you will see: +# +# #0 main (argc=1, argv=0x7fffffff1fc8) at ../../i3-4.12/src/main.c:187 +# +# instead of: +# +# #0 main (argc=1, argv=0x7fffffff1fc8) at ../src/main.c:187 +# +# In case your code uses the __FILE__ preprocessor directive to refer to +# the filename of the current source file (e.g. in debug messages), using +# the extended path might be undesirable. For this purpose, +# AX_EXTEND_SRCDIR defines the output variable AX_EXTEND_SRCDIR_CPPFLAGS, +# which can be added to AM_CPPFLAGS in Makefile.am in order to define the +# preprocessor directive STRIPPED__FILE__. As an example, when compiling +# the file "../../i3-4.12/src/main.c", STRIPPED__FILE__ evaluates to +# "main.c". +# +# There are some caveats: When $srcdir is "." (i.e. when ./configure was +# called instead of ../configure in a separate build directory), +# AX_EXTEND_SRCDIR will still extend $srcdir, but the intended effect will +# not be achieved because of the way automake specifies file paths: +# automake defines COMPILE to use "`test -f '$source' || echo +# '\$(srcdir)/'`$source" in order to prefer files in the current directory +# over specifying $srcdir explicitly. +# +# The AX_EXTEND_SRCDIR author is not aware of any way to influence this +# automake behavior. Patches very welcome. +# +# To work around this issue, you can use AX_ENABLE_BUILDDIR i.e. by adding +# the following code to configure.ac: +# +# AX_ENABLE_BUILDDIR +# dnl ... +# AX_EXTEND_SRCDIR +# +# Then also add this bit to Makefile.am (if you wish to use +# STRIPPED__FILE__ in your code): +# +# AM_CPPFLAGS = @AX_EXTEND_SRCDIR_CPPFLAGS@ +# +# LICENSE +# +# Copyright (c) 2016 Michael Stapelberg +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AC_DEFUN([AX_EXTEND_SRCDIR], +[dnl +AS_CASE([$srcdir], + [.|.*|/*], + [ + # pwd -P is specified in IEEE 1003.1 from 2004 + as_dir=`cd "$srcdir" && pwd -P` + as_base=`AS_BASENAME([$as_dir])` + srcdir=${srcdir}/../${as_base} + + AC_SUBST([AX_EXTEND_SRCDIR_CPPFLAGS], ["-DSTRIPPED__FILE__=AS_ESCAPE([\"$$(basename $<)\"])"]) + ]) +])dnl AX_EXTEND_SRCDIR diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ext_have_lib.m4 projectm-3.1.0/m4/autoconf-archive/ax_ext_have_lib.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ext_have_lib.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ext_have_lib.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ext_have_lib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXT_HAVE_LIB(, , , ) +# +# DESCRIPTION +# +# AX_EXT_HAVE_LIB is identical to AC_SEARCH_LIBS with the exception that +# will add -L when looking, and use a different variable for +# each directory. +# +# Any required -L flags are added to LDFLAGS and located +# libraies are added to LIBS +# +# Some libraries are unlinkable without other extra libraries, which can +# be specified in the 4th argument. The mysql client library needs -lz, +# for example. +# +# Example: +# +# AX_EXT_HAVE_LIB(/lib /usr/lib /usr/local/lib /usr/lib/mysql /usr/local/mysql/lib, mysqlclient, mysql_init, [-lz]) +# +# which finds the mysql client library if succeeds system when it tries +# with -L/usr/lib/mysql then it adds -lmysqlclient to LIBS and +# -L/usr/lib/mysql to LDFLAGS. +# +# The test itself is based on the autoconf 2.53 version of AC_SEARCH_LIBS. +# +# LICENSE +# +# Copyright (c) 2008 Duncan Simpson +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_EXT_HAVE_LIB], +[ +new_ldflags=${LDFLAGS} +new_libs=$LIBS +AC_CHECK_LIB([$2], $3, new_libs="-l$2"; ext_lib_found="yes", ext_lib_found="no") +for dir in $1 +do +if test $ext_lib_found = no +then +ext_haslib_cvdir=`echo $dir | $as_tr_sh` +AC_CACHE_CHECK([for $2 library with -L$dir], [ext_cv${ext_haslib_cvdir}_haslib_$2], +[ext_func_search_save_LIBS=$LIBS +ext_func_save_ldflags=${LDFLAGS} +LIBS="-l$2 $4 ${ext_func_search_save_LIBS}" +LDFLAGS="-L$dir ${ext_func_save_ldflags}" +AC_TRY_LINK_FUNC([$3], [eval "ext_cv${ext_haslib_cvdir}_haslib_$2"="yes"], +[eval "ext_cv${ext_haslib_cvdir}_haslib_$2"="no"]) +LIBS=$ext_func_search_save_LIBS +LDFLAGS=$ext_func_save_ldflags +]) +if eval `echo 'test x${'ext_cv${ext_haslib_cvdir}_haslib_$2'}' = "xyes"`; then +new_libs="-l$2" +new_ldflags="-L${dir} ${new_ldflags}" +ext_lib_found="yes" +fi +fi +done +LIBS="$new_libs ${LIBS}" +LDFLAGS=$new_ldflags +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ext.m4 projectm-3.1.0/m4/autoconf-archive/ax_ext.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ext.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ext.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,328 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ext.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXT +# +# DESCRIPTION +# +# Find supported SIMD extensions by requesting cpuid. When a SIMD +# extension is found, the -m"simdextensionname" is added to SIMD_FLAGS if +# compiler supports it. For example, if "sse2" is available then "-msse2" +# is added to SIMD_FLAGS. +# +# Find other supported CPU extensions by requesting cpuid. When a +# processor extension is found, the -m"extensionname" is added to +# CPUEXT_FLAGS if compiler supports it. For example, if "bmi2" is +# available then "-mbmi2" is added to CPUEXT_FLAGS. +# +# This macro calls: +# +# AC_SUBST(SIMD_FLAGS) +# AC_SUBST(CPUEXT_FLAGS) +# +# And defines: +# +# HAVE_RDRND / HAVE_BMI1 / HAVE_BMI2 / HAVE_ADX / HAVE_MPX +# HAVE_PREFETCHWT1 / HAVE_ABM / HAVE_MMX / HAVE_SSE / HAVE_SSE2 +# HAVE_SSE3 / HAVE_SSSE3 / HAVE_SSE4_1 / HAVE_SSE4_2 / HAVE_SSE4a +# HAVE_SHA / HAVE_AES / HAVE_AVX / HAVE_FMA3 / HAVE_FMA4 / HAVE_XOP +# HAVE_AVX2 / HAVE_AVX512_F / HAVE_AVX512_CD / HAVE_AVX512_PF +# HAVE_AVX512_ER / HAVE_AVX512_VL / HAVE_AVX512_BW / HAVE_AVX512_DQ +# HAVE_AVX512_IFMA / HAVE_AVX512_VBMI / HAVE_ALTIVEC / HAVE_VSX +# +# LICENSE +# +# Copyright (c) 2007 Christophe Tournayre +# Copyright (c) 2013,2015 Michael Petch +# Copyright (c) 2017 Rafael de Lucena Valle +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 17 + +AC_DEFUN([AX_EXT], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_PROG_CC]) + + CPUEXT_FLAGS="" + SIMD_FLAGS="" + + case $host_cpu in + powerpc*) + AC_CACHE_CHECK([whether altivec is supported for old distros], [ax_cv_have_altivec_old_ext], + [ + if test `/usr/sbin/sysctl -a 2>/dev/null| grep -c hw.optional.altivec` != 0; then + if test `/usr/sbin/sysctl -n hw.optional.altivec` = 1; then + ax_cv_have_altivec_old_ext=yes + fi + fi + ]) + + if test "$ax_cv_have_altivec_old_ext" = yes; then + AC_DEFINE(HAVE_ALTIVEC,,[Support Altivec instructions]) + AX_CHECK_COMPILE_FLAG(-faltivec, SIMD_FLAGS="$SIMD_FLAGS -faltivec", []) + fi + + AC_CACHE_CHECK([whether altivec is supported], [ax_cv_have_altivec_ext], + [ + if test `LD_SHOW_AUXV=1 /bin/true 2>/dev/null|grep -c altivec` != 0; then + ax_cv_have_altivec_ext=yes + fi + ]) + + if test "$ax_cv_have_altivec_ext" = yes; then + AC_DEFINE(HAVE_ALTIVEC,,[Support Altivec instructions]) + AX_CHECK_COMPILE_FLAG(-maltivec, SIMD_FLAGS="$SIMD_FLAGS -maltivec", []) + fi + + AC_CACHE_CHECK([whether vsx is supported], [ax_cv_have_vsx_ext], + [ + if test `LD_SHOW_AUXV=1 /bin/true 2>/dev/null|grep -c vsx` != 0; then + ax_cv_have_vsx_ext=yes + fi + ]) + + if test "$ax_cv_have_vsx_ext" = yes; then + AC_DEFINE(HAVE_VSX,,[Support VSX instructions]) + AX_CHECK_COMPILE_FLAG(-mvsx, SIMD_FLAGS="$SIMD_FLAGS -mvsx", []) + fi + ;; + + i[[3456]]86*|x86_64*|amd64*) + + AC_REQUIRE([AX_GCC_X86_CPUID]) + AC_REQUIRE([AX_GCC_X86_CPUID_COUNT]) + AC_REQUIRE([AX_GCC_X86_AVX_XGETBV]) + + eax_cpuid0=0 + AX_GCC_X86_CPUID(0x00000000) + if test "$ax_cv_gcc_x86_cpuid_0x00000000" != "unknown"; + then + eax_cpuid0=`echo $ax_cv_gcc_x86_cpuid_0x00000000 | cut -d ":" -f 1` + fi + + eax_cpuid80000000=0 + AX_GCC_X86_CPUID(0x80000000) + if test "$ax_cv_gcc_x86_cpuid_0x80000000" != "unknown"; + then + eax_cpuid80000000=`echo $ax_cv_gcc_x86_cpuid_0x80000000 | cut -d ":" -f 1` + fi + + ecx_cpuid1=0 + edx_cpuid1=0 + if test "$((0x$eax_cpuid0))" -ge 1 ; then + AX_GCC_X86_CPUID(0x00000001) + if test "$ax_cv_gcc_x86_cpuid_0x00000001" != "unknown"; + then + ecx_cpuid1=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 3` + edx_cpuid1=`echo $ax_cv_gcc_x86_cpuid_0x00000001 | cut -d ":" -f 4` + fi + fi + + ebx_cpuid7=0 + ecx_cpuid7=0 + if test "$((0x$eax_cpuid0))" -ge 7 ; then + AX_GCC_X86_CPUID_COUNT(0x00000007, 0x00) + if test "$ax_cv_gcc_x86_cpuid_0x00000007" != "unknown"; + then + ebx_cpuid7=`echo $ax_cv_gcc_x86_cpuid_0x00000007 | cut -d ":" -f 2` + ecx_cpuid7=`echo $ax_cv_gcc_x86_cpuid_0x00000007 | cut -d ":" -f 3` + fi + fi + + ecx_cpuid80000001=0 + edx_cpuid80000001=0 + if test "$((0x$eax_cpuid80000000))" -ge "$((0x80000001))" ; then + AX_GCC_X86_CPUID(0x80000001) + if test "$ax_cv_gcc_x86_cpuid_0x80000001" != "unknown"; + then + ecx_cpuid80000001=`echo $ax_cv_gcc_x86_cpuid_0x80000001 | cut -d ":" -f 3` + edx_cpuid80000001=`echo $ax_cv_gcc_x86_cpuid_0x80000001 | cut -d ":" -f 4` + fi + fi + + AC_CACHE_VAL([ax_cv_have_mmx_os_support_ext], + [ + ax_cv_have_mmx_os_support_ext=yes + ]) + + ax_cv_have_none_os_support_ext=yes + + AC_CACHE_VAL([ax_cv_have_sse_os_support_ext], + [ + ax_cv_have_sse_os_support_ext=no, + if test "$((0x$edx_cpuid1>>25&0x01))" = 1; then + AC_LANG_PUSH([C]) + AC_TRY_RUN([ +#include +#include + /* No way at ring1 to ring3 in protected mode to check the CR0 and CR4 + control registers directly. Execute an SSE instruction. + If it raises SIGILL then OS doesn't support SSE based instructions */ + void sig_handler(int signum){ exit(1); } + int main(){ + signal(SIGILL, sig_handler); + /* SSE instruction xorps %xmm0,%xmm0 */ + __asm__ __volatile__ (".byte 0x0f, 0x57, 0xc0"); + return 0; + }], + ax_cv_have_sse_os_support_ext=yes, + ax_cv_have_sse_os_support_ext=no, + ax_cv_have_sse_os_support_ext=no) + AC_LANG_POP([C]) + fi + ]) + + xgetbv_eax=0 + if test "$((0x$ecx_cpuid1>>28&0x01))" = 1; then + AX_GCC_X86_AVX_XGETBV(0x00000000) + + if test x"$ax_cv_gcc_x86_avx_xgetbv_0x00000000" != x"unknown"; then + xgetbv_eax=`echo $ax_cv_gcc_x86_avx_xgetbv_0x00000000 | cut -d ":" -f 1` + fi + + AC_CACHE_VAL([ax_cv_have_avx_os_support_ext], + [ + ax_cv_have_avx_os_support_ext=no + if test "$((0x$ecx_cpuid1>>27&0x01))" = 1; then + if test "$((0x$xgetbv_eax&0x6))" = 6; then + ax_cv_have_avx_os_support_ext=yes + fi + fi + ]) + fi + + AC_CACHE_VAL([ax_cv_have_avx512_os_support_ext], + [ + ax_cv_have_avx512_os_support_ext=no + if test "$ax_cv_have_avx_os_support_ext" = yes; then + if test "$((0x$xgetbv_eax&0xe6))" = "$((0xe6))"; then + ax_cv_have_avx512_os_support_ext=yes + fi + fi + ]) + + for ac_instr_info dnl + in "none;rdrnd;RDRND;ecx_cpuid1,30;-mrdrnd;HAVE_RDRND;CPUEXT_FLAGS" dnl + "none;bmi1;BMI1;ebx_cpuid7,3;-mbmi;HAVE_BMI1;CPUEXT_FLAGS" dnl + "none;bmi2;BMI2;ebx_cpuid7,8;-mbmi2;HAVE_BMI2;CPUEXT_FLAGS" dnl + "none;adx;ADX;ebx_cpuid7,19;-madx;HAVE_ADX;CPUEXT_FLAGS" dnl + "none;mpx;MPX;ebx_cpuid7,14;-mmpx;HAVE_MPX;CPUEXT_FLAGS" dnl + "none;prefetchwt1;PREFETCHWT1;ecx_cpuid7,0;-mprefetchwt1;HAVE_PREFETCHWT1;CPUEXT_FLAGS" dnl + "none;abm;ABM;ecx_cpuid80000001,5;-mabm;HAVE_ABM;CPUEXT_FLAGS" dnl + "mmx;mmx;MMX;edx_cpuid1,23;-mmmx;HAVE_MMX;SIMD_FLAGS" dnl + "sse;sse;SSE;edx_cpuid1,25;-msse;HAVE_SSE;SIMD_FLAGS" dnl + "sse;sse2;SSE2;edx_cpuid1,26;-msse2;HAVE_SSE2;SIMD_FLAGS" dnl + "sse;sse3;SSE3;ecx_cpuid1,1;-msse3;HAVE_SSE3;SIMD_FLAGS" dnl + "sse;ssse3;SSSE3;ecx_cpuid1,9;-mssse3;HAVE_SSSE3;SIMD_FLAGS" dnl + "sse;sse41;SSE4.1;ecx_cpuid1,19;-msse4.1;HAVE_SSE4_1;SIMD_FLAGS" dnl + "sse;sse42;SSE4.2;ecx_cpuid1,20;-msse4.2;HAVE_SSE4_2;SIMD_FLAGS" dnl + "sse;sse4a;SSE4a;ecx_cpuid80000001,6;-msse4a;HAVE_SSE4a;SIMD_FLAGS" dnl + "sse;sha;SHA;ebx_cpuid7,29;-msha;HAVE_SHA;SIMD_FLAGS" dnl + "sse;aes;AES;ecx_cpuid1,25;-maes;HAVE_AES;SIMD_FLAGS" dnl + "avx;avx;AVX;ecx_cpuid1,28;-mavx;HAVE_AVX;SIMD_FLAGS" dnl + "avx;fma3;FMA3;ecx_cpuid1,12;-mfma;HAVE_FMA3;SIMD_FLAGS" dnl + "avx;fma4;FMA4;ecx_cpuid80000001,16;-mfma4;HAVE_FMA4;SIMD_FLAGS" dnl + "avx;xop;XOP;ecx_cpuid80000001,11;-mxop;HAVE_XOP;SIMD_FLAGS" dnl + "avx;avx2;AVX2;ebx_cpuid7,5;-mavx2;HAVE_AVX2;SIMD_FLAGS" dnl + "avx512;avx512f;AVX512-F;ebx_cpuid7,16;-mavx512f;HAVE_AVX512_F;SIMD_FLAGS" dnl + "avx512;avx512cd;AVX512-CD;ebx_cpuid7,28;-mavx512cd;HAVE_AVX512_CD;SIMD_FLAGS" dnl + "avx512;avx512pf;AVX512-PF;ebx_cpuid7,26;-mavx512pf;HAVE_AVX512_PF;SIMD_FLAGS" dnl + "avx512;avx512er;AVX512-ER;ebx_cpuid7,27;-mavx512er;HAVE_AVX512_ER;SIMD_FLAGS" dnl + "avx512;avx512vl;AVX512-VL;ebx_cpuid7,31;-mavx512vl;HAVE_AVX512_VL;SIMD_FLAGS" dnl + "avx512;avx512bw;AVX512-BW;ebx_cpuid7,30;-mavx512bw;HAVE_AVX512_BW;SIMD_FLAGS" dnl + "avx512;avx512dq;AVX512-DQ;ebx_cpuid7,17;-mavx512dq;HAVE_AVX512_DQ;SIMD_FLAGS" dnl + "avx512;avx512ifma;AVX512-IFMA;ebx_cpuid7,21;-mavx512ifma;HAVE_AVX512_IFMA;SIMD_FLAGS" dnl + "avx512;avx512vbmi;AVX512-VBMI;ecx_cpuid7,1;-mavx512vbmi;HAVE_AVX512_VBMI;SIMD_FLAGS" dnl + # + do ac_instr_os_support=$(eval echo \$ax_cv_have_$(echo $ac_instr_info | cut -d ";" -f 1)_os_support_ext) + ac_instr_acvar=$(echo $ac_instr_info | cut -d ";" -f 2) + ac_instr_shortname=$(echo $ac_instr_info | cut -d ";" -f 3) + ac_instr_chk_loc=$(echo $ac_instr_info | cut -d ";" -f 4) + ac_instr_chk_reg=0x$(eval echo \$$(echo $ac_instr_chk_loc | cut -d "," -f 1)) + ac_instr_chk_bit=$(echo $ac_instr_chk_loc | cut -d "," -f 2) + ac_instr_compiler_flags=$(echo $ac_instr_info | cut -d ";" -f 5) + ac_instr_have_define=$(echo $ac_instr_info | cut -d ";" -f 6) + ac_instr_flag_type=$(echo $ac_instr_info | cut -d ";" -f 7) + + AC_CACHE_CHECK([whether ${ac_instr_shortname} is supported by the processor], [ax_cv_have_${ac_instr_acvar}_cpu_ext], + [ + eval ax_cv_have_${ac_instr_acvar}_cpu_ext=no + if test "$((${ac_instr_chk_reg}>>${ac_instr_chk_bit}&0x01))" = 1 ; then + eval ax_cv_have_${ac_instr_acvar}_cpu_ext=yes + fi + ]) + + if test x"$(eval echo \$ax_cv_have_${ac_instr_acvar}_cpu_ext)" = x"yes"; then + AC_CACHE_CHECK([whether ${ac_instr_shortname} is supported by the processor and OS], [ax_cv_have_${ac_instr_acvar}_ext], + [ + eval ax_cv_have_${ac_instr_acvar}_ext=no + if test x"${ac_instr_os_support}" = x"yes"; then + eval ax_cv_have_${ac_instr_acvar}_ext=yes + fi + ]) + + if test "$(eval echo \$ax_cv_have_${ac_instr_acvar}_ext)" = yes; then + AX_CHECK_COMPILE_FLAG(${ac_instr_compiler_flags}, eval ax_cv_support_${ac_instr_acvar}_ext=yes, + eval ax_cv_support_${ac_instr_acvar}_ext=no) + if test x"$(eval echo \$ax_cv_support_${ac_instr_acvar}_ext)" = x"yes"; then + eval ${ac_instr_flag_type}=\"\$${ac_instr_flag_type} ${ac_instr_compiler_flags}\" + AC_DEFINE_UNQUOTED([${ac_instr_have_define}]) + else + AC_MSG_WARN([Your processor and OS supports ${ac_instr_shortname} instructions but not your compiler, can you try another compiler?]) + fi + else + if test x"${ac_instr_os_support}" = x"no"; then + AC_CACHE_VAL(ax_cv_support_${ac_instr_acvar}_ext, eval ax_cv_support_${ac_instr_acvar}_ext=no) + AC_MSG_WARN([Your processor supports ${ac_instr_shortname}, but your OS doesn't]) + fi + fi + else + AC_CACHE_VAL(ax_cv_have_${ac_instr_acvar}_ext, eval ax_cv_have_${ac_instr_acvar}_ext=no) + AC_CACHE_VAL(ax_cv_support_${ac_instr_acvar}_ext, eval ax_cv_support_${ac_instr_acvar}_ext=no) + fi + done + ;; + esac + + AH_TEMPLATE([HAVE_RDRND],[Define to 1 to support Digital Random Number Generator]) + AH_TEMPLATE([HAVE_BMI1],[Define to 1 to support Bit Manipulation Instruction Set 1]) + AH_TEMPLATE([HAVE_BMI2],[Define to 1 to support Bit Manipulation Instruction Set 2]) + AH_TEMPLATE([HAVE_ADX],[Define to 1 to support Multi-Precision Add-Carry Instruction Extensions]) + AH_TEMPLATE([HAVE_MPX],[Define to 1 to support Memory Protection Extensions]) + AH_TEMPLATE([HAVE_PREFETCHWT1],[Define to 1 to support Prefetch Vector Data Into Caches WT1]) + AH_TEMPLATE([HAVE_ABM],[Define to 1 to support Advanced Bit Manipulation]) + AH_TEMPLATE([HAVE_MMX],[Define to 1 to support Multimedia Extensions]) + AH_TEMPLATE([HAVE_SSE],[Define to 1 to support Streaming SIMD Extensions]) + AH_TEMPLATE([HAVE_SSE2],[Define to 1 to support Streaming SIMD Extensions]) + AH_TEMPLATE([HAVE_SSE3],[Define to 1 to support Streaming SIMD Extensions 3]) + AH_TEMPLATE([HAVE_SSSE3],[Define to 1 to support Supplemental Streaming SIMD Extensions 3]) + AH_TEMPLATE([HAVE_SSE4_1],[Define to 1 to support Streaming SIMD Extensions 4.1]) + AH_TEMPLATE([HAVE_SSE4_2],[Define to 1 to support Streaming SIMD Extensions 4.2]) + AH_TEMPLATE([HAVE_SSE4a],[Define to 1 to support AMD Streaming SIMD Extensions 4a]) + AH_TEMPLATE([HAVE_SHA],[Define to 1 to support Secure Hash Algorithm Extension]) + AH_TEMPLATE([HAVE_AES],[Define to 1 to support Advanced Encryption Standard New Instruction Set (AES-NI)]) + AH_TEMPLATE([HAVE_AVX],[Define to 1 to support Advanced Vector Extensions]) + AH_TEMPLATE([HAVE_FMA3],[Define to 1 to support Fused Multiply-Add Extensions 3]) + AH_TEMPLATE([HAVE_FMA4],[Define to 1 to support Fused Multiply-Add Extensions 4]) + AH_TEMPLATE([HAVE_XOP],[Define to 1 to support eXtended Operations Extensions]) + AH_TEMPLATE([HAVE_AVX2],[Define to 1 to support Advanced Vector Extensions 2]) + AH_TEMPLATE([HAVE_AVX512_F],[Define to 1 to support AVX-512 Foundation Extensions]) + AH_TEMPLATE([HAVE_AVX512_CD],[Define to 1 to support AVX-512 Conflict Detection Instructions]) + AH_TEMPLATE([HAVE_AVX512_PF],[Define to 1 to support AVX-512 Conflict Prefetch Instructions]) + AH_TEMPLATE([HAVE_AVX512_ER],[Define to 1 to support AVX-512 Exponential & Reciprocal Instructions]) + AH_TEMPLATE([HAVE_AVX512_VL],[Define to 1 to support AVX-512 Vector Length Extensions]) + AH_TEMPLATE([HAVE_AVX512_BW],[Define to 1 to support AVX-512 Byte and Word Instructions]) + AH_TEMPLATE([HAVE_AVX512_DQ],[Define to 1 to support AVX-512 Doubleword and Quadword Instructions]) + AH_TEMPLATE([HAVE_AVX512_IFMA],[Define to 1 to support AVX-512 Integer Fused Multiply Add Instructions]) + AH_TEMPLATE([HAVE_AVX512_VBMI],[Define to 1 to support AVX-512 Vector Byte Manipulation Instructions]) + AC_SUBST(SIMD_FLAGS) + AC_SUBST(CPUEXT_FLAGS) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_extra_dist.m4 projectm-3.1.0/m4/autoconf-archive/ax_extra_dist.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_extra_dist.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_extra_dist.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,75 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_extra_dist.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_EXTRA_DIST +# +# DESCRIPTION +# +# Allow support for custom dist targets. +# +# To add custom dist targets, you must create a dist- target within +# your Makefile.am, where is the name of the dist and then add +# to EXTRA_SRC_DISTS or EXTRA_BIN_DISTS. For example: +# +# dist-foobar: +# +# +# EXTRA_BIN_DISTS += foobar +# +# You can then build all the src dist targets by running: +# +# make dist-src +# +# You can build all the binary dist targets by running: +# +# make dist-bin +# +# and you can build both the src and dist targets by running: +# +# make all-dist +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_EXTRA_DIST], +[ +AC_MSG_NOTICE([adding custom dist support]) +AM_CONDITIONAL(USING_AX_EXTRA_DIST, [true]) +AX_ADD_AM_MACRO_STATIC([ +EXTRA_SRC_DISTS = +EXTRA_BIN_DISTS = +dist-src-extra: + @echo \"Making custom src targets...\" + @cd \$(top_builddir); \\ + list='\$(EXTRA_SRC_DISTS)'; \\ + for dist in \$\$list; do \\ + \$(MAKE) \$(AM_MAKEFLAGS) dist-\$\$dist; \\ + done + +dist-src: dist-all dist-src-extra + + +dist-bin: + @echo \"Making custom binary targets...\" + @cd \$(top_builddir); \\ + list='\$(EXTRA_BIN_DISTS)'; \\ + for dist in \$\$list; do \\ + \$(MAKE) \$(AM_MAKEFLAGS) dist-\$\$dist; \\ + done + +all-dist dist2 dist-all2: dist-src dist-bin + +all-dist-check dist2-check dist-all-check: dist-check dist-src-extra dist-bin +]) +])# AX_EXTRA_DIST diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f77_cmain_fflags.m4 projectm-3.1.0/m4/autoconf-archive/ax_f77_cmain_fflags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f77_cmain_fflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f77_cmain_fflags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,102 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_f77_cmain_fflags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_F77_CMAIN_FFLAGS([ACTION-IF-SUCCEED], [ACTION-IF-FAIL]) +# +# DESCRIPTION +# +# This macro figures out if extra Fortran compiler flags are required in +# order to use the Fortran linker to link programs where the main() +# function is defined via C (or other language). On some systems, notably +# the Alpha with Compaq compilers, the Fortran libraries have their own +# main() function which must be disabled. +# +# Runs ACTION-IF-SUCCEED if successful, and ACTION-IF-FAIL if not. Defines +# the output variable F77_CMAIN_FFLAGS to any discovered flags. (If +# ACTION-IF-FAIL is not specified, defaults to halting with an error.) +# +# This macro is especially useful in conjunction with automake, since by +# default automake uses $F77 to link programs mixing C and Fortran, +# leading to a link error on some systems. In this case, you should set +# the FFLAGS for that program to include F77_CMAIN_FFLAGS. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([ACX_F77_CMAIN_FFLAGS], [AX_F77_CMAIN_FFLAGS]) +AC_DEFUN([AX_F77_CMAIN_FFLAGS], +[AC_CACHE_CHECK([for f77 flags to use C main function], ax_cv_f77_cmain_fflags, +[ax_cv_f77_cmain_fflags="unknown" +AC_LANG_PUSH(C) +AC_COMPILE_IFELSE([[int main(void) { return 0; }]], + [mv conftest.$ac_objext conftest_cmain.$ac_objext], + [ax_cv_f77_cmain_fflags=error]) +AC_LANG_POP(C) +if test "x$ax_cv_f77_cmain_fflags" != xerror; then + AC_LANG_PUSH(Fortran 77) + ax_save_LIBS=$LIBS + LIBS="conftest_cmain.$ac_objext $LIBS" + ax_save_FFLAGS=$FFLAGS + for ax_flag in none -nofor_main; do + case $ax_flag in + none) FFLAGS=$ax_save_FFLAGS ;; + *) FFLAGS="$ax_save_FFLAGS $ax_flag" ;; + esac + AC_LINK_IFELSE([ + subroutine foobar() + return + end +], [ax_cv_f77_cmain_fflags=$ax_flag; break]); + done + FFLAGS=$ax_save_FFLAGS + LIBS=$ax_save_LIBS + AC_LANG_POP(Fortran 77) +fi]) + case $ax_cv_f77_cmain_fflags in + error|unknown) + F77_CMAIN_FFLAGS="" + ifelse([$2],,[AC_MSG_ERROR([cannot link C main with Fortran])],[$2]) + ;; + *) + if test "x$ax_cv_f77_cmain_fflags" = xnone; then + F77_CMAIN_FFLAGS="" + else + F77_CMAIN_FFLAGS="$ax_cv_f77_cmain_fflags" + fi + $1 + ;; + esac + AC_SUBST(F77_CMAIN_FFLAGS) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_header.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_header.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_header.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_header.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_f90_header.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_F90_HEADER(HEADER, HEADER-REGEXP, FUNCTION-BODY [, SEARCH-PATH [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# Set up the compiler flags to use a given fortran 90 header. HEADER is +# the name of the header. HEADER-REGEXP is a regular expression (used by +# find) matched by the filename of the header. FUNCTION-BODY is the body +# of a function (including the 'use' statement and the call to a function +# defined by the module) SEARCH-PATH is a colon-separated list of +# directories that will be recursively searched for header files. If +# empty, the search path will be composed of $prefix, $ac_default_prefix, +# and all directories exactly one level *above* the directories in +# $LD_LIBRARY_PATH (the rationale is that when libraries are put in +# /some/path/lib, the headers are often put in a directory like +# /some/path/include). An output variable named F90_HEADER_xxx will be set +# up with the proper flag for substitution in Makefiles (xxx is built from +# the first argument, with autoconf traditional escapes). +# +# LICENSE +# +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_F90_HEADER],[ + AX_F90_INTERNAL_HEADMOD([$1 fortran 90 header],[$2],-I, + [$3],AS_TR_SH(F90_HEADER_$1),[$4],[$5],[$6]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_internal_headmod.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_internal_headmod.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_internal_headmod.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_internal_headmod.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_f90_internal_headmod.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_F90_INTERNAL_HEADMOD(MESSAGE, FILE-REGEXP, FLAG, FUNCTION-BODY, OUTPUT-VAR[, SEARCH-PATH [, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# Internal macro used by AX_F90_HEADER and AX_F90_MODULE. +# +# LICENSE +# +# Copyright (c) 2009 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_F90_INTERNAL_HEADMOD],[ +AS_VAR_PUSHDEF([ax_include],[ax_cv_f90_headmod_$2]) +AC_MSG_CHECKING([$1]) +AC_LANG_PUSH(Fortran) +AS_VAR_SET(ax_include,"not found") +if test "x$6" = x ; then +ax_search="$prefix:$ac_default_prefix" +for ax_base in "" `echo $LD_LIBRARY_PATH | tr ':' '\012'` ; do + if test "x$ax_base" != x ; then + changequote(,)dnl + ax_base=`echo $ax_base | sed 's,/[^/]*$,,'` + changequote([,])dnl + ax_search="${ax_search}:${ax_base}" + fi +done +else +ax_search="$6" +fi +for ax_base in `echo $ax_search | tr ':' '\012'` ; do + if test "AS_VAR_GET(ax_include)" = "not found" ; then + for ax_mod in "" `find $ax_base -follow -name $2 -print` ; do + if test "x$ax_mod" != x ; then + changequote(,)dnl + ax_dir=`echo $ax_mod | sed 's,/[^/]*$,,'` + changequote([,])dnl + ax_save_FCFLAGS="$FCFLAGS" + FCFLAGS="$ax_save_FCFLAGS $3$ax_dir" + AC_COMPILE_IFELSE([subroutine conftest_routine +$4 + end subroutine conftest_routine + ],AS_VAR_SET(ax_include,"$3$ax_dir"),[]) + FCFLAGS="$ax_save_FCFLAGS" + fi + done + fi +done +AC_LANG_POP(Fortran) +AC_MSG_RESULT([AS_VAR_GET(ax_include)]) +if test "AS_VAR_GET(ax_include)" = "not found"; then + $5="" + $8 +else + $5="AS_VAR_GET(ax_include)" + $7 +fi +AC_SUBST($5) +AS_VAR_POPDEF([ax_include]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_library.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_library.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_library.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_library.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,111 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_f90_library.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_F90_LIBRARY(LIBRARY, LIB-REGEXP, FUNCTION-BODY [, SEARCH-PATH [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# Set up the compiler flags to link a given fortran 90 library LIBRARY is +# the name of the library. LIB-REGEXP is a regular expression (used by +# find) matched by the filename of the library, this is useful either if +# the library filename does not follow the traditional libxxx.a or +# libxxx.so pattern, or if some specific information is embedded into the +# name, like compiler used, debugging status ...). FUNCTION-BODY is the +# body of a function (including the 'use' statements and the call to a +# function defined by the library) SEARCH-PATH is a colon-separated list +# of directories that will be used as the base directories for 'find' to +# look for the library file. If empty, the search path will be composed of +# $prefix/lib, $ac_default_prefix/lib, and $LD_LIBRARY_PATH. Two output +# variables named F90_LDFLAGS_xxx and F90_LIBS_xxx will be set up with the +# proper flag for substitution in Makefiles (xxx is built from the first +# argument, with autoconf traditional escapes). +# +# LICENSE +# +# Copyright (c) 2009 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +AC_DEFUN([AX_F90_LIBRARY],[ +AS_VAR_PUSHDEF([ax_ldflags],[ax_cv_f90_ldflags_$1]) +AS_VAR_PUSHDEF([ax_libs],[ax_cv_f90_libs_$1]) +AC_MSG_CHECKING([$1 Fortran 90 library]) +AC_LANG_PUSH(Fortran) +AS_VAR_SET([ax_ldflags],"") +AS_VAR_SET([ax_libs],"not found") +if test "x$4" = x ; then + if test "x$prefix" != "xNONE" ; then + ax_search="$prefix:$ac_default_prefix" + else + ax_search="$ac_default_prefix" + fi +for ax_base in "" `echo $LD_LIBRARY_PATH | tr ':' '\012'` ; do + if test "x$ax_base" != x ; then + changequote(,)dnl + ax_base=`echo $ax_base | sed 's,/[^/]*$,,'` + changequote([,])dnl + ax_search="${ax_search}:${ax_base}" + fi +done +else +ax_search="$4" +fi +ax_save_LDFLAGS="$LDFLAGS" +ax_save_LIBS="$LIBS" +for ax_base in `echo $ax_search | tr ':' '\012'` ; do + if test "AS_VAR_GET(ax_libs)" = "not found" ; then + for ax_lib in "" `find $ax_base -follow -name '$2' -print` ; do + if test "x$ax_lib" != x ; then + changequote(,)dnl + ax_dir=`echo $ax_lib | sed 's,/[^/]*$,,'` + ax_lib=`echo $ax_lib | sed 's,.*/\([^/]*\)$,\1,'` + changequote([,])dnl + case "$ax_lib" in + lib*) + changequote(,)dnl + ax_lib="`echo $ax_lib | sed 's,lib\(.*\)\.[^.]*$,\1,'`" + changequote([,])dnl + AS_VAR_SET([ax_ldflags],"-L$ax_dir") + AS_VAR_SET([ax_libs],"-l$ax_lib") + ;; + *) + AS_VAR_SET([ax_ldflags],"") + AS_VAR_SET(ax_libs,"$ax_lib") + ;; + esac + LDFLAGS="$ax_save_LDFLAGS AS_VAR_GET(ax_ldflags)" + LIBS="AS_VAR_GET(ax_libs) $ax_save_LIBS" + AC_LINK_IFELSE([program conftest_program +$3 + end program conftest_program + ],[],[AS_VAR_SET(ax_ldflags,"") + AS_VAR_SET(ax_libs,"not found") + ]) + fi + done + fi +done +AC_LANG_POP(Fortran) +AC_MSG_RESULT([AS_VAR_GET(ax_ldflags) AS_VAR_GET(ax_libs)]) +if test "AS_VAR_GET(ax_libs)" = "not found"; then + AS_TR_SH(F90_LDFLAGS_$1)="" + AS_TR_SH(F90_LIBS_$1)="" + $6 +else + AS_TR_SH(F90_LDFLAGS_$1)=AS_VAR_GET(ax_ldflags) + AS_TR_SH(F90_LIBS_$1)=AS_VAR_GET(ax_libs) + $5 +fi +AC_SUBST(AS_TR_SH(F90_LDFLAGS_$1)) +AC_SUBST(AS_TR_SH(F90_LIBS_$1)) +AS_VAR_POPDEF([ax_libs]) +AS_VAR_POPDEF([ax_ldflags]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_library_setup.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_library_setup.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_library_setup.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_library_setup.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,79 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_f90_library_setup.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_F90_LIBRARY_SETUP(LIBRARY, HEADER-REGEXP, MODULE-REGEXP, LIB-REGEXP, FUNCTION-BODY) +# +# DESCRIPTION +# +# Convenience macro to set up a fortran 90 library in a simplified way. +# LIBRARY is the name of the library. HEADER-REGEXP is a regular +# expression (used by find) matched by the header file to look for (may be +# empty). MODULE-REGEXP is a regular expression (used by find) matched by +# the filename of the module (may be empty). LIB-REGEXP is a regular +# expression (used by find) matched by the filename of the library, this +# is useful either if the library filename does not follow the traditional +# libxxx.a or libxxx.so pattern, or if some specific information is +# embedded into the name, like compiler used, debugging status ...). +# FUNCTION-BODY is the body of a function (including the 'use' statements +# and the call to a function defined by the library). +# +# This macro is a simple wrapper around AX_F90_MODULE and AX_F90_LIBRARY +# that uses the parameters provided by the end user through a --with-xxx +# option to set up the search path. Both a module and a library will be +# tested, the same path will be used for both tests, so the path must be +# set up with a common parent directory of both the library file and the +# module file. The macro also automatically updates the FCFLAGS, LDFLAGS +# and LIBS variables in addition to providing the F90_HEADER_xxx, +# F90_MODULE_xxx, F90_LDFLAGS_xxx and F90_LIBS_xxx output variables. +# +# Example: suppose you have /home/nostradamus/esoteric/lib/libalchemy.a +# and /home/nostradamus/esoteric/mod/alchemy.mod which provides a function +# transmute_into_gold, you can use the following in you configure.ac: +# +# AX_F90_MODULE_EXTENSION +# if test x$ax_cv_f90_modext = xunknown ; then +# AC_MSG_ERROR([unable to find f90 modules extension]) +# fi +# AX_F90_LIBRARY_SETUP(alchemy,[],alchemy.$ax_cv_f90_modext,libalchemy*,[ +# use alchemy +# call transmute_into_gold('lead') +# ]) +# +# and the user could configure your package using a command like this: +# +# ./configure --with-alchemy=$HOME/esoteric +# +# LICENSE +# +# Copyright (c) 2009 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_F90_LIBRARY_SETUP],[ + AC_ARG_WITH([$1],[ --with-$1=path specify search path form $1 module and library], + [if test x${withval} = xno ; then + AC_MSG_WARN([$1 disabled at user option]) + fi],[withval=""]) + if test x$2 != x ; then + AX_F90_HEADER([$1],[$2],[$5],$withval,[ + FCFLAGS="$FCFLAGS $AS_TR_SH(F90_HEADER_$1)" + ],[]) + fi + if test x$3 != x ; then + AX_F90_MODULE([$1],[$3],[$5],$withval,[ + FCFLAGS="$FCFLAGS $AS_TR_SH(F90_MODULE_$1)" + ],[]) + fi + AX_F90_LIBRARY([$1],[$4],[$5],$withval,[ + LDFLAGS="$LDFLAGS $AS_TR_SH(F90_LDFLAGS_$1)" + LIBS="$AS_TR_SH(F90_LIBS_$1) $LIBS" + ],[]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_module_extension.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_module_extension.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_module_extension.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_module_extension.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,59 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_f90_module_extension.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_F90_MODULE_EXTENSION +# +# DESCRIPTION +# +# Find Fortran 90 modules file extension. The module extension is stored +# in the cached variable ax_f90_modext, or "unknown" if the extension +# cannot be found. +# +# LICENSE +# +# Copyright (c) 2009 Luc Maisonobe +# Copyright (c) 2009 Alexander Pletzer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_F90_MODULE_EXTENSION],[ +AC_CACHE_CHECK([fortran 90 modules extension], +ax_cv_f90_modext, +[AC_LANG_PUSH(Fortran) +i=0 +while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do + i=`expr $i + 1` +done +mkdir tmpdir_$i +cd tmpdir_$i +AC_COMPILE_IFELSE([ +!234567 + module conftest_module + contains + subroutine conftest_routine + write(*,'(a)') 'gotcha!' + end subroutine conftest_routine + end module conftest_module + ], + [ax_cv_f90_modext=`ls | sed -n 's,conftest_module\.,,p'` + if test x$ax_cv_f90_modext = x ; then +dnl Some F90 compilers put module filename in uppercase letters + ax_cv_f90_modext=`ls | sed -n 's,CONFTEST_MODULE\.,,p'` + if test x$ax_cv_f90_modext = x ; then + ax_cv_f90_modext="" + fi + fi + ], + [ax_cv_f90_modext=""]) +cd .. +rm -fr tmpdir_$i +AC_LANG_POP(Fortran) +])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_module_flag.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_module_flag.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_module_flag.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_module_flag.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_f90_module_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_F90_MODULE_FLAG +# +# DESCRIPTION +# +# Find Fortran 90 modules inclusion flag. The module inclusion flag is +# stored in the cached variable ax_f90_modflag. An error is triggered if +# the flag cannot be found. Supported are the -I GNU compilers flag, the +# -M SUN compilers flag, and the -p Absoft Pro Fortran compiler flag. +# +# LICENSE +# +# Copyright (c) 2009 Luc Maisonobe +# Copyright (c) 2009 Julian C. Cummings +# Copyright (c) 2009 Alexander Pletzer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +AC_DEFUN([AX_F90_MODULE_FLAG],[ +AC_CACHE_CHECK([fortran 90 modules inclusion flag], +ax_cv_f90_modflag, +[AC_LANG_PUSH(Fortran) +i=0 +while test \( -f tmpdir_$i \) -o \( -d tmpdir_$i \) ; do + i=`expr $i + 1` +done +mkdir tmpdir_$i +cd tmpdir_$i +AC_COMPILE_IFELSE([ +!234567 + module conftest_module + contains + subroutine conftest_routine + write(*,'(a)') 'gotcha!' + end subroutine conftest_routine + end module conftest_module + ],[],[]) +cd .. +ax_cv_f90_modflag="not found" +for ax_flag in "-I " "-I" "-M" "-p"; do + if test "$ax_cv_f90_modflag" = "not found" ; then + ax_save_FCFLAGS="$FCFLAGS" + FCFLAGS="$ax_save_FCFLAGS ${ax_flag}tmpdir_$i" + AC_COMPILE_IFELSE([ +!234567 + program conftest_program + use conftest_module + call conftest_routine + end program conftest_program + ],[ax_cv_f90_modflag="$ax_flag"],[]) + FCFLAGS="$ax_save_FCFLAGS" + fi +done +rm -fr tmpdir_$i +if test "$ax_cv_f90_modflag" = "not found" ; then + AC_MSG_ERROR([unable to find compiler flag for modules inclusion]) +fi +AC_LANG_POP(Fortran) +])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_module.m4 projectm-3.1.0/m4/autoconf-archive/ax_f90_module.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_f90_module.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_f90_module.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_f90_module.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_F90_MODULE(MODULE, MODULE-REGEXP, FUNCTION-BODY [, SEARCH-PATH [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# Set up the compiler flags to use a given fortran 90 module MODULE is the +# name of the module. MODULE-REGEXP is a regular expression (used by find) +# matched by the filename of the module. FUNCTION-BODY is the body of a +# function (including the 'use' statement and the call to a function +# defined by the module) SEARCH-PATH is a colon-separated list of +# directories that will be recursively searched for modules files. If +# empty, the search path will be composed of $prefix, $ac_default_prefix, +# and all directories exactly one level *above* the directories in +# $LD_LIBRARY_PATH (the rationale is that when libraries are put in +# /some/path/lib, the modules are often put in a directory like +# /some/path/include or /some/path/mod or something similar). An output +# variable named F90_MODULE_xxx will be set up with the proper flag for +# substitution in Makefiles (xxx is built from the first argument, with +# autoconf traditional escapes). +# +# LICENSE +# +# Copyright (c) 2009 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_F90_MODULE],[ + AC_REQUIRE([AX_F90_MODULE_FLAG]) + AX_F90_INTERNAL_HEADMOD([$1 fortran 90 module],[$2],"$ax_cv_f90_modflag", + [$3],AS_TR_SH(F90_MODULE_$1),[$4],[$5],[$6]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_fc_check_define.m4 projectm-3.1.0/m4/autoconf-archive/ax_fc_check_define.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_fc_check_define.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_fc_check_define.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_fc_check_define.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FC_CHECK_DEFINE([symbol], [ACTION-IF-FOUND], [ACTION-IF-NOT]) +# +# DESCRIPTION +# +# This macro checks to see if the Fortran pre-processor has a symbol +# defined. +# +# Consider a usage like: +# +# AC_FC_PP_DEFINE() +# AX_FC_CHECK_DEFINE(__BIGGEST_ALIGNMENT__, [], +# AX_APPEND_FLAG([${FC_DEFINE}__BIGGEST_ALIGNMENT__=64], +# [FCFLAGS])) +# +# LICENSE +# +# Copyright (c) 2016 Timothy Brown +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_FC_CHECK_DEFINE], [ + +AS_VAR_PUSHDEF([ax_var],[ax_cv_defined_$1])dnl +AC_LANG_PUSH([Fortran]) +ax_fc_check_define_srcext_save=$ac_fc_srcext +AC_FC_PP_SRCEXT([F]) +AC_CACHE_CHECK([if $1 is defined], [ax_var], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ +#ifdef $1 + integer :: ok +#else + choke me +#endif + ]])], + [AS_VAR_SET([ax_var], yes)], + [AS_VAR_SET([ax_var], no)])) +AS_IF([test AS_VAR_GET([ax_var]) != "no"], [$2], [$3]) +ac_fc_srcext=$ax_fc_check_define_srcext_save +AC_LANG_POP()dnl +AS_VAR_POPDEF([ax_var])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_file_escapes.m4 projectm-3.1.0/m4/autoconf-archive/ax_file_escapes.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_file_escapes.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_file_escapes.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,30 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FILE_ESCAPES +# +# DESCRIPTION +# +# Writes the specified data to the specified file. +# +# LICENSE +# +# Copyright (c) 2008 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_FILE_ESCAPES],[ +AX_DOLLAR="\$" +AX_SRB="\\135" +AX_SLB="\\133" +AX_BS="\\\\" +AX_DQ="\"" +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_find_hamcrest.m4 projectm-3.1.0/m4/autoconf-archive/ax_find_hamcrest.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_find_hamcrest.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_find_hamcrest.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_find_hamcrest.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FIND_HAMCREST +# +# DESCRIPTION +# +# AX_FIND_HAMCREST will look for the Hamcrest java library. When found its +# path will be put in HAMCREST_CPF as a classpath fragment. +# +# To override the location define HAMCREST_JAR to the wanted path. +# +# LICENSE +# +# Copyright (c) 2013 Sveinung Kvilhaugsvik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_ARG_VAR(HAMCREST_JAR, + [the location of the Hamcrest Matcher java library]) + +AC_DEFUN([AX_FIND_HAMCREST], [ + AC_CACHE_VAL(ax_cv_hamcrest_cpf, [ + AS_IF([test x"$HAMCREST_JAR" != x], + [ax_cv_hamcrest_cpf="$HAMCREST_JAR$PATH_SEPARATOR"], [ + AX_XTRA_CLASSPATH(ax_cv_hamcrest_cpf, org.hamcrest.Matcher, + [hamcrest-core-1.3.jar hamcrest-core.jar])])]) + + AS_IF([test x"$ax_cv_hamcrest_cpf" != x], + [AC_SUBST(HAMCREST_CPF, $ax_cv_hamcrest_cpf)], + AC_MSG_WARN([Hamcrest Matcher not found]))]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_find_junit.m4 projectm-3.1.0/m4/autoconf-archive/ax_find_junit.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_find_junit.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_find_junit.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_find_junit.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FIND_JUNIT +# +# DESCRIPTION +# +# AX_FIND_JUNIT will look for the JUnit java library. When found its path +# will be put in JUNIT_CPF as a classpath fragment. +# +# To override the location define JUNIT_JAR to the wanted path. +# +# LICENSE +# +# Copyright (c) 2013 Sveinung Kvilhaugsvik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_ARG_VAR(JUNIT_JAR, [the location of JUnit 4]) + +AC_DEFUN([AX_FIND_JUNIT], [ + AC_CACHE_VAL(ax_cv_junit_cpf, [ + AS_IF([test x"$JUNIT_JAR" != x], + [ax_cv_junit_cpf="$JUNIT_JAR$PATH_SEPARATOR"], [ + AX_XTRA_CLASSPATH(ax_cv_junit_cpf, org.junit.Assert, + [junit4-4.11.jar junit4.jar junit.jar]) + + # junit.jar may not have org.hamcrest.Matcher + classpath_when_starting_ax_find_junit="$CLASSPATH" + CLASSPATH="$ax_cv_junit_cpf$classpath_when_starting_ax_find_junit" + AC_CHECK_CLASS(org.hamcrest.Matcher, + built_in_hamcrest=yes, built_in_hamcrest=no) + CLASSPATH="$classpath_when_starting_ax_find_junit" + + AS_IF([test x"$built_in_hamcrest" = xno], [ + AX_FIND_HAMCREST + ax_cv_junit_cpf="$HAMCREST_CPF$ax_cv_junit_cpf"])])]) + + AS_IF([test x"$ax_cv_junit_cpf" != x], [ + AC_MSG_NOTICE([JUnit 4 found $ax_cv_junit_cpf]) + AC_SUBST(JUNIT_CPF, $ax_cv_junit_cpf)], + AC_MSG_WARN([JUnit 4 not found]))]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_find_scala_stdlib.m4 projectm-3.1.0/m4/autoconf-archive/ax_find_scala_stdlib.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_find_scala_stdlib.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_find_scala_stdlib.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,39 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_find_scala_stdlib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FIND_SCALA_STDLIB +# +# DESCRIPTION +# +# AX_FIND_SCALA_STDLIB will look for the Scala Standard Library. When +# found its path will be put in SCALA_STDLIB_CPF as a classpath fragment. +# +# To override the location define SCALA_STDLIB to the wanted path +# +# LICENSE +# +# Copyright (c) 2013 Sveinung Kvilhaugsvik +# +# Copying and distribution of this file, with or without modification,are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_ARG_VAR(SCALA_STDLIB, [path to the Scala Standard Library]) + +AC_DEFUN([AX_FIND_SCALA_STDLIB], [ + AC_CACHE_VAL(ax_cv_scala_libray, [ + AS_IF([test x"$SCALA_STDLIB" != x], + [ax_cv_scala_stdlib_cpf="$SCALA_STDLIB$PATH_SEPARATOR"], + [AX_XTRA_CLASSPATH(ax_cv_scala_stdlib_cpf, + scala.collection.immutable.List, scala-library.jar)])]) + + AS_IF([test x"$ax_cv_scala_stdlib_cpf" != x], [ + AC_MSG_NOTICE([Scala Standard Library found $ax_cv_scala_stdlib_cpf]) + AC_SUBST(SCALA_STDLIB_CPF, $ax_cv_scala_stdlib_cpf) + ], AC_MSG_WARN([Scala Standard Library not found]))]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_forceinline.m4 projectm-3.1.0/m4/autoconf-archive/ax_forceinline.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_forceinline.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_forceinline.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_forceinline.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FORCEINLINE() +# +# DESCRIPTION +# +# Provides a test for C compiler support of forced inlining. If usable, +# #define FORCEINLINE to the appropriate force inline keyword. Otherwise +# #define FORCEINLINE to be 'inline'. +# +# LICENSE +# +# Copyright (c) 2008 Alan Woodland +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_FORCEINLINE], [ + AC_LANG_PUSH([C]) + AC_MSG_CHECKING(for forced inline keyword) + AC_CACHE_VAL(ac_cv_forceinline, [ + ax_forceinline_keywords="__forceinline inline none" + for ax_forceinline_keyword in $ax_forceinline_keywords; do + case $ax_forceinline_keyword in + none) ac_cv_forceinline=none ; break ;; + *) + AC_TRY_COMPILE( + [#include + ] $ax_forceinline_keyword [ + static void + foo(void) { + exit(1); + }], + [], + [ac_cv_forceinline=$ax_forceinline_keyword ; break], + ac_cv_forceinline=none + ) + esac + done +]) + + if test "$ac_cv_forceinline" = "none"; then + ax_forceinline_keyword= + else + ax_forceinline_keyword=$ac_cv_forceinline + fi + AC_DEFINE_UNQUOTED([FORCEINLINE],$ax_forceinline_keyword, + [The most forceful inline keyword known by the compiler]) + AC_MSG_RESULT($ac_cv_forceinline) + AC_LANG_POP([C]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_accept_argtypes.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_accept_argtypes.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_accept_argtypes.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_accept_argtypes.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,90 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_func_accept_argtypes.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_FUNC_ACCEPT_ARGTYPES +# +# DESCRIPTION +# +# Checks the data types of the three arguments to accept(). Results are +# placed into the symbols ACCEPT_TYPE_ARG[123], consistent with the +# following example: +# +# #define ACCEPT_TYPE_ARG1 int +# #define ACCEPT_TYPE_ARG2 struct sockaddr * +# #define ACCEPT_TYPE_ARG3 socklen_t * +# +# This macro requires AC_CHECK_HEADERS to have already verified the +# presence or absence of sys/types.h and sys/socket.h. +# +# NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES +# macro. Credit for that one goes to David MacKenzie et. al. +# +# LICENSE +# +# Copyright (c) 2008 Daniel Richard G. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_FUNC_ACCEPT_ARGTYPES], [AX_FUNC_ACCEPT_ARGTYPES]) +AC_DEFUN([AX_FUNC_ACCEPT_ARGTYPES], +[AC_MSG_CHECKING([types of arguments for accept()]) + AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl + [AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl + [AC_CACHE_VAL(ac_cv_func_accept_arg3,dnl + [for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do + for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'void *'; do + for ac_cv_func_accept_arg3 in 'socklen_t *' 'size_t *' 'unsigned int *' 'int *'; do + AC_TRY_COMPILE(dnl +[#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif +extern accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3);],,dnl + [ac_not_found=no ; break 3], ac_not_found=yes) + done + done + done + ])dnl AC_CACHE_VAL + ])dnl AC_CACHE_VAL + ])dnl AC_CACHE_VAL + if test "$ac_not_found" = yes; then + ac_cv_func_accept_arg1=int + ac_cv_func_accept_arg2='struct sockaddr *' + ac_cv_func_accept_arg3='socklen_t *' + fi + AC_MSG_RESULT([$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3]) + AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG1,$ac_cv_func_accept_arg1) + AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG2,$ac_cv_func_accept_arg2) + AC_DEFINE_UNQUOTED(ACCEPT_TYPE_ARG3,$ac_cv_func_accept_arg3) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_getopt_long.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_getopt_long.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_getopt_long.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_getopt_long.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_getopt_long.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FUNC_GETOPT_LONG +# +# DESCRIPTION +# +# Check for getopt_long support. +# +# This assume that the standard getopt.h file (from GNU libc) is available +# as lib/gnugetopt.h. If needed, this file will be linked as getopt.h, but +# we want to default to the system's getopt.h file. (See +# http://sources.redhat.com/ml/automake/2000-09/msg00041.html for an +# explanation about why using the system's getopt.h file is important.) +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([ADL_FUNC_GETOPT_LONG], [AX_FUNC_GETOPT_LONG]) +AC_DEFUN([AX_FUNC_GETOPT_LONG], + [AC_PREREQ(2.49)dnl + # clean out junk possibly left behind by a previous configuration + rm -f lib/getopt.h + # Check for getopt_long support + AC_CHECK_HEADERS([getopt.h]) + AC_CHECK_FUNCS([getopt_long],, + [# FreeBSD has a gnugetopt library for this + AC_CHECK_LIB([gnugetopt],[getopt_long],[AC_DEFINE([HAVE_GETOPT_LONG])], + [# use the GNU replacement + AC_LIBOBJ(getopt) + AC_LIBOBJ(getopt1) + AC_CONFIG_LINKS([lib/getopt.h:lib/gnugetopt.h])])])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_memmove.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_memmove.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_memmove.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_memmove.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_memmove.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FUNC_MEMMOVE +# +# DESCRIPTION +# +# Checks for a memmove that can handle overlaps correctly. If no working +# memmove is found, request a replacement and warn the user about it. +# +# LICENSE +# +# Copyright (c) 2008 Ruediger Kuhlmann +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_FUNC_MEMMOVE], [AX_FUNC_MEMMOVE]) +AC_DEFUN([AX_FUNC_MEMMOVE], +[AC_CHECK_FUNCS(memmove) +AC_MSG_CHECKING(for working memmove) +AC_CACHE_VAL(ac_cv_have_working_memmove, +[AC_TRY_RUN( +[#include + +int main(void) +{ + char buf[10]; + strcpy (buf, "01234567"); + memmove (buf, buf + 2, 3); + if (strcmp (buf, "23434567")) + exit (1); + strcpy (buf, "01234567"); + memmove (buf + 2, buf, 3); + if (strcmp (buf, "01012567")) + exit (1); + exit (0); +}], ac_cv_have_working_memmove=yes, ac_cv_have_working_memmove=no, ac_cv_have_working_memmove=cross)]) +AC_MSG_RESULT([$ac_cv_have_working_memmove]) +if test x$ac_cv_have_working_memmove != "xyes"; then + AC_LIBOBJ(memmove) + AC_MSG_WARN([Replacing missing/broken memmove.]) + AC_DEFINE(PREFER_PORTABLE_MEMMOVE, 1, "enable replacement memmove if system memmove is broken or missing") +fi]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_mkdir.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_mkdir.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_mkdir.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_mkdir.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,99 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_mkdir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FUNC_MKDIR +# +# DESCRIPTION +# +# Check whether mkdir() is mkdir or _mkdir, and whether it takes one or +# two arguments. +# +# This macro can define HAVE_MKDIR, HAVE__MKDIR, and MKDIR_TAKES_ONE_ARG, +# which are expected to be used as follows: +# +# #if HAVE_MKDIR +# # if MKDIR_TAKES_ONE_ARG +# /* MinGW32 */ +# # define mkdir(a, b) mkdir(a) +# # endif +# #else +# # if HAVE__MKDIR +# /* plain Windows 32 */ +# # define mkdir(a, b) _mkdir(a) +# # else +# # error "Don't know how to create a directory on this system." +# # endif +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AU_ALIAS([AC_FUNC_MKDIR], [AX_FUNC_MKDIR]) +AC_DEFUN([AX_FUNC_MKDIR], +[AC_CHECK_FUNCS([mkdir _mkdir]) +AC_CACHE_CHECK([whether mkdir takes one argument], + [ac_cv_mkdir_takes_one_arg], +[AC_TRY_COMPILE([ +#include +#if HAVE_UNISTD_H +# include +#endif +], [mkdir (".");], +[ac_cv_mkdir_takes_one_arg=yes], [ac_cv_mkdir_takes_one_arg=no])]) +if test x"$ac_cv_mkdir_takes_one_arg" = xyes; then + AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, + [Define if mkdir takes only one argument.]) +fi +]) + +dnl Note: +dnl ===== +dnl I have not implemented the following suggestion because I don't have +dnl access to such a broken environment to test the macro. So I'm just +dnl appending the comments here in case you have, and want to fix +dnl AX_FUNC_MKDIR that way. +dnl +dnl |Thomas E. Dickey (dickey@herndon4.his.com) said: +dnl | it doesn't cover the problem areas (compilers that mistreat mkdir +dnl | may prototype it in dir.h and dirent.h, for instance). +dnl | +dnl |Alexandre: +dnl | Would it be sufficient to check for these headers and #include +dnl | them in the AC_TRY_COMPILE block? (and is AC_HEADER_DIRENT +dnl | suitable for this?) +dnl | +dnl |Thomas: +dnl | I think that might be a good starting point (with the set of recommended +dnl | ifdef's and includes for AC_HEADER_DIRENT, of course). diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_posix_memalign.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_posix_memalign.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_posix_memalign.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_posix_memalign.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_posix_memalign.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FUNC_POSIX_MEMALIGN +# +# DESCRIPTION +# +# Some versions of posix_memalign (notably glibc 2.2.5) incorrectly apply +# their power-of-two check to the size argument, not the alignment +# argument. AX_FUNC_POSIX_MEMALIGN defines HAVE_POSIX_MEMALIGN if the +# power-of-two check is correctly applied to the alignment argument. +# +# LICENSE +# +# Copyright (c) 2008 Scott Pakin +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_FUNC_POSIX_MEMALIGN], +[AC_CACHE_CHECK([for working posix_memalign], + [ax_cv_func_posix_memalign_works], + [AC_TRY_RUN([ +#include + +int +main () +{ + void *buffer; + + /* Some versions of glibc incorrectly perform the alignment check on + * the size word. */ + exit (posix_memalign (&buffer, sizeof(void *), 123) != 0); +} + ], + [ax_cv_func_posix_memalign_works=yes], + [ax_cv_func_posix_memalign_works=no], + [ax_cv_func_posix_memalign_works=no])]) +if test "$ax_cv_func_posix_memalign_works" = "yes" ; then + AC_DEFINE([HAVE_POSIX_MEMALIGN], [1], + [Define to 1 if `posix_memalign' works.]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_snprintf.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_snprintf.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_snprintf.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_snprintf.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,85 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_snprintf.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_FUNC_SNPRINTF +# +# DESCRIPTION +# +# Checks for a fully C99 compliant snprintf, in particular checks whether +# it does bounds checking and returns the correct string length; does the +# same check for vsnprintf. If no working snprintf or vsnprintf is found, +# request a replacement and warn the user about it. Note: the mentioned +# replacement is freely available and may be used in any project +# regardless of it's license. +# +# LICENSE +# +# Copyright (c) 2008 Ruediger Kuhlmann +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF]) +AC_DEFUN([AX_FUNC_SNPRINTF], +[AC_CHECK_FUNCS(snprintf vsnprintf) +AC_MSG_CHECKING(for working snprintf) +AC_CACHE_VAL(ac_cv_have_working_snprintf, +[AC_TRY_RUN( +[#include + +int main(void) +{ + char bufs[5] = { 'x', 'x', 'x', '\0', '\0' }; + char bufd[5] = { 'x', 'x', 'x', '\0', '\0' }; + int i; + i = snprintf (bufs, 2, "%s", "111"); + if (strcmp (bufs, "1")) exit (1); + if (i != 3) exit (1); + i = snprintf (bufd, 2, "%d", 111); + if (strcmp (bufd, "1")) exit (1); + if (i != 3) exit (1); + exit(0); +}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)]) +AC_MSG_RESULT([$ac_cv_have_working_snprintf]) +AC_MSG_CHECKING(for working vsnprintf) +AC_CACHE_VAL(ac_cv_have_working_vsnprintf, +[AC_TRY_RUN( +[#include +#include + +int my_vsnprintf (char *buf, const char *tmpl, ...) +{ + int i; + va_list args; + va_start (args, tmpl); + i = vsnprintf (buf, 2, tmpl, args); + va_end (args); + return i; +} + +int main(void) +{ + char bufs[5] = { 'x', 'x', 'x', '\0', '\0' }; + char bufd[5] = { 'x', 'x', 'x', '\0', '\0' }; + int i; + i = my_vsnprintf (bufs, "%s", "111"); + if (strcmp (bufs, "1")) exit (1); + if (i != 3) exit (1); + i = my_vsnprintf (bufd, "%d", 111); + if (strcmp (bufd, "1")) exit (1); + if (i != 3) exit (1); + exit(0); +}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)]) +AC_MSG_RESULT([$ac_cv_have_working_vsnprintf]) +if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then + AC_LIBOBJ(snprintf) + AC_MSG_WARN([Replacing missing/broken (v)snprintf() with version from http://www.ijs.si/software/snprintf/.]) + AC_DEFINE(PREFER_PORTABLE_SNPRINTF, 1, "enable replacement (v)snprintf if system (v)snprintf is broken") +fi]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_which_gethostbyname_r.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_which_gethostbyname_r.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_which_gethostbyname_r.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_which_gethostbyname_r.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,196 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_which_gethostbyname_r.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_FUNC_WHICH_GETHOSTBYNAME_R +# +# DESCRIPTION +# +# Determines which historical variant of the gethostbyname_r() call +# (taking three, five, or six arguments) is available on the system and +# defines one of the following macros accordingly: +# +# HAVE_FUNC_GETHOSTBYNAME_R_6 +# HAVE_FUNC_GETHOSTBYNAME_R_5 +# HAVE_FUNC_GETHOSTBYNAME_R_3 +# +# as well as +# +# HAVE_GETHOSTBYNAME_R +# +# If used in conjunction with gethostname.c, the API demonstrated in +# test.c can be used regardless of which gethostbyname_r() is available. +# These example files can be found at +# http://www.csn.ul.ie/~caolan/publink/gethostbyname_r +# +# based on David Arnold's autoconf suggestion in the threads faq +# +# Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten for +# Autoconf 2.5x, and updated for 2.68 by Daniel Richard G. +# +# LICENSE +# +# Copyright (c) 2008 Caolan McNamara +# Copyright (c) 2008 Daniel Richard G. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [ + + AC_LANG_PUSH([C]) + AC_MSG_CHECKING([how many arguments gethostbyname_r() takes]) + + AC_CACHE_VAL([ac_cv_func_which_gethostbyname_r], [ + +################################################################ + +ac_cv_func_which_gethostbyname_r=unknown + +# +# ONE ARGUMENT (sanity check) +# + +# This should fail, as there is no variant of gethostbyname_r() that takes +# a single argument. If it actually compiles, then we can assume that +# netdb.h is not declaring the function, and the compiler is thereby +# assuming an implicit prototype. In which case, we're out of luck. +# +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [ + char *name = "www.gnu.org"; + (void)gethostbyname_r(name) /* ; */ + ])], + [ac_cv_func_which_gethostbyname_r=no]) + +# +# SIX ARGUMENTS +# (e.g. Linux) +# + +if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [ + char *name = "www.gnu.org"; + struct hostent ret, *retp; + char buf@<:@1024@:>@; + int buflen = 1024; + int my_h_errno; + (void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */ + ])], + [ac_cv_func_which_gethostbyname_r=six]) + +fi + +# +# FIVE ARGUMENTS +# (e.g. Solaris) +# + +if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [ + char *name = "www.gnu.org"; + struct hostent ret; + char buf@<:@1024@:>@; + int buflen = 1024; + int my_h_errno; + (void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */ + ])], + [ac_cv_func_which_gethostbyname_r=five]) + +fi + +# +# THREE ARGUMENTS +# (e.g. AIX, HP-UX, Tru64) +# + +if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], + [ + char *name = "www.gnu.org"; + struct hostent ret; + struct hostent_data data; + (void)gethostbyname_r(name, &ret, &data) /* ; */ + ])], + [ac_cv_func_which_gethostbyname_r=three]) + +fi + +################################################################ + +]) dnl end AC_CACHE_VAL + +case "$ac_cv_func_which_gethostbyname_r" in + three|five|six) + AC_DEFINE([HAVE_GETHOSTBYNAME_R], [1], + [Define to 1 if you have some form of gethostbyname_r().]) + ;; +esac + +case "$ac_cv_func_which_gethostbyname_r" in + three) + AC_MSG_RESULT([three]) + AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_3], [1], + [Define to 1 if you have the three-argument form of gethostbyname_r().]) + ;; + + five) + AC_MSG_RESULT([five]) + AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_5], [1], + [Define to 1 if you have the five-argument form of gethostbyname_r().]) + ;; + + six) + AC_MSG_RESULT([six]) + AC_DEFINE([HAVE_FUNC_GETHOSTBYNAME_R_6], [1], + [Define to 1 if you have the six-argument form of gethostbyname_r().]) + ;; + + no) + AC_MSG_RESULT([cannot find function declaration in netdb.h]) + ;; + + unknown) + AC_MSG_RESULT([can't tell]) + ;; + + *) + AC_MSG_ERROR([internal error]) + ;; +esac + +AC_LANG_POP + +]) dnl end AC_DEFUN diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_which_getservbyname_r.m4 projectm-3.1.0/m4/autoconf-archive/ax_func_which_getservbyname_r.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_func_which_getservbyname_r.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_func_which_getservbyname_r.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_func_which_getservbyname_r.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_FUNC_WHICH_GETSERVBYNAME_R +# +# DESCRIPTION +# +# Provides a test to determine the correct way to call getservbyname_r: +# +# - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux) +# - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris) +# - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1) +# +# An example use can be found at +# http://raf.org/autoconf/net_getservbyname.c +# +# Based on Caolan McNamara's gethostbyname_r macro. Based on David +# Arnold's autoconf suggestion in the threads faq. +# +# LICENSE +# +# Copyright (c) 2008 raf +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_RAF_FUNC_WHICH_GETSERVBYNAME_R], [AX_FUNC_WHICH_GETSERVBYNAME_R]) +AC_DEFUN([AX_FUNC_WHICH_GETSERVBYNAME_R], +[AC_CACHE_CHECK(for getservbyname_r, ax_cv_func_which_getservbyname_r, [ +AC_CHECK_FUNC(getservbyname_r, [ + AC_TRY_COMPILE([ +# include + ], [ + + char *name; + char *proto; + struct servent *se; + struct servent_data data; + (void) getservbyname_r(name, proto, se, &data); + + ],ax_cv_func_which_getservbyname_r=four, + [ + AC_TRY_COMPILE([ +# include + ], [ + char *name; + char *proto; + struct servent *se, *res; + char buffer[2048]; + int buflen = 2048; + (void) getservbyname_r(name, proto, se, buffer, buflen, &res) + ],ax_cv_func_which_getservbyname_r=six, + + [ + AC_TRY_COMPILE([ +# include + ], [ + char *name; + char *proto; + struct servent *se; + char buffer[2048]; + int buflen = 2048; + (void) getservbyname_r(name, proto, se, buffer, buflen) + ],ax_cv_func_which_getservbyname_r=five,ax_cv_func_which_getservbyname_r=no) + + ] + + ) + ] + )] + ,ax_cv_func_which_getservbyname_r=no)]) + +if test $ax_cv_func_which_getservbyname_r = six; then + AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6) +elif test $ax_cv_func_which_getservbyname_r = five; then + AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5) +elif test $ax_cv_func_which_getservbyname_r = four; then + AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4) + +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_archflag.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_archflag.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_archflag.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_archflag.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,263 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_archflag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_ARCHFLAG([PORTABLE?], [ACTION-SUCCESS], [ACTION-FAILURE]) +# +# DESCRIPTION +# +# This macro tries to guess the "native" arch corresponding to the target +# architecture for use with gcc's -march=arch or -mtune=arch flags. If +# found, the cache variable $ax_cv_gcc_archflag is set to this flag and +# ACTION-SUCCESS is executed; otherwise $ax_cv_gcc_archflag is set to +# "unknown" and ACTION-FAILURE is executed. The default ACTION-SUCCESS is +# to add $ax_cv_gcc_archflag to the end of $CFLAGS. +# +# PORTABLE? should be either [yes] (default) or [no]. In the former case, +# the flag is set to -mtune (or equivalent) so that the architecture is +# only used for tuning, but the instruction set used is still portable. In +# the latter case, the flag is set to -march (or equivalent) so that +# architecture-specific instructions are enabled. +# +# The user can specify --with-gcc-arch= in order to override the +# macro's choice of architecture, or --without-gcc-arch to disable this. +# +# When cross-compiling, or if $CC is not gcc, then ACTION-FAILURE is +# called unless the user specified --with-gcc-arch manually. +# +# Requires macros: AX_CHECK_COMPILE_FLAG, AX_GCC_X86_CPUID +# +# (The main emphasis here is on recent CPUs, on the principle that doing +# high-performance computing on old hardware is uncommon.) +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# Copyright (c) 2014 Tsukasa Oi +# Copyright (c) 2017-2018 Alexey Kopytov +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 21 + +AC_DEFUN([AX_GCC_ARCHFLAG], +[AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_SED]) +AC_REQUIRE([AX_COMPILER_VENDOR]) + +AC_ARG_WITH(gcc-arch, [AS_HELP_STRING([--with-gcc-arch=], [use architecture for gcc -march/-mtune, instead of guessing])], + ax_gcc_arch=$withval, ax_gcc_arch=yes) + +AC_MSG_CHECKING([for gcc architecture flag]) +AC_MSG_RESULT([]) +AC_CACHE_VAL(ax_cv_gcc_archflag, +[ +ax_cv_gcc_archflag="unknown" + +if test "$GCC" = yes; then + +if test "x$ax_gcc_arch" = xyes; then +ax_gcc_arch="" +if test "$cross_compiling" = no; then +case $host_cpu in + i[[3456]]86*|x86_64*|amd64*) # use cpuid codes + AX_GCC_X86_CPUID(0) + AX_GCC_X86_CPUID(1) + case $ax_cv_gcc_x86_cpuid_0 in + *:756e6547:6c65746e:49656e69) # Intel + case $ax_cv_gcc_x86_cpuid_1 in + *5[[4578]]?:*:*:*) ax_gcc_arch="pentium-mmx pentium" ;; + *5[[123]]?:*:*:*) ax_gcc_arch=pentium ;; + *0?61?:*:*:*|?61?:*:*:*|61?:*:*:*) ax_gcc_arch=pentiumpro ;; + *0?6[[356]]?:*:*:*|?6[[356]]?:*:*:*|6[[356]]?:*:*:*) ax_gcc_arch="pentium2 pentiumpro" ;; + *0?6[[78ab]]?:*:*:*|?6[[78ab]]?:*:*:*|6[[78ab]]?:*:*:*) ax_gcc_arch="pentium3 pentiumpro" ;; + *0?6[[9d]]?:*:*:*|?6[[9d]]?:*:*:*|6[[9d]]?:*:*:*|*1?65?:*:*:*) ax_gcc_arch="pentium-m pentium3 pentiumpro" ;; + *0?6e?:*:*:*|?6e?:*:*:*|6e?:*:*:*) ax_gcc_arch="yonah pentium-m pentium3 pentiumpro" ;; + *0?6f?:*:*:*|?6f?:*:*:*|6f?:*:*:*|*1?66?:*:*:*) ax_gcc_arch="core2 pentium-m pentium3 pentiumpro" ;; + *1?6[[7d]]?:*:*:*) ax_gcc_arch="penryn core2 pentium-m pentium3 pentiumpro" ;; + *1?6[[aef]]?:*:*:*|*2?6e?:*:*:*) ax_gcc_arch="nehalem corei7 core2 pentium-m pentium3 pentiumpro" ;; + *2?6[[5cf]]?:*:*:*) ax_gcc_arch="westmere corei7 core2 pentium-m pentium3 pentiumpro" ;; + *2?6[[ad]]?:*:*:*) ax_gcc_arch="sandybridge corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; + *3?6[[ae]]?:*:*:*) ax_gcc_arch="ivybridge core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; + *3?6[[cf]]?:*:*:*|*4?6[[56]]?:*:*:*) ax_gcc_arch="haswell core-avx2 core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; + *3?6d?:*:*:*|*4?6[[7f]]?:*:*:*|*5?66?:*:*:*) ax_gcc_arch="broadwell core-avx2 core-avx-i corei7-avx corei7 core2 pentium-m pentium3 pentiumpro" ;; + *1?6c?:*:*:*|*2?6[[67]]?:*:*:*|*3?6[[56]]?:*:*:*) ax_gcc_arch="bonnell atom core2 pentium-m pentium3 pentiumpro" ;; + *3?67?:*:*:*|*[[45]]?6[[ad]]?:*:*:*) ax_gcc_arch="silvermont atom core2 pentium-m pentium3 pentiumpro" ;; + *000?f[[012]]?:*:*:*|?f[[012]]?:*:*:*|f[[012]]?:*:*:*) ax_gcc_arch="pentium4 pentiumpro" ;; + *000?f[[346]]?:*:*:*|?f[[346]]?:*:*:*|f[[346]]?:*:*:*) ax_gcc_arch="nocona prescott pentium4 pentiumpro" ;; + # fallback + *5??:*:*:*) ax_gcc_arch=pentium ;; + *??6??:*:*:*) ax_gcc_arch="core2 pentiumpro" ;; + *6??:*:*:*) ax_gcc_arch=pentiumpro ;; + *00??f??:*:*:*|??f??:*:*:*|?f??:*:*:*|f??:*:*:*) ax_gcc_arch="pentium4 pentiumpro" ;; + esac ;; + *:68747541:444d4163:69746e65) # AMD + case $ax_cv_gcc_x86_cpuid_1 in + *5[[67]]?:*:*:*) ax_gcc_arch=k6 ;; + *5[[8]]?:*:*:*) ax_gcc_arch="k6-2 k6" ;; + *5[[9d]]?:*:*:*) ax_gcc_arch="k6-3 k6" ;; + *6[[12]]?:*:*:*) ax_gcc_arch="athlon k7" ;; + *6[[34]]?:*:*:*) ax_gcc_arch="athlon-tbird k7" ;; + *6[[678a]]?:*:*:*) ax_gcc_arch="athlon-xp athlon-4 athlon k7" ;; + *000?f[[4578bcef]]?:*:*:*|?f[[4578bcef]]?:*:*:*|f[[4578bcef]]?:*:*:*|*001?f[[4578bcf]]?:*:*:*|1?f[[4578bcf]]?:*:*:*) ax_gcc_arch="athlon64 k8" ;; + *002?f[[13457bcf]]?:*:*:*|2?f[[13457bcf]]?:*:*:*|*004?f[[138bcf]]?:*:*:*|4?f[[138bcf]]?:*:*:*|*005?f[[df]]?:*:*:*|5?f[[df]]?:*:*:*|*006?f[[8bcf]]?:*:*:*|6?f[[8bcf]]?:*:*:*|*007?f[[cf]]?:*:*:*|7?f[[cf]]?:*:*:*|*00c?f1?:*:*:*|c?f1?:*:*:*|*020?f3?:*:*:*|20?f3?:*:*:*) ax_gcc_arch="athlon64-sse3 k8-sse3 athlon64 k8" ;; + *010?f[[245689a]]?:*:*:*|10?f[[245689a]]?:*:*:*|*030?f1?:*:*:*|30?f1?:*:*:*) ax_gcc_arch="barcelona amdfam10 k8" ;; + *050?f[[12]]?:*:*:*|50?f[[12]]?:*:*:*) ax_gcc_arch="btver1 amdfam10 k8" ;; + *060?f1?:*:*:*|60?f1?:*:*:*) ax_gcc_arch="bdver1 amdfam10 k8" ;; + *060?f2?:*:*:*|60?f2?:*:*:*|*061?f[[03]]?:*:*:*|61?f[[03]]?:*:*:*) ax_gcc_arch="bdver2 bdver1 amdfam10 k8" ;; + *063?f0?:*:*:*|63?f0?:*:*:*) ax_gcc_arch="bdver3 bdver2 bdver1 amdfam10 k8" ;; + *07[[03]]?f0?:*:*:*|7[[03]]?f0?:*:*:*) ax_gcc_arch="btver2 btver1 amdfam10 k8" ;; + # fallback + *0[[13]]??f??:*:*:*|[[13]]??f??:*:*:*) ax_gcc_arch="barcelona amdfam10 k8" ;; + *020?f??:*:*:*|20?f??:*:*:*) ax_gcc_arch="athlon64-sse3 k8-sse3 athlon64 k8" ;; + *05??f??:*:*:*|5??f??:*:*:*) ax_gcc_arch="btver1 amdfam10 k8" ;; + *060?f??:*:*:*|60?f??:*:*:*) ax_gcc_arch="bdver1 amdfam10 k8" ;; + *061?f??:*:*:*|61?f??:*:*:*) ax_gcc_arch="bdver2 bdver1 amdfam10 k8" ;; + *06??f??:*:*:*|6??f??:*:*:*) ax_gcc_arch="bdver3 bdver2 bdver1 amdfam10 k8" ;; + *070?f??:*:*:*|70?f??:*:*:*) ax_gcc_arch="btver2 btver1 amdfam10 k8" ;; + *???f??:*:*:*) ax_gcc_arch="amdfam10 k8" ;; + esac ;; + *:746e6543:736c7561:48727561) # IDT / VIA (Centaur) + case $ax_cv_gcc_x86_cpuid_1 in + *54?:*:*:*) ax_gcc_arch=winchip-c6 ;; + *5[[89]]?:*:*:*) ax_gcc_arch=winchip2 ;; + *66?:*:*:*) ax_gcc_arch=winchip2 ;; + *6[[78]]?:*:*:*) ax_gcc_arch=c3 ;; + *6[[9adf]]?:*:*:*) ax_gcc_arch="c3-2 c3" ;; + esac ;; + esac + if test x"$ax_gcc_arch" = x; then # fallback + case $host_cpu in + i586*) ax_gcc_arch=pentium ;; + i686*) ax_gcc_arch=pentiumpro ;; + esac + fi + ;; + + sparc*) + AC_PATH_PROG([PRTDIAG], [prtdiag], [prtdiag], [$PATH:/usr/platform/`uname -i`/sbin/:/usr/platform/`uname -m`/sbin/]) + cputype=`(((grep cpu /proc/cpuinfo | cut -d: -f2) ; ($PRTDIAG -v |grep -i sparc) ; grep -i cpu /var/run/dmesg.boot ) | head -n 1) 2> /dev/null` + cputype=`echo "$cputype" | tr -d ' -' | $SED 's/SPARCIIi/SPARCII/' |tr $as_cr_LETTERS $as_cr_letters` + case $cputype in + *ultrasparciv*) ax_gcc_arch="ultrasparc4 ultrasparc3 ultrasparc v9" ;; + *ultrasparciii*) ax_gcc_arch="ultrasparc3 ultrasparc v9" ;; + *ultrasparc*) ax_gcc_arch="ultrasparc v9" ;; + *supersparc*|*tms390z5[[05]]*) ax_gcc_arch="supersparc v8" ;; + *hypersparc*|*rt62[[056]]*) ax_gcc_arch="hypersparc v8" ;; + *cypress*) ax_gcc_arch=cypress ;; + esac ;; + + alphaev5) ax_gcc_arch=ev5 ;; + alphaev56) ax_gcc_arch=ev56 ;; + alphapca56) ax_gcc_arch="pca56 ev56" ;; + alphapca57) ax_gcc_arch="pca57 pca56 ev56" ;; + alphaev6) ax_gcc_arch=ev6 ;; + alphaev67) ax_gcc_arch=ev67 ;; + alphaev68) ax_gcc_arch="ev68 ev67" ;; + alphaev69) ax_gcc_arch="ev69 ev68 ev67" ;; + alphaev7) ax_gcc_arch="ev7 ev69 ev68 ev67" ;; + alphaev79) ax_gcc_arch="ev79 ev7 ev69 ev68 ev67" ;; + + powerpc*) + cputype=`((grep cpu /proc/cpuinfo | head -n 1 | cut -d: -f2 | cut -d, -f1 | $SED 's/ //g') ; /usr/bin/machine ; /bin/machine; grep CPU /var/run/dmesg.boot | head -n 1 | cut -d" " -f2) 2> /dev/null` + cputype=`echo $cputype | $SED -e 's/ppc//g;s/ *//g'` + case $cputype in + *750*) ax_gcc_arch="750 G3" ;; + *740[[0-9]]*) ax_gcc_arch="$cputype 7400 G4" ;; + *74[[4-5]][[0-9]]*) ax_gcc_arch="$cputype 7450 G4" ;; + *74[[0-9]][[0-9]]*) ax_gcc_arch="$cputype G4" ;; + *970*) ax_gcc_arch="970 G5 power4";; + *POWER4*|*power4*|*gq*) ax_gcc_arch="power4 970";; + *POWER5*|*power5*|*gr*|*gs*) ax_gcc_arch="power5 power4 970";; + 603ev|8240) ax_gcc_arch="$cputype 603e 603";; + *) ax_gcc_arch=$cputype ;; + esac + ax_gcc_arch="$ax_gcc_arch powerpc" + ;; + aarch64) + cpuimpl=`grep 'CPU implementer' /proc/cpuinfo 2> /dev/null | cut -d: -f2 | tr -d " " | head -n 1` + cpuarch=`grep 'CPU architecture' /proc/cpuinfo 2> /dev/null | cut -d: -f2 | tr -d " " | head -n 1` + cpuvar=`grep 'CPU variant' /proc/cpuinfo 2> /dev/null | cut -d: -f2 | tr -d " " | head -n 1` + case $cpuimpl in + 0x42) case $cpuarch in + 8) case $cpuvar in + 0x0) ax_gcc_arch="thunderx2t99 vulcan armv8.1-a armv8-a+lse armv8-a native" ;; + esac + ;; + esac + ;; + 0x43) case $cpuarch in + 8) case $cpuvar in + 0x0) ax_gcc_arch="thunderx armv8-a native" ;; + 0x1) ax_gcc_arch="thunderx+lse armv8.1-a armv8-a+lse armv8-a native" ;; + esac + ;; + esac + ;; + esac + ;; +esac +fi # not cross-compiling +fi # guess arch + +if test "x$ax_gcc_arch" != x -a "x$ax_gcc_arch" != xno; then +if test "x[]m4_default([$1],yes)" = xyes; then # if we require portable code + flag_prefixes="-mtune=" + if test "x$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" = xclang; then flag_prefixes="-march="; fi + # -mcpu=$arch and m$arch generate nonportable code on every arch except + # x86. And some other arches (e.g. Alpha) don't accept -mtune. Grrr. + case $host_cpu in i*86|x86_64*|amd64*) flag_prefixes="$flag_prefixes -mcpu= -m";; esac +else + flag_prefixes="-march= -mcpu= -m" +fi +for flag_prefix in $flag_prefixes; do + for arch in $ax_gcc_arch; do + flag="$flag_prefix$arch" + AX_CHECK_COMPILE_FLAG($flag, [if test "x$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" = xclang; then + if test "x[]m4_default([$1],yes)" = xyes; then + if test "x$flag" = "x-march=$arch"; then flag=-mtune=$arch; fi + fi + fi; ax_cv_gcc_archflag=$flag; break]) + done + test "x$ax_cv_gcc_archflag" = xunknown || break +done +fi + +fi # $GCC=yes +]) +AC_MSG_CHECKING([for gcc architecture flag]) +AC_MSG_RESULT($ax_cv_gcc_archflag) +if test "x$ax_cv_gcc_archflag" = xunknown; then + m4_default([$3],:) +else + m4_default([$2], [CFLAGS="$CFLAGS $ax_cv_gcc_archflag"]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_builtin.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_builtin.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_builtin.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_builtin.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,170 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_builtin.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_BUILTIN(BUILTIN) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's built-in +# functions; many other compilers also provide those same built-ins. +# +# The BUILTIN parameter is the name of the built-in function. +# +# If BUILTIN is supported define HAVE_. Keep in mind that since +# builtins usually start with two underscores they will be copied over +# into the HAVE_ definition (e.g. HAVE___BUILTIN_EXPECT for +# __builtin_expect()). +# +# The macro caches its result in the ax_cv_have_ variable (e.g. +# ax_cv_have___builtin_expect). +# +# The macro currently supports the following built-in functions: +# +# __builtin_assume_aligned +# __builtin_bswap16 +# __builtin_bswap32 +# __builtin_bswap64 +# __builtin_choose_expr +# __builtin___clear_cache +# __builtin_clrsb +# __builtin_clrsbl +# __builtin_clrsbll +# __builtin_clz +# __builtin_clzl +# __builtin_clzll +# __builtin_complex +# __builtin_constant_p +# __builtin_ctz +# __builtin_ctzl +# __builtin_ctzll +# __builtin_expect +# __builtin_ffs +# __builtin_ffsl +# __builtin_ffsll +# __builtin_fpclassify +# __builtin_huge_val +# __builtin_huge_valf +# __builtin_huge_vall +# __builtin_inf +# __builtin_infd128 +# __builtin_infd32 +# __builtin_infd64 +# __builtin_inff +# __builtin_infl +# __builtin_isinf_sign +# __builtin_nan +# __builtin_nand128 +# __builtin_nand32 +# __builtin_nand64 +# __builtin_nanf +# __builtin_nanl +# __builtin_nans +# __builtin_nansf +# __builtin_nansl +# __builtin_object_size +# __builtin_parity +# __builtin_parityl +# __builtin_parityll +# __builtin_popcount +# __builtin_popcountl +# __builtin_popcountll +# __builtin_powi +# __builtin_powif +# __builtin_powil +# __builtin_prefetch +# __builtin_trap +# __builtin_types_compatible_p +# __builtin_unreachable +# +# Unsupported built-ins will be tested with an empty parameter set and the +# result of the check might be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_DEFUN([AX_GCC_BUILTIN], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_$1]) + + AC_CACHE_CHECK([for $1], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [ + m4_case([$1], + [__builtin_assume_aligned], [$1("", 0)], + [__builtin_bswap16], [$1(0)], + [__builtin_bswap32], [$1(0)], + [__builtin_bswap64], [$1(0)], + [__builtin_choose_expr], [$1(0, 0, 0)], + [__builtin___clear_cache], [$1("", "")], + [__builtin_clrsb], [$1(0)], + [__builtin_clrsbl], [$1(0)], + [__builtin_clrsbll], [$1(0)], + [__builtin_clz], [$1(0)], + [__builtin_clzl], [$1(0)], + [__builtin_clzll], [$1(0)], + [__builtin_complex], [$1(0.0, 0.0)], + [__builtin_constant_p], [$1(0)], + [__builtin_ctz], [$1(0)], + [__builtin_ctzl], [$1(0)], + [__builtin_ctzll], [$1(0)], + [__builtin_expect], [$1(0, 0)], + [__builtin_ffs], [$1(0)], + [__builtin_ffsl], [$1(0)], + [__builtin_ffsll], [$1(0)], + [__builtin_fpclassify], [$1(0, 1, 2, 3, 4, 0.0)], + [__builtin_huge_val], [$1()], + [__builtin_huge_valf], [$1()], + [__builtin_huge_vall], [$1()], + [__builtin_inf], [$1()], + [__builtin_infd128], [$1()], + [__builtin_infd32], [$1()], + [__builtin_infd64], [$1()], + [__builtin_inff], [$1()], + [__builtin_infl], [$1()], + [__builtin_isinf_sign], [$1(0.0)], + [__builtin_nan], [$1("")], + [__builtin_nand128], [$1("")], + [__builtin_nand32], [$1("")], + [__builtin_nand64], [$1("")], + [__builtin_nanf], [$1("")], + [__builtin_nanl], [$1("")], + [__builtin_nans], [$1("")], + [__builtin_nansf], [$1("")], + [__builtin_nansl], [$1("")], + [__builtin_object_size], [$1("", 0)], + [__builtin_parity], [$1(0)], + [__builtin_parityl], [$1(0)], + [__builtin_parityll], [$1(0)], + [__builtin_popcount], [$1(0)], + [__builtin_popcountl], [$1(0)], + [__builtin_popcountll], [$1(0)], + [__builtin_powi], [$1(0, 0)], + [__builtin_powif], [$1(0, 0)], + [__builtin_powil], [$1(0, 0)], + [__builtin_prefetch], [$1("")], + [__builtin_trap], [$1()], + [__builtin_types_compatible_p], [$1(int, int)], + [__builtin_unreachable], [$1()], + [m4_warn([syntax], [Unsupported built-in $1, the test may fail]) + $1()] + ) + ])], + [AS_VAR_SET([ac_var], [yes])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$1), 1, + [Define to 1 if the system has the `$1' built-in function])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_const_call.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_const_call.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_const_call.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_const_call.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_const_call.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_CONST_CALL +# +# DESCRIPTION +# +# The macro will compile a test program to see whether the compiler does +# understand the per-function postfix pragma. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_GCC_CONST_CALL],[dnl +AC_CACHE_CHECK( + [whether the compiler supports function __attribute__((__const__))], + ax_cv_gcc_const_call,[ + AC_TRY_COMPILE([__attribute__((__const__)) + int f(int i) { return i; }], + [], + ax_cv_gcc_const_call=yes, ax_cv_gcc_const_call=no)]) + if test "$ax_cv_gcc_const_call" = yes; then + AC_DEFINE([GCC_CONST_CALL],[__attribute__((__const__))], + [most gcc compilers know a function __attribute__((__const__))]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_func_attribute.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_func_attribute.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_func_attribute.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_func_attribute.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,238 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's function +# attributes; many other compilers also provide function attributes with +# the same syntax. Compiler warnings are used to detect supported +# attributes as unsupported ones are ignored by default so quieting +# warnings when using this macro will yield false positives. +# +# The ATTRIBUTE parameter holds the name of the attribute to be checked. +# +# If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_. +# +# The macro caches its result in the ax_cv_have_func_attribute_ +# variable. +# +# The macro currently supports the following function attributes: +# +# alias +# aligned +# alloc_size +# always_inline +# artificial +# cold +# const +# constructor +# constructor_priority for constructor attribute with priority +# deprecated +# destructor +# dllexport +# dllimport +# error +# externally_visible +# fallthrough +# flatten +# format +# format_arg +# gnu_inline +# hot +# ifunc +# leaf +# malloc +# noclone +# noinline +# nonnull +# noreturn +# nothrow +# optimize +# pure +# sentinel +# sentinel_position +# unused +# used +# visibility +# warning +# warn_unused_result +# weak +# weakref +# +# Unsupported function attributes will be tested with a prototype +# returning an int and not accepting any arguments and the result of the +# check might be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1]) + + AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + m4_case([$1], + [alias], [ + int foo( void ) { return 0; } + int bar( void ) __attribute__(($1("foo"))); + ], + [aligned], [ + int foo( void ) __attribute__(($1(32))); + ], + [alloc_size], [ + void *foo(int a) __attribute__(($1(1))); + ], + [always_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [artificial], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [cold], [ + int foo( void ) __attribute__(($1)); + ], + [const], [ + int foo( void ) __attribute__(($1)); + ], + [constructor_priority], [ + int foo( void ) __attribute__((__constructor__(65535/2))); + ], + [constructor], [ + int foo( void ) __attribute__(($1)); + ], + [deprecated], [ + int foo( void ) __attribute__(($1(""))); + ], + [destructor], [ + int foo( void ) __attribute__(($1)); + ], + [dllexport], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [dllimport], [ + int foo( void ) __attribute__(($1)); + ], + [error], [ + int foo( void ) __attribute__(($1(""))); + ], + [externally_visible], [ + int foo( void ) __attribute__(($1)); + ], + [fallthrough], [ + int foo( void ) {switch (0) { case 1: __attribute__(($1)); case 2: break ; }}; + ], + [flatten], [ + int foo( void ) __attribute__(($1)); + ], + [format], [ + int foo(const char *p, ...) __attribute__(($1(printf, 1, 2))); + ], + [format_arg], [ + char *foo(const char *p) __attribute__(($1(1))); + ], + [gnu_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [hot], [ + int foo( void ) __attribute__(($1)); + ], + [ifunc], [ + int my_foo( void ) { return 0; } + static int (*resolve_foo(void))(void) { return my_foo; } + int foo( void ) __attribute__(($1("resolve_foo"))); + ], + [leaf], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [malloc], [ + void *foo( void ) __attribute__(($1)); + ], + [noclone], [ + int foo( void ) __attribute__(($1)); + ], + [noinline], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [nonnull], [ + int foo(char *p) __attribute__(($1(1))); + ], + [noreturn], [ + void foo( void ) __attribute__(($1)); + ], + [nothrow], [ + int foo( void ) __attribute__(($1)); + ], + [optimize], [ + __attribute__(($1(3))) int foo( void ) { return 0; } + ], + [pure], [ + int foo( void ) __attribute__(($1)); + ], + [sentinel], [ + int foo(void *p, ...) __attribute__(($1)); + ], + [sentinel_position], [ + int foo(void *p, ...) __attribute__(($1(1))); + ], + [returns_nonnull], [ + void *foo( void ) __attribute__(($1)); + ], + [unused], [ + int foo( void ) __attribute__(($1)); + ], + [used], [ + int foo( void ) __attribute__(($1)); + ], + [visibility], [ + int foo_def( void ) __attribute__(($1("default"))); + int foo_hid( void ) __attribute__(($1("hidden"))); + int foo_int( void ) __attribute__(($1("internal"))); + int foo_pro( void ) __attribute__(($1("protected"))); + ], + [warning], [ + int foo( void ) __attribute__(($1(""))); + ], + [warn_unused_result], [ + int foo( void ) __attribute__(($1)); + ], + [weak], [ + int foo( void ) __attribute__(($1)); + ], + [weakref], [ + static int foo( void ) { return 0; } + static int bar( void ) __attribute__(($1("foo"))); + ], + [ + m4_warn([syntax], [Unsupported attribute $1, the test may fail]) + int foo( void ) __attribute__(($1)); + ] + )], []) + ], + dnl GCC doesn't exit with an error if an unknown attribute is + dnl provided but only outputs a warning, so accept the attribute + dnl only if no warning were issued. + [AS_IF([test -s conftest.err], + [AS_VAR_SET([ac_var], [no])], + [AS_VAR_SET([ac_var], [yes])])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1, + [Define to 1 if the system has the `$1' function attribute])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_libgcc_eh.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_libgcc_eh.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_libgcc_eh.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_libgcc_eh.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,53 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_libgcc_eh.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_LIBGCC_EH(VARIABLE) +# +# DESCRIPTION +# +# AX_GCC_LIBGCC_EH defines VARIABLE as the absolute path to libgcc_eh.a if +# it is available on the system, empty otherwise +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AC_DEFUN([AX_GCC_LIBGCC_EH], [ + AX_GCC_LIB([libgcc_eh.a],[ + AX_GCC_INSTALL_DIR([GCC_INSTALL_DIR]) + $1="$GCC_INSTALL_DIR/libgcc_eh.a" + ],[ + $1="" + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_lib.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_lib.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_lib.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_lib.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_lib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_LIB(LIBRARY,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# AX_GCC_LIB looks for LIBRARY inside gcc install directory, performs +# ACTION-IF-FOUND if the library is available, ACTION-IF-NOT-FOUND +# otherwise. The gcc install directory is retrieved using +# AX_GCC_INSTALL_DIR macro. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AC_DEFUN([AX_GCC_LIB], [ + AX_GCC_INSTALL_DIR([GCC_INSTALL_DIR]) + + AC_MSG_CHECKING([if gcc $1 is available in $GCC_INSTALL_DIR]) + + AS_IF([test -f "$GCC_INSTALL_DIR/$1"],[ + AC_MSG_RESULT([yes]) + $2 + ],[ + AC_MSG_RESULT([no]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_libsupcxx.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_libsupcxx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_libsupcxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_libsupcxx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_libsupcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_LIBSUPCXX(VARIABLE) +# +# DESCRIPTION +# +# AX_GCC_LIBSUPCXX defines VARIABLE as the absolute path to libsupc++.a if +# it is available on the system, empty otherwise. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# Copyright (c) 2009 Alessandro Massignan +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_GCC_LIBSUPCXX], [ + AX_GCC_LIBRARIES_DIR([GCC_LIBRARIES_DIR]) + AS_IF([test -z "$GCC_LIBRARIES_DIR"],[ + AC_MSG_ERROR([problems detecting gcc libraries dir]) + ]) + + AC_MSG_CHECKING([for libsupc++.a]) + + ax_gcc_libraries_dir_IFS=$IFS + IFS=":" + + $1="" + for i in $GCC_LIBRARIES_DIR + do + AS_IF([test -f "$i/libsupc++.a"],[ + IFS=$ax_gcc_libraries_dir_IFS + $1="$i/libsupc++.a" + break + ]) + done + + IFS=$ax_gcc_libraries_dir_IFS + + AC_MSG_RESULT([$$1]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_malloc_call.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_malloc_call.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_malloc_call.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_malloc_call.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_malloc_call.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_MALLOC_CALL +# +# DESCRIPTION +# +# The macro will compile a test program to see whether the compiler does +# understand the per-function postfix pragma. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_GCC_MALLOC_CALL],[dnl +AC_CACHE_CHECK( + [whether the compiler supports function __attribute__((__malloc__))], + ax_cv_gcc_malloc_call,[ + AC_TRY_COMPILE([__attribute__((__malloc__)) + int f(int i) { return i; }], + [], + ax_cv_gcc_malloc_call=yes, ax_cv_gcc_malloc_call=no)]) + if test "$ax_cv_gcc_malloc_call" = yes; then + AC_DEFINE([GCC_MALLOC_CALL],[__attribute__((__malloc__))], + [most gcc compilers know a function __attribute__((__malloc__))]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_var_attribute.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_var_attribute.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_var_attribute.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_var_attribute.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,141 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_var_attribute.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_VAR_ATTRIBUTE(ATTRIBUTE) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's variable +# attributes; many other compilers also provide variable attributes with +# the same syntax. Compiler warnings are used to detect supported +# attributes as unsupported ones are ignored by default so quieting +# warnings when using this macro will yield false positives. +# +# The ATTRIBUTE parameter holds the name of the attribute to be checked. +# +# If ATTRIBUTE is supported define HAVE_VAR_ATTRIBUTE_. +# +# The macro caches its result in the ax_cv_have_var_attribute_ +# variable. +# +# The macro currently supports the following variable attributes: +# +# aligned +# cleanup +# common +# nocommon +# deprecated +# mode +# packed +# tls_model +# unused +# used +# vector_size +# weak +# dllimport +# dllexport +# init_priority +# +# Unsupported variable attributes will be tested against a global integer +# variable and without any arguments given to the attribute itself; the +# result of this check might be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AC_DEFUN([AX_GCC_VAR_ATTRIBUTE], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_var_attribute_$1]) + + AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + m4_case([$1], + [aligned], [ + int foo __attribute__(($1(32))); + ], + [cleanup], [ + int bar(int *t) { return *t; }; + ], + [common], [ + int foo __attribute__(($1)); + ], + [nocommon], [ + int foo __attribute__(($1)); + ], + [deprecated], [ + int foo __attribute__(($1)) = 0; + ], + [mode], [ + long foo __attribute__(($1(word))); + ], + [packed], [ + struct bar { + int baz __attribute__(($1)); + }; + ], + [tls_model], [ + __thread int bar1 __attribute__(($1("global-dynamic"))); + __thread int bar2 __attribute__(($1("local-dynamic"))); + __thread int bar3 __attribute__(($1("initial-exec"))); + __thread int bar4 __attribute__(($1("local-exec"))); + ], + [unused], [ + int foo __attribute__(($1)); + ], + [used], [ + int foo __attribute__(($1)); + ], + [vector_size], [ + int foo __attribute__(($1(16))); + ], + [weak], [ + int foo __attribute__(($1)); + ], + [dllimport], [ + int foo __attribute__(($1)); + ], + [dllexport], [ + int foo __attribute__(($1)); + ], + [init_priority], [ + struct bar { bar() {} ~bar() {} }; + bar b __attribute__(($1(65535/2))); + ], + [ + m4_warn([syntax], [Unsupported attribute $1, the test may fail]) + int foo __attribute__(($1)); + ] + )], [ + m4_case([$1], + [cleanup], [ + int foo __attribute__(($1(bar))) = 0; + foo = foo + 1; + ], + [] + )]) + ], + dnl GCC doesn't exit with an error if an unknown attribute is + dnl provided but only outputs a warning, so accept the attribute + dnl only if no warning were issued. + [AS_IF([test -s conftest.err], + [AS_VAR_SET([ac_var], [no])], + [AS_VAR_SET([ac_var], [yes])])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_VAR_ATTRIBUTE_$1), 1, + [Define to 1 if the system has the `$1' variable attribute])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_warn_unused_result.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_warn_unused_result.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_warn_unused_result.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_warn_unused_result.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_warn_unused_result.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_GCC_WARN_UNUSED_RESULT +# +# DESCRIPTION +# +# The macro will compile a test program to see whether the compiler does +# understand the per-function postfix pragma. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_GCC_WARN_UNUSED_RESULT],[dnl +AC_CACHE_CHECK( + [whether the compiler supports function __attribute__((__warn_unused_result__))], + ax_cv_gcc_warn_unused_result,[ + AC_TRY_COMPILE([__attribute__((__warn_unused_result__)) + int f(int i) { return i; }], + [], + ax_cv_gcc_warn_unused_result=yes, ax_cv_gcc_warn_unused_result=no)]) + if test "$ax_cv_gcc_warn_unused_result" = yes; then + AC_DEFINE([GCC_WARN_UNUSED_RESULT],[__attribute__((__warn_unused_result__))], + [most gcc compilers know a function __attribute__((__warn_unused_result__))]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_x86_avx_xgetbv.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_x86_avx_xgetbv.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_x86_avx_xgetbv.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_x86_avx_xgetbv.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,79 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_x86_avx_xgetbv.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_X86_AVX_XGETBV +# +# DESCRIPTION +# +# On later x86 processors with AVX SIMD support, with gcc or a compiler +# that has a compatible syntax for inline assembly instructions, run a +# small program that executes the xgetbv instruction with input OP. This +# can be used to detect if the OS supports AVX instruction usage. +# +# On output, the values of the eax and edx registers are stored as +# hexadecimal strings as "eax:edx" in the cache variable +# ax_cv_gcc_x86_avx_xgetbv. +# +# If the xgetbv instruction fails (because you are running a +# cross-compiler, or because you are not using gcc, or because you are on +# a processor that doesn't have this instruction), +# ax_cv_gcc_x86_avx_xgetbv_OP is set to the string "unknown". +# +# This macro mainly exists to be used in AX_EXT. +# +# LICENSE +# +# Copyright (c) 2013 Michael Petch +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_GCC_X86_AVX_XGETBV], +[AC_REQUIRE([AC_PROG_CC]) +AC_LANG_PUSH([C]) +AC_CACHE_CHECK(for x86-AVX xgetbv $1 output, ax_cv_gcc_x86_avx_xgetbv_$1, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], [ + int op = $1, eax, edx; + FILE *f; + /* Opcodes for xgetbv */ + __asm__ __volatile__ (".byte 0x0f, 0x01, 0xd0" + : "=a" (eax), "=d" (edx) + : "c" (op)); + f = fopen("conftest_xgetbv", "w"); if (!f) return 1; + fprintf(f, "%x:%x\n", eax, edx); + fclose(f); + return 0; +])], + [ax_cv_gcc_x86_avx_xgetbv_$1=`cat conftest_xgetbv`; rm -f conftest_xgetbv], + [ax_cv_gcc_x86_avx_xgetbv_$1=unknown; rm -f conftest_xgetbv], + [ax_cv_gcc_x86_avx_xgetbv_$1=unknown])]) +AC_LANG_POP([C]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_x86_cpuid.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_x86_cpuid.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_x86_cpuid.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_x86_cpuid.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,89 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_x86_cpuid.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_X86_CPUID(OP) +# AX_GCC_X86_CPUID_COUNT(OP, COUNT) +# +# DESCRIPTION +# +# On Pentium and later x86 processors, with gcc or a compiler that has a +# compatible syntax for inline assembly instructions, run a small program +# that executes the cpuid instruction with input OP. This can be used to +# detect the CPU type. AX_GCC_X86_CPUID_COUNT takes an additional COUNT +# parameter that gets passed into register ECX before calling cpuid. +# +# On output, the values of the eax, ebx, ecx, and edx registers are stored +# as hexadecimal strings as "eax:ebx:ecx:edx" in the cache variable +# ax_cv_gcc_x86_cpuid_OP. +# +# If the cpuid instruction fails (because you are running a +# cross-compiler, or because you are not using gcc, or because you are on +# a processor that doesn't have this instruction), ax_cv_gcc_x86_cpuid_OP +# is set to the string "unknown". +# +# This macro mainly exists to be used in AX_GCC_ARCHFLAG. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# Copyright (c) 2015 Michael Petch +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_GCC_X86_CPUID], +[AX_GCC_X86_CPUID_COUNT($1, 0) +]) + +AC_DEFUN([AX_GCC_X86_CPUID_COUNT], +[AC_REQUIRE([AC_PROG_CC]) +AC_LANG_PUSH([C]) +AC_CACHE_CHECK(for x86 cpuid $1 output, ax_cv_gcc_x86_cpuid_$1, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([#include ], [ + int op = $1, level = $2, eax, ebx, ecx, edx; + FILE *f; + __asm__ __volatile__ ("xchg %%ebx, %1\n" + "cpuid\n" + "xchg %%ebx, %1\n" + : "=a" (eax), "=r" (ebx), "=c" (ecx), "=d" (edx) + : "a" (op), "2" (level)); + + f = fopen("conftest_cpuid", "w"); if (!f) return 1; + fprintf(f, "%x:%x:%x:%x\n", eax, ebx, ecx, edx); + fclose(f); + return 0; +])], + [ax_cv_gcc_x86_cpuid_$1=`cat conftest_cpuid`; rm -f conftest_cpuid], + [ax_cv_gcc_x86_cpuid_$1=unknown; rm -f conftest_cpuid], + [ax_cv_gcc_x86_cpuid_$1=unknown])]) +AC_LANG_POP([C]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_x86_cpu_supports.m4 projectm-3.1.0/m4/autoconf-archive/ax_gcc_x86_cpu_supports.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gcc_x86_cpu_supports.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gcc_x86_cpu_supports.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,104 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_gcc_x86_cpu_supports.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_GCC_X86_CPU_SUPPORTS(X86-INSTRUCTION-SET, +# [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks if the host cpu supports X86-INSTRUCTION-SET. The instruction set +# that can be tested are "mmx, popcnt, sse, sse2, sse3, sse4.1, sse4.2, +# sse4a, avx, avx2, avx512f, fma, fma4, bmi, bmi2". If the instruction set +# is supported by the host cpu, the C preprocessor macro +# HAVE_XXX_INSTRUCTIONS is set to 1. The XXX is up-cased instruction case +# with dot replaced by underscore. For example, the test for "sse4.2" +# would export HAVE_SSE4_2_INSTRUCTIONS=1. This macro requires gcc +# extended builtin function "__builtin_cpu_init" and +# "__builtin_cpu_supports" to detect the cpu features. It will error out +# if the compiler doesn't has these builtins. +# +# If the test for the instruction set succeeded, the hook ACTION-IF-FOUND +# would run. Otherwise the hook ACTION-IF-NOT-FOUND would run if +# specified. +# +# See also AX_CHECK_X86_FEATURES, which checks all the possible +# instruction set and export the corresponding CFLAGS. +# +# LICENSE +# +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN_ONCE([_AX_GCC_X86_CPU_INIT], + [AC_LANG_PUSH([C]) + AC_CACHE_CHECK([for gcc __builtin_cpu_init function], + [ax_cv_gcc_check_x86_cpu_init], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([#include ], + [__builtin_cpu_init ();]) + ], + [ax_cv_gcc_check_x86_cpu_init=yes], + [ax_cv_gcc_check_x86_cpu_init=no])]) + AS_IF([test "X$ax_cv_gcc_check_x86_cpu_init" = "Xno"], + [AC_MSG_ERROR([Need GCC to support X86 CPU features tests])]) +]) + +AC_DEFUN([AX_GCC_X86_CPU_SUPPORTS], + [AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([_AX_GCC_X86_CPU_INIT]) + AC_LANG_PUSH([C]) + AS_VAR_PUSHDEF([gcc_x86_feature], [AS_TR_SH([ax_cv_gcc_x86_cpu_supports_$1])]) + AC_CACHE_CHECK([for x86 $1 instruction support], + [gcc_x86_feature], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( [#include ], + [ __builtin_cpu_init (); + if (__builtin_cpu_supports("$1")) + return 0; + return 1; + ])], + [gcc_x86_feature=yes], + [gcc_x86_feature=no] + )] + ) + AC_LANG_POP([C]) + AS_VAR_IF([gcc_x86_feature],[yes], + [AC_DEFINE( + AS_TR_CPP([HAVE_$1_INSTRUCTIONS]), + [1], + [Define if $1 instructions are supported]) + $2], + [$3] + ) + AS_VAR_POPDEF([gcc_x86_feature]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_generate_changelog.m4 projectm-3.1.0/m4/autoconf-archive/ax_generate_changelog.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_generate_changelog.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_generate_changelog.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,99 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_generate_changelog.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GENERATE_CHANGELOG() +# +# DESCRIPTION +# +# Builds a rule for generating a ChangeLog file from version control +# system commit messages. Currently, the only supported VCS is git, but +# support for others could be added in future. +# +# Defines GENERATE_CHANGELOG_RULES which should be substituted in your +# Makefile. +# +# Usage example: +# +# configure.ac: +# +# AX_GENERATE_CHANGELOG +# +# Makefile.am: +# +# @GENERATE_CHANGELOG_RULES@ +# CHANGELOG_START = 0.2.3^ +# dist-hook: dist-ChangeLog +# +# ChangeLog (stub committed to VCS): +# +# The ChangeLog is auto-generated when releasing. +# If you are seeing this, use 'git log' for a detailed list of changes. +# +# This results in a "dist-ChangeLog" rule being added to the Makefile. +# When run, "dist-ChangeLog" will generate a ChangeLog in the +# $(top_distdir), using $(CHANGELOG_GIT_FLAGS) to format the output from +# "git log" being run in $(CHANGELOG_GIT_DIR). +# +# Unless Automake is initialised with the 'foreign' option, a dummy +# ChangeLog file must be committed to VCS in $(top_srcdir), containing the +# text above (for example). It will be substituted by the automatically +# generated ChangeLog during "make dist". +# +# LICENSE +# +# Copyright (c) 2015 David King +# Copyright (c) 2015 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_GENERATE_CHANGELOG],[ + # Find git, defaulting to the 'missing' script so the user gets a nice + # message if git is missing, rather than a plain 'command not found'. + AC_PATH_PROG([GIT],[git],[${am_missing_run}git]) + AC_SUBST([GIT]) + + # Build the ChangeLog rules. + m4_pattern_allow([AM_V_GEN]) +GENERATE_CHANGELOG_RULES=' +# Generate ChangeLog +# +# Optional: +# - CHANGELOG_START: git commit ID or tag name to output changelogs from +# (exclusive). (Default: include all commits) +# - CHANGELOG_GIT_FLAGS: General flags to pass to git-log when generating the +# ChangeLog. (Default: various) +# - CHANGELOG_GIT_DIR: .git directory to use. (Default: $(top_srcdir)/.git) + +# git-specific +CHANGELOG_GIT_FLAGS ?= --stat -M -C --name-status --no-color --no-decorate +CHANGELOG_GIT_DIR ?= $(top_srcdir)/.git + +ifeq ($(CHANGELOG_START),) +CHANGELOG_GIT_RANGE = +else +CHANGELOG_GIT_RANGE = $(CHANGELOG_START).. +endif + +# Generate a ChangeLog in $(top_distdir) +dist-ChangeLog: + $(AM_V_GEN)if $(GIT) \ + --git-dir=$(CHANGELOG_GIT_DIR) --work-tree=$(top_srcdir) log \ + $(CHANGELOG_GIT_FLAGS) $(CHANGELOG_GIT_RANGE) \ + | fmt --split-only >.ChangeLog.tmp; \ + then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \ + else rm -f .ChangeLog.tmp; exit 1; fi + +.PHONY: dist-ChangeLog +' + + AC_SUBST([GENERATE_CHANGELOG_RULES]) + m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([GENERATE_CHANGELOG_RULES])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gnu_autotest.m4 projectm-3.1.0/m4/autoconf-archive/ax_gnu_autotest.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_gnu_autotest.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_gnu_autotest.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,889 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gnu_autotest.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GNU_AUTOTEST([testdir = `tests'], [testsuites = `testsuite'], +# [atlocal-sources = `'], [gen-package = `yes'], +# [force = `no']) +# +# DESCRIPTION +# +# Sets up one or multiple GNU Autotest test suites [1]. +# +# TL;DR: +# +# * Write tests/testsuite.at as normal +# * Add to configure.ac: AX_GNU_AUTOTEST +# * Add to Makefile.am or Makefile.in in top_srcdir: +# @AX_GNU_AUTOTEST_DEFAULT@ +# * autoreconf && ./configure && make check +# +# GNU Autotest is a very powerful testing framework to script executing +# binaries, observing their output and logging failures, all in the same +# portable manner as configure itself. But the only help given the +# developer in setting up the framework is the AC_CONFIG_TESTDIR() +# command, which leaves several additional steps up to the developer +# copying examples from the manual: +# +# * generating the "package.m4" file used in generating the "testsuite" +# * generating the "testsuite" executable by calling autom4te +# * adding Makefile rules to keep both "package.m4" and "testsuite" +# current +# * figuring out how to do all the above if the Makefile does not reside +# in the testdir +# +# This command takes care of all of the above. It is designed to be called +# multiple times for different testdir directories, to have multiple +# testsuites scripts per directory and to handle the optional "package.m4" +# and "atlocal" (re)generation. +# +# The various actions taken by this command happen in different phases of +# the build process: +# +# 1) During the autoconf execution, generate the testsuites and any +# "package.m4" files. So these are already available before configure +# ran. The reasoning for deviating from the examples in [1] is that +# these files are distributed and must be placed in the srcdir: it +# seems cleaner to not generate anything in srcdir during any of the +# later phases. +# 2) During the config.status execution (following the configure +# execution), generate "atconfig" and any "atlocal" files in the +# buildir. The "atconfig" generation is handled by calling +# AC_CONFIG_TESTDIR() so the developer does not have to do so +# themselves. +# 3) During the execution of make, several additional rules and file +# lists are made available via AC_SUBST(). The rules are intended +# to be called where appropriate (e.g. make check can depend on +# check-autotest) and the file lists are intended to be added +# to the appropriate lists (i.e. to DISTCLEANFILES and EXTRA_DIST). +# +# Description of AX_GNU_AUTOTEST() arguments: +# +# * testdir: directory-name containing the testsuites. AX_GNU_AUTOTEST() +# must be called exactly once for each directory containing testsuites. +# If empty, defaults to "tests". +# * testsuites: space-separated list of words, where each word is the +# name of a test suite script optionally followed by a colon and the +# name of the scripts source file. If the source file is not given, +# it defaults to the script name suffixed by ".at". So these words +# are all equivalent: "foo", "foo:" and "foo:foo.at". If the argument +# is empty, it defaults to "testsuite". The script filenames must not +# contain any path, but that is allowed for the source filenames. +# * atlocal-sources: space- or colon-separated list of filenames, which +# are registered with AC_CONFIG_FILES() as the sources of atlocal. +# If empty, no atlocal file is generated. +# * gen-package: boolean ("yes" or "no") indicating whether "package.m4" +# should be generated. If empty, defaults to "yes". +# * force: boolean ("yes" or "no") whether to treat errors in arguments +# as errors and abort (for "no") or whether to ignore any such errors +# (for "yes"). If empty, defaults to "no". +# +# All filenames above must be relative. The testdir name is interpreted +# relative to top_srcdir. All other names are interpreted relative to the +# testdir. The boolean values are interpreted as "yes" for any non-empty +# value except "0", "n", "no" and their mixed-case variants. +# +# Description of Makefile.am / Makefile.in substitutions: +# +# * AX_GNU_AUTOTEST_RULES: the make rules provided here. Substitute this +# in a separate line. +# * AX_GNU_AUTOTEST_DCLEAN: the list of files to be added to +# DISTCLEANFILES. +# * AX_GNU_AUTOTEST_DIST: the list of files to be added to EXTRA_DIST. +# * AX_GNU_AUTOTEST_DEFAULT: includes all other substitutions and uses +# them in a "default" way. +# +# All must be used as a substitution (@...@) instead of as a variable +# ($(...) or ${...}). These substitutions are generated multiple times, +# once for each directory where an affected Makefile may be located. All +# substitutions start with the base as given above but may have suffixes +# for the directories. Assuming this example in configure.ac: +# +# AX_GNU_AUTOTEST([foo/bar]) +# AX_GNU_AUTOTEST([baz]) +# +# Then the following substitutions are available (where stands for +# one of the above prefixes): +# +# * : for use in top_srcdir/Makefile +# * _foo : for use in top_srcdir/foo/Makefile +# * _foo_bar : for use in top_srcdir/foo/bar/Makefile +# * _baz : for use in top_srcdir/baz/Makefile +# +# The substitutions cover both foo/bar and baz, so none of the +# other substitutions should be used. Indeed, no Makefiles are needed in +# the other directories. But if sub-directory Makefiles are used, then +# both _baz and either of _foo or _foo_bar must be used +# in their respective Makefiles. +# +# Description of Makefile targets defined by AX_GNU_AUTOTEST_RULES*: +# +# * check-autotest: The equivalent of check. +# * installcheck-autotest: The equivalent of installcheck. +# * clean-autotest: The equivalent of clean. +# +# The developer can either define the above targets as dependencies of +# their appropriate equivalent rule or of their *-local equivalent rule +# for automake or they can define a rule with a sub-make call as they +# wish. +# +# All rules are dependent on like-named rules for each sub-directory and +# for each testsuite. Only the testsuite rules actually do any work, the +# rest are just collectors and convenience names. Assuming this example in +# configure.ac: +# +# AX_GNU_AUTOTEST([foo], [testsuite bar]) +# AX_GNU_AUTOTEST([baz]) +# +# Then AX_GNU_AUTOTEST_RULES defines these check rules (likewise for +# installcheck and clean): +# +# check-autotest: check-autotest-foo check-autotest-baz +# check-autotest-foo: check-autotest-foo-testsuite check-autotest-foo-bar +# check-autotest-baz: check-autotest-baz-testsuite +# check-autotest-foo-testsuite # Executes foo/testsuite -C foo +# check-autotest-foo-bar # Executes foo/bar -C foo +# check-autotest-baz-testsuite # Executes baz/testsuite -C baz +# +# And AX_GNU_AUTOTEST_RULES_baz defines these check rules: +# +# check-autotest: check-autotest-testsuite +# check-autotest-testsuite # Executes testsuite (which is baz/testsuite) +# +# Note how the rule names only contain the directory and testsuite paths +# relative to the Makefile location. Also note how each testsuite is +# executed in its respective testdir. +# +# In addition to the above, AX_GNU_AUTOTEST_RULES* also contains the rules +# to keep the testsuites, "package.m4" and "atconfig" updated. The +# matching rules to keep "atlocal" updated are generated by automake if +# that is used or are the responsibility of the developer. +# +# All testsuite executions (except for clean) use variables +# AX_GNU_AUTOTEST_FLAGS, AX_GNU_AUTOTEST_CHECK_FLAGS, +# AX_GNU_AUTOTEST_INSTALLCHECK_FLAGS and more path-and-script-specific +# variants for additional command line options. These variables can be +# defined by the developer to pass options to the testsuite. In the +# example above, the rule check-autotest-foo-bar would look like this: +# +# check-autotest-foo-bar: +# foo/bar -C foo $(AX_GNU_AUTOTEST_FLAGS) \ +# $(AX_GNU_AUTOTEST_CHECK_FLAGS) \ +# $(AX_GNU_AUTOTEST_FLAGS_foo) \ +# $(AX_GNU_AUTOTEST_CHECK_FLAGS_foo) \ +# $(AX_GNU_AUTOTEST_FLAGS_foo_bar) \ +# $(AX_GNU_AUTOTEST_CHECK_FLAGS_foo_bar) +# +# Description of Makefile file lists: +# +# These lists are intended to be added to DISTCLEANFILES and EXTRA_DIST. +# The *_DCLEAN list contains all "atconfig" files and the *_DIST list +# contains all testsuites and "package.m4" files. The lists are again +# generated per directory: so AX_GNU_AUTOTEST_DCLEAN contains all +# "atconfig" files while e.g. AX_GNU_AUTOTEST_DIST_foo contains only files +# below the "foo" directory. These file lists are prevented from becoming +# Makefile variables by calling AM_SUBST_NOTMAKE(): that way, only the +# single version used by the Makefile is substituted, not all lists for +# all other paths as well. So use either like this: +# +# DISTCLEANFILES = @AX_GNU_AUTOTEST_DCLEAN@ +# EXTRA_DIST = @AX_GNU_AUTOTEST_DIST_foo@ +# +# Or like this: +# +# AX_GNU_AUTOTEST_DCLEAN_foo = @AX_GNU_AUTOTEST_DCLEAN_foo@ +# AX_GNU_AUTOTEST_DIST_foo = @AX_GNU_AUTOTEST_DIST_foo@ +# DISTCLEANFILES = ${AX_GNU_AUTOTEST_DCLEAN_foo} +# EXTRA_DIST = ${AX_GNU_AUTOTEST_DIST_foo} +# +# Description of shorthand default Makefile contents defined by +# AX_GNU_AUTOTEST_DEFAULT*: +# +# This shorthand defines the appropriate rules, adds the file lists to the +# proper variables and makes the new targets dependencies of the standard +# "check", "installcheck" and "clean" targets. AX_GNU_AUTOTEST_DEFAULT is +# for example equivalent to: +# +# @AX_GNU_AUTOTEST_RULES@ +# check: check-autotest +# installcheck: installcheck-autotest +# clean: clean-autotest +# distclean: distclean-autotest +# distclean-autotest: clean-autotest +# -rm -f @AX_GNU_AUTOTEST_DCLEAN@ +# .PHONY: distclean-autotest +# EXTRA_DIST += @AX_GNU_AUTOTEST_DIST@ +# +# Note that this is copied verbatim into the Makefile (after expansion of +# the contained @...@ substitutions): it does not shadow the default +# targets as would happen if the same lines were written in a Makefile.am +# file. And also note the use of the += operator: this will not be +# compatible with all versions of Make. Finally, the DISTCLEANFILES list +# is not used because automake only uses that list if it saw the variable +# in the Makefile.am file: in a substitution, it gets ignored unless the +# user already used the list. +# +# Alternative standard GNU test suites not supported here: +# +# * Automake test suites configured by the TESTS variable [2] +# * DejaGnu test suites [3,4] +# +# [1]: +# +# +# [2]: +# +# [3]: +# +# [4]: +# +# +# LICENSE +# +# Copyright (c) 2015 Olaf Mandel +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +# _AX_GNU_AUTOTEST_remove_parent(filename) +# ---------------------------------------- +# Remove all sequences of foo/.. from the filename, recursively (so e.g. +# foo/bar/../.. is empty) +# normal input, quoted output! +# replacement: 1st pattern removes in middle of string +# 2nd pattern removes at beginning: string starts with [[ ! +# 3rd pattern removes at end of string: string ends in ]] ! +# 4th pattern handles complete collapse: string is surrounded +# by [[ ... ]] ! +m4_define([_AX_GNU_AUTOTEST_remove_parent], +[m4_bmatch([$1], [./\.\.\(/\|$\)], + [_AX_GNU_AUTOTEST_remove_parent(m4_bpatsubsts([[$1]], + [/[^/]*\([^.]\|[^.]\.\|[^/]\.\.\)/\.\./], [/], + [^\(..\)[^/]*\([^.]\|[^.]\.\|[^/]\.\.\)/\.\./], [\1], + [/[^/]*\([^.]\|[^.]\.\|[^/]\.\.\)/\.\.\(..\)$], [\2], + [^\(..\)[^/]*\([^.]\|[^.]\.\|[^/]\.\.\)/\.\.\(..\)$], [\1.\3]))], + [[$1]])dnl +])# _AX_GNU_AUTOTEST_remove_parent + +# _AX_GNU_AUTOTEST_canonicalize(filename) +# --------------------------------------- +# Canonicalize filename: see below for replacements +# normal input, quoted output! +# replacement: 1st pattern removes runs of / +# 2nd pattern removes runs of ./ from middle +# 3rd pattern removes ./ from beginning: string starts with [[ ! +# 4th pattern removes / and /. from end: string ends in ]] ! +m4_define([_AX_GNU_AUTOTEST_canonicalize], +[_AX_GNU_AUTOTEST_remove_parent(dnl +m4_bpatsubsts([[$1]], + [//+], [/], + [/\(\./\)+], [/], + [^\(..\)\./], [\1], + [/\.?\(..\)$], [\1]))dnl +])# _AX_GNU_AUTOTEST_canonicalize + +# _AX_GNU_AUTOTEST_check_filename(filename) +# ----------------------------------------- +# Checks and warns if filename contains invalid characters +m4_define([_AX_GNU_AUTOTEST_check_filename], +[m4_bmatch([$1], + [\[\|\]], [m4_fatal([Overquoted file name '$1'])], + [,], [m4_fatal([Comma in file name '$1'])], + [:], [m4_fatal([Colon in file name '$1'])], + ['], [m4_fatal([Quote in file name '$1'])], + [ ], [m4_fatal([Whitespace in file name '$1'])])dnl +])# _AX_GNU_AUTOTEST_check_filename + +# _AX_GNU_AUTOTEST_suite_split(suite) +# ----------------------------------- +# Convert string [foo:bar] into list [[foo],[bar]] and string [foo] to +# list [[foo],[]] +# Output is quoted +# For the m4_bpatsubst, the string starts and ends with [ ] +m4_define([_AX_GNU_AUTOTEST_suite_split], +[m4_bmatch([$1], + [:], [m4_dquote(m4_bpatsubst([[$1]], [:.*\(.\)$], [\1]), + m4_bpatsubst([[$1]], [^\(.\)[^:]*:], [\1]))], + [m4_dquote([$1], [])])dnl +])# _AX_GNU_AUTOTEST_suite_split + +# _AX_GNU_AUTOTEST_check_suite1(suite, source) +# -------------------------------------------- +# Checks both suite and source with _AX_GNU_AUTOTEST_check_filename +m4_define([_AX_GNU_AUTOTEST_check_suite1], +[_AX_GNU_AUTOTEST_check_filename([$1])dnl +_AX_GNU_AUTOTEST_check_filename([$2])dnl +])# _AX_GNU_AUTOTEST_suite_canon1 + +# _AX_GNU_AUTOTEST_suite_canon(suite, source) +# ------------------------------------------- +# Returns a quoted list of canonicalized suite and source +m4_define([_AX_GNU_AUTOTEST_suite_canon], +[m4_dquote(_AX_GNU_AUTOTEST_canonicalize([$1]), + _AX_GNU_AUTOTEST_canonicalize([$2]))dnl +])# _AX_GNU_AUTOTEST_suite_canon + +# _AX_GNU_AUTOTEST_check_suite2(suite) +# ------------------------------------ +# Check for and warn about the presence of a slash (path-separator) +m4_define([_AX_GNU_AUTOTEST_check_suite2], +[m4_bmatch([$1], + [/], [m4_fatal([Path in test suite file name '$1'])])dnl +])# _AX_GNU_AUTOTEST_check_suite2 + +# _AX_GNU_AUTOTEST_suite_expand(suite, source) +# -------------------------------------------- +# Returns a quoted list of default values: suite defaults to [testsuite] and +# source defaults to suite[.at] +m4_define([_AX_GNU_AUTOTEST_suite_expand], +[m4_dquote(m4_ifblank([$1], [[testsuite]], [[$1]]), + m4_ifblank([$2], [m4_ifblank([$1], [[testsuite.at]], [[$1.at]])], + [[$2]]))dnl +])# _AX_GNU_AUTOTEST_suite_expand + +# _AX_GNU_AUTOTEST_add_suite(dir, [suite, source], gen_package, force) +# -------------------------------------------------------------------- +# Add dir/suite to the _AX_GNU_AUTOTEST_suites variable, warning about +# duplicates unless force is non-blank. And add the source and if +# gen_package is true also package.m4 to _AX_GNU_AUTOTEST_suite_srcs +# Global variables used: +# - _AX_GNU_AUTOTEST_suites +# - _AX_GNU_AUTOTEST_suite_srcs +m4_define([_AX_GNU_AUTOTEST_add_suite], +[m4_set_add([_AX_GNU_AUTOTEST_suites], [$1/]m4_car($2), [], + [m4_ifblank([$4], [m4_fatal([Multiple mentions of testsuite ']dnl +[$1/]m4_car($2)['])])])dnl +m4_define([_AX_GNU_AUTOTEST_suite_srcs]m4_dquote([$1/]m4_car($2)), + m4_dquote(m4_unquote(m4_cdr($2))dnl +m4_ifnblank($3, [,[package.m4]])))dnl +])# _AX_GNU_AUTOTEST_add_suite + +# _AX_GNU_AUTOTEST_gen_package(file) +# ---------------------------------- +# Generate a package.m4 file if out of date wrt/ configure.am +# TODO: what other dependencies to check? +m4_define([_AX_GNU_AUTOTEST_gen_package], +[m4_if(m4_esyscmd_s([test -f '$1' -a ! '$1' -ot ']__file__['; echo $?]), 1, +[m4_errprintn(m4_location[: generating `$1' ]dnl +m4_esyscmd_s([mkdir -p "`dirname '$1'`" && cat >'$1' <<"EOFpackage.m4" +# Signature of the current package. +m4_define([AT_PACKAGE_NAME], + ]m4_dquote(m4_defn([AC_PACKAGE_NAME]))[) +m4_define([AT_PACKAGE_TARNAME], + ]m4_dquote(m4_defn([AC_PACKAGE_TARNAME]))[) +m4_define([AT_PACKAGE_VERSION], + ]m4_dquote(m4_defn([AC_PACKAGE_VERSION]))[) +m4_define([AT_PACKAGE_STRING], + ]m4_dquote(m4_defn([AC_PACKAGE_STRING]))[) +m4_define([AT_PACKAGE_BUGREPORT], + ]m4_dquote(m4_defn([AC_PACKAGE_BUGREPORT]))[) +m4_define([AT_PACKAGE_URL], + ]m4_dquote(m4_defn([AC_PACKAGE_URL]))[) +EOFpackage.m4]))])dnl +])# _AX_GNU_AUTOTEST_gen_package + +# _AX_GNU_AUTOTEST_gen_suite(dir, [suite, source], package) +# --------------------------------------------------------- +# Generate a testscript file dir/suite if out of date wrt/ dir/source (or +# dir/package.m4 if package-var is non-zero) +m4_define([_AX_GNU_AUTOTEST_gen_suite], +[m4_pushdef([suite], [$1/]m4_car($2))dnl +m4_pushdef([source], [$1/]m4_argn(2, $2))dnl +m4_if(m4_esyscmd_s([test -f ']m4_defn([suite])[' -a ! ']dnl +m4_defn([suite])[' -ot ']m4_defn([source])[']m4_ifnblank($3, +m4_dquote([ -a ! ']m4_defn([suite])[' -ot '$1/package.m4']))dnl +[; echo $?]), 1, +[m4_errprintn(m4_location[: generating `]m4_defn([suite])[' ]dnl +m4_esyscmd_s([mkdir -p '$1' && autom4te --language=autotest -I '$1' -o ']dnl +m4_defn([suite])[' ']m4_defn([source])[']))])dnl +m4_popdef([suite], [source])dnl +])# _AX_GNU_AUTOTEST_gen_suite + +# _AX_GNU_AUTOTEST_dist_suite(dir, [suite, source]) +# ------------------------------------------------- +# Add dir/suite and dir/source to _AX_GNU_AUTOTEST_dist +# Global variables used: +# - _AX_GNU_AUTOTEST_dist +m4_define([_AX_GNU_AUTOTEST_dist_suite], +[m4_set_add([_AX_GNU_AUTOTEST_dist], [$1/]m4_car($2))dnl +m4_set_add([_AX_GNU_AUTOTEST_dist], [$1/]m4_argn(2, $2))dnl +])# _AX_GNU_AUTOTEST_dist_suite + +# _AX_GNU_AUTOTEST_acsubst_shared() +# --------------------------------- +# Generates rules and Makefile snippets shared between all directories +# shared1 is used for silencing builds and included in all RULES, +# shared2 is used in the DEFAULT substitution +m4_define([_AX_GNU_AUTOTEST_acsubst_shared], +[AC_SUBST([_AX_GNU_AUTOTEST_shared1], +[['AX_GNU_AUTOTEST_V_RUN = $(_AX_GNU_AUTOTEST_v_RUN_$(V)) +_AX_GNU_AUTOTEST_v_RUN_ = $(_AX_GNU_AUTOTEST_v_RUN_$(AM_DEFAULT_VERBOSITY)) +_AX_GNU_AUTOTEST_v_RUN_0 = @echo " RUN " $<; +AX_GNU_AUTOTEST_V_quiet_flag = $(_AX_GNU_AUTOTEST_v_quiet_flag_$(V)) +_AX_GNU_AUTOTEST_v_quiet_flag_ = ]dnl +[$(_AX_GNU_AUTOTEST_v_quiet_flag_$(AM_DEFAULT_VERBOSITY)) +_AX_GNU_AUTOTEST_v_quiet_flag_0 = -q # <- Note: trailing whitespace']])dnl +AM_SUBST_NOTMAKE([_AX_GNU_AUTOTEST_shared1])dnl +AC_SUBST([_AX_GNU_AUTOTEST_shared2], +[['check: check-autotest +installcheck: installcheck-autotest +clean: clean-autotest +distclean: distclean-autotest +.PHONY: distclean-autotest +distclean-autotest: clean-autotest']])dnl +AM_SUBST_NOTMAKE([_AX_GNU_AUTOTEST_shared2])dnl +])# _AX_GNU_AUTOTEST_acsubst_shared + +# _AX_GNU_AUTOTEST_cleanname(char, name) +# -------------------------------------- +# Output name with all non-alphanumeric characters replaced with char +# Output is quoted +# For the m4_bpatsubsts the string starts and ends in [[ ]] and +# the repetition catches all possible sequences of non-alnum chars +m4_define([_AX_GNU_AUTOTEST_cleanname], +[m4_bpatsubsts([[$2]], [\(..\)[^0-9A-Za-z$1]\(..\)], [\1$1\2], + [\(..\)[^0-9A-Za-z$1]\(..\)], [\1$1\2], + [\(..\)[^0-9A-Za-z$1]\(..\)], [\1$1\2], + [\(..\)[^0-9A-Za-z$1]\(..\)], [\1$1\2], + [\(..\)[^0-9A-Za-z$1]\(..\)], [\1$1\2])dnl +])# _AX_GNU_AUTOTEST_cleanname + +# _AX_GNU_AUTOTEST_substr(str, start, [len]) +# ------------------------------------------ +# Like m4_substr(), but with quoted output +# For m4_bpatsubst the string starts and ends in [ ] +# TODO: RE repetition does not work, so need to use loops... Why? +# TODO: What about out-of-range start or len +m4_define([_AX_GNU_AUTOTEST_substr], +[m4_pushdef([i])dnl +m4_if($#, 2, [m4_bpatsubst([[$1]], [^\(.\)]m4_if(m4_eval([($2) > 0]), [0],, + [m4_for([i], 0, m4_eval([($2)-1]),, + [[.]])])[\(.*\)], [\1\2])], + [m4_bpatsubst([[$1]], [^\(.\)]m4_if(m4_eval([($2) > 0]), [0],, + [m4_for([i], 0, m4_eval([($2)-1]),, + [[.]])])[\(]m4_if(m4_eval([($3) > 0]), [0],, + [m4_for([i], 0, m4_eval([($3)-1]),, + [[.]])])[\).*\(.\)], [\1\2\3])])dnl +m4_popdef([i])dnl +])# _AX_GNU_AUTOTEST_substr + +# _AX_GNU_AUTOTEST_list_prependc(prefix, arg1, ...) +# ------------------------------------------------- +# Returns unquoted list of ,prefixarg1,prefixarg2, ... +# Output starts with a comma if at least one arg +m4_define([_AX_GNU_AUTOTEST_list_prependc], +[m4_pushdef([i])dnl +m4_foreach([i], m4_cdr($@), + [,[$1]m4_defn([i])])dnl +m4_popdef([i])dnl +])# _AX_GNU_AUTOTEST_list_prependc + +# _AX_GNU_AUTOTEST_list_appendc(postfix, arg1, ...) +# ------------------------------------------------- +# Returns unquoted list of ,arg1postfix,arg2postfix, ... +# Output starts with a comma if at least one arg +m4_define([_AX_GNU_AUTOTEST_list_appendc], +[m4_pushdef([i])dnl +m4_foreach([i], m4_cdr($@), + [,m4_defn([i])[$1]])dnl +m4_popdef([i])dnl +])# _AX_GNU_AUTOTEST_list_appendc + +# _AX_GNU_AUTOTEST_filter_listc(prefix, arg1, ...) +# ------------------------------------------------ +# Returns unquoted list of all args starting with prefix, but the prefix is +# stripped in the output. Output starts with a comma if at least one arg +m4_define([_AX_GNU_AUTOTEST_filter_listc], +[m4_pushdef([n], m4_len([$1]))dnl +m4_pushdef([i])dnl +m4_foreach([i], m4_cdr($@), + [m4_if([$1], _AX_GNU_AUTOTEST_substr(m4_defn([i]), 0, n), + [,_AX_GNU_AUTOTEST_substr(m4_defn([i]), n)])])dnl +m4_popdef([n], [i])dnl +])# _AX_GNU_AUTOTEST_filter_listc + +# _AX_GNU_AUTOTEST_filterout_listc(rx, arg1, ...) +# ----------------------------------------------- +# Returns unquoted list of all args not matching regular expression rx +# The arguments are not modified (unlike filter_listc). Output starts with +# a comma if at least one arg +m4_define([_AX_GNU_AUTOTEST_filterout_listc], +[m4_pushdef([i])dnl +m4_foreach([i], m4_cdr($@), + [m4_bmatch(m4_defn([i]), [$1], [], [,m4_defn([i])])])dnl +m4_popdef([i])dnl +])# _AX_GNU_AUTOTEST_filterout_listc + +# _AX_GNU_AUTOTEST_filterpref_listc(prefix, arg1, ...) +# ---------------------------------------------------- +# Returns unquoted list of all args that do not start with any of the other +# args followed by the prefix. Output starts with a comma if at least one +# arg. Example: +# filterpref([/], [foo], [foo/bar], [baz/bar]) +# => ,[foo],[baz/baz] +# Uses a set variable _AX_GNU_AUTOTEST_filterpref_var, which interferes with +# other variables of the same name elsewhere (pushdef / popdef do not work +# fully for sets). +m4_define([_AX_GNU_AUTOTEST_filterpref_listc], +[m4_pushdef([_AX_GNU_AUTOTEST_filterpref_var])dnl +m4_set_delete([_AX_GNU_AUTOTEST_filterpref_var])dnl +m4_if([$#], [1], [], [m4_set_add_all([_AX_GNU_AUTOTEST_filterpref_var], + m4_unquote(m4_cdr($@)))])dnl +m4_pushdef([i])dnl +m4_pushdef([j])dnl +m4_pushdef([m], m4_len([$1]))dnl +m4_pushdef([n])dnl +m4_foreach([i], m4_cdr($@), + [m4_define([n], m4_eval(m4_defn([m]) + m4_len(m4_defn([i]))))dnl +m4_set_foreach([_AX_GNU_AUTOTEST_filterpref_var], [j], + [m4_if(m4_defn([i])[$1], + _AX_GNU_AUTOTEST_substr(m4_defn([j]), 0, n), + [m4_set_remove([_AX_GNU_AUTOTEST_filterpref_var], + m4_defn([j]))])])])dnl +m4_set_listc([_AX_GNU_AUTOTEST_filterpref_var])dnl +m4_popdef([_AX_GNU_AUTOTEST_filterpref_var], [i], [j], [m], [n])dnl +])# _AX_GNU_AUTOTEST_filterpref_listc + +# _AX_GNU_AUTOTEST_rules_flags(dirsuite, target) +# ---------------------------------------------- +# Outputs the list of flag variables for the Makefile rules, specific to +# the suite / dir and target +# Recurses into all parent-directories (parent-first) +# For m4_bpatsubsts the string starts and ends in [[ ]] +m4_define([_AX_GNU_AUTOTEST_rules_flags], +[m4_pushdef([name], _AX_GNU_AUTOTEST_cleanname([_], [$1]))dnl +m4_bmatch([$1], [^\.?$], + [[ $(AX_GNU_AUTOTEST_FLAGS) $(AX_GNU_AUTOTEST_$2_FLAGS)]], + [_AX_GNU_AUTOTEST_rules_flags(m4_bpatsubsts([[$1]], + [^\(..\)[^/]*\(..\)$], [\1\2], + [/[^/]*\(..\)$], [\1]), + [$2])dnl +[ $(AX_GNU_AUTOTEST_FLAGS_]m4_defn([name])[) $(AX_GNU_AUTOTEST_$2_FLAGS_]dnl +m4_defn([name])[)]])dnl +m4_popdef([name])dnl +])# _AX_GNU_AUTOTEST_rules_flags + +# _AX_GNU_AUTOTEST_acsubst_rules_suite_deps(suite, dep1, ...) +# ----------------------------------------------------------- +# Generates the three rules for one suite, output as string +# The suite and dependencies are already relative to the source-dir. +# For the m4_bpatsubst, the string starts and ends with [ ] +# The two quotes ('') in AM_V_GEN obviate the need for m4_pattern_allow +m4_define([_AX_GNU_AUTOTEST_acsubst_rules_suite_deps], +[m4_pushdef([name], _AX_GNU_AUTOTEST_cleanname([-], [$1]))dnl +m4_pushdef([atconf], [atconfig])dnl +m4_bmatch([$1], + [/], [m4_define([atconf], m4_bpatsubst([[$1]], [/[^/]*\(.\)$], + [/atconfig\1]))])dnl +m4_pushdef([cdir])dnl +m4_bmatch([$1], + [/], [m4_define([cdir], [ -C ]m4_bpatsubst([[$1]], [/[^/]*\(.\)$], + [\1]))])dnl +m4_dquote([$(srcdir)/$1: $(top_srcdir)/]__file__[]dnl +m4_mapall([[ $(srcdir)/]m4_quote], m4_cdr($@))[ + $(A''M_V_GEN)cd $(top_srcdir) && $(AUTOCONF) -f +]m4_defn([atconf])[: + $(A''M_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status ]dnl +$(AX_GNU_AUTOTEST_V_quiet_flag)[$][@ +check-autotest-]m4_defn([name])[: $(srcdir)/$1 ]m4_defn([atconf])[ + $(AX_GNU_AUTOTEST_V_RUN)$(SHELL) $(srcdir)/$1]m4_defn([cdir])dnl +_AX_GNU_AUTOTEST_rules_flags([$1], [CHECK])[ +installcheck-autotest-]m4_defn([name])[: $(srcdir)/$1 ]m4_defn([atconf])[ + $(AX_GNU_AUTOTEST_V_RUN)$(SHELL) $(srcdir)/$1]m4_defn([cdir])dnl +[ AUTOTEST_PATH=$(DESTDIR)$(bindir)]dnl +_AX_GNU_AUTOTEST_rules_flags([$1], [INSTALLCHECK])[ +clean-autotest-]m4_defn([name])[: $(srcdir)/$1 + -$(SHELL) $(srcdir)/$1]m4_defn([cdir])[ -c +])dnl +m4_popdef([name], [atconf], [cdir])dnl +])# _AX_GNU_AUTOTEST_acsubst_rules_suite_deps + +# _AX_GNU_AUTOTEST_acsubst_rules_suite(dir, suite) +# ------------------------------------------------ +# Generates the three rules for one suite, output as string +# The suite is supplied still containing the dir prefix. +# Global variables used: +# - _AX_GNU_AUTOTEST_suite_srcs +m4_define([_AX_GNU_AUTOTEST_acsubst_rules_suite], +[m4_pushdef([suite], [$2])dnl +m4_ifnblank([$1], [m4_define([suite], m4_unquote(m4_cdr(dnl +_AX_GNU_AUTOTEST_filter_listc([$1/], [$2]))))])dnl +m4_pushdef([sdir])dnl +m4_bmatch([$2], [/], [m4_define([sdir], + m4_bpatsubst([[$2]], [/[^/]*\(.\)$], [\1]))])dnl +m4_pushdef([deps], m4_dquote(, + m4_unquote(m4_defn([_AX_GNU_AUTOTEST_suite_srcs[$2]]))))dnl +m4_ifnblank(m4_defn([sdir]), [m4_define([deps], m4_dquote(dnl +_AX_GNU_AUTOTEST_list_prependc(m4_defn([sdir])[/]deps)))])dnl +m4_ifnblank([$1], [m4_define([deps], + m4_dquote(_AX_GNU_AUTOTEST_filter_listc([$1/]deps)))])dnl +_AX_GNU_AUTOTEST_acsubst_rules_suite_deps(m4_defn([suite])deps)dnl +m4_popdef([deps], [sdir], [suite])dnl +])# _AX_GNU_AUTOTEST_acsubst_rules_suite + +# _AX_GNU_AUTOTEST_acsubst_rules_dir(base, dir) +# --------------------------------------------- +# Generates the dependency rules for one directory relative to base, output +# as string +# For the m4_bpatsubst, the string starts and ends with [ ] +# Global variables used: +# - _AX_GNU_AUTOTEST_suites +# - _AX_GNU_AUTOTEST_testdirs +m4_define([_AX_GNU_AUTOTEST_acsubst_rules_dir], +[m4_pushdef([name])dnl +m4_ifnblank([$2], + [m4_define([name], [-]_AX_GNU_AUTOTEST_cleanname([-], [$2]))])dnl +m4_pushdef([suites], m4_dquote(m4_set_listc([_AX_GNU_AUTOTEST_suites])))dnl +m4_ifnblank([$1], [m4_define([suites], m4_dquote(dnl +_AX_GNU_AUTOTEST_filter_listc([$1/]suites)))])dnl +m4_ifblank([$2], [m4_define([suites], m4_dquote(dnl +_AX_GNU_AUTOTEST_filterout_listc([/]suites)))], + [m4_define([suites], m4_dquote(dnl +_AX_GNU_AUTOTEST_list_prependc([$2/]dnl +_AX_GNU_AUTOTEST_filterout_listc([/]dnl +_AX_GNU_AUTOTEST_filter_listc([$2/]suites)))))])dnl +m4_pushdef([testdirs], m4_dquote(m4_set_listc(dnl +[_AX_GNU_AUTOTEST_testdirs])))dnl +m4_ifnblank([$1], [m4_define([testdirs], m4_dquote(dnl +_AX_GNU_AUTOTEST_filter_listc([$1/]testdirs)))])dnl +m4_ifblank([$2], [m4_define([testdirs], m4_dquote(dnl +_AX_GNU_AUTOTEST_filterpref_listc([/]testdirs)))], + [m4_define([testdirs], m4_dquote(dnl +_AX_GNU_AUTOTEST_list_prependc([$2/]dnl +_AX_GNU_AUTOTEST_filterpref_listc([/]dnl +_AX_GNU_AUTOTEST_filter_listc([$2/]testdirs)))))])dnl +m4_pushdef([deps], m4_quote(m4_cdr(testdirs[]suites)))dnl +m4_define([deps], m4_dquote(m4_mapall_sep(dnl +[[-autotest-]m4_curry([_AX_GNU_AUTOTEST_cleanname], [-])], [,], +m4_defn([deps]))))dnl +m4_dquote([check-autotest]m4_defn([name])[:]m4_mapall([[ check]m4_quote], + m4_defn([deps]))[ +installcheck-autotest]m4_defn([name])[:]m4_mapall([[ installcheck]m4_quote], + m4_defn([deps]))[ +clean-autotest]m4_defn([name])[:]m4_mapall([[ clean]m4_quote], + m4_defn([deps]))[ +])dnl +m4_popdef([deps], [name], [suites], [testdirs])dnl +])# _AX_GNU_AUTOTEST_acsubst_rules_dir + +# _AX_GNU_AUTOTEST_acsubst_rules_phony(element) +# --------------------------------------------- +# Generates the names of the three targets for one element as string +m4_define([_AX_GNU_AUTOTEST_acsubst_rules_phony], +[m4_pushdef([name])dnl +m4_ifnblank([$1], [m4_define([name], + _AX_GNU_AUTOTEST_cleanname([-], [-$1]))])dnl +m4_dquote([ check-autotest]m4_defn([name])dnl +[ installcheck-autotest]m4_defn([name])dnl +[ clean-autotest]m4_defn([name]))dnl +m4_popdef([name])dnl +])# _AX_GNU_AUTOTEST_acsubst_rules_phony + +# _AX_GNU_AUTOTEST_acsubst_rules_one(name, dir) +# --------------------------------------------- +# AC_SUBSTs one variable called "name" to contain the rules for all suites +# in or below dir +# Global variables used: +# - _AX_GNU_AUTOTEST_suites +# - _AX_GNU_AUTOTEST_testdirs +m4_define([_AX_GNU_AUTOTEST_acsubst_rules_one], +[m4_pushdef([suites])dnl +m4_ifblank([$2], [m4_define([suites], m4_dquote(dnl +m4_set_listc([_AX_GNU_AUTOTEST_suites])))], + [m4_define([suites], m4_dquote(dnl +_AX_GNU_AUTOTEST_list_prependc([$2/]dnl +_AX_GNU_AUTOTEST_filter_listc([$2/]dnl +m4_set_listc([_AX_GNU_AUTOTEST_suites])))))])dnl +m4_pushdef([testdirs])dnl +m4_ifblank([$2], [m4_define([testdirs], m4_dquote([], + m4_set_listc([_AX_GNU_AUTOTEST_testdirs])))], + [m4_define([testdirs], m4_dquote([], + _AX_GNU_AUTOTEST_filter_listc([$2/]dnl +m4_set_listc([_AX_GNU_AUTOTEST_testdirs]))))])dnl +AC_SUBST([$1], +[["${_AX_GNU_AUTOTEST_shared1}"' +]]m4_map_args([m4_curry([_AX_GNU_AUTOTEST_acsubst_rules_suite], + [$2])]suites)dnl +m4_map_args([m4_curry([_AX_GNU_AUTOTEST_acsubst_rules_dir], [$2])]testdirs)dnl +[[.PHONY:]]m4_map_args_sep([_AX_GNU_AUTOTEST_acsubst_rules_phony(], [)], [\ +]testdirs[]suites)[[']])dnl +AM_SUBST_NOTMAKE([$1])dnl +m4_popdef([suites], [testdirs])dnl +])# _AX_GNU_AUTOTEST_acsubst_rules_one + +# _AX_GNU_AUTOTEST_acsubst_rules(dir) +# ----------------------------------- +# AC_SUBSTs the rules variable for dir and recurses for all parent-dirs +# Recurses into all parent-directories +# For m4_bpatsubsts the string starts and ends in [[ ]] +m4_define([_AX_GNU_AUTOTEST_acsubst_rules], +[m4_bmatch([$1], [^\.?$], + [_AX_GNU_AUTOTEST_acsubst_rules_one([AX_GNU_AUTOTEST_RULES], + [])], + [_AX_GNU_AUTOTEST_acsubst_rules_one(dnl +[AX_GNU_AUTOTEST_RULES_]_AX_GNU_AUTOTEST_cleanname([_], [$1]), [$1])dnl +_AX_GNU_AUTOTEST_acsubst_rules(m4_bpatsubsts([[$1]], [^\(..\)[^/]*\(..\)$], + [\1\2], [/[^/]*\(..\)$], [\1]))])dnl +])# _AX_GNU_AUTOTEST_acsubst_rules + +# _AX_GNU_AUTOTEST_acsubst_list(name, arg1, ...) +# ---------------------------------------------- +# AC_SUBSTs the name variable to contain all arg1, ... +m4_define([_AX_GNU_AUTOTEST_acsubst_list], +[AC_SUBST([$1], [[']]m4_dquote(m4_mapall_sep([m4_quote], [[\ + ]], m4_dquote(m4_dquote_elt(m4_unquote(m4_cdr($@))))))[[']])dnl +AM_SUBST_NOTMAKE([$1])dnl +])# _AX_GNU_AUTOTEST_acsubst_list + +# _AX_GNU_AUTOTEST_acsubst_dclean(dir) +# ------------------------------------ +# AC_SUBSTs the dclean variable for dir and recurses for all parent-dirs +# Global variables used: +# - _AX_GNU_AUTOTEST_testdirs +# Recurses into all parent-directories +# For m4_bpatsubsts the string starts and ends in [[ ]] +m4_define([_AX_GNU_AUTOTEST_acsubst_dclean], +[m4_bmatch([$1], [^\.?$], + [_AX_GNU_AUTOTEST_acsubst_list([AX_GNU_AUTOTEST_DCLEAN]dnl +_AX_GNU_AUTOTEST_list_appendc([/atconfig]dnl +m4_set_listc([_AX_GNU_AUTOTEST_testdirs])))], + [_AX_GNU_AUTOTEST_acsubst_list(dnl +[AX_GNU_AUTOTEST_DCLEAN_]_AX_GNU_AUTOTEST_cleanname([_], [$1])dnl +_AX_GNU_AUTOTEST_filter_listc([$1/]dnl +_AX_GNU_AUTOTEST_list_appendc([/atconfig]dnl +m4_set_listc([_AX_GNU_AUTOTEST_testdirs]))))dnl +_AX_GNU_AUTOTEST_acsubst_dclean(m4_bpatsubsts([[$1]], [^\(..\)[^/]*\(..\)$], + [\1\2], [/[^/]*\(..\)$], [\1]))])dnl +])# _AX_GNU_AUTOTEST_acsubst_dclean + +# _AX_GNU_AUTOTEST_acsubst_dist(dir) +# ---------------------------------- +# AC_SUBSTs the dist variable for dir and recurses for all parent-dirs +# Global variables used: +# - _AX_GNU_AUTOTEST_dist +# Recurses into all parent-directories +# For m4_bpatsubsts the string starts and ends in [[ ]] +m4_define([_AX_GNU_AUTOTEST_acsubst_dist], +[m4_bmatch([$1], [^\.?$], + [_AX_GNU_AUTOTEST_acsubst_list([AX_GNU_AUTOTEST_DIST]dnl +m4_set_listc([_AX_GNU_AUTOTEST_dist]))], + [_AX_GNU_AUTOTEST_acsubst_list(dnl +[AX_GNU_AUTOTEST_DIST_]_AX_GNU_AUTOTEST_cleanname([_], [$1])dnl +_AX_GNU_AUTOTEST_filter_listc([$1/]m4_set_listc([_AX_GNU_AUTOTEST_dist])))dnl +_AX_GNU_AUTOTEST_acsubst_dist(m4_bpatsubsts([[$1]], [^\(..\)[^/]*\(..\)$], + [\1\2], [/[^/]*\(..\)$], [\1]))])dnl +])# _AX_GNU_AUTOTEST_acsubst_dist + +# _AX_GNU_AUTOTEST_acsubst_default(dir) +# ------------------------------------- +# AC_SUBSTs the rules of the "default" use-case for dir and recurses for +# all parent-dirs +# Recurses into all parent-directories +# For m4_bpatsubsts the string starts and ends in [[ ]] +m4_define([_AX_GNU_AUTOTEST_acsubst_default], +[m4_pushdef([name])dnl +m4_bmatch([$1], [^\.?$], [], + [m4_define([name], [_]_AX_GNU_AUTOTEST_cleanname([_], [$1]))])dnl +AC_SUBST([AX_GNU_AUTOTEST_DEFAULT]m4_defn([name]), +[["${AX_GNU_AUTOTEST_RULES]m4_defn([name])[} +${_AX_GNU_AUTOTEST_shared2}"' + -rm -f '"${AX_GNU_AUTOTEST_DCLEAN]m4_defn([name])[}"' +EXTRA_DIST += '"${AX_GNU_AUTOTEST_DIST]m4_defn([name])[}"]])dnl +AM_SUBST_NOTMAKE([AX_GNU_AUTOTEST_DEFAULT]m4_defn([name]))dnl +m4_popdef([name])dnl +m4_bmatch([$1], [^\.?$], [], + [_AX_GNU_AUTOTEST_acsubst_default(m4_bpatsubsts([[$1]], + [^\(..\)[^/]*\(..\)$], [\1\2], [/[^/]*\(..\)$], [\1]))])dnl +])# _AX_GNU_AUTOTEST_acsubst_default + +# AX_GNU_AUTOTEST([testdir = `tests'], [testsuites = `testsuite'], +# [atlocal-sources = `'], [gen-package = `yes'], +# [force = `no']) +# ---------------------------------------------------------------- +# Global variables used: +# - _AX_GNU_AUTOTEST_testdirs +# - _AX_GNU_AUTOTEST_suites +# - _AX_GNU_AUTOTEST_suite_srcs +# - _AX_GNU_AUTOTEST_dist +AC_DEFUN([AX_GNU_AUTOTEST], +[dnl Check command arguments +dnl Check $5: force +m4_pushdef([force], m4_normalize([$5]))dnl +m4_bmatch(m4_defn([force]), [^\([Nn][Oo]?\|0\)$], [m4_define([force], [])])dnl +m4_ifnblank(m4_defn([force]), [m4_define([force], 1)])dnl +dnl +dnl Check $1: testdir +m4_pushdef([testdir], m4_normalize([$1]))dnl +m4_ifblank(m4_defn([testdir]), [m4_define([testdir], [tests])])dnl +m4_ifblank(force, [_AX_GNU_AUTOTEST_check_filename(m4_defn([testdir]))])dnl +m4_define([testdir], _AX_GNU_AUTOTEST_canonicalize(m4_defn([testdir])))dnl +m4_set_add([_AX_GNU_AUTOTEST_testdirs], m4_defn([testdir]), [], + [m4_ifblank(force, + [m4_fatal([Already configured directory ']m4_defn([testdir])['])])])dnl +dnl +dnl Check $4: gen-package +m4_pushdef([gen_package], m4_normalize([$4]))dnl +m4_ifblank(m4_defn([gen_package]), [m4_define([gen_package], [yes])])dnl +m4_bmatch(m4_defn([gen_package]), + [^\([Nn][Oo]?\|0\)$], [m4_define([gen_package], [])])dnl +m4_ifnblank(m4_defn([gen_package]), [m4_define([gen_package], 1)])dnl +dnl +dnl Check $2: testsuites +m4_pushdef([testsuites], m4_normalize([$2]))dnl +m4_ifblank(m4_defn([testsuites]), [m4_define([testsuites], [testsuite])])dnl +m4_define([testsuites], m4_dquote(m4_map_args_w(m4_defn([testsuites]), + [_AX_GNU_AUTOTEST_suite_split(], [)], [,])))dnl +m4_ifblank(force, [m4_map([_AX_GNU_AUTOTEST_check_suite1], + m4_defn([testsuites]))])dnl +m4_define([testsuites], m4_dquote(m4_map_sep([_AX_GNU_AUTOTEST_suite_canon], + [,], m4_defn([testsuites]))))dnl +m4_ifblank(force, [m4_map([_AX_GNU_AUTOTEST_check_suite2], + m4_defn([testsuites]))])dnl +m4_define([testsuites], m4_dquote(m4_map_sep([_AX_GNU_AUTOTEST_suite_expand], + [,], m4_defn([testsuites]))))dnl +m4_map_args_sep([_AX_GNU_AUTOTEST_add_suite(]m4_quote(m4_defn([testdir]))[,], + [,]m4_defn([gen_package])[,]m4_defn([force])[)], [], + testsuites)dnl +dnl +dnl Check $3: atlocal-sources +m4_pushdef([atlocal_sources], m4_normalize(m4_bpatsubst([[$3]], [:], [ ])))dnl +m4_define([atlocal_sources], m4_split(m4_defn([atlocal_sources]), [ ]))dnl +m4_ifnblank(m4_defn([atlocal_sources]), [m4_define([atlocal_sources], + m4_dquote(m4_map_args_sep([_AX_GNU_AUTOTEST_canonicalize(], + [)], [,], atlocal_sources)))])dnl +m4_ifblank(force, [m4_map_args([_AX_GNU_AUTOTEST_check_filename], + atlocal_sources)])dnl +dnl +dnl Phase 1 +m4_ifnblank(gen_package, +[_AX_GNU_AUTOTEST_gen_package(m4_defn([testdir])[/package.m4])dnl +m4_set_add([_AX_GNU_AUTOTEST_dist], m4_defn([testdir])[/package.m4])dnl +])dnl +m4_map_args_sep([_AX_GNU_AUTOTEST_gen_suite([]m4_defn([testdir])[],], + [,]gen_package[)], [], testsuites)dnl +m4_map_args_sep([_AX_GNU_AUTOTEST_dist_suite([]m4_defn([testdir])[],], + [)], [], testsuites)dnl +dnl +dnl Phase 2 +dnl The following commands fail for quotes in testdir +AC_CONFIG_TESTDIR(m4_dquote(m4_defn([testdir])))dnl +m4_ifnblank(m4_defn([atlocal_sources]), [AC_CONFIG_FILES(dnl +m4_defn([testdir])[/atlocal:]m4_map_args_sep(m4_defn([testdir])[/], + [], [:], atlocal_sources))])dnl +dnl +dnl Phase 3 +_AX_GNU_AUTOTEST_acsubst_shared()dnl +_AX_GNU_AUTOTEST_acsubst_rules(m4_defn([testdir]))dnl +_AX_GNU_AUTOTEST_acsubst_dclean(m4_defn([testdir]))dnl +_AX_GNU_AUTOTEST_acsubst_dist(m4_defn([testdir]))dnl +_AX_GNU_AUTOTEST_acsubst_default(m4_defn([testdir]))dnl +dnl +m4_popdef([testdir], [testsuites], [atlocal_sources], [gen_package], + [force])dnl +])# AX_GNU_AUTOTEST diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_adns.m4 projectm-3.1.0/m4/autoconf-archive/ax_have_adns.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_adns.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_have_adns.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_have_adns.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_HAVE_ADNS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Check whether the GNU ADNS library available from +# http://www.chiark.greenend.org.uk/~ian/adns/ is installed on this +# system. The test is known to work with version 1.4 (or later). If the +# library is found, the flags necessary to link it are added to $LIBS. +# +# LICENSE +# +# Copyright (c) 2008 Peter Simons +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AC_DEFUN([AX_HAVE_ADNS], [dnl + AC_CHECK_HEADER([adns.h], [dnl + AC_SEARCH_LIBS([adns_init], [adns], [dnl + AC_CACHE_CHECK([for GNU ADNS], [ax_cv_have_adns], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM( + [#include ], + [int rc; rc = adns_init((adns_state *)(0), adns_if_none, (FILE *)(0));])], + [ax_cv_have_adns=yes], + [ax_cv_have_adns=no])])])]) + AS_IF([test "${ax_cv_have_adns}" = "yes"], [$1], [$2]) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_epoll.m4 projectm-3.1.0/m4/autoconf-archive/ax_have_epoll.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_epoll.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_have_epoll.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,104 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_have_epoll.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_HAVE_EPOLL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# AX_HAVE_EPOLL_PWAIT([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro determines whether the system supports the epoll I/O event +# interface. A neat usage example would be: +# +# AX_HAVE_EPOLL( +# [AX_CONFIG_FEATURE_ENABLE(epoll)], +# [AX_CONFIG_FEATURE_DISABLE(epoll)]) +# AX_CONFIG_FEATURE( +# [epoll], [This platform supports epoll(7)], +# [HAVE_EPOLL], [This platform supports epoll(7).]) +# +# The epoll interface was added to the Linux kernel in version 2.5.45, and +# the macro verifies that a kernel newer than this is installed. This +# check is somewhat unreliable if doesn't match the +# running kernel, but it is necessary regardless, because glibc comes with +# stubs for the epoll_create(), epoll_wait(), etc. that allow programs to +# compile and link even if the kernel is too old; the problem would then +# be detected only at runtime. +# +# Linux kernel version 2.6.19 adds the epoll_pwait() call in addition to +# epoll_wait(). The availability of that function can be tested with the +# second macro. Generally speaking, it is safe to assume that +# AX_HAVE_EPOLL would succeed if AX_HAVE_EPOLL_PWAIT has, but not the +# other way round. +# +# LICENSE +# +# Copyright (c) 2008 Peter Simons +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_HAVE_EPOLL], [dnl + ax_have_epoll_cppflags="${CPPFLAGS}" + AC_CHECK_HEADER([linux/version.h], [CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"]) + AC_MSG_CHECKING([for Linux epoll(7) interface]) + AC_CACHE_VAL([ax_cv_have_epoll], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM([dnl +#include +#ifdef HAVE_LINUX_VERSION_H +# include +# if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45) +# error linux kernel version is too old to have epoll +# endif +#endif +], [dnl +int fd, rc; +struct epoll_event ev; +fd = epoll_create(128); +rc = epoll_wait(fd, &ev, 1, 0);])], + [ax_cv_have_epoll=yes], + [ax_cv_have_epoll=no])]) + CPPFLAGS="${ax_have_epoll_cppflags}" + AS_IF([test "${ax_cv_have_epoll}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl + +AC_DEFUN([AX_HAVE_EPOLL_PWAIT], [dnl + ax_have_epoll_cppflags="${CPPFLAGS}" + AC_CHECK_HEADER([linux/version.h], + [CPPFLAGS="${CPPFLAGS} -DHAVE_LINUX_VERSION_H"]) + AC_MSG_CHECKING([for Linux epoll(7) interface with signals extension]) + AC_CACHE_VAL([ax_cv_have_epoll_pwait], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM([dnl +#ifdef HAVE_LINUX_VERSION_H +# include +# if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) +# error linux kernel version is too old to have epoll_pwait +# endif +#endif +#include +#include +], [dnl +int fd, rc; +struct epoll_event ev; +fd = epoll_create(128); +rc = epoll_wait(fd, &ev, 1, 0); +rc = epoll_pwait(fd, &ev, 1, 0, (sigset_t const *)(0));])], + [ax_cv_have_epoll_pwait=yes], + [ax_cv_have_epoll_pwait=no])]) + CPPFLAGS="${ax_have_epoll_cppflags}" + AS_IF([test "${ax_cv_have_epoll_pwait}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_poll.m4 projectm-3.1.0/m4/autoconf-archive/ax_have_poll.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_poll.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_have_poll.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_have_poll.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_HAVE_POLL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# AX_HAVE_PPOLL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro determines whether the system supports the poll I/O event +# interface. A neat usage example would be: +# +# AX_HAVE_POLL( +# [AX_CONFIG_FEATURE_ENABLE(poll)], +# [AX_CONFIG_FEATURE_DISABLE(poll)]) +# AX_CONFIG_FEATURE( +# [poll], [This platform supports poll(7)], +# [HAVE_POLL], [This platform supports poll(7).]) +# +# Some systems -- most notably Linux kernel 2.6.16 and later -- also have +# the variant ppoll(). The availability of that function can be tested +# with the second macro. Generally speaking, it is safe to assume that +# AX_HAVE_POLL would succeed if AX_HAVE_PPOLL has, but not the other way +# round. +# +# LICENSE +# +# Copyright (c) 2009 Peter Simons +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_HAVE_POLL], [dnl + AC_MSG_CHECKING([for poll(2)]) + AC_CACHE_VAL([ax_cv_have_poll], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM( + [#include ], + [int rc; rc = poll((struct pollfd *)(0), 0, 0);])], + [ax_cv_have_poll=yes], + [ax_cv_have_poll=no])]) + AS_IF([test "${ax_cv_have_poll}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl + +AC_DEFUN([AX_HAVE_PPOLL], [dnl + AC_MSG_CHECKING([for ppoll(2)]) + AC_CACHE_VAL([ax_cv_have_ppoll], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM( + [dnl +#include +#include ], + [dnl +int rc; +rc = poll((struct pollfd *)(0), 0, 0); +rc = ppoll((struct pollfd *)(0), 0, (struct timespec const *)(0), (sigset_t const *)(0));])], + [ax_cv_have_ppoll=yes], + [ax_cv_have_ppoll=no])]) + AS_IF([test "${ax_cv_have_ppoll}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_qt.m4 projectm-3.1.0/m4/autoconf-archive/ax_have_qt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_qt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_have_qt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,225 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_have_qt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_HAVE_QT +# +# DESCRIPTION +# +# Searches $PATH and queries qmake for Qt include files, libraries and Qt +# binary utilities. The macro only supports Qt5 or later. +# +# The following shell variable is set to either "yes" or "no": +# +# have_qt +# +# Additionally, the following variables are exported: +# +# QT_CXXFLAGS +# QT_LIBS +# QT_MOC +# QT_UIC +# QT_LRELEASE +# QT_LUPDATE +# QT_DIR +# +# which respectively contain an "-I" flag pointing to the Qt include +# directory, link flags necessary to link with Qt and X, the full path to +# the meta object compiler and the user interface compiler both, and +# finally the variable QTDIR as Qt likes to see it defined. +# +# Example lines for Makefile.in: +# +# CXXFLAGS = @QT_CXXFLAGS@ +# MOC = @QT_MOC@ +# +# After the variables have been set, a trial compile and link is performed +# to check the correct functioning of the meta object compiler. This test +# may fail when the different detected elements stem from different +# releases of the Qt framework. In that case, an error message is emitted +# and configure stops. +# +# No common variables such as $LIBS or $CFLAGS are polluted. +# +# LICENSE +# +# Copyright (c) 2008 Bastiaan Veelo +# Copyright (c) 2014 Alex Henrie +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +AU_ALIAS([BNV_HAVE_QT], [AX_HAVE_QT]) +AC_DEFUN([AX_HAVE_QT], +[ + AC_REQUIRE([AC_PROG_CXX]) + AC_REQUIRE([AC_PATH_X]) + AC_REQUIRE([AC_PATH_XTRA]) + + AC_MSG_CHECKING(for Qt) + # If we have Qt5 or later in the path, we're golden + ver=`qmake --version | grep -o "Qt version ."` + if test "$ver" ">" "Qt version 4"; then + have_qt=yes + # This pro file dumps qmake's variables, but it only works on Qt 5 or later + am_have_qt_pro=`mktemp` + am_have_qt_makefile=`mktemp` + # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt + cat > $am_have_qt_pro << EOF +qtHaveModule(axcontainer): QT += axcontainer +qtHaveModule(axserver): QT += axserver +qtHaveModule(concurrent): QT += concurrent +qtHaveModule(core): QT += core +qtHaveModule(dbus): QT += dbus +qtHaveModule(declarative): QT += declarative +qtHaveModule(designer): QT += designer +qtHaveModule(gui): QT += gui +qtHaveModule(help): QT += help +qtHaveModule(multimedia): QT += multimedia +qtHaveModule(multimediawidgets): QT += multimediawidgets +qtHaveModule(network): QT += network +qtHaveModule(opengl): QT += opengl +qtHaveModule(printsupport): QT += printsupport +qtHaveModule(qml): QT += qml +qtHaveModule(qmltest): QT += qmltest +qtHaveModule(x11extras): QT += x11extras +qtHaveModule(script): QT += script +qtHaveModule(scripttools): QT += scripttools +qtHaveModule(sensors): QT += sensors +qtHaveModule(serialport): QT += serialport +qtHaveModule(sql): QT += sql +qtHaveModule(svg): QT += svg +qtHaveModule(testlib): QT += testlib +qtHaveModule(uitools): QT += uitools +qtHaveModule(webkit): QT += webkit +qtHaveModule(webkitwidgets): QT += webkitwidgets +qtHaveModule(xml): QT += xml +qtHaveModule(xmlpatterns): QT += xmlpatterns +percent.target = % +percent.commands = @echo -n "\$(\$(@))\ " +QMAKE_EXTRA_TARGETS += percent +EOF + qmake $am_have_qt_pro -o $am_have_qt_makefile + QT_CXXFLAGS=`make -s -f $am_have_qt_makefile CXXFLAGS INCPATH` + QT_LIBS=`make -s -f $am_have_qt_makefile LIBS` + rm $am_have_qt_pro $am_have_qt_makefile + + # Look for specific tools in $PATH + QT_MOC=`which moc` + QT_UIC=`which uic` + QT_LRELEASE=`which lrelease` + QT_LUPDATE=`which lupdate` + + # Get Qt version from qmake + QT_DIR=`qmake --version | grep -o -E /.+` + + # All variables are defined, report the result + AC_MSG_RESULT([$have_qt: + QT_CXXFLAGS=$QT_CXXFLAGS + QT_DIR=$QT_DIR + QT_LIBS=$QT_LIBS + QT_UIC=$QT_UIC + QT_MOC=$QT_MOC + QT_LRELEASE=$QT_LRELEASE + QT_LUPDATE=$QT_LUPDATE]) + else + # Qt was not found + have_qt=no + QT_CXXFLAGS= + QT_DIR= + QT_LIBS= + QT_UIC= + QT_MOC= + QT_LRELEASE= + QT_LUPDATE= + AC_MSG_RESULT($have_qt) + fi + AC_SUBST(QT_CXXFLAGS) + AC_SUBST(QT_DIR) + AC_SUBST(QT_LIBS) + AC_SUBST(QT_UIC) + AC_SUBST(QT_MOC) + AC_SUBST(QT_LRELEASE) + AC_SUBST(QT_LUPDATE) + + #### Being paranoid: + if test x"$have_qt" = xyes; then + AC_MSG_CHECKING(correct functioning of Qt installation) + AC_CACHE_VAL(ax_cv_qt_test_result, + [ + cat > ax_qt_test.h << EOF +#include +class Test : public QObject +{ +Q_OBJECT +public: + Test() {} + ~Test() {} +public slots: + void receive() {} +signals: + void send(); +}; +EOF + + cat > ax_qt_main.$ac_ext << EOF +#include "ax_qt_test.h" +#include +int main( int argc, char **argv ) +{ + QApplication app( argc, argv ); + Test t; + QObject::connect( &t, SIGNAL(send()), &t, SLOT(receive()) ); +} +EOF + + ax_cv_qt_test_result="failure" + ax_try_1="$QT_MOC ax_qt_test.h -o moc_ax_qt_test.$ac_ext >/dev/null 2>/dev/null" + AC_TRY_EVAL(ax_try_1) + if test x"$ac_status" != x0; then + echo "$ax_err_1" >&AS_MESSAGE_LOG_FD + echo "configure: could not run $QT_MOC on:" >&AS_MESSAGE_LOG_FD + cat ax_qt_test.h >&AS_MESSAGE_LOG_FD + else + ax_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o moc_ax_qt_test.o moc_ax_qt_test.$ac_ext >/dev/null 2>/dev/null" + AC_TRY_EVAL(ax_try_2) + if test x"$ac_status" != x0; then + echo "$ax_err_2" >&AS_MESSAGE_LOG_FD + echo "configure: could not compile:" >&AS_MESSAGE_LOG_FD + cat moc_ax_qt_test.$ac_ext >&AS_MESSAGE_LOG_FD + else + ax_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o ax_qt_main.o ax_qt_main.$ac_ext >/dev/null 2>/dev/null" + AC_TRY_EVAL(ax_try_3) + if test x"$ac_status" != x0; then + echo "$ax_err_3" >&AS_MESSAGE_LOG_FD + echo "configure: could not compile:" >&AS_MESSAGE_LOG_FD + cat ax_qt_main.$ac_ext >&AS_MESSAGE_LOG_FD + else + ax_try_4="$CXX -o ax_qt_main ax_qt_main.o moc_ax_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null" + AC_TRY_EVAL(ax_try_4) + if test x"$ac_status" != x0; then + echo "$ax_err_4" >&AS_MESSAGE_LOG_FD + else + ax_cv_qt_test_result="success" + fi + fi + fi + fi + ])dnl AC_CACHE_VAL ax_cv_qt_test_result + AC_MSG_RESULT([$ax_cv_qt_test_result]) + if test x"$ax_cv_qt_test_result" = "xfailure"; then + AC_MSG_ERROR([Failed to find matching components of a complete + Qt installation. Try using more options, + see ./configure --help.]) + fi + + rm -f ax_qt_test.h moc_ax_qt_test.$ac_ext moc_ax_qt_test.o \ + ax_qt_main.$ac_ext ax_qt_main.o ax_qt_main + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_select.m4 projectm-3.1.0/m4/autoconf-archive/ax_have_select.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_have_select.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_have_select.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_have_select.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_HAVE_SELECT([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# AX_HAVE_PSELECT([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro determines whether the system supports the select I/O event +# interface. A neat usage example would be: +# +# AX_HAVE_SELECT( +# [AX_CONFIG_FEATURE_ENABLE(select)], +# [AX_CONFIG_FEATURE_DISABLE(select)]) +# AX_CONFIG_FEATURE( +# [select], [This platform supports select(7)], +# [HAVE_SELECT], [This platform supports select(7).]) +# +# Some systems also have the variant pselect(). The availability of that +# function can be tested with the second macro. Generally speaking, it is +# safe to assume that AX_HAVE_SELECT would succeed if AX_HAVE_SELECT_PWAIT +# has, but not the other way round. +# +# LICENSE +# +# Copyright (c) 2009 Peter Simons +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_HAVE_SELECT], [dnl + AC_MSG_CHECKING([for select(2)]) + AC_CACHE_VAL([ax_cv_have_select], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM( + [#include ], + [int rc; rc = select(0, (fd_set *)(0), (fd_set *)(0), (fd_set *)(0), (struct timeval *)(0));])], + [ax_cv_have_select=yes], + [ax_cv_have_select=no])]) + AS_IF([test "${ax_cv_have_select}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl + +AC_DEFUN([AX_HAVE_PSELECT], [dnl + AC_MSG_CHECKING([for pselect(2)]) + AC_CACHE_VAL([ax_cv_have_pselect], [dnl + AC_LINK_IFELSE([dnl + AC_LANG_PROGRAM( + [dnl +#include +#include ], + [dnl +int rc; +rc = select(0, (fd_set *)(0), (fd_set *)(0), (fd_set *)(0), (struct timeval *)(0)); +rc = pselect(0, (fd_set *)(0), (fd_set *)(0), (fd_set *)(0), (struct timespec const *)(0), (sigset_t const *)(0));])], + [ax_cv_have_pselect=yes], + [ax_cv_have_pselect=no])]) + AS_IF([test "${ax_cv_have_pselect}" = "yes"], + [AC_MSG_RESULT([yes]) +$1],[AC_MSG_RESULT([no]) +$2]) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_include_strcasecmp.m4 projectm-3.1.0/m4/autoconf-archive/ax_include_strcasecmp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_include_strcasecmp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_include_strcasecmp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,55 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_include_strcasecmp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_INCLUDE_STRCASECMP +# +# DESCRIPTION +# +# This macro tries to find a header for strcasecmp() in strings.h, then +# string.h, and AC_DEFINEs AX_STRCASECMP_HEADER to the value it found. Use +# it in your source like so: +# +# #ifdef AX_STRCASECMP_HEADER +# #include AX_STRCASECMP_HEADER +# #endif +# +# LICENSE +# +# Copyright (c) 2012 Leo Davis +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_INCLUDE_STRCASECMP], +[ +AC_CACHE_CHECK([for strcasecmp header file], [ax_cv_include_strcasecmp_found], [ + ax_cv_include_strcasecmp_found=no + AC_TRY_LINK( + [ #include ], + [ strcasecmp("foo", "bar"); ], + [ax_cv_include_strcasecmp_found=''], + [ax_cv_include_strcasecmp_found=no]) + + if test x"$ax_cv_include_strcasecmp_found" = "xno" + then + AC_TRY_LINK( + [ #include ], + [ strcasecmp("foo", "bar"); ], + [ax_cv_include_strcasecmp_found=''], + [ax_cv_include_strcasecmp_found=no]) + fi +]) + if test x"$ax_cv_include_strcasecmp_found" != "xno" + then + AC_DEFINE_UNQUOTED([AX_STRCASECMP_HEADER], [$ax_cv_include_strcasecmp_found], + [Defined to or if strcasecmp is found]) + + fi +]) dnl AX_INCLUDE_STRCASECMP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_install_files.m4 projectm-3.1.0/m4/autoconf-archive/ax_install_files.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_install_files.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_install_files.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,89 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_install_files.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_INSTALL_FILES +# +# DESCRIPTION +# +# Adds target for creating a install_files file, which contains the list +# of files that will be installed. +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +AC_DEFUN([AX_INSTALL_FILES], +[ +AC_MSG_NOTICE([adding install_files support]) +AC_ARG_VAR(GAWK, [gawk executable to use]) +if test "x$GAWK" = "x"; then + AC_CHECK_PROGS(GAWK,[gawk]) +fi +AC_SUBST(GAWK) + +if test "x$GAWK" != "x"; then + AC_MSG_NOTICE([install_files support enabled]) + AX_HAVE_INSTALL_FILES=true +else + AX_HAVE_INSTALL_FILES=false; + AC_MSG_WARN([install_files support disable... gawk not found]) +fi +AM_CONDITIONAL([ax_install_files_enabled], + [test "x$AX_HAVE_INSTALL_FILES" = "xtrue"]) + +AX_ADD_AM_MACRO_STATIC([ + +if ax_install_files_enabled +AX_INSTALL_FILES_CLEANFILES = \\ +\$(top_builddir)/install_files + +\$(top_builddir)/install_files: do-mfstamp-recursive + @if test \"\$(top_builddir)/mfstamp\" -nt \"\$(top_builddir)/install_files\"; then \\ + cd \$(top_builddir) && STAGING=\"\$(PWD)/staging\"; \\ + \$(MAKE) \$(AM_MAKEFLAGS) DESTDIR=\"\$\$STAGING\" install; \\ + cd \"\$\$STAGING\" && find "." ! -type d -print | \\ + \$(GAWK) ' \\ + /^\\.\\/usr\\/local\\/lib/ { \\ + sub( /\\.\\/usr\\/local\\/lib/, \"%%{_libdir}\" ); } \\ + /^\\.\\/usr\\/local\\/bin/ { \\ + sub( /\\.\\/usr\\/local\\/bin/, \"%%{_bindir}\" ); } \\ + /^\\.\\/usr\\/local\\/include/ { \\ + sub( /\\.\\/usr\\/local\\/include/, \"%%{_includedir}\" ); } \\ + /^\\.\\/usr\\/local\\/share/ { \\ + sub( /\\.\\/usr\\/local\\/share/, \"%%{_datadir}\" ); } \\ + /^\\.\\/usr\\/local/ { \\ + sub( /\\.\\/usr\\/local/, \"%%{_prefix}\" ); } \\ + /^\\./ { sub( /\\./, \"\" ); } \\ + /./ { print; }' > ../install_files; \\ + rm -rf \"\$\$STAGING\"; \\ + else \\ + echo \"\\\`\$(top_builddir)/install_files\' is up to date.\"; \\ + fi + +]) +AX_ADD_RECURSIVE_AM_MACRO_STATIC([do-mfstamp],[ +\$(top_builddir)/mfstamp: do-mfstamp-recursive + +do-mfstamp-am do-mfstamp: Makefile.in + @echo \"timestamp for all Makefile.in files\" > \$(top_builddir)/mfstamp + @touch ${AX_DOLLAR}@ + +]) +AX_ADD_AM_MACRO_STATIC([ +endif # ax_install_files_enabled + +clean-local: clean-ax-install-files +clean-ax-install-files: + -test -z \"\$(AX_INSTALL_FILES)\" || rm -f \$(AX_INSTALL_FILES) +]) +])# AX_INSTALL_FILES diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_is_release.m4 projectm-3.1.0/m4/autoconf-archive/ax_is_release.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_is_release.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_is_release.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_is_release.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_IS_RELEASE(POLICY) +# +# DESCRIPTION +# +# Determine whether the code is being configured as a release, or from +# git. Set the ax_is_release variable to 'yes' or 'no'. +# +# If building a release version, it is recommended that the configure +# script disable compiler errors and debug features, by conditionalising +# them on the ax_is_release variable. If building from git, these +# features should be enabled. +# +# The POLICY parameter specifies how ax_is_release is determined. It can +# take the following values: +# +# * git-directory: ax_is_release will be 'no' if a '.git' directory exists +# * minor-version: ax_is_release will be 'no' if the minor version number +# in $PACKAGE_VERSION is odd; this assumes +# $PACKAGE_VERSION follows the 'major.minor.micro' scheme +# * micro-version: ax_is_release will be 'no' if the micro version number +# in $PACKAGE_VERSION is odd; this assumes +# $PACKAGE_VERSION follows the 'major.minor.micro' scheme +# * dash-version: ax_is_release will be 'no' if there is a dash '-' +# in $PACKAGE_VERSION, for example 1.2-pre3, 1.2.42-a8b9 +# or 2.0-dirty (in particular this is suitable for use +# with git-version-gen) +# * always: ax_is_release will always be 'yes' +# * never: ax_is_release will always be 'no' +# +# Other policies may be added in future. +# +# LICENSE +# +# Copyright (c) 2015 Philip Withnall +# Copyright (c) 2016 Collabora Ltd. +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. + +#serial 7 + +AC_DEFUN([AX_IS_RELEASE],[ + AC_BEFORE([AC_INIT],[$0]) + + m4_case([$1], + [git-directory],[ + # $is_release = (.git directory does not exist) + AS_IF([test -d ${srcdir}/.git],[ax_is_release=no],[ax_is_release=yes]) + ], + [minor-version],[ + # $is_release = ($minor_version is even) + minor_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + AS_IF([test "$(( $minor_version % 2 ))" -ne 0], + [ax_is_release=no],[ax_is_release=yes]) + ], + [micro-version],[ + # $is_release = ($micro_version is even) + micro_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]]*\.[[^.]]*\.\([[^.]]*\).*/\1/'` + AS_IF([test "$(( $micro_version % 2 ))" -ne 0], + [ax_is_release=no],[ax_is_release=yes]) + ], + [dash-version],[ + # $is_release = ($PACKAGE_VERSION has a dash) + AS_CASE([$PACKAGE_VERSION], + [*-*], [ax_is_release=no], + [*], [ax_is_release=yes]) + ], + [always],[ax_is_release=yes], + [never],[ax_is_release=no], + [ + AC_MSG_ERROR([Invalid policy. Valid policies: git-directory, minor-version, micro-version, dash-version, always, never.]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_java_check_class.m4 projectm-3.1.0/m4/autoconf-archive/ax_java_check_class.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_java_check_class.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_java_check_class.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,85 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_java_check_class.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_JAVA_CHECK_CLASS(,,) +# +# DESCRIPTION +# +# Test if a Java class is available. Based on AX_PROG_JAVAC_WORKS. This +# version uses a cache variable which is both compiler, options and +# classpath dependent (so if you switch from javac to gcj it correctly +# notices and redoes the test). +# +# The macro tries to compile a minimal program importing . Some +# newer compilers moan about the failure to use this but fail or produce a +# class file anyway. All moaning is sunk to /dev/null since I only wanted +# to know if the class could be imported. This is a recommended followup +# to AX_CHECK_JAVA_PLUGIN with classpath appropriately adjusted. +# +# LICENSE +# +# Copyright (c) 2008 Duncan Simpson +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 12 + +AU_ALIAS([DPS_JAVA_CHECK_CLASS], [AX_JAVA_CHECK_CLASS]) +AC_DEFUN([AX_JAVA_CHECK_CLASS],[ +m4_define([cache_val],[m4_translit(ax_cv_have_java_class_$1, " ." ,"__")]) +if test "x$CLASSPATH" != "x"; then +xtra=" with classpath ${CLASSPATH}" +xopts=`echo ${CLASSPATH} | ${SED} 's/^ *://'` +xopts="-classpath $xopts" +else xtra=""; xopts=""; fi +cache_var="cache_val"AS_TR_SH([_Jc_${JAVAC}_Cp_${CLASSPATH}]) +AC_CACHE_CHECK([if the $1 class is available$xtra], [$cache_var], [ +JAVA_TEST=Test.java +CLASS_TEST=Test.class +cat << \EOF > $JAVA_TEST +/* [#]xline __oline__ "configure" */ +import $1; +public class Test { +} +EOF +if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $xopts $JAVA_TEST) >/dev/null 2>&1; then + eval "${cache_var}=yes" +else + eval "${cache_var}=no" + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat $JAVA_TEST >&AS_MESSAGE_LOG_FD +fi +rm -f $JAVA_TEST $CLASS_TEST +]) +if eval 'test "x$'${cache_var}'" = "xyes"'; then +$2 +true; else +$3 +false; fi]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_java_options.m4 projectm-3.1.0/m4/autoconf-archive/ax_java_options.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_java_options.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_java_options.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,48 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_java_options.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_JAVA_OPTIONS +# +# DESCRIPTION +# +# AX_JAVA_OPTIONS adds configure command line options used for Java m4 +# macros. This Macro is optional. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Devin Weaver +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([AC_JAVA_OPTIONS], [AX_JAVA_OPTIONS]) +AC_DEFUN([AX_JAVA_OPTIONS],[ +AC_ARG_WITH(java-prefix, + [ --with-java-prefix=PFX prefix where Java runtime is installed (optional)]) +AC_ARG_WITH(javac-flags, + [ --with-javac-flags=FLAGS flags to pass to the Java compiler (optional)]) +AC_ARG_WITH(java-flags, + [ --with-java-flags=FLAGS flags to pass to the Java VM (optional)]) +JAVAPREFIX=$with_java_prefix +JAVACFLAGS=$with_javac_flags +JAVAFLAGS=$with_java_flags +AC_SUBST(JAVAPREFIX)dnl +AC_SUBST(JAVACFLAGS)dnl +AC_SUBST(JAVAFLAGS)dnl +AC_SUBST(JAVA)dnl +AC_SUBST(JAVAC)dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_jni_include_dir.m4 projectm-3.1.0/m4/autoconf-archive/ax_jni_include_dir.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_jni_include_dir.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_jni_include_dir.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,145 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_JNI_INCLUDE_DIR +# +# DESCRIPTION +# +# AX_JNI_INCLUDE_DIR finds include directories needed for compiling +# programs using the JNI interface. +# +# JNI include directories are usually in the Java distribution. This is +# deduced from the value of $JAVA_HOME, $JAVAC, or the path to "javac", in +# that order. When this macro completes, a list of directories is left in +# the variable JNI_INCLUDE_DIRS. +# +# Example usage follows: +# +# AX_JNI_INCLUDE_DIR +# +# for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS +# do +# CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" +# done +# +# If you want to force a specific compiler: +# +# - at the configure.in level, set JAVAC=yourcompiler before calling +# AX_JNI_INCLUDE_DIR +# +# - at the configure level, setenv JAVAC +# +# Note: This macro can work with the autoconf M4 macros for Java programs. +# This particular macro is not part of the original set of macros. +# +# LICENSE +# +# Copyright (c) 2008 Don Anderson +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR]) +AC_DEFUN([AX_JNI_INCLUDE_DIR],[ + +JNI_INCLUDE_DIRS="" + +if test "x$JAVA_HOME" != x; then + _JTOPDIR="$JAVA_HOME" +else + if test "x$JAVAC" = x; then + JAVAC=javac + fi + AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no]) + if test "x$_ACJNI_JAVAC" = xno; then + AC_MSG_ERROR([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME]) + fi + _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") + _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` +fi + +case "$host_os" in + darwin*) # Apple Java headers are inside the Xcode bundle. + macos_version=$(sw_vers -productVersion | sed -n -e 's/^@<:@0-9@:>@*.\(@<:@0-9@:>@*\).@<:@0-9@:>@*/\1/p') + if @<:@ "$macos_version" -gt "7" @:>@; then + _JTOPDIR="$(xcrun --show-sdk-path)/System/Library/Frameworks/JavaVM.framework" + _JINC="$_JTOPDIR/Headers" + else + _JTOPDIR="/System/Library/Frameworks/JavaVM.framework" + _JINC="$_JTOPDIR/Headers" + fi + ;; + *) _JINC="$_JTOPDIR/include";; +esac +_AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR]) +_AS_ECHO_LOG([_JINC=$_JINC]) + +# On Mac OS X 10.6.4, jni.h is a symlink: +# /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h +# -> ../../CurrentJDK/Headers/jni.h. +AC_CACHE_CHECK(jni headers, ac_cv_jni_header_path, +[ + if test -f "$_JINC/jni.h"; then + ac_cv_jni_header_path="$_JINC" + JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $ac_cv_jni_header_path" + else + _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` + if test -f "$_JTOPDIR/include/jni.h"; then + ac_cv_jni_header_path="$_JTOPDIR/include" + JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $ac_cv_jni_header_path" + else + ac_cv_jni_header_path=none + fi + fi +]) + +# get the likely subdirectories for system specific java includes +case "$host_os" in +bsdi*) _JNI_INC_SUBDIRS="bsdos";; +freebsd*) _JNI_INC_SUBDIRS="freebsd";; +darwin*) _JNI_INC_SUBDIRS="darwin";; +linux*) _JNI_INC_SUBDIRS="linux genunix";; +osf*) _JNI_INC_SUBDIRS="alpha";; +solaris*) _JNI_INC_SUBDIRS="solaris";; +mingw*) _JNI_INC_SUBDIRS="win32";; +cygwin*) _JNI_INC_SUBDIRS="win32";; +*) _JNI_INC_SUBDIRS="genunix";; +esac + +if test "x$ac_cv_jni_header_path" != "xnone"; then + # add any subdirectories that are present + for JINCSUBDIR in $_JNI_INC_SUBDIRS + do + if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then + JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR" + fi + done +fi +]) + +# _ACJNI_FOLLOW_SYMLINKS +# Follows symbolic links on , +# finally setting variable _ACJNI_FOLLOWED +# ---------------------------------------- +AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[ +# find the include directory relative to the javac executable +_cur="$1" +while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do + AC_MSG_CHECKING([symlink for $_cur]) + _slink=`ls -ld "$_cur" | sed 's/.* -> //'` + case "$_slink" in + /*) _cur="$_slink";; + # 'X' avoids triggering unwanted echo options. + *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";; + esac + AC_MSG_RESULT([$_cur]) +done +_ACJNI_FOLLOWED="$_cur" +])# _ACJNI diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lapack.m4 projectm-3.1.0/m4/autoconf-archive/ax_lapack.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lapack.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lapack.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,131 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lapack.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LAPACK([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro looks for a library that implements the LAPACK linear-algebra +# interface (see http://www.netlib.org/lapack/). On success, it sets the +# LAPACK_LIBS output variable to hold the requisite library linkages. +# +# To link with LAPACK, you should link with: +# +# $LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS +# +# in that order. BLAS_LIBS is the output variable of the AX_BLAS macro, +# called automatically. FLIBS is the output variable of the +# AC_F77_LIBRARY_LDFLAGS macro (called if necessary by AX_BLAS), and is +# sometimes necessary in order to link with F77 libraries. Users will also +# need to use AC_F77_DUMMY_MAIN (see the autoconf manual), for the same +# reason. +# +# The user may also use --with-lapack= in order to use some specific +# LAPACK library . In order to link successfully, however, be aware +# that you will probably need to use the same Fortran compiler (which can +# be set via the F77 env. var.) as was used to compile the LAPACK and BLAS +# libraries. +# +# ACTION-IF-FOUND is a list of shell commands to run if a LAPACK library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_LAPACK. +# +# LICENSE +# +# Copyright (c) 2009 Steven G. Johnson +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AU_ALIAS([ACX_LAPACK], [AX_LAPACK]) +AC_DEFUN([AX_LAPACK], [ +AC_REQUIRE([AX_BLAS]) +ax_lapack_ok=no + +AC_ARG_WITH(lapack, + [AS_HELP_STRING([--with-lapack=], [use LAPACK library ])]) +case $with_lapack in + yes | "") ;; + no) ax_lapack_ok=disable ;; + -* | */* | *.a | *.so | *.so.* | *.o) LAPACK_LIBS="$with_lapack" ;; + *) LAPACK_LIBS="-l$with_lapack" ;; +esac + +# Get fortran linker name of LAPACK function to check for. +AC_F77_FUNC(cheev) + +# We cannot use LAPACK if BLAS is not found +if test "x$ax_blas_ok" != xyes; then + ax_lapack_ok=noblas + LAPACK_LIBS="" +fi + +# First, check LAPACK_LIBS environment variable +if test "x$LAPACK_LIBS" != x; then + save_LIBS="$LIBS"; LIBS="$LAPACK_LIBS $BLAS_LIBS $LIBS $FLIBS" + AC_MSG_CHECKING([for $cheev in $LAPACK_LIBS]) + AC_TRY_LINK_FUNC($cheev, [ax_lapack_ok=yes], [LAPACK_LIBS=""]) + AC_MSG_RESULT($ax_lapack_ok) + LIBS="$save_LIBS" + if test $ax_lapack_ok = no; then + LAPACK_LIBS="" + fi +fi + +# LAPACK linked to by default? (is sometimes included in BLAS lib) +if test $ax_lapack_ok = no; then + save_LIBS="$LIBS"; LIBS="$LIBS $BLAS_LIBS $FLIBS" + AC_CHECK_FUNC($cheev, [ax_lapack_ok=yes]) + LIBS="$save_LIBS" +fi + +# Generic LAPACK library? +for lapack in lapack lapack_rs6k; do + if test $ax_lapack_ok = no; then + save_LIBS="$LIBS"; LIBS="$BLAS_LIBS $LIBS" + AC_CHECK_LIB($lapack, $cheev, + [ax_lapack_ok=yes; LAPACK_LIBS="-l$lapack"], [], [$FLIBS]) + LIBS="$save_LIBS" + fi +done + +AC_SUBST(LAPACK_LIBS) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x"$ax_lapack_ok" = xyes; then + ifelse([$1],,AC_DEFINE(HAVE_LAPACK,1,[Define if you have LAPACK library.]),[$1]) + : +else + ax_lapack_ok=no + $2 +fi +])dnl AX_LAPACK diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_beecrypt.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_beecrypt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_beecrypt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_beecrypt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,75 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_beecrypt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_BEECRYPT([yes|no|auto]) +# +# DESCRIPTION +# +# Searches for the 'beecrypt' library with the --with... option. +# +# If found, define HAVE_BEECRYPT and macro BEECRYPT_LIBS. Also defines +# BEECRYPT_WITH_ for the algorithms found available. Possible +# algorithms: BASE64 AES BF MD5 SHA1 SHA256 SHA384 SHA512. +# +# The argument is used if no --with...-beecrypt option is set. Value "yes" +# requires the configuration by default. Value "no" does not require it by +# default. Value "auto" configures the library only if available. +# +# See also AX_LIB_CRYPTO and AX_LIB_GCRYPT. +# +# LICENSE +# +# Copyright (c) 2009 Fabien Coelho +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +# AX_CHECK_BEECRYPT_ALGO([name],[function]) +AC_DEFUN([AX_CHECK_BEECRYPT_ALGO],[ + AC_CHECK_LIB([beecrypt], [$2], + AC_DEFINE([BEECRYPT_WITH_$1],[1],[Algorithm $1 in beecrypt library])) +]) + +# AX_LIB_BEECRYPT([yes|no|auto]) +AC_DEFUN([AX_LIB_BEECRYPT],[ + AC_MSG_CHECKING([whether beecrypt is enabled]) + AC_ARG_WITH([beecrypt],[ --with-beecrypt require beecrypt library + --without-beecrypt disable beecrypt library],[ + AC_MSG_RESULT([$withval]) + ac_with_beecrypt=$withval + ],[ + AC_MSG_RESULT([$1]) + ac_with_beecrypt=$1 + ]) + if test "$ac_with_beecrypt" = "yes" -o "$ac_with_beecrypt" = "auto" ; then + AC_CHECK_HEADERS([beecrypt/beecrypt.h],[ + AC_CHECK_LIB([beecrypt],[blockCipherFind],[ + AC_DEFINE([HAVE_BEECRYPT],[1],[Beecrypt library is available]) + HAVE_BEECRYPT=1 + AC_SUBST([BEECRYPT_LIBS],[-lbeecrypt]) + # encoding + AX_CHECK_BEECRYPT_ALGO([BASE64],[b64encode]) + # ciphers + AX_CHECK_BEECRYPT_ALGO([AES],[aesSetup]) + AX_CHECK_BEECRYPT_ALGO([BF],[blowfishSetup]) + # digests + AX_CHECK_BEECRYPT_ALGO([MD5],[md5Digest]) + AX_CHECK_BEECRYPT_ALGO([SHA1],[sha1Digest]) + AX_CHECK_BEECRYPT_ALGO([SHA256],[sha256Digest]) + AX_CHECK_BEECRYPT_ALGO([SHA384],[sha384Digest]) + AX_CHECK_BEECRYPT_ALGO([SHA512],[sha512Digest]) + ]) + ]) + # complain only if explicitly required + if test "$ac_with_beecrypt" = "yes" -a "x$HAVE_BEECRYPT" = "x" ; then + AC_MSG_ERROR([cannot configure required beecrypt library]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_cgal_core.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_cgal_core.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_cgal_core.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_cgal_core.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,114 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_cgal_core.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_CGAL_CORE([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the CGAL_Core library. +# +# By using the "--with-cgal=" option, define a special installation +# directory. If CGAL is not found there, the script will fail immediately. +# Otherwise, $CGAL_HOME is searched, then standard system locations. +# +# NOTE: This script depends on BOOST_CPPFLAGS, so be sure to run +# AX_BOOST_BASE in advance. +# +# This macro calls: +# +# AC_SUBST(CGAL_CPPFLAGS) +# AC_SUBST(CGAL_LDFLAGS) +# +# And sets: +# +# HAVE_CGAL +# +# LICENSE +# +# Copyright (c) 2010 Sebastian Hegler +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_LIB_CGAL_CORE],[ + +dnl guess from env, or use given value +AC_ARG_WITH([cgal], + AS_HELP_STRING([--with-cgal@<:@=DIR@:>@], + [location of cgal installation, default $CGAL_HOME]), + [ac_cgal_dirs="$withval"], + [ac_cgal_dirs="$CGAL_HOME"' /usr /usr/local /opt /opt/local'] +) + +AC_LANG_PUSH([C++]) + +for ac_cgal_iterate in $ac_cgal_dirs ; do + CPPFLAGS_SAVED="$CPPFLAGS" + CGAL_CPPFLAGS="-I$ac_cgal_iterate/include" + CPPFLAGS="$CPPFLAGS $CGAL_CPPFLAGS $BOOST_CPPFLAGS" + export CPPFLAGS + + CGAL_LDFLAGS="-L$ac_cgal_iterate/lib -lCGAL -lCGAL_Core" + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $CGAL_LDFLAGS" + export LDFLAGS + + AC_MSG_CHECKING([whether CGAL is available in $ac_cgal_iterate]) + dnl This test program is taken from: + dnl http://www.cgal.org/Manual/latest/examples/Convex_hull_2/vector_convex_hull_2.cpp + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [ + [@%:@include ] + [@%:@include ] + [@%:@include ] + [typedef CGAL::Exact_predicates_inexact_constructions_kernel K;] + [typedef K::Point_2 Point_2;] + [typedef std::vector Points;] + ], + [ + [Points points, result; + points.push_back(Point_2(0,0)); + points.push_back(Point_2(10,0)); + points.push_back(Point_2(10,10)); + points.push_back(Point_2(6,5)); + points.push_back(Point_2(4,1)); + CGAL::convex_hull_2(points.begin(),points.end(),std::back_inserter(result)); + //std::cout << result.size() << " points on the convex hull" << std::endl;] + ])] + ,[ac_cgal=yes],[ac_cgal=no]) + + LDFLAGS="$LDFLAGS_SAVED" + export LDFLAGS + CPPFLAGS="$CPPFLAGS_SAVED" + export CPPFLAGS + + if test $ac_cgal = yes ; then + AC_MSG_RESULT([yes]) + break + else + AC_MSG_RESULT([no]) + fi +done + +AC_LANG_POP([C++]) + +if test $ac_cgal = yes ; then + AC_DEFINE(HAVE_CGAL,[1],[Indicates presence of CGAL library]) + AC_SUBST(CGAL_CPPFLAGS) + AC_SUBST(CGAL_LDFLAGS) + # execute ACTION-IF-FOUND + ifelse([$1], , :, [$1]) +else + # execute ACTION-IF-NOT-FOUND + ifelse([$2], , :, [$2]) +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_crypto.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_crypto.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_crypto.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_crypto.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,85 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_crypto.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_CRYPTO([yes|no|auto]) +# +# DESCRIPTION +# +# Searches for the 'crypto' library with the --with... option. +# +# If found, define HAVE_CRYPTO and macro CRYPTO_LIBS. Also defines +# CRYPTO_WITH_ for the algorithms found available. Possible +# algorithms: AES BF CAMELLIA CAST DES IDEA RC2 RC5 MD2 MD4 MD5 SHA RIPEMD +# RSA DSA DH +# +# The argument is used if no --with...-crypto option is set. Value "yes" +# requires the configuration by default. Value "no" does not require it by +# default. Value "auto" configures the library only if available. +# +# See also AX_LIB_BEECRYPT and AX_LIB_GCRYPT. +# +# LICENSE +# +# Copyright (c) 2009 Fabien Coelho +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +# AX_CHECK_CRYPTO_LIB([algo-name],[function]) +AC_DEFUN([AX_CHECK_CRYPTO_LIB],[ + AC_CHECK_LIB([crypto], $2, [ + AC_DEFINE([CRYPTO_WITH_$1],[1],[Algorithm $1 in openssl crypto library]) + ]) +]) + +# AX_LIB_CRYPTO([yes|no|auto]) +AC_DEFUN([AX_LIB_CRYPTO],[ + AC_MSG_CHECKING([whether openssl crypto is enabled]) + AC_ARG_WITH([crypto],[ --with-crypto requite crypto library + --without-crypto disable crypto library],[ + AC_MSG_RESULT([$withval]) + ac_with_crypto=$withval + ],[ + AC_MSG_RESULT([$1]) + ac_with_crypto=$1 + ]) + if test "$ac_with_crypto" = "yes" -o "$ac_with_crypto" = "auto" ; then + AC_CHECK_HEADERS([openssl/opensslconf.h],[ + AC_CHECK_LIB([crypto], [CRYPTO_lock],[ + AC_DEFINE([HAVE_CRYPTO],[1],[Openssl crypto library is available]) + HAVE_CRYPTO=1 + AC_SUBST([CRYPTO_LIBS],[-lcrypto]) + # ciphers + AX_CHECK_CRYPTO_LIB([AES],[AES_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([BF],[BF_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([CAST],[CAST_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([CAMELLIA],[Camellia_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([DES],[DES_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([IDEA],[idea_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([RC2],[RC2_ecb_encrypt]) + AX_CHECK_CRYPTO_LIB([RC5],[RC5_32_ecb_encrypt]) + # digests + AX_CHECK_CRYPTO_LIB([MD2],[MD2]) + AX_CHECK_CRYPTO_LIB([MD4],[MD4]) + AX_CHECK_CRYPTO_LIB([MD5],[MD5]) + AX_CHECK_CRYPTO_LIB([RIPEMD],[RIPEMD160]) + AX_CHECK_CRYPTO_LIB([SHA],[SHA1]) + # others + AX_CHECK_CRYPTO_LIB([RSA],[RSA_set_method]) + AX_CHECK_CRYPTO_LIB([DSA],[DSA_set_method]) + AX_CHECK_CRYPTO_LIB([DH],[DH_set_method]) + ]) + ]) + # complain only if crypto as *explicitly* required + if test "$ac_with_crypto" = "yes" -a "x$HAVE_CRYPTO" = "x" ; then + AC_MSG_ERROR([cannot configure required openssl crypto library]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_curl.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_curl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_curl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_curl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_curl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_CURL([VERSION],[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Checks for minimum curl library version VERSION. If successful executes +# ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# Defines CURL_LIBS and CURL_CFLAGS. +# +# A simple example: +# +# AX_LIB_CURL([7.19.4],,[ +# AC_MSG_ERROR([Your system lacks libcurl >= 7.19.4]) +# ]) +# +# This macro is a rearranged version of AC_LIB_CURL from Akos Maroy. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_CHECK_CURL], [AX_LIB_CURL]) +AC_DEFUN([AX_LIB_CURL], [ + AX_PATH_GENERIC([curl],[$1],'s/^libcurl\ \+//',[$2],[$3]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_ev.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_ev.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_ev.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_ev.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,81 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_ev.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_EV([VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Checks for libev mimicking pkg-config's way of doing things for as long +# as upstream doesn't provide a .pc file. If successful and provided +# expand ACTION-IF-FOUND, otherwise expand ACTION-IF-NOT-FOUND, or, if +# omitted, error out like pkg-config does. +# +# Defines libev_LIBS and libev_CFLAGS. +# +# LICENSE +# +# Copyright (c) 2012 Sebastian Freundt +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_CHECK_EV_H], [ +dnl AX_CHECK_EV_H([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl defs: ax_cv_header_ev_h yes|no +## assume libev_CFLAGS have been set + saved_CPPFLAGS="${CPPFLAGS}" + CPPFLAGS="${CPPFLAGS} ${libev_CFLAGS}" + ## not so fast, we need ev.h checks + AC_CHECK_HEADER([ev.h], [ + ax_cv_header_ev_h="yes" + $1 + ], [$2]) + CPPFLAGS="${saved_CPPFLAGS}" +]) + +AU_ALIAS([AC_CHECK_LIBEV], [AX_LIB_EV]) +AC_DEFUN([AX_LIB_EV], [ + pushdef([VERSION], [m4_default([$1], [>= 4.0])]) + pushdef([ACTION_IF_FOUND], [$2]) + pushdef([ACTION_IF_NOT_FOUND], [$3]) + + AC_CACHE_VAL([ax_cv_feat_libev], [ + ## assume failure + ax_cv_feat_libev="no" + + PKG_CHECK_MODULES([libev], [libev ]VERSION[], [:], [:]) + + ## CHECK_MODULES' if_found case + AX_CHECK_EV_H([ + ax_cv_feat_libev="yes" + + if test -z "${pkg_cv_libev_LIBS}"; then + libev_LIBS="${libev_LIBS} -lev" + fi + + ACTION_IF_FOUND + ], [ + m4_default([]ACTION_IF_NOT_FOUND[], [AC_MSG_ERROR([dnl +Package requirements (libev version) were not met. + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables libev_CFLAGS +and libev_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + ]) + ]) + ]) + + popdef([ACTION_IF_NOT_FOUND]) + popdef([ACTION_IF_FOUND]) + popdef([VERSION]) +])dnl AX_LIB_EV diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_expat.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_expat.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_expat.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_expat.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,283 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_expat.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_EXPAT([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of Expat XML Parser of +# particular version or newer. This macro checks for Expat XML Parser +# headers and libraries and defines compilation flags +# +# Macro supports following options and their values: +# +# 1) Single-option usage: +# +# --with-expat -- yes, no, or path to Expat XML Parser +# installation prefix +# +# 2) Three-options usage (all options are required): +# +# --with-expat=yes +# --with-expat-inc -- path to base directory with Expat headers +# --with-expat-lib -- linker flags for Expat +# +# This macro calls: +# +# AC_SUBST(EXPAT_CFLAGS) +# AC_SUBST(EXPAT_LIBS) +# AC_SUBST(EXPAT_LDFLAGS) +# AC_SUBST(EXPAT_VERSION) -- only if version requirement is used +# +# And sets: +# +# HAVE_EXPAT +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_LIB_EXPAT], +[ + AC_ARG_WITH([expat], + AS_HELP_STRING([--with-expat=@<:@ARG@:>@], + [use Expat XML Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -f /usr/local/include/expat.h ; then + expat_prefix=/usr/local + elif test -f /usr/include/expat.h ; then + expat_prefix=/usr + else + expat_prefix="" + fi + expat_requested="yes" + elif test -d "$withval"; then + expat_prefix="$withval" + expat_requested="yes" + else + expat_prefix="" + expat_requested="no" + fi + ], + [ + dnl Default behavior is implicit yes + if test -f /usr/local/include/expat.h ; then + expat_prefix=/usr/local + elif test -f /usr/include/expat.h ; then + expat_prefix=/usr + else + expat_prefix="" + fi + ] + ) + + AC_ARG_WITH([expat-inc], + AS_HELP_STRING([--with-expat-inc=@<:@DIR@:>@], + [path to Expat XML Parser headers] + ), + [expat_include_dir="$withval"], + [expat_include_dir=""] + ) + AC_ARG_WITH([expat-lib], + AS_HELP_STRING([--with-expat-lib=@<:@ARG@:>@], + [link options for Expat XML Parser libraries] + ), + [expat_lib_flags="$withval"], + [expat_lib_flags=""] + ) + + EXPAT_CFLAGS="" + EXPAT_LIBS="" + EXPAT_VERSION="" + + dnl + dnl Collect include/lib paths and flags + dnl + run_expat_test="no" + + if test -n "$expat_prefix"; then + expat_include_dir="$expat_prefix/include" + expat_ld_flags="-L$expat_prefix/lib" + expat_lib_flags="-lexpat" + run_expat_test="yes" + elif test "$expat_requested" = "yes"; then + if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then + run_expat_test="yes" + fi + else + run_expat_test="no" + fi + + dnl + dnl Check Expat XML Parser files + dnl + if test "$run_expat_test" = "yes"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$expat_include_dir" + + saved_LIBS="$LIBS" + LIBS="$LIBS $expat_lib_flags" + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $expat_ld_flags" + + dnl + dnl Check Expat headers + dnl + AC_MSG_CHECKING([for Expat XML Parser headers in $expat_include_dir]) + + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include + ]], + [[]] + )], + [ + EXPAT_CFLAGS="-I$expat_include_dir" + expat_header_found="yes" + AC_MSG_RESULT([found]) + ], + [ + expat_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + + dnl + dnl Check Expat libraries + dnl + if test "$expat_header_found" = "yes"; then + + AC_MSG_CHECKING([for Expat XML Parser libraries]) + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include + ]], + [[ +XML_Parser p = XML_ParserCreate(NULL); +XML_ParserFree(p); +p = NULL; + ]] + )], + [ + EXPAT_LIBS="$expat_lib_flags" + EXPAT_LDFLAGS="$expat_ld_flags" + expat_lib_found="yes" + AC_MSG_RESULT([found]) + ], + [ + expat_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" + fi + + AC_MSG_CHECKING([for Expat XML Parser]) + + if test "$run_expat_test" = "yes"; then + if test "$expat_header_found" = "yes" -a "$expat_lib_found" = "yes"; then + + AC_SUBST([EXPAT_CFLAGS]) + AC_SUBST([EXPAT_LDFLAGS]) + AC_SUBST([EXPAT_LIBS]) + + HAVE_EXPAT="yes" + else + HAVE_EXPAT="no" + fi + + AC_MSG_RESULT([$HAVE_EXPAT]) + + dnl + dnl Check Expat version + dnl + if test "$HAVE_EXPAT" = "yes"; then + + expat_version_req=ifelse([$1], [], [], [$1]) + + if test -n "$expat_version_req"; then + + AC_MSG_CHECKING([if Expat XML Parser version is >= $expat_version_req]) + + if test -f "$expat_include_dir/expat.h"; then + + expat_major=`cat $expat_include_dir/expat.h | \ + grep '^#define.*XML_MAJOR_VERSION.*[0-9]$' | \ + sed -e 's/#define XML_MAJOR_VERSION.//'` + + expat_minor=`cat $expat_include_dir/expat.h | \ + grep '^#define.*XML_MINOR_VERSION.*[0-9]$' | \ + sed -e 's/#define XML_MINOR_VERSION.//'` + + expat_revision=`cat $expat_include_dir/expat.h | \ + grep '^#define.*XML_MICRO_VERSION.*[0-9]$' | \ + sed -e 's/#define XML_MICRO_VERSION.//'` + + EXPAT_VERSION="$expat_major.$expat_minor.$expat_revision" + AC_SUBST([EXPAT_VERSION]) + + dnl Decompose required version string and calculate numerical representation + expat_version_req_major=`expr $expat_version_req : '\([[0-9]]*\)'` + expat_version_req_minor=`expr $expat_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + expat_version_req_revision=`expr $expat_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$expat_version_req_revision" = "x"; then + expat_version_req_revision="0" + fi + + expat_version_req_number=`expr $expat_version_req_major \* 10000 \ + \+ $expat_version_req_minor \* 100 \ + \+ $expat_version_req_revision` + + dnl Calculate numerical representation of detected version + expat_version_number=`expr $expat_major \* 10000 \ + \+ $expat_minor \* 100 \ + \+ $expat_revision` + + expat_version_check=`expr $expat_version_number \>\= $expat_version_req_number` + if test "$expat_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Found Expat XML Parser $EXPAT_VERSION, which is older than required. Possible compilation failure.]) + fi + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Missing expat.h header. Unable to determine Expat version.]) + fi + fi + fi + + else + HAVE_EXPAT="no" + AC_MSG_RESULT([$HAVE_EXPAT]) + + if test "$expat_requested" = "yes"; then + AC_MSG_WARN([Expat XML Parser support requested but headers or library not found. Specify valid prefix of Expat using --with-expat=@<:@DIR@:>@ or provide include directory and linker flags using --with-expat-inc and --with-expat-lib]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_firebird.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_firebird.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_firebird.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_firebird.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,170 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_firebird.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_FIREBIRD([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# Test for the Firebird client library of a particular version (or newer). +# This macro takes only one optional argument, the required version of +# Firebird library. If required version is not passed, then 1.5.0 is used +# in test of existence of Firebird client library. +# +# For more information about Firebird API versioning check: API Identifies +# Client Version http://www.firebirdsql.org/rlsnotes20/rnfbtwo-apiods.html +# +# If no installation prefix to the installed Firebird library is given the +# macro searches under /usr, /usr/local, and /opt. +# +# This macro calls: +# +# AC_SUBST(FIREBIRD_CFLAGS) +# AC_SUBST(FIREBIRD_LDFLAGS) +# AC_SUBST(FIREBIRD_VERSION) +# +# And sets: +# +# HAVE_FIREBIRD +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +AC_DEFUN([AX_LIB_FIREBIRD], +[ + AC_ARG_WITH([firebird], + AS_HELP_STRING( + [--with-firebird=@<:@ARG@:>@], + [use Firebird client library @<:@default=yes@:>@, optionally specify the prefix for firebird library] + ), + [ + if test "$withval" = "no"; then + WANT_FIREBIRD="no" + elif test "$withval" = "yes"; then + WANT_FIREBIRD="yes" + ac_firebird_path="" + else + WANT_FIREBIRD="yes" + ac_firebird_path="$withval" + fi + ], + [WANT_FIREBIRD="yes"] + ) + + FIREBIRD_CFLAGS="" + FIREBIRD_LDFLAGS="" + FIREBIRD_VERSION="" + + if test "x$WANT_FIREBIRD" = "xyes"; then + + ac_firebird_header="ibase.h" + + firebird_version_req=ifelse([$1], [], [3.0.0], [$1]) + firebird_version_req_shorten=`expr $firebird_version_req : '\([[0-9]]*\.[[0-9]]*\)'` + firebird_version_req_major=`expr $firebird_version_req : '\([[0-9]]*\)'` + firebird_version_req_minor=`expr $firebird_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + firebird_version_req_micro=`expr $firebird_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$firebird_version_req_micro" = "x" ; then + firebird_version_req_micro="0" + fi + + dnl FB_API_VER represents the version of Firebird as follows: + dnl - Any version of Interbase, or Firebird 1.0.x: 10 + dnl - Firebird 1.5.x: 15 + dnl - Firebird 2.0.x: 20 + + firebird_version_req_number=`expr $firebird_version_req_major \+ $firebird_version_req_minor` + + AC_MSG_CHECKING([for Firebird client library >= $firebird_version_req]) + + if test "$ac_firebird_path" != ""; then + ac_firebird_ldflags="-L$ac_firebird_path/lib" + ac_firebird_cppflags="-I$ac_firebird_path/include" + else + for ac_firebird_path_tmp in /usr /usr/local /opt ; do + if test -f "$ac_firebird_path_tmp/include/$ac_firebird_header" \ + && test -r "$ac_firebird_path_tmp/include/$ac_firebird_header"; then + ac_firebird_path=$ac_firebird_path_tmp + ac_firebird_cppflags="-I$ac_firebird_path_tmp/include" + ac_firebird_ldflags="-L$ac_firebird_path_tmp/lib" + break; + fi + done + fi + + ac_firebird_header_path="$ac_firebird_path/include/$ac_firebird_header" + + if test ! -f "$ac_firebird_header_path"; then + AC_MSG_RESULT([no]) + success="no" + else + + ac_firebird_ldflags="$ac_firebird_ldflags -lfbclient -lpthread" + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_firebird_cppflags" + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([[@%:@include ]], + [[ +#if (FB_API_VER >= $firebird_version_req_number) +// Everything is okay +#else +# error Firebird version is too old +#endif + ]] + ) + ], + [ + AC_MSG_RESULT([yes]) + success="yes" + ], + [ + AC_MSG_RESULT([not found]) + success="no" + ] + ) + AC_LANG_POP([C++]) + + CPPFLAGS="$saved_CPPFLAGS" + + if test "$success" = "yes"; then + + FIREBIRD_CFLAGS="$ac_firebird_cppflags" + FIREBIRD_LDFLAGS="$ac_firebird_ldflags" + + dnl Retrieve Firebird release version + + ac_firebird_version=`cat $ac_firebird_header_path | \ + grep '#define.*FB_API_VER.*' | \ + sed -e 's/.* //'` + + if test -n "$ac_firebird_version"; then + ac_firebird_version_major=`expr $ac_firebird_version \/ 10` + ac_firebird_version_minor=`expr $ac_firebird_version \% 10` + + FIREBIRD_VERSION="$ac_firebird_version_major.$ac_firebird_version_minor.x" + else + AC_MSG_WARN([Could not find FB_API_VER macro in $ac_firebird_header to get Firebird version.]) + fi + + AC_SUBST(FIREBIRD_CFLAGS) + AC_SUBST(FIREBIRD_LDFLAGS) + AC_SUBST(FIREBIRD_VERSION) + AC_DEFINE(HAVE_FIREBIRD) + fi + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_libgcj_jar.m4 projectm-3.1.0/m4/autoconf-archive/ax_libgcj_jar.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_libgcj_jar.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_libgcj_jar.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,83 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_libgcj_jar.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIBGCJ_JAR +# +# DESCRIPTION +# +# Locate libgcj.jar so you can place it before everything else when using +# gcj. +# +# LICENSE +# +# Copyright (c) 2008 Duncan Simpson +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 12 + +AU_ALIAS([DPS_LIBGCJ_JAR], [AX_LIBGCJ_JAR]) +AC_DEFUN([AX_LIBGCJ_JAR], +[ +AC_REQUIRE([AC_EXEEXT]) +AC_REQUIRE([AX_PROG_JAVAC]) +AC_REQUIRE([AC_PROG_FGREP]) +AC_PROG_SED +if test "x$SED" = "x"; then +AC_MSG_WARN([sed not available, so libgcj.jar test skipped]) +else +AC_MSG_CHECKING([if $JAVAC is gcj]); +jc=`eval "[echo x$JAVAC | $SED 's/^x.*\\/\\([^/]*\\)\$/x\\1/;s/^ *\\([^ ]*\\) .*$/\\1/;s/"$EXEEXT"$//']"` +if test "x$jc" != "xxgcj"; then +AC_MSG_RESULT(no) +else +AC_MSG_RESULT(yes) +AC_MSG_CHECKING([libgcj.jar location]) +save_cp="$CLASSPATH"; +unset CLASSPATH; +AC_MSG_CHECKING([gcj default classpath]) +cat << \EOF > Test.java +/* [#]line __oline__ "configure" */ +public class Test { +} +EOF +lgcj=`eval "[$JAVAC -v -C Test.java 2>&1 | $FGREP \\(system\\) | $SED 's/^ *\\([^ ]*\\) .*$/\\1/;s/\\.jar\\//.jar/']"`; +if test -f Test.class && test "x$lgcj" != "x"; then +AC_MSG_RESULT($lgcj) +$1="$lgcj:" +else +AC_MSG_RESULT(failed) +$1="" +fi +if test "x$save_cp" != "x"; then CLASSPATH="$save_cp"; fi +rm -f Test.java Test.class +fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_gcrypt.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_gcrypt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_gcrypt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_gcrypt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,108 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_gcrypt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_GCRYPT([yes|no|auto]) +# +# DESCRIPTION +# +# Searches for the 'gcrypt' library with the --with... option. +# +# If found, define HAVE_GCRYPT and macro GCRYPT_LIBS and GCRYPT_CFLAGS. +# Also defines GCRYPT_WITH_ for the algorithms found available. +# Possible algorithms are: AES ARCFOUR BLOWFISH CAST5 DES IDEA RFC2268 +# SERPENT TWOFISH CRC HAVAL MD2 MD4 MD5 RMD160 SHA0 SHA1 SHA224 SHA256 +# SHA384 SHA512 TIGER WHIRLPOOL DSA ELGAMAL RSA +# +# The argument is used if no --with...-gcrypt option is set. Value "yes" +# requires the configuration by default. Value "no" does not require it by +# default. Value "auto" configures the library only if available. +# +# See also AX_LIB_BEECRYPT and AX_LIB_CRYPTO. +# +# LICENSE +# +# Copyright (c) 2009 Fabien Coelho +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +# AX_CHECK_GCRYPT_ALGO([algo]) +# generate convenient defines for each algorithm +AC_DEFUN([AX_CHECK_GCRYPT_ALGO],[ + AC_REQUIRE([AC_PROG_EGREP]) + AC_MSG_CHECKING([for $1 in gcrypt]) + if echo $gcrypt_algos | $EGREP -i ":.*( $1 | $1$)" > /dev/null ; then + AC_DEFINE([GCRYPT_WITH_$1],[1],[Algorithm $1 in gcrypt library]) + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +]) + +# AX_LIB_GCRYPT([yes|no|auto]) +AC_DEFUN([AX_LIB_GCRYPT],[ + AC_MSG_CHECKING([whether gcrypt is enabled]) + AC_ARG_WITH([gcrypt],[ --with-gcrypt require gcrypt library + --without-gcrypt disable gcrypt library],[ + AC_MSG_RESULT([$withval]) + ac_with_gcrypt=$withval + ],[ + AC_MSG_RESULT($1) + ac_with_gcrypt=$1 + ]) + if test "$ac_with_gcrypt" = "yes" -o "$ac_with_gcrypt" = "auto" ; then + AM_PATH_LIBGCRYPT([1.2.0],[ + AC_DEFINE([HAVE_GCRYPT],[1],[Gcrypt library is available]) + HAVE_GCRYPT=1 + # checking for available algorithms... + gcrypt_algos=`$LIBGCRYPT_CONFIG --algorithms` + # ciphers + # this does not work with a "for" loop: nothing generated in config.h:-( + AX_CHECK_GCRYPT_ALGO([AES]) + AX_CHECK_GCRYPT_ALGO([ARCFOUR]) + AX_CHECK_GCRYPT_ALGO([BLOWFISH]) + AX_CHECK_GCRYPT_ALGO([CAST5]) + AX_CHECK_GCRYPT_ALGO([DES]) + AX_CHECK_GCRYPT_ALGO([IDEA]) + AX_CHECK_GCRYPT_ALGO([RFC2268]) + AX_CHECK_GCRYPT_ALGO([SERPENT]) + AX_CHECK_GCRYPT_ALGO([TWOFISH]) + # digests + AX_CHECK_GCRYPT_ALGO([CRC]) + AX_CHECK_GCRYPT_ALGO([HAVAL]) + AX_CHECK_GCRYPT_ALGO([MD2]) + AX_CHECK_GCRYPT_ALGO([MD4]) + AX_CHECK_GCRYPT_ALGO([MD5]) + AX_CHECK_GCRYPT_ALGO([RMD160]) + AX_CHECK_GCRYPT_ALGO([SHA0]) + AX_CHECK_GCRYPT_ALGO([SHA1]) + AX_CHECK_GCRYPT_ALGO([SHA224]) + AX_CHECK_GCRYPT_ALGO([SHA256]) + AX_CHECK_GCRYPT_ALGO([SHA384]) + AX_CHECK_GCRYPT_ALGO([SHA512]) + AX_CHECK_GCRYPT_ALGO([TIGER]) + AX_CHECK_GCRYPT_ALGO([WHIRLPOOL]) + # others + AX_CHECK_GCRYPT_ALGO([DSA]) + AX_CHECK_GCRYPT_ALGO([ELGAMAL]) + AX_CHECK_GCRYPT_ALGO([RSA]) + # conclusion + GCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` + GCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` + AC_SUBST(GCRYPT_CFLAGS) + AC_SUBST(GCRYPT_LIBS) + ],[ + # complain only if explicitly required + if test "$ac_with_gcrypt" = "yes" ; then + AC_MSG_ERROR([cannot configure required gcrypt library]) + fi + ]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_gdal.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_gdal.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_gdal.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_gdal.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,153 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_gdal.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_GDAL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of GDAL/OGR library of +# particular version or newer. +# +# AX_LIB_GDAL macro takes only one argument which is optional. If there is +# no required version passed, then macro does not run version test. +# +# The --with-gdal option takes complete path to gdal-config utility, +# +# This macro calls AC_SUBST for: +# +# GDAL_VERSION +# GDAL_CFLAGS +# GDAL_LDFLAGS +# GDAL_DEP_LDFLAGS +# GDAL_OGR_ENABLED +# +# and AC_DEFINE for: +# +# HAVE_GDAL +# HAVE_GDAL_OGR +# +# LICENSE +# +# Copyright (c) 2011 Mateusz Loskot +# Copyright (c) 2011 Alessandro Candini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_LIB_GDAL], +[ + dnl If gdal-config path is not given in ---with-gdal option, + dnl check if it is present in the system anyway + AC_ARG_WITH([gdal], + AC_HELP_STRING([--with-gdal=@<:@ARG@:>@], + [Specify full path to gdal-config script]), + [ac_gdal_config_path=$withval], + [gdal_config_system=check]) + + dnl if gdal-config is present in the system, fill the ac_gdal_config_path variable with it full path + AS_IF([test "x$gdal_config_system" = xcheck], + [AC_PATH_PROG([GDAL_CONFIG], [gdal-config])], + [AC_PATH_PROG([GDAL_CONFIG], [gdal-config], + [no], [`dirname $ac_gdal_config_path 2> /dev/null`])] + ) + + if test ! -x "$GDAL_CONFIG"; then + AC_MSG_ERROR([gdal-config does not exist or it is not an executable file]) + GDAL_CONFIG="no" + found_gdal="no" + fi + + GDAL_VERSION="" + GDAL_CFLAGS="" + GDAL_LDFLAGS="" + GDAL_DEP_LDFLAGS="" + GDAL_OGR_ENABLED="" + + + dnl + dnl Check GDAL library (libgdal) + dnl + + if test "$GDAL_CONFIG" != "no"; then + AC_MSG_CHECKING([for GDAL library]) + + GDAL_VERSION="`$GDAL_CONFIG --version`" + GDAL_CFLAGS="`$GDAL_CONFIG --cflags`" + GDAL_LDFLAGS="`$GDAL_CONFIG --libs`" + GDAL_DEP_LDFLAGS="`$GDAL_CONFIG --dep-libs`" + + AC_DEFINE([HAVE_GDAL], [1], [Define to 1 if GDAL library are available]) + + found_gdal="yes" + else + found_gdal="no" + fi + + AC_MSG_RESULT([$found_gdal]) + + if test "$found_gdal" = "yes"; then + AC_MSG_CHECKING([for OGR support in GDAL library]) + + GDAL_OGR_ENABLED="`$GDAL_CONFIG --ogr-enabled`" + AC_DEFINE([HAVE_GDAL_OGR], [1], [Define to 1 if GDAL library includes OGR support]) + + AC_MSG_RESULT([$GDAL_OGR_ENABLED]) + fi + + dnl + dnl Check if required version of GDAL is available + dnl + + gdal_version_req=ifelse([$1], [], [], [$1]) + if test "$found_gdal" = "yes" -a -n "$gdal_version_req"; then + + AC_MSG_CHECKING([if GDAL version is >= $gdal_version_req]) + + dnl Decompose required version string of GDAL + dnl and calculate its number representation + gdal_version_req_major=`expr $gdal_version_req : '\([[0-9]]*\)'` + gdal_version_req_minor=`expr $gdal_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + gdal_version_req_micro=`expr $gdal_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$gdal_version_req_micro" = "x"; then + gdal_version_req_micro="0" + fi + + gdal_version_req_number=`expr $gdal_version_req_major \* 1000000 \ + \+ $gdal_version_req_minor \* 1000 \ + \+ $gdal_version_req_micro` + + dnl Decompose version string of installed GDAL + dnl and calculate its number representation + gdal_version_major=`expr $GDAL_VERSION : '\([[0-9]]*\)'` + gdal_version_minor=`expr $GDAL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` + gdal_version_micro=`expr $GDAL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$gdal_version_micro" = "x"; then + gdal_version_micro="0" + fi + + gdal_version_number=`expr $gdal_version_major \* 1000000 \ + \+ $gdal_version_minor \* 1000 \ + \+ $gdal_version_micro` + + gdal_version_check=`expr $gdal_version_number \>\= $gdal_version_req_number` + if test "$gdal_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([GDAL $GDAL_VERSION found, but required version is $gdal_version_req]) + fi + fi + + AC_SUBST(GDAL_VERSION) + AC_SUBST(GDAL_CFLAGS) + AC_SUBST(GDAL_LDFLAGS) + AC_SUBST(GDAL_DEP_LDFLAGS) + AC_SUBST(GDAL_OGR_ENABLED) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_hdf5.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_hdf5.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_hdf5.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_hdf5.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,323 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_hdf5.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_HDF5([serial/parallel]) +# +# DESCRIPTION +# +# This macro provides tests of the availability of HDF5 library. +# +# The optional macro argument should be either 'serial' or 'parallel'. The +# former only looks for serial HDF5 installations via h5cc. The latter +# only looks for parallel HDF5 installations via h5pcc. If the optional +# argument is omitted, serial installations will be preferred over +# parallel ones. +# +# The macro adds a --with-hdf5 option accepting one of three values: +# +# no - do not check for the HDF5 library. +# yes - do check for HDF5 library in standard locations. +# path - complete path to the HDF5 helper script h5cc or h5pcc. +# +# If HDF5 is successfully found, this macro calls +# +# AC_SUBST(HDF5_VERSION) +# AC_SUBST(HDF5_CC) +# AC_SUBST(HDF5_CFLAGS) +# AC_SUBST(HDF5_CPPFLAGS) +# AC_SUBST(HDF5_LDFLAGS) +# AC_SUBST(HDF5_LIBS) +# AC_SUBST(HDF5_FC) +# AC_SUBST(HDF5_FFLAGS) +# AC_SUBST(HDF5_FLIBS) +# AC_SUBST(HDF5_TYPE) +# AC_DEFINE(HAVE_HDF5) +# +# and sets with_hdf5="yes". Additionally, the macro sets +# with_hdf5_fortran="yes" if a matching Fortran wrapper script is found. +# Note that Autoconf's Fortran support is not used to perform this check. +# H5CC and H5FC will contain the appropriate serial or parallel HDF5 +# wrapper script locations. +# +# If HDF5 is disabled or not found, this macros sets with_hdf5="no" and +# with_hdf5_fortran="no". +# +# Your configuration script can test $with_hdf to take any further +# actions. HDF5_{C,CPP,LD}FLAGS may be used when building with C or C++. +# HDF5_F{FLAGS,LIBS} should be used when building Fortran applications. +# +# To use the macro, one would code one of the following in "configure.ac" +# before AC_OUTPUT: +# +# 1) dnl Check for HDF5 support +# AX_LIB_HDF5() +# +# 2) dnl Check for serial HDF5 support +# AX_LIB_HDF5([serial]) +# +# 3) dnl Check for parallel HDF5 support +# AX_LIB_HDF5([parallel]) +# +# One could test $with_hdf5 for the outcome or display it as follows +# +# echo "HDF5 support: $with_hdf5" +# +# You could also for example, override the default CC in "configure.ac" to +# enforce compilation with the compiler that HDF5 uses: +# +# AX_LIB_HDF5([parallel]) +# if test "$with_hdf5" = "yes"; then +# CC="$HDF5_CC" +# else +# AC_MSG_ERROR([Unable to find HDF5, we need parallel HDF5.]) +# fi +# +# The HDF5_TYPE environment variable returns "parallel" or "serial", +# depending on which type of library is found. +# +# LICENSE +# +# Copyright (c) 2009 Timothy Brown +# Copyright (c) 2010 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 18 + +AC_DEFUN([AX_LIB_HDF5], [ + +AC_REQUIRE([AC_PROG_SED]) +AC_REQUIRE([AC_PROG_AWK]) +AC_REQUIRE([AC_PROG_GREP]) + +dnl Check first argument is one of the recognized values. +dnl Fail eagerly if is incorrect as this simplifies case statements below. +if test "m4_normalize(m4_default([$1],[]))" = "" ; then + : # Recognized value +elif test "m4_normalize(m4_default([$1],[]))" = "serial" ; then + : # Recognized value +elif test "m4_normalize(m4_default([$1],[]))" = "parallel"; then + : # Recognized value +else + AC_MSG_ERROR([ +Unrecognized value for AX[]_LIB_HDF5 within configure.ac. +If supplied, argument 1 must be either 'serial' or 'parallel'. +]) +fi + +dnl Add a default --with-hdf5 configuration option. +AC_ARG_WITH([hdf5], + AS_HELP_STRING( + [--with-hdf5=[yes/no/PATH]], + m4_case(m4_normalize([$1]), + [serial], [location of h5cc for serial HDF5 configuration], + [parallel], [location of h5pcc for parallel HDF5 configuration], + [location of h5cc or h5pcc for HDF5 configuration]) + ), + [if test "$withval" = "no"; then + with_hdf5="no" + elif test "$withval" = "yes"; then + with_hdf5="yes" + else + with_hdf5="yes" + H5CC="$withval" + fi], + [with_hdf5="yes"] +) + +dnl Set defaults to blank +HDF5_CC="" +HDF5_VERSION="" +HDF5_CFLAGS="" +HDF5_CPPFLAGS="" +HDF5_LDFLAGS="" +HDF5_LIBS="" +HDF5_FC="" +HDF5_FFLAGS="" +HDF5_FLIBS="" +HDF5_TYPE="" + +dnl Try and find hdf5 compiler tools and options. +if test "$with_hdf5" = "yes"; then + if test -z "$H5CC"; then + dnl Check to see if H5CC is in the path. + AC_PATH_PROGS( + [H5CC], + m4_case(m4_normalize([$1]), + [serial], [h5cc], + [parallel], [h5pcc], + [h5cc h5pcc]), + []) + else + AC_MSG_CHECKING([Using provided HDF5 C wrapper]) + AC_MSG_RESULT([$H5CC]) + fi + AC_MSG_CHECKING([for HDF5 type]) + AS_CASE([$H5CC], + [*h5pcc], [HDF5_TYPE=parallel], + [*h5cc], [HDF5_TYPE=serial], + [HDF5_TYPE=neither]) + AC_MSG_RESULT([$HDF5_TYPE]) + AC_MSG_CHECKING([for HDF5 libraries]) + if test ! -f "$H5CC" || test ! -x "$H5CC"; then + AC_MSG_RESULT([no]) + AC_MSG_WARN(m4_case(m4_normalize([$1]), + [serial], [ +Unable to locate serial HDF5 compilation helper script 'h5cc'. +Please specify --with-hdf5= as the full path to h5cc. +HDF5 support is being disabled (equivalent to --with-hdf5=no). +], [parallel],[ +Unable to locate parallel HDF5 compilation helper script 'h5pcc'. +Please specify --with-hdf5= as the full path to h5pcc. +HDF5 support is being disabled (equivalent to --with-hdf5=no). +], [ +Unable to locate HDF5 compilation helper scripts 'h5cc' or 'h5pcc'. +Please specify --with-hdf5= as the full path to h5cc or h5pcc. +HDF5 support is being disabled (equivalent to --with-hdf5=no). +])) + with_hdf5="no" + with_hdf5_fortran="no" + else + dnl Get the h5cc output + HDF5_SHOW=$(eval $H5CC -show) + + dnl Get the actual compiler used + HDF5_CC=$(eval $H5CC -show | $AWK '{print $[]1}') + if test "$HDF5_CC" = "ccache"; then + HDF5_CC=$(eval $H5CC -show | $AWK '{print $[]2}') + fi + + dnl h5cc provides both AM_ and non-AM_ options + dnl depending on how it was compiled either one of + dnl these are empty. Lets roll them both into one. + + dnl Look for "HDF5 Version: X.Y.Z" + HDF5_VERSION=$(eval $H5CC -showconfig | $GREP 'HDF5 Version:' \ + | $AWK '{print $[]3}') + + dnl A ideal situation would be where everything we needed was + dnl in the AM_* variables. However most systems are not like this + dnl and seem to have the values in the non-AM variables. + dnl + dnl We try the following to find the flags: + dnl (1) Look for "NAME:" tags + dnl (2) Look for "H5_NAME:" tags + dnl (3) Look for "AM_NAME:" tags + dnl + HDF5_tmp_flags=$(eval $H5CC -showconfig \ + | $GREP 'FLAGS\|Extra libraries:' \ + | $AWK -F: '{printf("%s "), $[]2}' ) + + dnl Find the installation directory and append include/ + HDF5_tmp_inst=$(eval $H5CC -showconfig \ + | $GREP 'Installation point:' \ + | $AWK '{print $[]NF}' ) + + dnl Add this to the CPPFLAGS + HDF5_CPPFLAGS="-I${HDF5_tmp_inst}/include" + + dnl Now sort the flags out based upon their prefixes + for arg in $HDF5_SHOW $HDF5_tmp_flags ; do + case "$arg" in + -I*) echo $HDF5_CPPFLAGS | $GREP -e "$arg" 2>&1 >/dev/null \ + || HDF5_CPPFLAGS="$arg $HDF5_CPPFLAGS" + ;; + -L*) echo $HDF5_LDFLAGS | $GREP -e "$arg" 2>&1 >/dev/null \ + || HDF5_LDFLAGS="$arg $HDF5_LDFLAGS" + ;; + -l*) echo $HDF5_LIBS | $GREP -e "$arg" 2>&1 >/dev/null \ + || HDF5_LIBS="$arg $HDF5_LIBS" + ;; + esac + done + + HDF5_LIBS="$HDF5_LIBS -lhdf5" + AC_MSG_RESULT([yes (version $[HDF5_VERSION])]) + + dnl See if we can compile + AC_LANG_PUSH([C]) + ax_lib_hdf5_save_CC=$CC + ax_lib_hdf5_save_CPPFLAGS=$CPPFLAGS + ax_lib_hdf5_save_LIBS=$LIBS + ax_lib_hdf5_save_LDFLAGS=$LDFLAGS + CC=$HDF5_CC + CPPFLAGS=$HDF5_CPPFLAGS + LIBS=$HDF5_LIBS + LDFLAGS=$HDF5_LDFLAGS + AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no]) + AC_CHECK_LIB([hdf5], [H5Fcreate], [ac_cv_libhdf5=yes], + [ac_cv_libhdf5=no]) + if test "$ac_cv_hadf5_h" = "no" && test "$ac_cv_libhdf5" = "no" ; then + AC_MSG_WARN([Unable to compile HDF5 test program]) + fi + dnl Look for HDF5's high level library + AC_HAVE_LIBRARY([hdf5_hl], [HDF5_LIBS="$HDF5_LIBS -lhdf5_hl"], [], []) + + CC=$ax_lib_hdf5_save_CC + CPPFLAGS=$ax_lib_hdf5_save_CPPFLAGS + LIBS=$ax_lib_hdf5_save_LIBS + LDFLAGS=$ax_lib_hdf5_save_LDFLAGS + AC_LANG_POP([C]) + + AC_MSG_CHECKING([for matching HDF5 Fortran wrapper]) + dnl Presume HDF5 Fortran wrapper is just a name variant from H5CC + H5FC=$(eval echo -n $H5CC | $SED -n 's/cc$/fc/p') + if test -x "$H5FC"; then + AC_MSG_RESULT([$H5FC]) + with_hdf5_fortran="yes" + AC_SUBST([H5FC]) + + dnl Again, pry any remaining -Idir/-Ldir from compiler wrapper + for arg in `$H5FC -show` + do + case "$arg" in #( + -I*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \ + || HDF5_FFLAGS="$arg $HDF5_FFLAGS" + ;;#( + -L*) echo $HDF5_FFLAGS | $GREP -e "$arg" >/dev/null \ + || HDF5_FFLAGS="$arg $HDF5_FFLAGS" + dnl HDF5 installs .mod files in with libraries, + dnl but some compilers need to find them with -I + echo $HDF5_FFLAGS | $GREP -e "-I${arg#-L}" >/dev/null \ + || HDF5_FFLAGS="-I${arg#-L} $HDF5_FFLAGS" + ;; + esac + done + + dnl Make Fortran link line by inserting Fortran libraries + for arg in $HDF5_LIBS + do + case "$arg" in #( + -lhdf5_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5hl_fortran $arg" + ;; #( + -lhdf5) HDF5_FLIBS="$HDF5_FLIBS -lhdf5_fortran $arg" + ;; #( + *) HDF5_FLIBS="$HDF5_FLIBS $arg" + ;; + esac + done + else + AC_MSG_RESULT([no]) + with_hdf5_fortran="no" + fi + + AC_SUBST([HDF5_VERSION]) + AC_SUBST([HDF5_CC]) + AC_SUBST([HDF5_CFLAGS]) + AC_SUBST([HDF5_CPPFLAGS]) + AC_SUBST([HDF5_LDFLAGS]) + AC_SUBST([HDF5_LIBS]) + AC_SUBST([HDF5_FC]) + AC_SUBST([HDF5_FFLAGS]) + AC_SUBST([HDF5_FLIBS]) + AC_SUBST([HDF5_TYPE]) + AC_DEFINE([HAVE_HDF5], [1], [Defined if you have HDF5 support]) + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_id3.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_id3.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_id3.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_id3.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,77 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_id3.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_ID3([ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro will check for the existence of id3lib +# (http://id3lib.sourceforge.net/). It does this by checking for the +# header file id3.h and the id3 library object file. A --with-id3lib +# option is supported as well. The following output variables are set with +# AC_SUBST: +# +# ID3_CPPFLAGS +# ID3_LDFLAGS +# ID3_LIBS +# +# You can use them like this in Makefile.am: +# +# AM_CPPFLAGS = $(ID3_CPPFLAGS) +# AM_LDFLAGS = $(ID3_LDFLAGS) +# program_LDADD = $(ID3_LIBS) +# +# Additionally, the C preprocessor symbol HAVE_ID3LIB will be defined with +# AC_DEFINE if id3lib is available. +# +# LICENSE +# +# Copyright (c) 2009 Oskar Liljeblad +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_LIB_ID3], [AX_LIB_ID3]) +AC_DEFUN([AX_LIB_ID3], [ + AH_TEMPLATE([HAVE_ID3LIB], [Define if id3lib is available]) + AC_ARG_WITH(id3lib, [ --with-id3lib=DIR prefix for id3 library files and headers], [ + if test "$withval" = "no"; then + ac_id3_path= + $2 + elif test "$withval" = "yes"; then + ac_id3_path=/usr + else + ac_id3_path="$withval" + fi + ],[ac_id3_path=/usr]) + if test "$ac_id3_path" != ""; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$ac_id3_path/include" + AC_CHECK_HEADER([id3.h], [ + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ac_id3_path/lib" + AC_CHECK_LIB(id3, ID3Tag_New, [ + AC_SUBST(ID3_CPPFLAGS, [-I$ac_id3_path/include]) + AC_SUBST(ID3_LDFLAGS, [-L$ac_id3_path/lib]) + AC_SUBST(ID3_LIBS, [-lid3]) + AC_DEFINE([HAVE_ID3LIB]) + $1 + ], [ + : + $2 + ]) + LDFLAGS="$saved_LDFLAGS" + ], [ + AC_MSG_RESULT([not found]) + $2 + ]) + CPPFLAGS="$saved_CPPFLAGS" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_libkml.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_libkml.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_libkml.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_libkml.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,277 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_libkml.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_LIBKML([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro tests whether Google's libkml library +# is available in particular version or +# newer. The generated configure script will support the following +# options: +# +# 1) Single-option usage: +# +# --with-libkml - yes, no or path to Google libkml installation prefix +# +# 2) Three-options usage (all options are required): +# +# --with-libkml=yes +# --with-libkml-inc - path to base directory with headers +# --with-libkml-lib - linker flags for +# +# This macro calls: +# +# AC_SUBST(LIBKML_CFLAGS) +# AC_SUBST(LIBKML_LDFLAGS) +# AC_SUBST(LIBKML_VERSION) - only if version requirement is used +# +# And sets: +# +# HAVE_LIBKML +# +# LICENSE +# +# Copyright (c) 2010 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_LIB_LIBKML], +[ + AC_ARG_WITH([libkml], + AC_HELP_STRING([--with-libkml=@<:@ARG@:>@], + [use Google libkml from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -d /usr/local/include/kml ; then + libkml_prefix=/usr/local + elif test -d /usr/include/kml ; then + libkml_prefix=/usr + else + libkml_prefix="" + fi + libkml_requested="yes" + elif test -d "$withval"; then + libkml_prefix="$withval" + libkml_requested="yes" + else + libkml_prefix="" + libkml_requested="no" + fi + ], + [ + dnl Default behavior is implicit yes + if test -d /usr/local/include/kml ; then + libkml_prefix=/usr/local + elif test -d /usr/include/kml ; then + libkml_prefix=/usr + else + libkml_prefix="" + fi + ] + ) + + AC_ARG_WITH([libkml-inc], + AC_HELP_STRING([--with-libkml-inc=@<:@DIR@:>@], + [path to Google libkml headers] + ), + [libkml_include_dir="$withval"], + [libkml_include_dir=""] + ) + AC_ARG_WITH([libkml-lib], + AC_HELP_STRING([--with-libkml-lib=@<:@ARG@:>@], + [link options for Google libkml libraries] + ), + [libkml_lib_flags="$withval"], + [libkml_lib_flags=""] + ) + + LIBKML_CFLAGS="" + LIBKML_LDFLAGS="" + LIBKML_VERSION="" + + dnl + dnl Collect include/lib paths and flags + dnl + run_libkml_test="no" + + if test -n "$libkml_prefix"; then + libkml_include_dir="$libkml_prefix/include" + libkml_include_dir2="$libkml_prefix/include/kml" + if test "$libkml_prefix" = "/usr"; then + libkml_lib_flags="-lkmlengine -lkmldom -lkmlbase -lkmlconvenience" + else + libkml_lib_flags="-L$libkml_prefix/lib -lkmlengine -lkmldom -lkmlbase -lkmlconvenience" + fi + run_libkml_test="yes" + elif test "$libkml_requested" = "yes"; then + if test -n "$libkml_include_dir" -a -n "$libkml_lib_flags"; then + libkml_include_dir2="$libkml_include_dir/kml" + run_libkml_test="yes" + fi + else + run_libkml_test="no" + fi + + dnl + dnl Check libkml headers/libraries + dnl + if test "$run_libkml_test" = "yes"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$libkml_include_dir -I$libkml_include_dir2" + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $libkml_lib_flags" + + dnl + dnl Check headers + dnl + AC_MSG_CHECKING([for Google libkml headers in $libkml_include_dir and $libkml_include_dir2]) + + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include + ]], + [[]] + )], + [ + LIBKML_CFLAGS="-I$libkml_include_dir -I$libkml_include_dir2" + libkml_header_found="yes" + AC_MSG_RESULT([found]) + ], + [ + libkml_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + + dnl + dnl Check libraries + dnl + if test "$libkml_header_found" = "yes"; then + + AC_MSG_CHECKING([for Google libkml libraries]) + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include + ]], + [[ +kmldom::KmlFactory* factory = kmldom::KmlFactory::GetFactory(); + ]] + )], + [ + LIBKML_LDFLAGS="$libkml_lib_flags" + libkml_lib_found="yes" + AC_MSG_RESULT([found]) + ], + [ + libkml_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + fi + + AC_MSG_CHECKING([for Google libkml]) + + if test "$run_libkml_test" = "yes"; then + if test "$libkml_header_found" = "yes" -a "$libkml_lib_found" = "yes"; then + + AC_SUBST([LIBKML_CFLAGS]) + AC_SUBST([LIBKML_LDFLAGS]) + + HAVE_LIBKML="yes" + else + HAVE_LIBKML="no" + fi + + AC_MSG_RESULT([$HAVE_LIBKML]) + + dnl + dnl Check version + dnl + if test "$HAVE_LIBKML" = "yes"; then + + libkml_version_req=ifelse([$1], [], [], [$1]) + + if test -n "$libkml_version_req"; then + + AC_MSG_CHECKING([if Google libkml version is >= $libkml_version_req]) + + if test -f "$libkml_include_dir2/base/version.h"; then + + libkml_major=`cat $libkml_include_dir2/base/version.h | \ + grep '^#define.*LIBKML_MAJOR_VERSION.*[0-9]$' | \ + sed -e 's/#define LIBKML_MAJOR_VERSION.//'` + + libkml_minor=`cat $libkml_include_dir2/base/version.h | \ + grep '^#define.*LIBKML_MINOR_VERSION.*[0-9]$' | \ + sed -e 's/#define LIBKML_MINOR_VERSION.//'` + + libkml_revision=`cat $libkml_include_dir2/base/version.h | \ + grep '^#define.*LIBKML_MICRO_VERSION.*[0-9]$' | \ + sed -e 's/#define LIBKML_MICRO_VERSION.//'` + + LIBKML_VERSION="$libkml_major.$libkml_minor.$libkml_revision" + AC_SUBST([LIBKML_VERSION]) + + dnl Decompose required version string and calculate numerical representation + libkml_version_req_major=`expr $libkml_version_req : '\([[0-9]]*\)'` + libkml_version_req_minor=`expr $libkml_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + libkml_version_req_revision=`expr $libkml_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$libkml_version_req_revision" = "x"; then + libkml_version_req_revision="0" + fi + + libkml_version_req_number=`expr $libkml_version_req_major \* 10000 \ + \+ $libkml_version_req_minor \* 100 \ + \+ $libkml_version_req_revision` + + dnl Calculate numerical representation of detected version + libkml_version_number=`expr $libkml_major \* 10000 \ + \+ $libkml_minor \* 100 \ + \+ $libkml_revision` + + libkml_version_check=`expr $libkml_version_number \>\= $libkml_version_req_number` + if test "$libkml_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Found Google libkml $LIBKML_VERSION, which is older than required. Possible compilation failure.]) + fi + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Missing header $libkml_include_dir2/base/bersion.hpp. Unable to determine Google libkml version.]) + fi + fi + fi + + else + HAVE_LIBKML="no" + AC_MSG_RESULT([$HAVE_LIBKML]) + + if test "$libkml_requested" = "yes"; then + AC_MSG_WARN([Google libkml support requested but headers or library not found. Specify valid prefix of libkml using --with-libkml=@<:@DIR@:>@ or provide include directory and linker flags using --with-libkml-inc and --with-libkml-lib]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_metis.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_metis.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_metis.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_metis.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,119 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_metis.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_METIS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the METIS library in the user specified +# location. The user may specify the location either by defining the +# environment variable METIS or by using the --with-metis option to +# configure. If the environment variable is defined it has precedent over +# everything else. If no location was specified then it searches in +# /usr/lib and /usr/local/lib for the library and in /usr/include and +# /usr/local/include for the header files. Upon successful completion the +# variables METIS_LIB and METIS_INCLUDE are set. +# +# ACTION-IF-FOUND is a list of shell commands to run if a METIS library is +# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is +# not found. If ACTION-IF-FOUND is not specified, the default action will +# define HAVE_METIS. If ACTION-IF-NOT-FOUND is not specified then an error +# will be generated halting configure. +# +# LICENSE +# +# Copyright (c) 2008 Ben Bergen +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([IMMDX_LIB_METIS], [AX_LIB_METIS]) +AC_DEFUN([AX_LIB_METIS], [ + AC_MSG_CHECKING(for METIS library) + AC_REQUIRE([AC_PROG_CC]) + # + # User hints... + # + AC_ARG_VAR([METIS], [METIS library location]) + AC_ARG_WITH([metis], + [AS_HELP_STRING([--with-metis], + [user defined path to METIS library])], + [ + if test -n "$METIS" ; then + AC_MSG_RESULT(yes) + with_metis=$METIS + elif test "$withval" != no ; then + AC_MSG_RESULT(yes) + with_metis=$withval + else + AC_MSG_RESULT(no) + fi + ], + [ + if test -n "$METIS" ; then + with_metis=$METIS + AC_MSG_RESULT(yes) + else + with_metis=/usr + if test ! -f "$with_metis/include/metis.h" ; then + with_metis=/usr/local + if test ! -f "$with_metis/include/metis.h" ; then + with_metis="" + AC_MSG_RESULT(failed) + else + AC_MSG_RESULT(yes) + fi + else + AC_MSG_RESULT(yes) + fi + fi + ]) + # + # locate METIS library + # + if test -n "$with_metis" ; then + old_CFLAGS=$CFLAGS + old_LDFLAGS=$LDFLAGS + CFLAGS="-I$with_metis/include" + LDFLAGS="-L$with_metis/lib" + + AC_LANG_SAVE + AC_LANG_C + + AC_CHECK_LIB(metis, METIS_PartMeshDual, + [metis_lib=yes], [metis_lib=yes], [-lm]) + AC_CHECK_HEADER(metis.h, [metis_h=yes], + [metis_h=no], [/* check */]) + + AC_LANG_RESTORE + + CFLAGS=$old_CFLAGS + LDFLAGS=$old_LDFLAGS + + AC_MSG_CHECKING(METIS in $with_metis) + if test "$metis_lib" = "yes" -a "$metis_h" = "yes" ; then + AC_SUBST(METIS_INCLUDE, [-I$with_metis/include]) + AC_SUBST(METIS_LIB, [-L$with_metis/lib]) + AC_MSG_RESULT(ok) + else + AC_MSG_RESULT(failed) + fi + fi + # + # + # + if test x = x"$METIS_LIB" ; then + ifelse([$2],,[AC_MSG_ERROR(Failed to find valid METIS library)],[$2]) + : + else + ifelse([$1],,[AC_DEFINE(HAVE_METIS,1,[Define if you have METIS library])],[$1]) + : + fi + ])dnl AX_LIB_METIS diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_mysqlcppconn.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_mysqlcppconn.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_mysqlcppconn.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_mysqlcppconn.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,181 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_mysqlcppconn.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_MYSQLCPPCONN([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the MySQL Connector/C++ libraries +# +# If no path to the installed library is given the macro searches under +# /usr, /usr/local, /opt and /opt/local. +# +# This macro calls: +# +# AC_SUBST(LIBMYSQLCPPCONN_CXXFLAGS) / AC_SUBST(LIBMYSQLCPPCONN_LDFLAGS) +# +# And sets: +# +# HAVE_LIBMYSQLCPPCONN +# +# Note that this library needs to link with either MySQL client library or +# MySQL Connector/C to work. The macros defined here don't take care of +# external dependencies so you have to do it on your own. See also +# AX_LIB_MYSQL macro. +# +# LICENSE +# +# Copyright (c) 2011 Xiyue Deng +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_LIB_MYSQLCPPCONN], +[ +AC_ARG_WITH([libmysqlcppconn], + [AS_HELP_STRING([--with-libmysqlcppconn@<:@=ARG@:>@], + [use libmysqlcppconn from a standard location (ARG=yes), + from the specified location (ARG=), + or disable if (ARG=no) + @<:@ARG=yes@:>@ ])], + [ + if test "x$withval" = "xno"; then + want_libmysqlcppconn="no" + elif test "x$withval" = "xyes"; then + want_libmysqlcppconn="yes" + else + want_libmysqlcppconn="yes" + ac_libmysqlcppconn_path="$withval" + fi + ], + [want_libmysqlcppconn="yes"]) + +AC_ARG_WITH([libmysqlcppconn-include], + [AS_HELP_STRING([--with-libmysqlcppconn-include=INCLUDE_DIR], + [Force given directory for libmysqlcppconn include path. Note that this will overwrite general library path setting.]) + ], [ + if test -d "$withval"; then + ac_libmysqlcppconn_include_path="$withval" + else + AC_MSG_ERROR([--with-libmysqlcppconn-include expected directory name]) + fi + ], + [ac_libmysqlcppconn_include_path=""] +) + +AC_ARG_WITH([libmysqlcppconn-lib], + [AS_HELP_STRING([--with-libmysqlcppconn-lib=LIB_DIR], + [Force given directory for libmysqlcppconn libraries. Note that this will overwrite general library path setting.]) + ], [ + if test -d "$withval"; then + ac_libmysqlcppconn_lib_path="$withval" + else + AC_MSG_ERROR([--with-libmysqlcppconn-lib expected directory name]) + fi + ], + [ac_libmysqlcppconn_lib_path=""] +) + +if test "x$want_libmysqlcppconn" = "xyes"; then + succeeded=no + + dnl On x86_64 systems check for system libraries in both lib64 and lib. + dnl The former is specified by FHS, but e.g. Debian does not adhere to + dnl this (as it rises problems for generic multi-arch support). + dnl The last entry in the list is chosen by default when no libraries + dnl are found, e.g. when only header-only libraries are installed! + libsubdirs="lib" + if test `uname -m` = x86_64; then + libsubdirs="lib lib64" + fi + + if test "x$ac_libmysqlcppconn_path" != "x"; then + for libsubdir in $libsubdirs ; do + if ls "$ac_libmysqlcppconn_path/$libsubdir/libmysqlcppconn"* >/dev/null 2>&1 ; then + LIBMYSQLCPPCONN_LDFLAGS="-L$ac_libmysqlcppconn_path/$libsubdir" + LIBMYSQLCPPCONN_CXXFLAGS="-I$ac_libmysqlcppconn_path/include" + break; + fi + done + elif test "x$cross_compiling" != yes; then + for ac_libmysqlcppconn_path_tmp in /usr /usr/local /opt /opt/local ; do + for libsubdir in $libsubdirs ; do + if ls "$ac_libmysqlcppconn_path_tmp/$libsubdir/libmysqlcppconn"* >/dev/null 2>&1 ; then + LIBMYSQLCPPCONN_LDFLAGS="-L$ac_libmysqlcppconn_path_tmp/$libsubdir" + LIBMYSQLCPPCONN_CXXFLAGS="-I$ac_libmysqlcppconn_path_tmp/include" + break; + fi + done + done + fi + + if test "x$ac_libmysqlcppconn_include_path" != "x" ; then + LIBMYSQLCPPCONN_CXXFLAGS="-I$ac_libmysqlcppconn_include_path" + fi + + if test "x$ac_libmysqlcppconn_lib_path" != "x" ; then + LIBMYSQLCPPCONN_LDFLAGS="-L$ac_libmysqlcppconn_lib_path" + fi + + CXXFLAGS_SAVED="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $LIBMYSQLCPPCONN_CXXFLAGS" + export CXXFLAGS + + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $LIBMYSQLCPPCONN_CXXFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $LIBMYSQLCPPCONN_LDFLAGS" + export LDFLAGS + + + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([mysql_connection.h mysql_driver.h], [ + ax_cv_libmysqlcppconn_version_check=yes + ], [ + ax_cv_libmysqlcppconn_version_check=no + ] + ) + + AS_IF([test "x$ax_cv_libmysqlcppconn_version_check" != "xyes"], [ + AC_MSG_ERROR([Could not find working libmysqlcppconn $libmysqlcppconn_version_req installation.]) + ]) + + AC_CHECK_LIB([mysqlcppconn], [main], [ + LIBMYSQLCPPCONN_LDFLAGS="$LIBMYSQLCPPCONN_LDFLAGS -lmysqlcppconn" + succeeded=yes + ], [ + AC_MSG_ERROR([Could not find working libmysqlcppconn library.]) + ax_cv_libmysqlcppconn_link=no + ]) + + if test "x$succeeded" = "xyes"; then + AC_SUBST(LIBMYSQLCPPCONN_CXXFLAGS) + AC_SUBST(LIBMYSQLCPPCONN_LDFLAGS) + AC_DEFINE(HAVE_LIBMYSQLCPPCONN, , [define if libmysqlcppconn is available]) + ifelse([$1], , :, [$1]) + else + AC_MSG_NOTICE([[Could not detect the libmysqlcppconn installation. Please make sure you have a working libmysqlcppconn installation and specify its path with --with-libmysqlcppconn option.]]) + ifelse([$2], , :, [$2]) + fi + + CXXFLAGS="$CXXFLAGS_SAVED" + export CXXFLAGS + + CPPFLAGS="$CPPFLAGS_SAVED" + export CPPFLAGS + + LDFLAGS="$LDFLAGS_SAVED" + export LDFLAGS + +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_mysql.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_mysql.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_mysql.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_mysql.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,147 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_mysql.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_MYSQL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of MySQL client library of +# particular version or newer. +# +# AX_LIB_MYSQL macro takes only one argument which is optional. If there +# is no required version passed, then macro does not run version test. +# +# The --with-mysql option takes one of three possible values: +# +# no - do not check for MySQL client library +# +# yes - do check for MySQL library in standard locations (mysql_config +# should be in the PATH) +# +# path - complete path to mysql_config utility, use this option if +# mysql_config can't be found in the PATH +# +# This macro calls: +# +# AC_SUBST(MYSQL_CFLAGS) +# AC_SUBST(MYSQL_LDFLAGS) +# AC_SUBST(MYSQL_VERSION) +# +# And sets: +# +# HAVE_MYSQL +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +AC_DEFUN([AX_LIB_MYSQL], +[ + AC_ARG_WITH([mysql], + AS_HELP_STRING([--with-mysql=@<:@ARG@:>@], + [use MySQL client library @<:@default=yes@:>@, optionally specify path to mysql_config] + ), + [ + if test "$withval" = "no"; then + want_mysql="no" + elif test "$withval" = "yes"; then + want_mysql="yes" + else + want_mysql="yes" + MYSQL_CONFIG="$withval" + fi + ], + [want_mysql="yes"] + ) + AC_ARG_VAR([MYSQL_CONFIG], [Full path to mysql_config program]) + + MYSQL_CFLAGS="" + MYSQL_LDFLAGS="" + MYSQL_VERSION="" + + dnl + dnl Check MySQL libraries + dnl + + if test "$want_mysql" = "yes"; then + + if test -z "$MYSQL_CONFIG" ; then + AC_PATH_PROGS([MYSQL_CONFIG], [mysql_config mysql_config5], [no]) + fi + + if test "$MYSQL_CONFIG" != "no"; then + MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`" + MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`" + + MYSQL_VERSION=`$MYSQL_CONFIG --version` + + found_mysql="yes" + else + found_mysql="no" + fi + fi + + dnl + dnl Check if required version of MySQL is available + dnl + + + mysql_version_req=ifelse([$1], [], [], [$1]) + + if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then + + AC_MSG_CHECKING([if MySQL version is >= $mysql_version_req]) + + dnl Decompose required version string of MySQL + dnl and calculate its number representation + mysql_version_req_major=`expr $mysql_version_req : '\([[0-9]]*\)'` + mysql_version_req_minor=`expr $mysql_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + mysql_version_req_micro=`expr $mysql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$mysql_version_req_micro" = "x"; then + mysql_version_req_micro="0" + fi + + mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \ + \+ $mysql_version_req_minor \* 1000 \ + \+ $mysql_version_req_micro` + + dnl Decompose version string of installed MySQL + dnl and calculate its number representation + mysql_version_major=`expr $MYSQL_VERSION : '\([[0-9]]*\)'` + mysql_version_minor=`expr $MYSQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` + mysql_version_micro=`expr $MYSQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$mysql_version_micro" = "x"; then + mysql_version_micro="0" + fi + + mysql_version_number=`expr $mysql_version_major \* 1000000 \ + \+ $mysql_version_minor \* 1000 \ + \+ $mysql_version_micro` + + mysql_version_check=`expr $mysql_version_number \>\= $mysql_version_req_number` + if test "$mysql_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + fi + + if test "$found_mysql" = "yes" ; then + AC_DEFINE([HAVE_MYSQL], [1], + [Define to 1 if MySQL libraries are available]) + fi + + AC_SUBST([MYSQL_VERSION]) + AC_SUBST([MYSQL_CFLAGS]) + AC_SUBST([MYSQL_LDFLAGS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_netcdf4.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_netcdf4.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_netcdf4.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_netcdf4.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,277 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_netcdf4.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_NETCDF4([serial/parallel]) +# +# DESCRIPTION +# +# This macro provides tests of the availability of the NetCDF v4 library. +# +# The optional macro argument should be either 'serial' or 'parallel'. The +# macro will call nc-config to check the output of the '--has-pnetcdf' +# option and error out if the requested parallel isn't supported. +# +# If the optional argument is omitted, no check is made to see if NetCDF +# has parallel support. +# +# The macro adds a --with-netcdf4 option accepting one of three values: +# +# no - do not check for the NetCDF4 library. +# yes - do check for NetCDF4 library in standard locations. +# path - installation prefix for NetCDF version 4. +# +# If NetCDF4 is successfully found, this macro calls +# +# AC_SUBST(NETCDF4_VERSION) +# AC_SUBST(NETCDF4_CC) +# AC_SUBST(NETCDF4_CFLAGS) +# AC_SUBST(NETCDF4_CPPFLAGS) +# AC_SUBST(NETCDF4_LDFLAGS) +# AC_SUBST(NETCDF4_LIBS) +# AC_SUBST(NETCDF4_FC) +# AC_SUBST(NETCDF4_FFLAGS) +# AC_SUBST(NETCDF4_FLIBS) +# AC_DEFINE(HAVE_NETCDF4) +# +# It also sets +# +# with_netcdf4="yes" +# with_netcdf4_fortran="yes" (if NetCDF has Fortran support) +# with_netcdf4_parallel="yes" (if NetCDF has MPI support) +# +# If NetCDF4 is disabled or not found, this macros sets +# +# with_netcdf4="no" +# with_netcdf4_fortran="no" +# +# Note it does not set with_netcdf4_parallel in this case. +# +# Your configuration script can test $with_netcdf4 to take any further +# actions. NETCDF4_{C,CPP,LD}FLAGS may be used when building with C or +# C++. NETCDF4_F{FLAGS,LIBS} and NETCDF4_LDFLAGS should be used when +# building Fortran applications. +# +# To use the macro, one would code one of the following in "configure.ac" +# before AC_OUTPUT: +# +# 1) dnl Check for NetCDF4 support +# AX_LIB_NETCDF4() +# +# 2) dnl Check for serial NetCDF4 support +# AX_LIB_NETCDF4([serial]) +# +# 3) dnl Check for parallel NetCDF4 support +# AX_LIB_NETCDF4([parallel]) +# +# One could test $with_netcdf4 for the outcome or display it as follows +# +# echo "NetCDF v4 support: $with_netcdf4" +# +# One could also for example, override the default CC in "configure.ac" to +# enforce compilation with the compiler that NetCDF v4 was built with: +# +# AX_LIB_NETCDF4([parallel]) +# if test "$with_netcdf4" = "yes"; then +# CC="$NETCDF4_CC" +# else +# AC_MSG_ERROR([Unable to find NetCDF4, we need parallel NetCDF4.]) +# fi +# +# LICENSE +# +# Copyright (c) 2016 Timothy Brown +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_LIB_NETCDF4], [ + +AC_REQUIRE([AC_PROG_SED]) +AC_REQUIRE([AC_PROG_AWK]) +AC_REQUIRE([AC_PROG_GREP]) + +dnl Check first argument is one of the recognized values. +dnl Fail eagerly if is incorrect as this simplifies case statements below. +if test "m4_normalize(m4_default([$1],[]))" = "" ; then + netcdf4_requested_mode="serial" +elif test "m4_normalize(m4_default([$1],[]))" = "serial" ; then + netcdf4_requested_mode="serial" +elif test "m4_normalize(m4_default([$1],[]))" = "parallel"; then + netcdf4_requested_mode="parallel" +else + AC_MSG_ERROR([ +Unrecognized value for AX[]_LIB_NETCDF4 within configure.ac. +If supplied, argument 1 must be either 'serial' or 'parallel'. +]) +fi + +dnl Add a default --with-netcdf4 configuration option. +AC_ARG_WITH([netcdf4], + AS_HELP_STRING( + [--with-netcdf4=[yes/no/PATH]], + m4_case(m4_normalize([$1]), + [serial], [base directory of serial NetCDF4 installation], + [parallel], [base directory of parallel NetCDF4 installation], + [base directory of NetCDF4 installation]) + ), + [if test "$withval" = "no"; then + with_netcdf4="no" + elif test "$withval" = "yes"; then + with_netcdf4="yes" + else + with_netcdf4="yes" + NETCDF4_PREFIX="${withval}" + NC_CONFIG="${withval}/bin/nc-config" + fi], + [with_netcdf4="yes"] +) + +dnl Set defaults to blank +NETCDF4_CC="" +NETCDF4_VERSION="" +NETCDF4_CFLAGS="" +NETCDF4_CPPFLAGS="" +NETCDF4_LDFLAGS="" +NETCDF4_LIBS="" +NETCDF4_FC="" +NETCDF4_FFLAGS="" +NETCDF4_FLIBS="" + +dnl Try and find NetCDF4 tools and options. +if test "$with_netcdf4" = "yes"; then + if test -z "$NC_CONFIG"; then + dnl Check to see if NC_CONFIG is in the path. + AC_PATH_PROGS([NC_CONFIG], [nc-config], []) + NETCDF4_PREFIX=$(AS_DIRNAME([$(AS_DIRNAME(["$NC_CONFIG"]))])) + else + AC_MSG_CHECKING([Using provided NetCDF4 prefix]) + AC_MSG_RESULT([$NC_CONFIG]) + fi + + AC_MSG_CHECKING([for NetCDF4 libraries]) + + if test ! -f "$NC_CONFIG" || test ! -x "$NC_CONFIG"; then + AC_MSG_RESULT([no]) + AC_MSG_WARN([ + +Unable to locate NetCDF4 compilation helper script 'nc-config'. +Please specify --with-netcdf4= as the full path prefix +where NetCDF4 has been installed. +NetCDF4 support is being disabled (equivalent to --with-netcdf4=no). +]) + with_netcdf4="no" + with_netcdf4_fortran="no" + else + dnl Get the actual compiler used + NETCDF4_CC=$(eval $NC_CONFIG --cc | $AWK '{print $[]1}') + if test "$NETCDF4_CC" = "ccache"; then + NETCDF4_CC=$(eval $NC_CONFIG --cc | $AWK '{print $[]2}') + fi + + dnl Look for version + NETCDF4_VERSION=$(eval $NC_CONFIG --version | $AWK '{print $[]2}') + + dnl Look for the CFLAGS + NETCDF4_CFLAGS=$(eval $NC_CONFIG --cflags) + + dnl Look for the LIBS and LDFLAGS + NETCDF4_tmp_clibs=$(eval $NC_CONFIG --libs) + + dnl Sort out the tmp libs based on their prefixes + for arg in $NETCDF4_tmp_clibs ; do + case "$arg" in + -L*) echo $NETCDF4_LDFLAGS | $GREP -e "$arg" 2>&1 >/dev/null \ + || NETCDF4_LDFLAGS="$arg $NETCDF4_LDFLAGS" + ;; + -l*) echo $NETCDF4_LIBS | $GREP -e "$arg" 2>&1 >/dev/null \ + || NETCDF4_LIBS="$arg $NETCDF4_LIBS" + ;; + esac + done + + AC_MSG_RESULT([yes (version $[NETCDF4_VERSION])]) + + dnl See if we need (and have) parallel support + if test "$netcdf4_requested_mode" = "parallel" ; then + with_netcdf4_parallel=$(eval $NC_CONFIG --has-pnetcdf) + if test "$with_netcdf4_parallel" = "no" ; then + AC_MSG_ERROR([ +parallel NetCDF4 is not supported (while it was requested) +]) + fi + fi + + dnl See if we can compile + ax_lib_netcdf4_save_CC=$CC + ax_lib_netcdf4_save_CPPFLAGS=$CPPFLAGS + ax_lib_netcdf4_save_LIBS=$LIBS + ax_lib_netcdf4_save_LDFLAGS=$LDFLAGS + CC=$NETCDF4_CC + CFLAGS=$NETCDF4_CFLAGS + LIBS=$NETCDF4_LIBS + LDFLAGS=$NETCDF4_LDFLAGS + AC_CHECK_HEADER([netcdf.h], [ac_cv_netcdf4_h=yes], [ac_cv_netcdf4_h=no]) + AC_CHECK_LIB([netcdf], [nc_create], [ac_cv_libnetcdf4=yes], + [ac_cv_libnetcdf4=no]) + if test "$ac_cv_netcdf4_h" = "no" && \ + test "$ac_cv_libnetcdf4" = "no" ; then + AC_MSG_WARN([Unable to compile NetCDF4 test program]) + fi + + CC=$ax_lib_netcdf4_save_CC + CFLAGS=$ax_lib_netcdf4_save_CFLAGS + LIBS=$ax_lib_netcdf4_save_LIBS + LDFLAGS=$ax_lib_hdf5_save_LDFLAGS + + + AC_MSG_CHECKING([for matching NetCDF4 Fortran libraries]) + NF_CONFIG="${NETCDF4_PREFIX}/bin/nf-config" + if test ! -f "$NF_CONFIG" || test ! -x "$NF_CONFIG"; then + AC_MSG_RESULT([no]) + with_netcdf4_fortran="no" + else + NETCDF_FVERSION=$(eval $NF_CONFIG --version | $AWK '{print $[]2}') + AC_MSG_RESULT([yes (version $[NETCDF_FVERSION])]) + NETCDF4_FC=$(eval $NF_CONFIG --fc | $AWK '{print $[]1}') + if test "$NETCDF4_FC" = "ccache"; then + NETCDF4_FC=$(eval $NF_CONFIG --fc | $AWK '{print $[]2}') + fi + dnl Look for the FFLAGS + NETCDF4_FFLAGS=$(eval $NC_CONFIG --fflags) + + dnl Look for the FLIBS and LDFLAGS + NETCDF4_tmp_flibs=$(eval $NC_CONFIG --flibs) + + dnl Sort out the tmp libs based on their prefixes + for arg in $NETCDF4_tmp_flibs ; do + case "$arg" in + -L*) echo $NETCDF4_LDFLAGS | $GREP -e "$arg" 2>&1 >/dev/null \ + || NETCDF4_LDFLAGS="$arg $NETCDF4_LDFLAGS" + ;; + -l*) echo $NETCDF4_FLIBS | $GREP -e "$arg" 2>&1 >/dev/null \ + || NETCDF4_FLIBS="$arg $NETCDF4_FLIBS" + ;; + esac + done + with_netcdf4_fortran="yes" + fi + + AC_SUBST([NETCDF4_VERSION]) + AC_SUBST([NETCDF4_CC]) + AC_SUBST([NETCDF4_CFLAGS]) + AC_SUBST([NETCDF4_LDFLAGS]) + AC_SUBST([NETCDF4_LIBS]) + AC_SUBST([NETCDF4_FC]) + AC_SUBST([NETCDF4_FFLAGS]) + AC_SUBST([NETCDF4_FLIBS]) + AC_DEFINE([HAVE_NETCDF4], [1], [Defined if you have NETCDF4 support]) + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_nettle.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_nettle.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_nettle.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_nettle.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_nettle.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_NETTLE([yes|no|auto]) +# +# DESCRIPTION +# +# Searches for the 'nettle' library with the --with... option. +# +# If found, define HAVE_NETTLE and macro NETTLE_LIBS. Also defines +# NETTLE_WITH_ for the algorithms found available. Possible +# algorithms: AES ARCTWO BLOWFISH CAST128 DES DES3 SERPENT TWOFISH MD2 MD4 +# MD5 SHA1 SHA256. +# +# The argument is used if no --with...-nettle option is set. Value "yes" +# requires the configuration by default. Value "no" does not require it by +# default. Value "auto" configures the library only if available. +# +# See also AX_LIB_BEECRYPT, AX_LIB_CRYPTO, and AX_LIB_GCRYPT. +# +# LICENSE +# +# Copyright (c) 2009 Fabien Coelho +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +# AX_CHECK_NETTLE_ALGO([name],[function]) +AC_DEFUN([AX_CHECK_NETTLE_ALGO],[ + AC_CHECK_LIB([nettle], [nettle_$2], + AC_DEFINE([NETTLE_WITH_$1],[1],[Algorithm $1 in nettle library])) +]) + +# AX_LIB_NETTLE([yes|no|auto]) +AC_DEFUN([AX_LIB_NETTLE],[ + AC_MSG_CHECKING([whether nettle is enabled]) + AC_ARG_WITH([nettle],[ --with-nettle require nettle library + --without-nettle disable nettle library],[ + AC_MSG_RESULT([$withval]) + ax_with_nettle=$withval + ],[ + AC_MSG_RESULT([$1]) + ax_with_nettle=$1 + ]) + if test "$ax_with_nettle" = "yes" -o "$ax_with_nettle" = "auto" ; then + AC_CHECK_HEADERS([nettle/nettle-meta.h],[ + AC_CHECK_LIB([nettle],[nettle_base64_encode_final],[ + AC_DEFINE([HAVE_NETTLE],[1],[Nettle library is available]) + HAVE_NETTLE=1 + AC_SUBST([NETTLE_LIBS],[-lnettle]) + # ciphers + AX_CHECK_NETTLE_ALGO([AES],[aes_encrypt]) + AX_CHECK_NETTLE_ALGO([ARCTWO],[arctwo_encrypt]) + AX_CHECK_NETTLE_ALGO([BLOWFISH],[blowfish_encrypt]) + AX_CHECK_NETTLE_ALGO([CAST128],[cast128_encrypt]) + AX_CHECK_NETTLE_ALGO([DES],[des_encrypt]) + AX_CHECK_NETTLE_ALGO([DES3],[des3_encrypt]) + AX_CHECK_NETTLE_ALGO([SERPENT],[serpent_encrypt]) + AX_CHECK_NETTLE_ALGO([TWOFISH],[twofish_encrypt]) + # digests + AX_CHECK_NETTLE_ALGO([MD2],[md2_digest]) + AX_CHECK_NETTLE_ALGO([MD4],[md4_digest]) + AX_CHECK_NETTLE_ALGO([MD5],[md5_digest]) + AX_CHECK_NETTLE_ALGO([SHA1],[sha1_digest]) + AX_CHECK_NETTLE_ALGO([SHA256],[sha256_digest]) + ]) + ]) + # complain only if explicitly required + if test "$ax_with_nettle" = "yes" -a "x$HAVE_NETTLE" = "x" ; then + AC_MSG_ERROR([cannot configure required nettle library]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_nokalva.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_nokalva.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_nokalva.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_nokalva.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,76 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_nokalva.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_NOKALVA([ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro will check for the existence of OSS Nokalva +# (http://www.oss.com/products/). It does this by checking for the header +# file asn1.h and the cppsoed library object file. A --with-nokalva option +# is supported as well. The following output variables are set with +# AC_SUBST: +# +# NOKALVA_CPPFLAGS +# NOKALVA_LDFLAGS +# NOKALVA_LIBS +# +# You can use them like this in Makefile.am: +# +# AM_CPPFLAGS = $(NOKALVA_CPPFLAGS) +# AM_LDFLAGS = $(NOKALVA_LDFLAGS) +# program_LDADD = $(NOKALVA_LIBS) +# +# Additionally, the C preprocessor symbol HAVE_NOKALVA will be defined +# with AC_DEFINE if Nokalva is available. +# +# LICENSE +# +# Copyright (c) 2009 Krzysztof Burghardt +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +AC_DEFUN([AX_LIB_NOKALVA], [ + AH_TEMPLATE([HAVE_NOKALVA], [Define if Nokalva is available]) + AC_ARG_WITH(nokalva, [ --with-nokalva=DIR prefix for Nokalva library files and headers], [ + if test "$withval" = "no"; then + ac_nokalva_path= + $2 + elif test "$withval" = "yes"; then + ac_nokalva_path=/usr + else + ac_nokalva_path="$withval" + fi + ],[ac_nokalva_path=/usr]) + if test "$ac_nokalva_path" != ""; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$ac_nokalva_path/include" + AC_CHECK_HEADER([asn1.h], [ + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ac_nokalva_path/lib" + AC_CHECK_LIB(cppsoed, ossMalloc, [ + AC_SUBST(NOKALVA_CPPFLAGS, [-I$ac_nokalva_path/include]) + AC_SUBST(NOKALVA_LDFLAGS, [-L$ac_nokalva_path/lib]) + AC_SUBST(NOKALVA_LIBS, ["-ldl -lcppsoed -losscpp"]) + AC_DEFINE([HAVE_NOKALVA]) + $1 + ], [ + : + $2 + ], [-ldl]) + LDFLAGS="$saved_LDFLAGS" + ], [ + AC_MSG_RESULT([not found]) + $2 + ]) + CPPFLAGS="$saved_CPPFLAGS" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_oracle_occi.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_oracle_occi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_oracle_occi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_oracle_occi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,320 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_oracle_occi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_ORACLE_OCCI([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of Oracle OCCI API of +# particular version or newer. This macros checks for Oracle OCCI headers +# and libraries and defines compilation flags. +# +# Macro supports following options and their values: +# +# 1) Single-option usage: +# +# --with-occi -- path to ORACLE_HOME directory +# +# 2) Two-options usage (both options are required): +# +# --with-occi-include -- path to directory with OCCI headers +# --with-occi-lib -- path to directory with OCCI libraries +# +# NOTE: These options described above do not take yes|no values. If 'yes' +# value is passed, then WARNING message will be displayed, 'no' value, as +# well as the --without-occi-* variations will cause the macro to not +# check anything. +# +# This macro calls: +# +# AC_SUBST(ORACLE_OCCI_CPPFLAGS) +# AC_SUBST(ORACLE_OCCI_LDFLAGS) +# AC_SUBST(ORACLE_OCCI_VERSION) +# +# And sets: +# +# HAVE_ORACLE_OCCI +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# Copyright (c) 2012 Krzysztof Burghardt +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_LIB_ORACLE_OCCI], +[ + AC_ARG_WITH([occi], + AS_HELP_STRING([--with-occi=@<:@ARG@:>@], + [use Oracle OCCI API from given Oracle home (ARG=path); use existing ORACLE_HOME (ARG=yes); disable Oracle OCCI support (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -n "$ORACLE_HOME"; then + oracle_home_dir="$ORACLE_HOME" + else + oracle_home_dir="" + fi + elif test -d "$withval"; then + oracle_home_dir="$withval" + else + oracle_home_dir="" + fi + ], + [ + if test -n "$ORACLE_HOME"; then + oracle_home_dir="$ORACLE_HOME" + else + oracle_home_dir="" + fi + ] + ) + + AC_ARG_WITH([occi-include], + AS_HELP_STRING([--with-occi-include=@<:@DIR@:>@], + [use Oracle OCCI API headers from given path] + ), + [oracle_home_include_dir="$withval"], + [oracle_home_include_dir=""] + ) + AC_ARG_WITH([occi-lib], + AS_HELP_STRING([--with-occi-lib=@<:@DIR@:>@], + [use Oracle OCCI API libraries from given path] + ), + [oracle_home_lib_dir="$withval"], + [oracle_home_lib_dir=""] + ) + + ORACLE_OCCI_CPPFLAGS="" + ORACLE_OCCI_LDFLAGS="" + ORACLE_OCCI_VERSION="" + + dnl + dnl Collect include/lib paths + dnl + want_oracle_but_no_path="no" + + if test -n "$oracle_home_dir"; then + + if test "$oracle_home_dir" != "no" -a "$oracle_home_dir" != "yes"; then + dnl ORACLE_HOME path provided + + dnl Primary path to OCCI headers, available in Oracle>=10 + oracle_include_dir="$oracle_home_dir/rdbms/public" + + dnl Secondary path to OCCI headers used by older versions + oracle_include_dir2="$oracle_home_dir/rdbms/demo" + + dnl Library path + oracle_lib_dir="$oracle_home_dir/lib" + elif test "$oracle_home_dir" = "yes"; then + want_oracle_but_no_path="yes" + fi + + elif test -n "$oracle_home_include_dir" -o -n "$oracle_home_lib_dir"; then + + if test "$oracle_home_include_dir" != "no" -a "$oracle_home_include_dir" != "yes"; then + oracle_include_dir="$oracle_home_include_dir" + elif test "$oracle_home_include_dir" = "yes"; then + want_oracle_but_no_path="yes" + fi + + if test "$oracle_home_lib_dir" != "no" -a "$oracle_home_lib_dir" != "yes"; then + oracle_lib_dir="$oracle_home_lib_dir" + elif test "$oracle_home_lib_dir" = "yes"; then + want_oracle_but_no_path="yes" + fi + fi + + if test "$want_oracle_but_no_path" = "yes"; then + AC_MSG_WARN([Oracle support is requested but no Oracle paths have been provided. \ +Please, locate Oracle directories using --with-occi or \ +--with-occi-include and --with-occi-lib options.]) + fi + + dnl + dnl Check OCCI files + dnl + if test -n "$oracle_include_dir" -a -n "$oracle_lib_dir"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$oracle_include_dir" + + dnl Additional path for older Oracle installations + if test -n "$oracle_include_dir2"; then + CPPFLAGS="$CPPFLAGS -I$oracle_include_dir2" + fi + + dnl Depending on later Oracle version detection, + dnl -lnnz11 flag might be removed for older Oracle < 10.x + saved_LDFLAGS="$LDFLAGS" + occi_ldflags="-L$oracle_lib_dir -lclntsh -lnnz11 -locci -lociei" + LDFLAGS="$LDFLAGS $occi_ldflags" + + dnl + dnl Check OCCI headers + dnl + AC_MSG_CHECKING([for Oracle OCCI headers in $oracle_include_dir]) + + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[@%:@include ]], + [[ +#if defined(OCCI_MAJOR_VERSION) +#if OCCI_MAJOR_VERSION == 10 && OCCI_MINOR_VERSION == 2 +// Oracle 10.2 detected +#endif +#elif defined(OCCI_V7_SYNTAX) +// OK, older Oracle detected +// TODO - mloskot: find better macro to check for older versions; +#else +# error Oracle occi.h header not found +#endif + ]] + )], + [ + ORACLE_OCCI_CPPFLAGS="-I$oracle_include_dir" + + if test -n "$oracle_include_dir2"; then + ORACLE_OCCI_CPPFLAGS="$ORACLE_OCCI_CPPFLAGS -I$oracle_include_dir2" + fi + + occi_header_found="yes" + AC_MSG_RESULT([yes]) + ], + [ + occi_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + + dnl + dnl Check OCCI libraries + dnl + if test "$occi_header_found" = "yes"; then + + AC_MSG_CHECKING([for Oracle OCCI libraries in $oracle_lib_dir]) + + AC_LANG_PUSH(C++) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[@%:@include ]], + [[ +oracle::occi::Environment *env; +env = oracle::occi::Environment::createEnvironment(); + ]] + )], + [ + ORACLE_OCCI_LDFLAGS="$occi_ldflags" + occi_lib_found="yes" + AC_MSG_RESULT([yes]) + ], + [ + occi_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + fi + + dnl + dnl Check required version of Oracle is available + dnl + oracle_version_req=ifelse([$1], [], [], [$1]) + + if test "$occi_header_found" = "yes" -a "$occi_lib_found" = "yes" -a \ + -n "$oracle_version_req"; then + + oracle_version_major=`cat $oracle_include_dir/oci.h \ + | grep '#define.*OCI_MAJOR_VERSION.*' \ + | sed -e 's/#define OCI_MAJOR_VERSION *//' \ + | sed -e 's/ *\/\*.*\*\///'` + + oracle_version_minor=`cat $oracle_include_dir/oci.h \ + | grep '#define.*OCI_MINOR_VERSION.*' \ + | sed -e 's/#define OCI_MINOR_VERSION *//' \ + | sed -e 's/ *\/\*.*\*\///'` + + AC_MSG_CHECKING([if Oracle OCCI version is >= $oracle_version_req]) + + if test -n "$oracle_version_major" -a -n $"oracle_version_minor"; then + + ORACLE_OCCI_VERSION="$oracle_version_major.$oracle_version_minor" + + dnl Decompose required version string of Oracle + dnl and calculate its number representation + oracle_version_req_major=`expr $oracle_version_req : '\([[0-9]]*\)'` + oracle_version_req_minor=`expr $oracle_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + + oracle_version_req_number=`expr $oracle_version_req_major \* 1000000 \ + \+ $oracle_version_req_minor \* 1000` + + dnl Calculate its number representation + oracle_version_number=`expr $oracle_version_major \* 1000000 \ + \+ $oracle_version_minor \* 1000` + + oracle_version_check=`expr $oracle_version_number \>\= $oracle_version_req_number` + if test "$oracle_version_check" = "1"; then + + oracle_version_checked="yes" + AC_MSG_RESULT([yes]) + + dnl Add -lnnz10 flag to Oracle >= 10.x + AC_MSG_CHECKING([for Oracle version >= 10.x and < 11.x to use -lnnz10 flag]) + oracle_nnz10_check=`expr \( $oracle_version_number \>\= 10 \* 1000000 \) \& \( $oracle_version_number \< 11 \* 1000000 \)` + if test "$oracle_nnz10_check" = "1"; then + ORACLE_OCCI_LDFLAGS="$ORACLE_OCCI_LDFLAGS -lnnz10" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + dnl Add -lnnz11 flag to Oracle >= 11.x + AC_MSG_CHECKING([for Oracle version >= 11.x to use -lnnz11 flag]) + oracle_nnz10_check=`expr $oracle_version_number \>\= 11 \* 1000000` + if test "$oracle_nnz10_check" = "1"; then + ORACLE_OCCI_LDFLAGS="$ORACLE_OCCI_LDFLAGS -lnnz11" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + else + oracle_version_checked="no" + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Oracle $ORACLE_OCCI_VERSION found, but required version is $oracle_version_req]) + fi + else + ORACLE_OCCI_VERSION="UNKNOWN" + AC_MSG_RESULT([no]) + AC_MSG_WARN([Oracle version unknown, probably OCCI older than 10.2 is available]) + fi + fi + + AC_MSG_CHECKING([if Oracle support is enabled]) + + if test "$occi_header_found" = "yes" -a "$occi_lib_found" = "yes"; then + + AC_SUBST([ORACLE_OCCI_VERSION]) + AC_SUBST([ORACLE_OCCI_CPPFLAGS]) + AC_SUBST([ORACLE_OCCI_LDFLAGS]) + + HAVE_ORACLE_OCCI="yes" + else + HAVE_ORACLE_OCCI="no" + fi + + AC_MSG_RESULT([$HAVE_ORACLE_OCCI]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_oracle_oci.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_oracle_oci.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_oracle_oci.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_oracle_oci.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,324 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_oracle_oci.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_ORACLE_OCI([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of Oracle OCI API of +# particular version or newer. This macros checks for Oracle OCI headers +# and libraries and defines compilation flags. +# +# Macro supports following options and their values: +# +# 1) Single-option usage: +# +# --with-oci -- path to ORACLE_HOME directory +# +# 2) Two-options usage (both options are required): +# +# --with-oci-include -- path to directory with OCI headers +# --with-oci-lib -- path to directory with OCI libraries +# +# NOTE: These options described above do not take yes|no values. If 'yes' +# value is passed, then WARNING message will be displayed, 'no' value, as +# well as the --without-oci-* variations will cause the macro to not check +# anything. +# +# This macro calls: +# +# AC_SUBST(ORACLE_OCI_CFLAGS) +# AC_SUBST(ORACLE_OCI_LDFLAGS) +# AC_SUBST(ORACLE_OCI_VERSION) +# +# And sets: +# +# HAVE_ORACLE_OCI +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# Copyright (c) 2015 Joost van Baal-Ilic +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 16 + +AC_DEFUN([AX_LIB_ORACLE_OCI], +[ + AC_ARG_WITH([oci], + AS_HELP_STRING([--with-oci=@<:@ARG@:>@], + [use Oracle OCI API from given Oracle home (ARG=path); use existing ORACLE_HOME (ARG=yes); disable Oracle OCI support (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -n "$ORACLE_HOME"; then + oracle_home_dir="$ORACLE_HOME" + else + oracle_home_dir="" + fi + elif test -d "$withval"; then + oracle_home_dir="$withval" + else + oracle_home_dir="" + fi + ], + [ + if test -n "$ORACLE_HOME"; then + oracle_home_dir="$ORACLE_HOME" + else + oracle_home_dir="" + fi + ] + ) + + AC_ARG_WITH([oci-include], + AS_HELP_STRING([--with-oci-include=@<:@DIR@:>@], + [use Oracle OCI API headers from given path] + ), + [oracle_home_include_dir="$withval"], + [oracle_home_include_dir=""] + ) + AC_ARG_WITH([oci-lib], + AS_HELP_STRING([--with-oci-lib=@<:@DIR@:>@], + [use Oracle OCI API libraries from given path] + ), + [oracle_home_lib_dir="$withval"], + [oracle_home_lib_dir=""] + ) + + ORACLE_OCI_CFLAGS="" + ORACLE_OCI_LDFLAGS="" + ORACLE_OCI_VERSION="" + + dnl + dnl Collect include/lib paths + dnl + want_oracle_but_no_path="no" + + if test -n "$oracle_home_dir"; then + + if test "$oracle_home_dir" != "no" -a "$oracle_home_dir" != "yes"; then + dnl ORACLE_HOME path provided + + dnl Primary path to OCI headers, available in Oracle>=10 + oracle_include_dir="$oracle_home_dir/rdbms/public" + + dnl Secondary path to OCI headers used by older versions + oracle_include_dir2="$oracle_home_dir/rdbms/demo" + + dnl Library path + oracle_lib_dir="$oracle_home_dir/lib" + elif test "$oracle_home_dir" = "yes"; then + want_oracle_but_no_path="yes" + fi + + elif test -n "$oracle_home_include_dir" -o -n "$oracle_home_lib_dir"; then + + if test "$oracle_home_include_dir" != "no" -a "$oracle_home_include_dir" != "yes"; then + oracle_include_dir="$oracle_home_include_dir" + elif test "$oracle_home_include_dir" = "yes"; then + want_oracle_but_no_path="yes" + fi + + if test "$oracle_home_lib_dir" != "no" -a "$oracle_home_lib_dir" != "yes"; then + oracle_lib_dir="$oracle_home_lib_dir" + elif test "$oracle_home_lib_dir" = "yes"; then + want_oracle_but_no_path="yes" + fi + fi + + if test "$want_oracle_but_no_path" = "yes"; then + AC_MSG_WARN([Oracle support is requested but no Oracle paths have been provided. \ +Please, locate Oracle directories using --with-oci or \ +--with-oci-include and --with-oci-lib options.]) + fi + + dnl + dnl Check OCI files + dnl + if test -n "$oracle_include_dir" -a -n "$oracle_lib_dir"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$oracle_include_dir" + + dnl Additional path for older Oracle installations + if test -n "$oracle_include_dir2"; then + CPPFLAGS="$CPPFLAGS -I$oracle_include_dir2" + fi + + dnl Depending on later Oracle version detection, + dnl -lnnz10 flag might be removed for older Oracle < 10.x + saved_LDFLAGS="$LDFLAGS" + saved_LIBS="$LIBS" + oci_ldflags="-L$oracle_lib_dir" + oci_libs="-lclntsh" + LDFLAGS="$LDFLAGS $oci_ldflags" + LIBS="$LIBS $oci_libs" + + dnl + dnl Check OCI headers + dnl + AC_MSG_CHECKING([for Oracle OCI headers in $oracle_include_dir]) + + AC_LANG_PUSH(C) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[@%:@include ]], + [[ +#if defined(OCI_MAJOR_VERSION) +#if OCI_MAJOR_VERSION == 10 && OCI_MINOR_VERSION == 2 +/* Oracle 10.2 detected */ +#endif +#elif defined(OCI_V7_SYNTAX) +/* OK, older Oracle detected */ +/* TODO - mloskot: find better macro to check for older versions; */ +#else +# error Oracle oci.h header not found +#endif + ]] + )], + [ + ORACLE_OCI_CFLAGS="-I$oracle_include_dir" + + if test -n "$oracle_include_dir2"; then + ORACLE_OCI_CFLAGS="$ORACLE_OCI_CFLAGS -I$oracle_include_dir2" + fi + + oci_header_found="yes" + AC_MSG_RESULT([yes]) + ], + [ + oci_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C]) + + dnl + dnl Check OCI libraries + dnl + if test "$oci_header_found" = "yes"; then + + AC_MSG_CHECKING([for Oracle OCI libraries in $oracle_lib_dir]) + + AC_LANG_PUSH(C) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[@%:@include ]], + [[ +OCIEnv* envh = 0; +OCIEnvCreate(&envh, OCI_DEFAULT, 0, 0, 0, 0, 0, 0); +if (envh) OCIHandleFree(envh, OCI_HTYPE_ENV); + ]] + )], + [ + ORACLE_OCI_LDFLAGS="$oci_ldflags $oci_libs" + oci_lib_found="yes" + AC_MSG_RESULT([yes]) + ], + [ + oci_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" + fi + + dnl + dnl Check required version of Oracle is available + dnl + oracle_version_req=ifelse([$1], [], [], [$1]) + + if test "$oci_header_found" = "yes" -a "$oci_lib_found" = "yes" -a \ + -n "$oracle_version_req"; then + + oracle_version_major=`cat $oracle_include_dir/oci.h \ + | grep '#define.*OCI_MAJOR_VERSION.*' \ + | sed -e 's/#define OCI_MAJOR_VERSION *//' \ + | sed -e 's/ *\/\*.*\*\///'` + + oracle_version_minor=`cat $oracle_include_dir/oci.h \ + | grep '#define.*OCI_MINOR_VERSION.*' \ + | sed -e 's/#define OCI_MINOR_VERSION *//' \ + | sed -e 's/ *\/\*.*\*\///'` + + AC_MSG_CHECKING([if Oracle OCI version is >= $oracle_version_req]) + + if test -n "$oracle_version_major" -a -n $"oracle_version_minor"; then + + ORACLE_OCI_VERSION="$oracle_version_major.$oracle_version_minor" + + dnl Decompose required version string of Oracle + dnl and calculate its number representation + oracle_version_req_major=`expr $oracle_version_req : '\([[0-9]]*\)'` + oracle_version_req_minor=`expr $oracle_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + + oracle_version_req_number=`expr $oracle_version_req_major \* 1000000 \ + \+ $oracle_version_req_minor \* 1000` + + dnl Calculate its number representation + oracle_version_number=`expr $oracle_version_major \* 1000000 \ + \+ $oracle_version_minor \* 1000` + + oracle_version_check=`expr $oracle_version_number \>\= $oracle_version_req_number` + if test "$oracle_version_check" = "1"; then + + oracle_version_checked="yes" + AC_MSG_RESULT([yes]) + + dnl Add -lnnz10 flag to Oracle = 10.x + AC_MSG_CHECKING([for Oracle version = 10.x to use -lnnz10 flag]) + oracle_nnz_check=`expr $oracle_version_major \= 10` + if test "$oracle_nnz_check" = "1"; then + ORACLE_OCI_LDFLAGS="$ORACLE_OCI_LDFLAGS -lnnz10" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + + dnl Add -lnnz12 flag to Oracle = 12.x + AC_MSG_CHECKING([for Oracle version = 12.x to use -lnnz12 flag]) + oracle_nnz_check=`expr $oracle_version_major \= 12` + if test "$oracle_nnz_check" = "1"; then + ORACLE_OCI_LDFLAGS="$ORACLE_OCI_LDFLAGS -lnnz12" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + else + oracle_version_checked="no" + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Oracle $ORACLE_OCI_VERSION found, but required version is $oracle_version_req]) + fi + else + ORACLE_OCI_VERSION="UNKNOWN" + AC_MSG_RESULT([no]) + AC_MSG_WARN([Oracle version unknown, probably OCI older than 10.2 is available]) + fi + fi + + AC_MSG_CHECKING([if Oracle support is enabled]) + + if test "$oci_header_found" = "yes" -a "$oci_lib_found" = "yes"; then + + AC_SUBST([ORACLE_OCI_VERSION]) + AC_SUBST([ORACLE_OCI_CFLAGS]) + AC_SUBST([ORACLE_OCI_LDFLAGS]) + + HAVE_ORACLE_OCI="yes" + else + HAVE_ORACLE_OCI="no" + fi + + AC_MSG_RESULT([$HAVE_ORACLE_OCI]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_orbit2.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_orbit2.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_orbit2.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_orbit2.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_orbit2.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_ORBIT2([VERSION],[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Checks for minimum Orbit2 library version VERSION. If successful +# executes ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# Defines ORBIT2_LIBS and ORBIT2_CFLAGS. +# +# A simple example: +# +# AX_LIB_ORBIT2([2.14.16],,[ +# AC_MSG_ERROR([Your system lacks of orbit2 >= 2.14.16]) +# ]) +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_LIB_ORBIT2], [ + AX_PATH_GENERIC([orbit2],[$1],'s/^ORBit2\ \+//',[$2],[$3]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_postgresql.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_postgresql.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_postgresql.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_postgresql.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,164 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_postgresql.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_POSTGRESQL([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of PostgreSQL 'libpq' library +# of particular version or newer. +# +# AX_LIB_POSTGRESQL macro takes only one argument which is optional. If +# there is no required version passed, then macro does not run version +# test. +# +# The --with-postgresql option takes one of three possible values: +# +# no - do not check for PostgreSQL client library +# +# yes - do check for PostgreSQL library in standard locations (pg_config +# should be in the PATH) +# +# path - complete path to pg_config utility, use this option if pg_config +# can't be found in the PATH +# +# This macro calls: +# +# AC_SUBST(POSTGRESQL_CPPFLAGS) +# AC_SUBST(POSTGRESQL_LDFLAGS) +# AC_SUBST(POSTGRESQL_LIBS) +# AC_SUBST(POSTGRESQL_VERSION) +# +# And sets: +# +# HAVE_POSTGRESQL +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# Copyright (c) 2014 Sree Harsha Totakura +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 15 + +AC_DEFUN([AX_LIB_POSTGRESQL], +[ + AC_ARG_WITH([postgresql], + AS_HELP_STRING([--with-postgresql=@<:@ARG@:>@], + [use PostgreSQL library @<:@default=yes@:>@, optionally specify path to pg_config] + ), + [ + if test "$withval" = "no"; then + want_postgresql="no" + elif test "$withval" = "yes"; then + want_postgresql="yes" + else + want_postgresql="yes" + PG_CONFIG="$withval" + fi + ], + [want_postgresql="yes"] + ) + + POSTGRESQL_CPPFLAGS="" + POSTGRESQL_LDFLAGS="" + POSTGRESQL_LIBS="" + POSTGRESQL_VERSION="" + + dnl + dnl Check PostgreSQL libraries (libpq) + dnl + + if test "$want_postgresql" = "yes"; then + + if test -z "$PG_CONFIG" -o test; then + AC_PATH_PROG([PG_CONFIG], [pg_config], []) + fi + + if test ! -x "$PG_CONFIG"; then + AC_MSG_ERROR([$PG_CONFIG does not exist or it is not an executable file]) + PG_CONFIG="no" + found_postgresql="no" + fi + + if test "$PG_CONFIG" != "no"; then + AC_MSG_CHECKING([for PostgreSQL libraries]) + + POSTGRESQL_CPPFLAGS="-I`$PG_CONFIG --includedir`" + POSTGRESQL_LDFLAGS="-L`$PG_CONFIG --libdir`" + POSTGRESQL_LIBS="-lpq" + POSTGRESQL_VERSION=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` + + AC_DEFINE([HAVE_POSTGRESQL], [1], + [Define to 1 if PostgreSQL libraries are available]) + + found_postgresql="yes" + AC_MSG_RESULT([yes]) + else + found_postgresql="no" + AC_MSG_RESULT([no]) + fi + fi + + dnl + dnl Check if required version of PostgreSQL is available + dnl + + + postgresql_version_req=ifelse([$1], [], [], [$1]) + + if test "$found_postgresql" = "yes" -a -n "$postgresql_version_req"; then + + AC_MSG_CHECKING([if PostgreSQL version is >= $postgresql_version_req]) + + dnl Decompose required version string of PostgreSQL + dnl and calculate its number representation + postgresql_version_req_major=`expr $postgresql_version_req : '\([[0-9]]*\)'` + postgresql_version_req_minor=`expr $postgresql_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + postgresql_version_req_micro=`expr $postgresql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$postgresql_version_req_micro" = "x"; then + postgresql_version_req_micro="0" + fi + + postgresql_version_req_number=`expr $postgresql_version_req_major \* 1000000 \ + \+ $postgresql_version_req_minor \* 1000 \ + \+ $postgresql_version_req_micro` + + dnl Decompose version string of installed PostgreSQL + dnl and calculate its number representation + postgresql_version_major=`expr $POSTGRESQL_VERSION : '\([[0-9]]*\)'` + postgresql_version_minor=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'` + postgresql_version_micro=`expr $POSTGRESQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$postgresql_version_micro" = "x"; then + postgresql_version_micro="0" + fi + + postgresql_version_number=`expr $postgresql_version_major \* 1000000 \ + \+ $postgresql_version_minor \* 1000 \ + \+ $postgresql_version_micro` + + postgresql_version_check=`expr $postgresql_version_number \>\= $postgresql_version_req_number` + if test "$postgresql_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_DEFINE([HAVE_POSTGRESQL], [0], + [A required version of PostgreSQL is not found]) + POSTGRESQL_CPPFLAGS="" + POSTGRESQL_LDFLAGS="" + POSTGRESQL_LIBS="" + fi + fi + + AC_SUBST([POSTGRESQL_VERSION]) + AC_SUBST([POSTGRESQL_CPPFLAGS]) + AC_SUBST([POSTGRESQL_LDFLAGS]) + AC_SUBST([POSTGRESQL_LIBS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_readline.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_readline.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_readline.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_readline.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,107 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_readline.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_READLINE +# +# DESCRIPTION +# +# Searches for a readline compatible library. If found, defines +# `HAVE_LIBREADLINE'. If the found library has the `add_history' function, +# sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the +# necessary include files and sets `HAVE_READLINE_H' or +# `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or +# 'HAVE_HISTORY_H' if the corresponding include files exists. +# +# The libraries that may be readline compatible are `libedit', +# `libeditline' and `libreadline'. Sometimes we need to link a termcap +# library for readline to work, this macro tests these cases too by trying +# to link with `libtermcap', `libcurses' or `libncurses' before giving up. +# +# Here is an example of how to use the information provided by this macro +# to perform the necessary includes or declarations in a C file: +# +# #ifdef HAVE_LIBREADLINE +# # if defined(HAVE_READLINE_READLINE_H) +# # include +# # elif defined(HAVE_READLINE_H) +# # include +# # else /* !defined(HAVE_READLINE_H) */ +# extern char *readline (); +# # endif /* !defined(HAVE_READLINE_H) */ +# char *cmdline = NULL; +# #else /* !defined(HAVE_READLINE_READLINE_H) */ +# /* no readline */ +# #endif /* HAVE_LIBREADLINE */ +# +# #ifdef HAVE_READLINE_HISTORY +# # if defined(HAVE_READLINE_HISTORY_H) +# # include +# # elif defined(HAVE_HISTORY_H) +# # include +# # else /* !defined(HAVE_HISTORY_H) */ +# extern void add_history (); +# extern int write_history (); +# extern int read_history (); +# # endif /* defined(HAVE_READLINE_HISTORY_H) */ +# /* no history */ +# #endif /* HAVE_READLINE_HISTORY */ +# +# LICENSE +# +# Copyright (c) 2008 Ville Laurikari +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE]) +AC_DEFUN([AX_LIB_READLINE], [ + AC_CACHE_CHECK([for a readline compatible library], + ax_cv_lib_readline, [ + ORIG_LIBS="$LIBS" + for readline_lib in readline edit editline; do + for termcap_lib in "" termcap curses ncurses; do + if test -z "$termcap_lib"; then + TRY_LIB="-l$readline_lib" + else + TRY_LIB="-l$readline_lib -l$termcap_lib" + fi + LIBS="$ORIG_LIBS $TRY_LIB" + AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB") + if test -n "$ax_cv_lib_readline"; then + break + fi + done + if test -n "$ax_cv_lib_readline"; then + break + fi + done + if test -z "$ax_cv_lib_readline"; then + ax_cv_lib_readline="no" + fi + LIBS="$ORIG_LIBS" + ]) + + if test "$ax_cv_lib_readline" != "no"; then + LIBS="$LIBS $ax_cv_lib_readline" + AC_DEFINE(HAVE_LIBREADLINE, 1, + [Define if you have a readline compatible library]) + AC_CHECK_HEADERS(readline.h readline/readline.h) + AC_CACHE_CHECK([whether readline supports history], + ax_cv_lib_readline_history, [ + ax_cv_lib_readline_history="no" + AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes") + ]) + if test "$ax_cv_lib_readline_history" = "yes"; then + AC_DEFINE(HAVE_READLINE_HISTORY, 1, + [Define if your readline library has \`add_history']) + AC_CHECK_HEADERS(history.h readline/history.h) + fi + fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_samtools.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_samtools.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_samtools.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_samtools.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,148 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_samtools.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_SAMTOOLS() +# +# DESCRIPTION +# +# This macro searches for an installed samtools library. If nothing was +# specified when calling configure, it searches first in /usr/local and +# then tries with ld's default library search path. If the +# --with-samtools=DIR is specified, it will try to find it in +# DIR/include/bam/sam.h and DIR/lib/libbam.a. As a final try it will look +# in DIR/sam.h and DIR/libbam.a as the samtools library does not contain +# an install rule. +# +# If --without-samtools is specified, the library is not searched at all. +# +# If either the header file (sam.h) or the library (libbam) is not found, +# the configuration exits on error, asking for a valid samtools +# installation directory or --without-samtools. +# +# The macro defines the symbol HAVE_SAMTOOLS if the library is found. You +# should use autoheader to include a definition for this symbol in a +# config.h file. Sample usage in a C/C++ source is as follows: +# +# #ifdef HAVE_SAMTOOLS +# #include +# #endif /* HAVE_SAMTOOLS */ +# +# The following output variables are set with AC_SUBST: +# +# SAMTOOLS_CPPFLAGS +# SAMTOOLS_LDFLAGS +# SAMTOOLS_LIBS +# +# You can use them like this in Makefile.am: +# +# AM_CPPFLAGS = $(SAMTOOLS_CPPFLAGS) +# AM_LDFLAGS = $(SAMTOOLS_LDFLAGS) +# program_LDADD = $(SAMTOOLS_LIBS) +# +# LICENSE +# +# Copyright (c) 2013 Timothy Brown +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_LIB_SAMTOOLS], +# +# Handle user hints +# +[AC_MSG_CHECKING([if samtools is wanted]) +AC_ARG_WITH([samtools], + AS_HELP_STRING([--with-samtools], + [search for samtools in DIR/include and DIR/lib]), + [if test "$withval" != no ; then + AC_MSG_RESULT([yes]) + if test -d "$withval" ; then + SAMTOOLS_HOME="$withval" + else + AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) + fi + else + AC_MSG_RESULT([no]) + fi], + [AC_MSG_RESULT([yes])]) + +if test -f "${SAMTOOLS_HOME}/include/bam/sam.h" ; then + SAMTOOLS_INCDIR="-I${SAMTOOLS_HOME}/include/bam" + SAMTOOLS_LIBDIR="-L${SAMTOOLS_HOME}/lib" +elif test -f "${SAMTOOLS_HOME}/include/sam.h" ; then + SAMTOOLS_INCDIR="-I${SAMTOOLS_HOME}/include" + SAMTOOLS_LIBDIR="-L${SAMTOOLS_HOME}/lib" +elif test -f "${SAMTOOLS_HOME}/sam.h" ; then + SAMTOOLS_INCDIR="-I${SAMTOOLS_HOME}" + SAMTOOLS_LIBDIR="-L${SAMTOOLS_HOME}" +elif test -f "/usr/local/include/bam/sam.h" ; then + SAMTOOLS_HOME="/usr/local" + SAMTOOLS_INCDIR="-I${SAMTOOLS_HOME}/include/bam" + SAMTOOLS_LIBDIR="-L${SAMTOOLS_HOME}/lib" +else + SAMTOOLS_HOME="/usr" + SAMTOOLS_INCDIR="-I${SAMTOOLS_HOME}/include/bam" + SAMTOOLS_LIBDIR="" +fi + +# +# Locate samtools, if wanted +# +if test -n "${SAMTOOLS_HOME}" ; then + + SAMTOOLS_OLD_LDFLAGS=$LDFLAGS + SAMTOOLS_OLD_CPPFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS ${SAMTOOLS_LIBDIR}" + CPPFLAGS="$CPPFLAGS ${SAMTOOLS_INCDIR}" + AC_LANG_SAVE + AC_LANG_C + AC_CHECK_HEADER([sam.h], [ac_cv_sam_h=yes], [ac_cv_sam_h=no]) + AC_CHECK_LIB([bam], [sam_open], [ac_cv_libbam=yes], [ac_cv_libbam=no]) + AC_LANG_RESTORE + if test "$ac_cv_libbam" = "yes" && test "$ac_cv_sam_h" = "yes" ; then + # + # If both library and header were found, use them + # + AC_MSG_CHECKING([samtools]) + AC_MSG_RESULT([ok]) + with_samtools=yes + else + # + # If either header or library was not found, revert and bomb + # + LDFLAGS="$SAMTOOLS_OLD_LDFLAGS" + CPPFLAGS="$SAMTOOLS_OLD_CPPFLAGS" + AC_MSG_CHECKING([samtools]) + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([either specify a valid samtools installation with --with-samtools=DIR or disable samtools usage with --without-samtools]) + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_socket_nsl.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_socket_nsl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_socket_nsl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_socket_nsl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,40 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_socket_nsl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_SOCKET_NSL +# +# DESCRIPTION +# +# This macro figures out what libraries are required on this platform to +# link sockets programs. +# +# The common cases are not to need any extra libraries, or to need +# -lsocket and -lnsl. We need to avoid linking with libnsl unless we need +# it, though, since on some OSes where it isn't necessary it will totally +# break networking. Unisys also includes gethostbyname() in libsocket but +# needs libnsl for socket(). +# +# LICENSE +# +# Copyright (c) 2008 Russ Allbery +# Copyright (c) 2008 Stepan Kasal +# Copyright (c) 2008 Warren Young +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([LIB_SOCKET_NSL], [AX_LIB_SOCKET_NSL]) +AC_DEFUN([AX_LIB_SOCKET_NSL], +[ + AC_SEARCH_LIBS([gethostbyname], [nsl]) + AC_SEARCH_LIBS([socket], [socket], [], [ + AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"], + [], [-lnsl])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_sqlite3.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_sqlite3.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_sqlite3.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_sqlite3.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,156 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_sqlite3.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_SQLITE3([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# Test for the SQLite 3 library of a particular version (or newer) +# +# This macro takes only one optional argument, required version of SQLite +# 3 library. If required version is not passed, 3.0.0 is used in the test +# of existence of SQLite 3. +# +# If no installation prefix to the installed SQLite library is given the +# macro searches under /usr, /usr/local, and /opt. +# +# This macro calls: +# +# AC_SUBST(SQLITE3_CFLAGS) +# AC_SUBST(SQLITE3_LDFLAGS) +# AC_SUBST(SQLITE3_VERSION) +# +# And sets: +# +# HAVE_SQLITE3 +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 18 + +AC_DEFUN([AX_LIB_SQLITE3], +[ + AC_ARG_WITH([sqlite3], + AS_HELP_STRING( + [--with-sqlite3=@<:@ARG@:>@], + [use SQLite 3 library @<:@default=yes@:>@, optionally specify the prefix for sqlite3 library] + ), + [ + if test "$withval" = "no"; then + WANT_SQLITE3="no" + elif test "$withval" = "yes"; then + WANT_SQLITE3="yes" + ac_sqlite3_path="" + else + WANT_SQLITE3="yes" + ac_sqlite3_path="$withval" + fi + ], + [WANT_SQLITE3="yes"] + ) + + SQLITE3_CFLAGS="" + SQLITE3_LDFLAGS="" + SQLITE3_VERSION="" + + if test "x$WANT_SQLITE3" = "xyes"; then + + ac_sqlite3_header="sqlite3.h" + + sqlite3_version_req=ifelse([$1], [], [3.0.0], [$1]) + sqlite3_version_req_shorten=`expr $sqlite3_version_req : '\([[0-9]]*\.[[0-9]]*\)'` + sqlite3_version_req_major=`expr $sqlite3_version_req : '\([[0-9]]*\)'` + sqlite3_version_req_minor=`expr $sqlite3_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + sqlite3_version_req_micro=`expr $sqlite3_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$sqlite3_version_req_micro" = "x" ; then + sqlite3_version_req_micro="0" + fi + + sqlite3_version_req_number=`expr $sqlite3_version_req_major \* 1000000 \ + \+ $sqlite3_version_req_minor \* 1000 \ + \+ $sqlite3_version_req_micro` + + AC_MSG_CHECKING([for SQLite3 library >= $sqlite3_version_req]) + + if test "$ac_sqlite3_path" != ""; then + ac_sqlite3_ldflags="-L$ac_sqlite3_path/lib" + ac_sqlite3_cppflags="-I$ac_sqlite3_path/include" + else + for ac_sqlite3_path_tmp in /usr /usr/local /opt ; do + if test -f "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header" \ + && test -r "$ac_sqlite3_path_tmp/include/$ac_sqlite3_header"; then + ac_sqlite3_path=$ac_sqlite3_path_tmp + ac_sqlite3_cppflags="-I$ac_sqlite3_path_tmp/include" + ac_sqlite3_ldflags="-L$ac_sqlite3_path_tmp/lib" + break; + fi + done + fi + + ac_sqlite3_ldflags="$ac_sqlite3_ldflags -lsqlite3" + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $ac_sqlite3_cppflags" + + AC_LANG_PUSH(C) + AC_COMPILE_IFELSE( + [ + AC_LANG_PROGRAM([[@%:@include ]], + [[ +#if (SQLITE_VERSION_NUMBER >= $sqlite3_version_req_number) +/* Everything is okay */ +#else +# error SQLite version is too old +#endif + ]] + ) + ], + [ + AC_MSG_RESULT([yes]) + success="yes" + ], + [ + AC_MSG_RESULT([not found]) + success="no" + ] + ) + AC_LANG_POP(C) + + CPPFLAGS="$saved_CPPFLAGS" + + if test "$success" = "yes"; then + + SQLITE3_CFLAGS="$ac_sqlite3_cppflags" + SQLITE3_LDFLAGS="$ac_sqlite3_ldflags" + + ac_sqlite3_header_path="$ac_sqlite3_path/include/$ac_sqlite3_header" + + dnl Retrieve SQLite release version + if test "x$ac_sqlite3_header_path" != "x"; then + ac_sqlite3_version=`cat $ac_sqlite3_header_path \ + | grep '#define.*SQLITE_VERSION.*\"' | sed -e 's/.* "//' \ + | sed -e 's/"//'` + if test $ac_sqlite3_version != ""; then + SQLITE3_VERSION=$ac_sqlite3_version + else + AC_MSG_WARN([Cannot find SQLITE_VERSION macro in sqlite3.h header to retrieve SQLite version!]) + fi + fi + + AC_SUBST(SQLITE3_CFLAGS) + AC_SUBST(SQLITE3_LDFLAGS) + AC_SUBST(SQLITE3_VERSION) + AC_DEFINE([HAVE_SQLITE3], [], [Have the SQLITE3 library]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_tabix.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_tabix.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_tabix.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_tabix.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,149 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_tabix.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_TABIX() +# +# DESCRIPTION +# +# This macro searches for an installed tabix library. If nothing was +# specified when calling configure, it searches first in /usr/local and +# then tries with ld's default library search path. If the +# --with-tabix=DIR is specified, it will try to find it in +# DIR/include/tabix/tabix.h and DIR/lib/libtabix.a. As a final try it will +# look in DIR/tabix.h and DIR/libtabix.a as the tabix library does not +# contain an install rule. +# +# If --without-tabix is specified, the library is not searched at all. +# +# If either the header file (tabix.h) or the library (libtabix) is not +# found, the configuration exits on error, asking for a valid tabix +# installation directory or --without-tabix. +# +# The macro defines the symbol HAVE_TABIX if the library is found. You +# should use autoheader to include a definition for this symbol in a +# config.h file. Sample usage in a C/C++ source is as follows: +# +# #ifdef HAVE_TABIX +# #include +# #endif /* HAVE_TABIX */ +# +# The following output variables are set with AC_SUBST: +# +# TABIX_CPPFLAGS +# TABIX_LDFLAGS +# TABIX_LIBS +# +# You can use them like this in Makefile.am: +# +# AM_CPPFLAGS = $(TABIX_CPPFLAGS) +# AM_LDFLAGS = $(TABIX_LDFLAGS) +# program_LDADD = $(TABIX_LIBS) +# +# LICENSE +# +# Copyright (c) 2013 Timothy Brown +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_LIB_TABIX], +# +# Handle user hints +# +[AC_MSG_CHECKING([if tabix is wanted]) +AC_ARG_WITH([tabix], + AS_HELP_STRING([--with-tabix], + [search for tabix in DIR/include and DIR/lib]), + [if test "$withval" != no ; then + AC_MSG_RESULT([yes]) + if test -d "$withval" ; then + TABIX_HOME="$withval" + else + AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) + fi + else + AC_MSG_RESULT([no]) + fi], + [AC_MSG_RESULT([yes])]) + +if test -f "${TABIX_HOME}/include/tabix/tabix.h" ; then + TABIX_INCDIR="-I${TABIX_HOME}/include/tabix" + TABIX_LIBDIR="-L${TABIX_HOME}/lib" +elif test -f "${TABIX_HOME}/include/tabix.h" ; then + TABIX_INCDIR="-I${TABIX_HOME}/include" + TABIX_LIBDIR="-L${TABIX_HOME}/lib" +elif test -f "${TABIX_HOME}/tabix.h" ; then + TABIX_INCDIR="-I${TABIX_HOME}" + TABIX_LIBDIR="-L${TABIX_HOME}" +elif test -f "/usr/local/include/tabix/tabix.h" ; then + TABIX_HOME="/usr/local" + TABIX_INCDIR="-I${TABIX_HOME}/include/tabix" + TABIX_LIBDIR="-L${TABIX_HOME}/lib" +else + TABIX_HOME="/usr" + TABIX_INCDIR="-I${TABIX_HOME}/include/tabix" + TABIX_LIBDIR="" +fi + +# +# Locate tabix, if wanted +# +if test -n "${TABIX_HOME}" ; then + + TABIX_OLD_LDFLAGS=$LDFLAGS + TABIX_OLD_CPPFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS ${TABIX_LIBDIR}" + CPPFLAGS="$CPPFLAGS ${TABIX_INCDIR}" + AC_LANG_SAVE + AC_LANG_C + AC_CHECK_HEADER([tabix.h], [ac_cv_tabix_h=yes], [ac_cv_tabix_h=no]) + AC_CHECK_LIB([tabix],[ti_open],[ac_cv_libtabix=yes],[ac_cv_libtabix=no]) + AC_LANG_RESTORE + if test "$ac_cv_libtabix" = "yes" && \ + test "$ac_cv_tabix_h" = "yes" ; then + # + # If both library and header were found, use them + # + AC_MSG_CHECKING([tabix]) + AC_MSG_RESULT([ok]) + with_tabix=yes + else + # + # If either header or library was not found, revert and bomb + # + LDFLAGS="$TABIX_OLD_LDFLAGS" + CPPFLAGS="$TABIX_OLD_CPPFLAGS" + AC_MSG_CHECKING([tabix]) + AC_MSG_RESULT([failed]) + AC_MSG_ERROR([either specify a valid tabix installation with --with-tabix=DIR or disable tabix usage with --without-tabix]) + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_taglib.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_taglib.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_taglib.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_taglib.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_taglib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_TAGLIB([VERSION],[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Checks for minimum taglib library version VERSION. If successful +# executes ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE. +# +# Defines TAGLIB_LIBS and TAGLIB_CFLAGS. +# +# A simple example: +# +# AX_LIB_TAGLIB([1.5],,[ +# AC_MSG_ERROR([Your system lacks of taglib >= 1.5]) +# ]) +# +# This macro is a rearranged version of AC_LIB_TAGLIB from Akos Maroy. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([AC_CHECK_TAGLIB], [AX_LIB_TAGLIB]) +AC_DEFUN([AX_LIB_TAGLIB], [ + AX_PATH_GENERIC([taglib],[$1],,[$2],[$3]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_libtoolize_cflags.m4 projectm-3.1.0/m4/autoconf-archive/ax_libtoolize_cflags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_libtoolize_cflags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_libtoolize_cflags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,33 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_libtoolize_cflags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIBTOOLIZE_CFLAGS(COMPILER-FLAGS-VAR) +# +# DESCRIPTION +# +# Change the contents of variable COMPILER-FLAGS-VAR so that they are +# Libtool friendly, ie. prefix each of them with `-Xcompiler' so that +# Libtool doesn't remove them. +# +# LICENSE +# +# Copyright (c) 2008 Ludovic Courtes +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_LIBTOOLIZE_CFLAGS], [AX_LIBTOOLIZE_CFLAGS]) +AC_DEFUN([AX_LIBTOOLIZE_CFLAGS], + [ac_libtoolize_ldflags_temp="" + for i in $$1 + do + ac_libtoolize_ldflags_temp="$ac_libtoolize_ldflags_temp -Xcompiler $i" + done + $1="$ac_libtoolize_ldflags_temp"])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_trace.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_trace.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_trace.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_trace.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,189 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_trace.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_TRACE([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the libtrace libraries of a particular version (or newer) +# +# If no path to the installed library is given the macro searches under +# /usr, /usr/local, /opt and /opt/local. +# +# This macro calls: +# +# AC_SUBST(LIBTRACE_CFLAGS) / AC_SUBST(LIBTRACE_LDFLAGS) +# +# And sets: +# +# HAVE_LIBTRACE +# +# LICENSE +# +# Copyright (c) 2011 Xiyue Deng +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_LIB_TRACE], +[ +AC_ARG_WITH([libtrace], + [AS_HELP_STRING([--with-libtrace@<:@=ARG@:>@], + [use libtrace from a standard location (ARG=yes), + from the specified location (ARG=), + or disable if (ARG=no) + @<:@ARG=yes@:>@ ])], + [ + if test "x$withval" = "xno"; then + want_libtrace="no" + elif test "x$withval" = "xyes"; then + want_libtrace="yes" + else + want_libtrace="yes" + ac_libtrace_path="$withval" + fi + ], + [want_libtrace="yes"]) + +AC_ARG_WITH([libtrace-include], + [AS_HELP_STRING([--with-libtrace-include=INCLUDE_DIR], + [Force given directory for libtrace include path. Note that this will overwrite general library path setting.]) + ], [ + if test -d "$withval"; then + ac_libtrace_include_path="$withval" + else + AC_MSG_ERROR([--with-libtrace-include expected directory name]) + fi + ], + [ac_libtrace_include_path=""] +) + +AC_ARG_WITH([libtrace-lib], + [AS_HELP_STRING([--with-libtrace-lib=LIB_DIR], + [Force given directory for libtrace libraries. Note that this will overwrite general library path setting.]) + ], [ + if test -d "$withval"; then + ac_libtrace_lib_path="$withval" + else + AC_MSG_ERROR([--with-libtrace-lib expected directory name]) + fi + ], + [ac_libtrace_lib_path=""] +) + +if test "x$want_libtrace" = "xyes"; then + libtrace_version_req=ifelse([$1], ,3.0.0,$1) + libtrace_version_req_major=`expr $libtrace_version_req : '\([[0-9]]*\)'` + libtrace_version_req_minor=`expr $libtrace_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + libtrace_version_req_macro=`expr $libtrace_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$libtrace_version_req_macro" = "x"; then + libtrace_version_req_macro="0" + fi + + succeeded=no + + dnl On x86_64 systems check for system libraries in both lib64 and lib. + dnl The former is specified by FHS, but e.g. Debian does not adhere to + dnl this (as it rises problems for generic multi-arch support). + dnl The last entry in the list is chosen by default when no libraries + dnl are found, e.g. when only header-only libraries are installed! + libsubdirs="lib" + if test `uname -m` = x86_64; then + libsubdirs="lib lib64" + fi + + if test "x$ac_libtrace_path" != "x"; then + for libsubdir in $libsubdirs ; do + if ls "$ac_libtrace_path/$libsubdir/libtrace"* >/dev/null 2>&1 ; then + LIBTRACE_LDFLAGS="-L$ac_libtrace_path/$libsubdir" + LIBTRACE_CFLAGS="-I$ac_libtrace_path/include" + break; + fi + done + elif test "x$cross_compiling" != yes; then + for ac_libtrace_path_tmp in /usr /usr/local /opt /opt/local ; do + for libsubdir in $libsubdirs ; do + if ls "$ac_libtrace_path_tmp/$libsubdir/libtrace"* >/dev/null 2>&1 ; then + LIBTRACE_LDFLAGS="-L$ac_libtrace_path_tmp/$libsubdir" + LIBTRACE_CFLAGS="-I$ac_libtrace_path_tmp/include" + break; + fi + done + done + fi + + if test "x$ac_libtrace_include_path" != "x" ; then + LIBTRACE_CFLAGS="-I$ac_libtrace_include_path" + fi + + if test "x$ac_libtrace_lib_path" != "x" ; then + LIBTRACE_LDFLAGS="-L$ac_libtrace_lib_path" + fi + + CFLAGS_SAVED="$CFLAGS" + CFLAGS="$CFLAGS $LIBTRACE_CFLAGS" + export CFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $LIBTRACE_LDFLAGS" + export LDFLAGS + + + AC_CACHE_CHECK([for libtrace >= $libtrace_version_req], + ax_cv_libtrace_version_check, + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #if !defined(LIBTRACE_API_VERSION) + || (LIBTRACE_API_VERSION < (($libtrace_version_req_major<<16)|($libtrace_version_req_minor<<8)|($libtrace_version_req_macro))) + # error Version check failed! + #endif + return 0; + ]] + )], [ + ax_cv_libtrace_version_check=yes + ], [ + ax_cv_libtrace_version_check=no + ] + )] + ) + + AS_IF([test "x$ax_cv_libtrace_version_check" != "xyes"], [ + AC_MSG_ERROR([Could not find working libtrace $libtrace_version_req installation.]) + ]) + + AC_CHECK_LIB([trace], [main], [ + LIBTRACE_LDFLAGS="$LIBTRACE_LDFLAGS -ltrace" + succeeded=yes + ], [ + AC_MSG_ERROR([Could not find working libtrace library.]) + ax_cv_libtrace_link=no + ]) + + if test "x$succeeded" = "xyes"; then + AC_SUBST(LIBTRACE_CFLAGS) + AC_SUBST(LIBTRACE_LDFLAGS) + AC_DEFINE(HAVE_LIBTRACE, , [define if libtrace is available]) + ifelse([$2], , :, [$2]) + else + AC_MSG_NOTICE([[Could not detect the libtrace installation (>= $libtrace_version_req). Please make sure you have a working libtrace installation and specify its path with --with-libtrace option.]]) + ifelse([$3], , :, [$3]) + fi + + CFLAGS="$CFLAGS_SAVED" + export CFLAGS + + LDFLAGS="$LDFLAGS_SAVED" + export LDFLAGS + +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_upnp.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_upnp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_upnp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_upnp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,76 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_upnp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_UPNP([ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# This macro will check for the existence of libupnp +# (http://upnp.sourceforge.net/). It does this by checking for the header +# file upnp.h and the upnp library object file. A --with-libupnp option is +# supported as well. The following output variables are set with AC_SUBST: +# +# UPNP_CPPFLAGS +# UPNP_LDFLAGS +# UPNP_LIBS +# +# You can use them like this in Makefile.am: +# +# AM_CPPFLAGS = $(UPNP_CPPFLAGS) +# AM_LDFLAGS = $(UPNP_LDFLAGS) +# program_LDADD = $(UPNP_LIBS) +# +# Additionally, the C preprocessor symbol HAVE_LIBUPNP will be defined +# with AC_DEFINE if libupnp is available. +# +# LICENSE +# +# Copyright (c) 2009 Oskar Liljeblad +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_LIB_UPNP], [AX_LIB_UPNP]) +AC_DEFUN([AX_LIB_UPNP], [ + AH_TEMPLATE([HAVE_LIBUPNP], [Define if libupnp is available]) + AC_ARG_WITH(libupnp, [ --with-libupnp=DIR prefix for upnp library files and headers], [ + if test "$withval" = "no"; then + ac_upnp_path= + $2 + elif test "$withval" = "yes"; then + ac_upnp_path=/usr + else + ac_upnp_path="$withval" + fi + ],[ac_upnp_path=/usr]) + if test "$ac_upnp_path" != ""; then + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$ac_upnp_path/include/upnp" + AC_CHECK_HEADER([upnp.h], [ + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -L$ac_upnp_path/lib" + AC_CHECK_LIB(upnp, UpnpInit, [ + AC_SUBST(UPNP_CPPFLAGS, [-I$ac_upnp_path/include/upnp]) + AC_SUBST(UPNP_LDFLAGS, [-L$ac_upnp_path/lib]) + AC_SUBST(UPNP_LIBS, [-lupnp]) + AC_DEFINE([HAVE_LIBUPNP]) + $1 + ], [ + : + $2 + ]) + LDFLAGS="$saved_LDFLAGS" + ], [ + AC_MSG_RESULT([not found]) + $2 + ]) + CPPFLAGS="$saved_CPPFLAGS" + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_wad.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_wad.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_wad.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_wad.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_wad.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_WAD +# +# DESCRIPTION +# +# This macro searches for an installed WAD library. +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_LIB_WAD], [AX_LIB_WAD]) +AC_DEFUN([AX_LIB_WAD], +[ + AC_REQUIRE([AX_PYTHON_DEVEL]) + AC_ARG_ENABLE(wad, + AS_HELP_STRING([--enable-wad], [enable wad module]), + [ + case "${enableval}" in + no) ;; + *) if test "x${enableval}" = xyes; + then + check_wad="yes" + fi ;; + esac + ], []) + + if test -n "$check_wad"; + then + AC_CHECK_LIB(wadpy, _init, [WADPY=-lwadpy], [], $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS) + AC_SUBST(WADPY) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_xalan.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_xalan.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_xalan.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_xalan.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,293 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_xalan.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_XALAN([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of Apache Xalan C++ XSLT +# processor of a particular version or newer. This macros checks for +# Apache Xalan C++ XSLT processor headers and libraries and defines +# compilation flags +# +# Macro supports following options and their values: +# +# 1) Single-option usage: +# +# --with-xalan - yes, no or path to Xalan installation prefix +# +# 2) Three-options usage (all options are required): +# +# --with-xalan=yes +# --with-xalan-inc - path to base directory with Xalan headers +# --with-xalan-lib - linker flags for Xalan +# +# This macro calls: +# +# AC_SUBST(XALAN_CPPFLAGS) +# AC_SUBST(XALAN_LDFLAGS) +# AC_SUBST(XALAN_VERSION) - only if version requirement is used +# +# And sets: +# +# HAVE_XALAN +# +# LICENSE +# +# Copyright (c) 2009 Mateusz Loskot +# Copyright (c) 2009 Bill Blough +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AC_DEFUN([AX_LIB_XALAN], +[ + AC_REQUIRE([AX_LIB_XERCES]) + + AC_ARG_WITH([xalan], + AS_HELP_STRING([--with-xalan=@<:@ARG@:>@], + [use Xalan C++ XSLT processor from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -d /usr/local/include/xalanc ; then + xalan_prefix=/usr/local + elif test -d /usr/include/xalanc ; then + xalan_prefix=/usr + else + xalan_prefix="" + fi + xalan_requested="yes" + elif test -d "$withval"; then + xalan_prefix="$withval" + xalan_requested="yes" + else + xalan_prefix="" + xalan_requested="no" + fi + ], + [ + dnl Default behavior is implicit yes + if test -d /usr/local/include/xalanc ; then + xalan_prefix=/usr/local + elif test -d /usr/include/xalanc ; then + xalan_prefix=/usr + else + xalan_prefix="" + fi + ] + ) + + AC_ARG_WITH([xalan-inc], + AS_HELP_STRING([--with-xalan-inc=@<:@DIR@:>@], + [path to Xalan C++ XSLT processor headers] + ), + [xalan_include_dir="$withval"], + [xalan_include_dir=""] + ) + AC_ARG_WITH([xalan-lib], + AS_HELP_STRING([--with-xalan-lib=@<:@ARG@:>@], + [link options for Xalan C++ XSLT processor libraries] + ), + [xalan_ldflags="$withval"], + [xalan_ldflags=""] + ) + + XALAN_CPPFLAGS="" + XALAN_LDFLAGS="" + XALAN_VERSION="" + + dnl + dnl Collect include/lib paths and flags + dnl + run_xalan_test="no" + + if test -n "$xalan_prefix"; then + xalan_include_dir="$xalan_prefix/include" + xalan_include_dir2="$xalan_prefix/include/xalanc" + xalan_ldflags="-L$xalan_prefix/lib" + run_xalan_test="yes" + elif test "$xalan_requested" = "yes"; then + if test -n "$xalan_include_dir" -a -n "$xalan_lib_flags"; then + xalan_include_dir2="$xalan_include_dir/xalanc" + run_xalan_test="yes" + fi + else + run_xalan_test="no" + fi + + xalan_libs="-lxalan-c" + + dnl + dnl Check Xalan C++ XSLT processor files + dnl + if test "$run_xalan_test" = "yes"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$xalan_include_dir -I$xalan_include_dir2" + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $xalan_ldflags $XERCES_LDFLAGS" + + saved_LIBS="$LIBS" + LIBS="$xalan_libs $XERCES_LIBS $LIBS" + + dnl + dnl Check Xalan headers + dnl + AC_MSG_CHECKING([for Xalan C++ XSLT processor headers in $xalan_include_dir and $xalan_include_dir2]) + + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include +@%:@include + ]], + [[]] + )], + [ + XALAN_CPPFLAGS="-I$xalan_include_dir -I$xalan_include_dir2" + xalan_header_found="yes" + AC_MSG_RESULT([found]) + ], + [ + xalan_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + + dnl + dnl Check Xalan libraries + dnl + if test "$xalan_header_found" = "yes"; then + + AC_MSG_CHECKING([for Xalan C++ XSLT processor libraries]) + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include +@%:@include +@%:@include +XALAN_USING_XERCES(XMLPlatformUtils) +XALAN_USING_XALAN(XalanTransformer) + ]], + [[ +XMLPlatformUtils::Initialize(); +XalanTransformer::initialize(); + + ]] + )], + [ + XALAN_LDFLAGS="$xalan_ldflags $XERCES_LDFLAGS" + XALAN_LIBS="$xalan_libs $XERCES_LIBS" + xalan_lib_found="yes" + AC_MSG_RESULT([found]) + ], + [ + xalan_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" + fi + + AC_MSG_CHECKING([for Xalan C++ XSLT processor]) + + if test "$run_xalan_test" = "yes"; then + if test "$xalan_header_found" = "yes" -a "$xalan_lib_found" = "yes"; then + + AC_SUBST([XALAN_CPPFLAGS]) + AC_SUBST([XALAN_LDFLAGS]) + AC_SUBST([XALAN_LIBS]) + + HAVE_XALAN="yes" + else + HAVE_XALAN="no" + fi + + AC_MSG_RESULT([$HAVE_XALAN]) + + dnl + dnl Check Xalan version + dnl + if test "$HAVE_XALAN" = "yes"; then + + xalan_version_req=ifelse([$1], [], [], [$1]) + + if test -n "$xalan_version_req"; then + + AC_MSG_CHECKING([if Xalan C++ XSLT processor version is >= $xalan_version_req]) + + if test -f "$xalan_include_dir2/Include/XalanVersion.hpp"; then + + xalan_major=`cat $xalan_include_dir2/Include/XalanVersion.hpp | \ + grep '^#define.*XALAN_VERSION_MAJOR.*[0-9]$' | \ + sed -e 's/#define XALAN_VERSION_MAJOR.//'` + + xalan_minor=`cat $xalan_include_dir2/Include/XalanVersion.hpp | \ + grep '^#define.*XALAN_VERSION_MINOR.*[0-9]$' | \ + sed -e 's/#define XALAN_VERSION_MINOR.//'` + + xalan_revision=`cat $xalan_include_dir2/Include/XalanVersion.hpp | \ + grep '^#define.*XALAN_VERSION_REVISION.*[0-9]$' | \ + sed -e 's/#define XALAN_VERSION_REVISION.//'` + + XALAN_VERSION="$xalan_major.$xalan_minor.$xalan_revision" + AC_SUBST([XALAN_VERSION]) + + dnl Decompose required version string and calculate numerical representation + xalan_version_req_major=`expr $xalan_version_req : '\([[0-9]]*\)'` + xalan_version_req_minor=`expr $xalan_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + xalan_version_req_revision=`expr $xalan_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$xalan_version_req_revision" = "x"; then + xalan_version_req_revision="0" + fi + + xalan_version_req_number=`expr $xalan_version_req_major \* 10000 \ + \+ $xalan_version_req_minor \* 100 \ + \+ $xalan_version_req_revision` + + dnl Calculate numerical representation of detected version + xalan_version_number=`expr $xalan_major \* 10000 \ + \+ $xalan_minor \* 100 \ + \+ $xalan_revision` + + xalan_version_check=`expr $xalan_version_number \>\= $xalan_version_req_number` + if test "$xalan_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Found Xalan C++ XSLT processor $XALAN_VERSION, which is older than required. Possible compilation failure.]) + fi + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Missing header XalanVersion.hpp. Unable to determine Xalan version.]) + fi + fi + fi + + else + HAVE_XALAN="no" + AC_MSG_RESULT([$HAVE_XALAN]) + + if test "$xalan_requested" = "yes"; then + AC_MSG_WARN([Xalan C++ XSLT processor support requested but headers or library not found. Specify valid prefix of Xalan C++ using --with-xalan=@<:@DIR@:>@ or provide include directory and linker flags using --with-xalan-inc and --with-xalan-lib]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_xerces.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_xerces.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_xerces.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_xerces.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,289 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_XERCES([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of Apache Xerces C++ Parser of +# particular version or newer. This macros checks for Apache Xerces C++ +# Parser headers and libraries and defines compilation flags +# +# Macro supports following options and their values: +# +# 1) Single-option usage: +# +# --with-xerces - yes, no or path to Xerces installation prefix +# +# 2) Three-options usage (all options are required): +# +# --with-xerces=yes +# --with-xerces-inc - path to base directory with Xerces headers +# --with-xerces-lib - linker flags for Xerces +# +# This macro calls: +# +# AC_SUBST(XERCES_CFLAGS) +# AC_SUBST(XERCES_LDFLAGS) +# AC_SUBST(XERCES_VERSION) - only if version requirement is used +# +# And sets: +# +# HAVE_XERCES +# +# LICENSE +# +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_LIB_XERCES], +[ + AC_REQUIRE([AX_PTHREAD]) + + AC_ARG_WITH([xerces], + AS_HELP_STRING([--with-xerces=@<:@ARG@:>@], + [use Xerces C++ Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -d /usr/local/include/xercesc ; then + xerces_prefix=/usr/local + elif test -d /usr/include/xercesc ; then + xerces_prefix=/usr + else + xerces_prefix="" + fi + xerces_requested="yes" + elif test -d "$withval"; then + xerces_prefix="$withval" + xerces_requested="yes" + else + xerces_prefix="" + xerces_requested="no" + fi + ], + [ + dnl Default behavior is implicit yes + if test -d /usr/local/include/xercesc ; then + xerces_prefix=/usr/local + elif test -d /usr/include/xercesc ; then + xerces_prefix=/usr + else + xerces_prefix="" + fi + ] + ) + + AC_ARG_WITH([xerces-inc], + AS_HELP_STRING([--with-xerces-inc=@<:@DIR@:>@], + [path to Xerces C++ Parser headers] + ), + [xerces_include_dir="$withval"], + [xerces_include_dir=""] + ) + AC_ARG_WITH([xerces-lib], + AS_HELP_STRING([--with-xerces-lib=@<:@ARG@:>@], + [link options for Xerces C++ Parser libraries] + ), + [xerces_ldflags="$withval"], + [xerces_ldflags=""] + ) + + XERCES_CPPFLAGS="" + XERCES_LDFLAGS="" + XERCES_VERSION="" + + dnl + dnl Collect include/lib paths and flags + dnl + run_xerces_test="no" + + if test -n "$xerces_prefix"; then + xerces_include_dir="$xerces_prefix/include" + xerces_include_dir2="$xerces_prefix/include/xercesc" + xerces_ldflags="-L$xerces_prefix/lib" + run_xerces_test="yes" + elif test "$xerces_requested" = "yes"; then + if test -n "$xerces_include_dir" -a -n "$xerces_lib_flags"; then + xerces_include_dir2="$xerces_include_dir/xercesc" + run_xerces_test="yes" + fi + else + run_xerces_test="no" + fi + + xerces_libs="-lxerces-c" + + dnl + dnl Check Xerces C++ Parser files + dnl + if test "$run_xerces_test" = "yes"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$xerces_include_dir -I$xerces_include_dir2" + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $xerces_ldflags $PTHREAD_LDFLAGS" + + saved_LIBS="$LIBS" + LIBS="$xerces_libs $PTHREAD_LIBS $LIBS" + + dnl + dnl Check Xerces headers + dnl + AC_MSG_CHECKING([for Xerces C++ Parser headers in $xerces_include_dir and $xerces_include_dir2]) + + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include +@%:@include + ]], + [[]] + )], + [ + XERCES_CPPFLAGS="-I$xerces_include_dir -I$xerces_include_dir2" + xerces_header_found="yes" + AC_MSG_RESULT([found]) + ], + [ + xerces_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + + dnl + dnl Check Xerces libraries + dnl + if test "$xerces_header_found" = "yes"; then + + AC_MSG_CHECKING([for Xerces C++ Parser libraries]) + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include +@%:@include +#if (_XERCES_VERSION >= 20200) +XERCES_CPP_NAMESPACE_USE +#endif + ]], + [[ +XMLPlatformUtils::Initialize(); + ]] + )], + [ + XERCES_LDFLAGS="$xerces_ldflags $PTHREAD_LDFLAGS" + XERCES_LIBS="$xerces_libs $PTHREAD_LIBS" + xerces_lib_found="yes" + AC_MSG_RESULT([found]) + ], + [ + xerces_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + LIBS="$saved_LIBS" + fi + + AC_MSG_CHECKING([for Xerces C++ Parser]) + + if test "$run_xerces_test" = "yes"; then + if test "$xerces_header_found" = "yes" -a "$xerces_lib_found" = "yes"; then + + AC_SUBST([XERCES_CPPFLAGS]) + AC_SUBST([XERCES_LDFLAGS]) + AC_SUBST([XERCES_LIBS]) + + HAVE_XERCES="yes" + else + HAVE_XERCES="no" + fi + + AC_MSG_RESULT([$HAVE_XERCES]) + + dnl + dnl Check Xerces version + dnl + if test "$HAVE_XERCES" = "yes"; then + + xerces_version_req=ifelse([$1], [], [], [$1]) + + if test -n "$xerces_version_req"; then + + AC_MSG_CHECKING([if Xerces C++ Parser version is >= $xerces_version_req]) + + if test -f "$xerces_include_dir2/util/XercesVersion.hpp"; then + + xerces_major=`cat $xerces_include_dir2/util/XercesVersion.hpp | \ + grep '^#define.*XERCES_VERSION_MAJOR.*[0-9]$' | \ + sed -e 's/#define XERCES_VERSION_MAJOR.//'` + + xerces_minor=`cat $xerces_include_dir2/util/XercesVersion.hpp | \ + grep '^#define.*XERCES_VERSION_MINOR.*[0-9]$' | \ + sed -e 's/#define XERCES_VERSION_MINOR.//'` + + xerces_revision=`cat $xerces_include_dir2/util/XercesVersion.hpp | \ + grep '^#define.*XERCES_VERSION_REVISION.*[0-9]$' | \ + sed -e 's/#define XERCES_VERSION_REVISION.//'` + + XERCES_VERSION="$xerces_major.$xerces_minor.$xerces_revision" + AC_SUBST([XERCES_VERSION]) + + dnl Decompose required version string and calculate numerical representation + xerces_version_req_major=`expr $xerces_version_req : '\([[0-9]]*\)'` + xerces_version_req_minor=`expr $xerces_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + xerces_version_req_revision=`expr $xerces_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$xerces_version_req_revision" = "x"; then + xerces_version_req_revision="0" + fi + + xerces_version_req_number=`expr $xerces_version_req_major \* 10000 \ + \+ $xerces_version_req_minor \* 100 \ + \+ $xerces_version_req_revision` + + dnl Calculate numerical representation of detected version + xerces_version_number=`expr $xerces_major \* 10000 \ + \+ $xerces_minor \* 100 \ + \+ $xerces_revision` + + xerces_version_check=`expr $xerces_version_number \>\= $xerces_version_req_number` + if test "$xerces_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Found Xerces C++ Parser $XERCES_VERSION, which is older than required. Possible compilation failure.]) + fi + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Missing header XercesVersion.hpp. Unable to determine Xerces version.]) + fi + fi + fi + + else + HAVE_XERCES="no" + AC_MSG_RESULT([$HAVE_XERCES]) + + if test "$xerces_requested" = "yes"; then + AC_MSG_WARN([Xerces C++ Parser support requested but headers or library not found. Specify valid prefix of Xerces C++ using --with-xerces=@<:@DIR@:>@ or provide include directory and linker flags using --with-xerces-inc and --with-xerces-lib]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_xml_security.m4 projectm-3.1.0/m4/autoconf-archive/ax_lib_xml_security.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lib_xml_security.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lib_xml_security.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,277 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lib_xml_security.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LIB_XML_SECURITY([MINIMUM-VERSION]) +# +# DESCRIPTION +# +# This macro provides tests of availability of Apache Xml-Security C++ +# library of particular version +# or newer. This macros checks for Apache Xml-Security C++ headers and +# libraries and defines compilation flags +# +# Macro supports following options and their values: +# +# 1) Single-option usage: +# +# --with-xml-security - yes, no or path to Xml-Security installation prefix +# +# 2) Three-options usage (all options are required): +# +# --with-xml-security=yes +# --with-xml-security-inc - path to base directory with Xml-Security headers +# --with-xml-security-lib - linker flags for Xml-Security +# +# This macro calls: +# +# AC_SUBST(XML_SECURITY_CFLAGS) +# AC_SUBST(XML_SECURITY_LDFLAGS) +# AC_SUBST(XML_SECURITY_VERSION) - only if version requirement is used +# +# And sets: +# +# HAVE_XML_SECURITY +# +# LICENSE +# +# Copyright (c) 2008 Alexander Petry +# Copyright (c) 2008 Mateusz Loskot +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_LIB_XML_SECURITY], +[ + AC_ARG_WITH([xml-security], + AS_HELP_STRING([--with-xml-security=@<:@ARG@:>@], + [use Xml-Security C++ library from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)] + ), + [ + if test "$withval" = "yes"; then + if test -d /usr/local/include/xsec ; then + xml_security_prefix=/usr/local + elif test -d /usr/include/xsec ; then + xml_security_prefix=/usr + else + xml_security_prefix="" + fi + xml_security_requested="yes" + elif test -d "$withval"; then + xml_security_prefix="$withval" + xml_security_requested="yes" + else + xml_security_prefix="" + xml_security_requested="no" + fi + ], + [ + dnl Default behavior is implicit yes + if test -d /usr/local/include/xsec ; then + xml_security_prefix=/usr/local + elif test -d /usr/include/xsec ; then + xml_security_prefix=/usr + else + xml-security_prefix="" + fi + ] + ) + + AC_ARG_WITH([xml-security-inc], + AS_HELP_STRING([--with-xml-security-inc=@<:@DIR@:>@], + [path to Xml-Security C++ headers] + ), + [xml_security_include_dir="$withval"], + [xml_security_include_dir=""] + ) + AC_ARG_WITH([xml-security-lib], + AS_HELP_STRING([--with-xml-security-lib=@<:@ARG@:>@], + [link options for Xml-Security C++ Parser libraries] + ), + [xml_security_lib_flags="$withval"], + [xml_security_lib_flags=""] + ) + + XML_SECURITY_CFLAGS="" + XML_SECURITY_LDFLAGS="" + XML_SECURITY_VERSION="" + + dnl + dnl Collect include/lib paths and flags + dnl + run_xml_security_test="no" + + if test -n "$xml_security_prefix"; then + xml_security_include_dir="$xml_security_prefix/include" + xml_security_include_dir2="$xml_security_prefix/include/xsec" + xml_security_lib_flags="-L$xml_security_prefix/lib -lxml-security-c -lpthread" + run_xml_security_test="yes" + elif test "$xml_security_requested" = "yes"; then + if test -n "$xml_security_include_dir" -a -n "$xml_security_lib_flags"; then + xml_security_include_dir2="$xml_security_include_dir/xenc" + run_xml_security_test="yes" + fi + else + run_xml_security_test="no" + fi + + dnl + dnl Check Xml-Security C++ files + dnl + if test "$run_xml_security_test" = "yes"; then + + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I$xml_security_include_dir -I$xml_security_include_dir2" + + saved_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $xml_security_lib_flags" + + dnl + dnl Check Xml-Security headers + dnl + AC_MSG_CHECKING([for Xml-Security C++ headers in $xml_security_include_dir and $xml_security_include_dir2]) + + AC_LANG_PUSH([C++]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ + @%:@include + ]], + [[ + ]] + )], + [ + XML_SECURITY_CFLAGS="-I$xml_security_include_dir -I$xml_security_include_dir2" + xml_security_header_found="yes" + AC_MSG_RESULT([found]) + ], + [ + xml_security_header_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + + dnl + dnl Check Xml-Security libraries + dnl + if test "$xml_security_header_found" = "yes"; then + + AC_MSG_CHECKING([for Xml-Security C++ libraries]) + + AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([ + AC_LANG_PROGRAM( + [[ +@%:@include +#ifdef XERCES_CPP_NAMESPACE_USE +XERCES_CPP_NAMESPACE_USE +#endif + ]], + [[ +XSECPlatformUtils::Initialise(); + ]] + )], + [ + XML_SECURITY_LDFLAGS="$xml_security_lib_flags" + xml_security_lib_found="yes" + AC_MSG_RESULT([found]) + ], + [ + xml_security_lib_found="no" + AC_MSG_RESULT([not found]) + ] + ) + AC_LANG_POP([C++]) + fi + + CPPFLAGS="$saved_CPPFLAGS" + LDFLAGS="$saved_LDFLAGS" + fi + + AC_MSG_CHECKING([for Xml-Security C++]) + + if test "$run_xml_security_test" = "yes"; then + if test x"$xml_security_header_found" = x"yes" -a x"$xml_security_lib_found" = x"yes"; then + + AC_SUBST([XML_SECURITY_CFLAGS]) + AC_SUBST([XML_SECURITY_LDFLAGS]) + + HAVE_XML_SECURITY="yes" + else + HAVE_XML_SECURITY="no" + fi + + AC_MSG_RESULT([$HAVE_XML_SECURITY]) + + dnl + dnl Check Xml-Security version + dnl + if test "$HAVE_XML_SECURITY" = "yes"; then + + xml_security_version_req=ifelse([$1], [], [], [$1]) + + if test -n "$xml_security_version_req"; then + + AC_MSG_CHECKING([if Xml-Security C++ version is >= $xml_security_version_req]) + + if test -f "$xml_security_include_dir2/framework/XSECConfig.hpp"; then + + xml_security_major=`cat $xml_security_include_dir2/framework/XSECConfig.hpp | \ + grep '^#define.*XSEC_VERSION_MAJOR.*[0-9]$' | \ + sed -e 's/#define XSEC_VERSION_MAJOR.//'` + + xml_security_medium=`cat $xml_security_include_dir2/framework/XSECConfig.hpp | \ + grep '^#define.*XSEC_VERSION_MEDIUM.*[0-9]$' | \ + sed -e 's/#define XSEC_VERSION_MEDIUM.//'` + + xml_security_minor=`cat $xml_security_include_dir2/framework/XSECConfig.hpp | \ + grep '^#define.*XSEC_VERSION_MINOR.*[0-9]$' | \ + sed -e 's/#define XSEC_VERSION_MINOR.//'` + + XML_SECURITY_VERSION="$xml_security_major.$xml_security_medium.$xml_security_minor" + AC_SUBST([XML_SECURITY_VERSION]) + + dnl Decompose required version string and calculate numerical representation + xml_security_version_req_major=`expr $xml_security_version_req : '\([[0-9]]*\)'` + xml_security_version_req_medium=`expr $xml_security_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + xml_security_version_req_minor=`expr $xml_security_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + + xml_security_version_req_number=`expr $xml_security_version_req_major \* 10000 \ + \+ $xml_security_version_req_medium \* 100 \ + \+ $xml_security_version_req_minor` + + dnl Calculate numerical representation of detected version + xml_security_version_number=`expr $xml_security_major \* 10000 \ + \+ $xml_security_medium \* 100 \ + \+ $xml_security_minor` + + xml_security_version_check=`expr $xml_security_version_number \>\= $xml_security_version_req_number` + if test "$xml_security_version_check" = "1"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Found Xml-Security C++ $XML_SECURITY_VERSION, which is older than required. Possible compilation failure.]) + fi + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Missing header XSECConfig.hpp. Unable to determine Xml-Security version.]) + fi + fi + fi + + else + HAVE_XML_SECURITY="no" + AC_MSG_RESULT([$HAVE_XML_SECURITY]) + + if test "$xml_security_requested" = "yes"; then + AC_MSG_ERROR([Xml-Security C++ support requested but headers or library not found. Specify valid prefix of Xml-Security C++ using --with-xml-security=@<:@DIR@:>@ or provide headers and linker flags using --with-xml-security-inc and --with-xml-security-lib]) + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_llvm.m4 projectm-3.1.0/m4/autoconf-archive/ax_llvm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_llvm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_llvm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,93 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_llvm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LLVM([llvm-libs]) +# +# DESCRIPTION +# +# Test for the existence of llvm, and make sure that it can be linked with +# the llvm-libs argument that is passed on to llvm-config i.e.: +# +# llvm --libs +# +# llvm-config will also include any libraries that are depended upon. +# +# LICENSE +# +# Copyright (c) 2008 Andy Kitchen +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 16 + +AC_DEFUN([AX_LLVM], +[ +AC_ARG_WITH([llvm], + AS_HELP_STRING([--with-llvm@<:@=DIR@:>@], [use llvm (default is yes) - it is possible to specify the root directory for llvm (optional)]), + [ + if test "$withval" = "no"; then + want_llvm="no" + elif test "$withval" = "yes"; then + want_llvm="yes" + ac_llvm_config_path=`which llvm-config` + else + want_llvm="yes" + ac_llvm_config_path="$withval" + fi + ], + [want_llvm="yes"]) + + succeeded=no + if test -z "$ac_llvm_config_path"; then + ac_llvm_config_path=`which llvm-config` + fi + + if test "x$want_llvm" = "xyes"; then + if test -e "$ac_llvm_config_path"; then + LLVM_CPPFLAGS=`$ac_llvm_config_path --cxxflags` + LLVM_LDFLAGS="$($ac_llvm_config_path --ldflags) $($ac_llvm_config_path --libs $1)" + + AC_REQUIRE([AC_PROG_CXX]) + CPPFLAGS_SAVED="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $LLVM_CPPFLAGS" + export CPPFLAGS + + LDFLAGS_SAVED="$LDFLAGS" + LDFLAGS="$LDFLAGS $LLVM_LDFLAGS" + export LDFLAGS + + AC_CACHE_CHECK(can compile with and link with llvm([$1]), + ax_cv_llvm, + [AC_LANG_PUSH([C++]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include + ]], + [[llvm::Module *M = new llvm::Module("test"); return 0;]])], + ax_cv_llvm=yes, ax_cv_llvm=no) + AC_LANG_POP([C++]) + ]) + + if test "x$ax_cv_llvm" = "xyes"; then + succeeded=yes + fi + + CPPFLAGS="$CPPFLAGS_SAVED" + LDFLAGS="$LDFLAGS_SAVED" + else + succeeded=no + fi + fi + + if test "$succeeded" != "yes" ; then + AC_MSG_ERROR([[We could not detect the llvm libraries make sure that llvm-config is on your path or specified by --with-llvm.]]) + else + AC_SUBST(LLVM_CPPFLAGS) + AC_SUBST(LLVM_LDFLAGS) + AC_DEFINE(HAVE_LLVM,,[define if the llvm library is available]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lua.m4 projectm-3.1.0/m4/autoconf-archive/ax_lua.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_lua.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_lua.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,664 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_lua.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_LUA[([MINIMUM-VERSION], [TOO-BIG-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])] +# AX_LUA_HEADERS[([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])] +# AX_LUA_LIBS[([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])] +# AX_LUA_READLINE[([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])] +# +# DESCRIPTION +# +# Detect a Lua interpreter, optionally specifying a minimum and maximum +# version number. Set up important Lua paths, such as the directories in +# which to install scripts and modules (shared libraries). +# +# Also detect Lua headers and libraries. The Lua version contained in the +# header is checked to match the Lua interpreter version exactly. When +# searching for Lua libraries, the version number is used as a suffix. +# This is done with the goal of supporting multiple Lua installs (5.1, +# 5.2, and 5.3 side-by-side). +# +# A note on compatibility with previous versions: This file has been +# mostly rewritten for serial 18. Most developers should be able to use +# these macros without needing to modify configure.ac. Care has been taken +# to preserve each macro's behavior, but there are some differences: +# +# 1) AX_WITH_LUA is deprecated; it now expands to the exact same thing as +# AX_PROG_LUA with no arguments. +# +# 2) AX_LUA_HEADERS now checks that the version number defined in lua.h +# matches the interpreter version. AX_LUA_HEADERS_VERSION is therefore +# unnecessary, so it is deprecated and does not expand to anything. +# +# 3) The configure flag --with-lua-suffix no longer exists; the user +# should instead specify the LUA precious variable on the command line. +# See the AX_PROG_LUA description for details. +# +# Please read the macro descriptions below for more information. +# +# This file was inspired by Andrew Dalke's and James Henstridge's +# python.m4 and Tom Payne's, Matthieu Moy's, and Reuben Thomas's ax_lua.m4 +# (serial 17). Basically, this file is a mash-up of those two files. I +# like to think it combines the best of the two! +# +# AX_PROG_LUA: Search for the Lua interpreter, and set up important Lua +# paths. Adds precious variable LUA, which may contain the path of the Lua +# interpreter. If LUA is blank, the user's path is searched for an +# suitable interpreter. +# +# If MINIMUM-VERSION is supplied, then only Lua interpreters with a +# version number greater or equal to MINIMUM-VERSION will be accepted. If +# TOO-BIG-VERSION is also supplied, then only Lua interpreters with a +# version number greater or equal to MINIMUM-VERSION and less than +# TOO-BIG-VERSION will be accepted. +# +# The Lua version number, LUA_VERSION, is found from the interpreter, and +# substituted. LUA_PLATFORM is also found, but not currently supported (no +# standard representation). +# +# Finally, the macro finds four paths: +# +# luadir Directory to install Lua scripts. +# pkgluadir $luadir/$PACKAGE +# luaexecdir Directory to install Lua modules. +# pkgluaexecdir $luaexecdir/$PACKAGE +# +# These paths are found based on $prefix, $exec_prefix, Lua's +# package.path, and package.cpath. The first path of package.path +# beginning with $prefix is selected as luadir. The first path of +# package.cpath beginning with $exec_prefix is used as luaexecdir. This +# should work on all reasonable Lua installations. If a path cannot be +# determined, a default path is used. Of course, the user can override +# these later when invoking make. +# +# luadir Default: $prefix/share/lua/$LUA_VERSION +# luaexecdir Default: $exec_prefix/lib/lua/$LUA_VERSION +# +# These directories can be used by Automake as install destinations. The +# variable name minus 'dir' needs to be used as a prefix to the +# appropriate Automake primary, e.g. lua_SCRIPS or luaexec_LIBRARIES. +# +# If an acceptable Lua interpreter is found, then ACTION-IF-FOUND is +# performed, otherwise ACTION-IF-NOT-FOUND is preformed. If ACTION-IF-NOT- +# FOUND is blank, then it will default to printing an error. To prevent +# the default behavior, give ':' as an action. +# +# AX_LUA_HEADERS: Search for Lua headers. Requires that AX_PROG_LUA be +# expanded before this macro. Adds precious variable LUA_INCLUDE, which +# may contain Lua specific include flags, e.g. -I/usr/include/lua5.1. If +# LUA_INCLUDE is blank, then this macro will attempt to find suitable +# flags. +# +# LUA_INCLUDE can be used by Automake to compile Lua modules or +# executables with embedded interpreters. The *_CPPFLAGS variables should +# be used for this purpose, e.g. myprog_CPPFLAGS = $(LUA_INCLUDE). +# +# This macro searches for the header lua.h (and others). The search is +# performed with a combination of CPPFLAGS, CPATH, etc, and LUA_INCLUDE. +# If the search is unsuccessful, then some common directories are tried. +# If the headers are then found, then LUA_INCLUDE is set accordingly. +# +# The paths automatically searched are: +# +# * /usr/include/luaX.Y +# * /usr/include/lua/X.Y +# * /usr/include/luaXY +# * /usr/local/include/luaX.Y +# * /usr/local/include/lua-X.Y +# * /usr/local/include/lua/X.Y +# * /usr/local/include/luaXY +# +# (Where X.Y is the Lua version number, e.g. 5.1.) +# +# The Lua version number found in the headers is always checked to match +# the Lua interpreter's version number. Lua headers with mismatched +# version numbers are not accepted. +# +# If headers are found, then ACTION-IF-FOUND is performed, otherwise +# ACTION-IF-NOT-FOUND is performed. If ACTION-IF-NOT-FOUND is blank, then +# it will default to printing an error. To prevent the default behavior, +# set the action to ':'. +# +# AX_LUA_LIBS: Search for Lua libraries. Requires that AX_PROG_LUA be +# expanded before this macro. Adds precious variable LUA_LIB, which may +# contain Lua specific linker flags, e.g. -llua5.1. If LUA_LIB is blank, +# then this macro will attempt to find suitable flags. +# +# LUA_LIB can be used by Automake to link Lua modules or executables with +# embedded interpreters. The *_LIBADD and *_LDADD variables should be used +# for this purpose, e.g. mymod_LIBADD = $(LUA_LIB). +# +# This macro searches for the Lua library. More technically, it searches +# for a library containing the function lua_load. The search is performed +# with a combination of LIBS, LIBRARY_PATH, and LUA_LIB. +# +# If the search determines that some linker flags are missing, then those +# flags will be added to LUA_LIB. +# +# If libraries are found, then ACTION-IF-FOUND is performed, otherwise +# ACTION-IF-NOT-FOUND is performed. If ACTION-IF-NOT-FOUND is blank, then +# it will default to printing an error. To prevent the default behavior, +# set the action to ':'. +# +# AX_LUA_READLINE: Search for readline headers and libraries. Requires the +# AX_LIB_READLINE macro, which is provided by ax_lib_readline.m4 from the +# Autoconf Archive. +# +# If a readline compatible library is found, then ACTION-IF-FOUND is +# performed, otherwise ACTION-IF-NOT-FOUND is performed. +# +# LICENSE +# +# Copyright (c) 2015 Reuben Thomas +# Copyright (c) 2014 Tim Perkins +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 40 + +dnl ========================================================================= +dnl AX_PROG_LUA([MINIMUM-VERSION], [TOO-BIG-VERSION], +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ========================================================================= +AC_DEFUN([AX_PROG_LUA], +[ + dnl Check for required tools. + AC_REQUIRE([AC_PROG_GREP]) + AC_REQUIRE([AC_PROG_SED]) + + dnl Make LUA a precious variable. + AC_ARG_VAR([LUA], [The Lua interpreter, e.g. /usr/bin/lua5.1]) + + dnl Find a Lua interpreter. + m4_define_default([_AX_LUA_INTERPRETER_LIST], + [lua lua5.3 lua53 lua5.2 lua52 lua5.1 lua51 lua50]) + + m4_if([$1], [], + [ dnl No version check is needed. Find any Lua interpreter. + AS_IF([test "x$LUA" = 'x'], + [AC_PATH_PROGS([LUA], [_AX_LUA_INTERPRETER_LIST], [:])]) + ax_display_LUA='lua' + + AS_IF([test "x$LUA" != 'x:'], + [ dnl At least check if this is a Lua interpreter. + AC_MSG_CHECKING([if $LUA is a Lua interpreter]) + _AX_LUA_CHK_IS_INTRP([$LUA], + [AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no]) + AC_MSG_ERROR([not a Lua interpreter]) + ]) + ]) + ], + [ dnl A version check is needed. + AS_IF([test "x$LUA" != 'x'], + [ dnl Check if this is a Lua interpreter. + AC_MSG_CHECKING([if $LUA is a Lua interpreter]) + _AX_LUA_CHK_IS_INTRP([$LUA], + [AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no]) + AC_MSG_ERROR([not a Lua interpreter]) + ]) + dnl Check the version. + m4_if([$2], [], + [_ax_check_text="whether $LUA version >= $1"], + [_ax_check_text="whether $LUA version >= $1, < $2"]) + AC_MSG_CHECKING([$_ax_check_text]) + _AX_LUA_CHK_VER([$LUA], [$1], [$2], + [AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no]) + AC_MSG_ERROR([version is out of range for specified LUA])]) + ax_display_LUA=$LUA + ], + [ dnl Try each interpreter until we find one that satisfies VERSION. + m4_if([$2], [], + [_ax_check_text="for a Lua interpreter with version >= $1"], + [_ax_check_text="for a Lua interpreter with version >= $1, < $2"]) + AC_CACHE_CHECK([$_ax_check_text], + [ax_cv_pathless_LUA], + [ for ax_cv_pathless_LUA in _AX_LUA_INTERPRETER_LIST none; do + test "x$ax_cv_pathless_LUA" = 'xnone' && break + _AX_LUA_CHK_IS_INTRP([$ax_cv_pathless_LUA], [], [continue]) + _AX_LUA_CHK_VER([$ax_cv_pathless_LUA], [$1], [$2], [break]) + done + ]) + dnl Set $LUA to the absolute path of $ax_cv_pathless_LUA. + AS_IF([test "x$ax_cv_pathless_LUA" = 'xnone'], + [LUA=':'], + [AC_PATH_PROG([LUA], [$ax_cv_pathless_LUA])]) + ax_display_LUA=$ax_cv_pathless_LUA + ]) + ]) + + AS_IF([test "x$LUA" = 'x:'], + [ dnl Run any user-specified action, or abort. + m4_default([$4], [AC_MSG_ERROR([cannot find suitable Lua interpreter])]) + ], + [ dnl Query Lua for its version number. + AC_CACHE_CHECK([for $ax_display_LUA version], + [ax_cv_lua_version], + [ dnl Get the interpreter version in X.Y format. This should work for + dnl interpreters version 5.0 and beyond. + ax_cv_lua_version=[`$LUA -e ' + -- return a version number in X.Y format + local _, _, ver = string.find(_VERSION, "^Lua (%d+%.%d+)") + print(ver)'`] + ]) + AS_IF([test "x$ax_cv_lua_version" = 'x'], + [AC_MSG_ERROR([invalid Lua version number])]) + AC_SUBST([LUA_VERSION], [$ax_cv_lua_version]) + AC_SUBST([LUA_SHORT_VERSION], [`echo "$LUA_VERSION" | $SED 's|\.||'`]) + + dnl The following check is not supported: + dnl At times (like when building shared libraries) you may want to know + dnl which OS platform Lua thinks this is. + AC_CACHE_CHECK([for $ax_display_LUA platform], + [ax_cv_lua_platform], + [ax_cv_lua_platform=[`$LUA -e 'print("unknown")'`]]) + AC_SUBST([LUA_PLATFORM], [$ax_cv_lua_platform]) + + dnl Use the values of $prefix and $exec_prefix for the corresponding + dnl values of LUA_PREFIX and LUA_EXEC_PREFIX. These are made distinct + dnl variables so they can be overridden if need be. However, the general + dnl consensus is that you shouldn't need this ability. + AC_SUBST([LUA_PREFIX], ['${prefix}']) + AC_SUBST([LUA_EXEC_PREFIX], ['${exec_prefix}']) + + dnl Lua provides no way to query the script directory, and instead + dnl provides LUA_PATH. However, we should be able to make a safe educated + dnl guess. If the built-in search path contains a directory which is + dnl prefixed by $prefix, then we can store scripts there. The first + dnl matching path will be used. + AC_CACHE_CHECK([for $ax_display_LUA script directory], + [ax_cv_lua_luadir], + [ AS_IF([test "x$prefix" = 'xNONE'], + [ax_lua_prefix=$ac_default_prefix], + [ax_lua_prefix=$prefix]) + + dnl Initialize to the default path. + ax_cv_lua_luadir="$LUA_PREFIX/share/lua/$LUA_VERSION" + + dnl Try to find a path with the prefix. + _AX_LUA_FND_PRFX_PTH([$LUA], [$ax_lua_prefix], [script]) + AS_IF([test "x$ax_lua_prefixed_path" != 'x'], + [ dnl Fix the prefix. + _ax_strip_prefix=`echo "$ax_lua_prefix" | $SED 's|.|.|g'` + ax_cv_lua_luadir=`echo "$ax_lua_prefixed_path" | \ + $SED "s|^$_ax_strip_prefix|$LUA_PREFIX|"` + ]) + ]) + AC_SUBST([luadir], [$ax_cv_lua_luadir]) + AC_SUBST([pkgluadir], [\${luadir}/$PACKAGE]) + + dnl Lua provides no way to query the module directory, and instead + dnl provides LUA_PATH. However, we should be able to make a safe educated + dnl guess. If the built-in search path contains a directory which is + dnl prefixed by $exec_prefix, then we can store modules there. The first + dnl matching path will be used. + AC_CACHE_CHECK([for $ax_display_LUA module directory], + [ax_cv_lua_luaexecdir], + [ AS_IF([test "x$exec_prefix" = 'xNONE'], + [ax_lua_exec_prefix=$ax_lua_prefix], + [ax_lua_exec_prefix=$exec_prefix]) + + dnl Initialize to the default path. + ax_cv_lua_luaexecdir="$LUA_EXEC_PREFIX/lib/lua/$LUA_VERSION" + + dnl Try to find a path with the prefix. + _AX_LUA_FND_PRFX_PTH([$LUA], + [$ax_lua_exec_prefix], [module]) + AS_IF([test "x$ax_lua_prefixed_path" != 'x'], + [ dnl Fix the prefix. + _ax_strip_prefix=`echo "$ax_lua_exec_prefix" | $SED 's|.|.|g'` + ax_cv_lua_luaexecdir=`echo "$ax_lua_prefixed_path" | \ + $SED "s|^$_ax_strip_prefix|$LUA_EXEC_PREFIX|"` + ]) + ]) + AC_SUBST([luaexecdir], [$ax_cv_lua_luaexecdir]) + AC_SUBST([pkgluaexecdir], [\${luaexecdir}/$PACKAGE]) + + dnl Run any user specified action. + $3 + ]) +]) + +dnl AX_WITH_LUA is now the same thing as AX_PROG_LUA. +AC_DEFUN([AX_WITH_LUA], +[ + AC_MSG_WARN([[$0 is deprecated, please use AX_PROG_LUA instead]]) + AX_PROG_LUA +]) + + +dnl ========================================================================= +dnl _AX_LUA_CHK_IS_INTRP(PROG, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +dnl ========================================================================= +AC_DEFUN([_AX_LUA_CHK_IS_INTRP], +[ + dnl A minimal Lua factorial to prove this is an interpreter. This should work + dnl for Lua interpreters version 5.0 and beyond. + _ax_lua_factorial=[`$1 2>/dev/null -e ' + -- a simple factorial + function fact (n) + if n == 0 then + return 1 + else + return n * fact(n-1) + end + end + print("fact(5) is " .. fact(5))'`] + AS_IF([test "$_ax_lua_factorial" = 'fact(5) is 120'], + [$2], [$3]) +]) + + +dnl ========================================================================= +dnl _AX_LUA_CHK_VER(PROG, MINIMUM-VERSION, [TOO-BIG-VERSION], +dnl [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +dnl ========================================================================= +AC_DEFUN([_AX_LUA_CHK_VER], +[ + dnl Check that the Lua version is within the bounds. Only the major and minor + dnl version numbers are considered. This should work for Lua interpreters + dnl version 5.0 and beyond. + _ax_lua_good_version=[`$1 -e ' + -- a script to compare versions + function verstr2num(verstr) + local _, _, majorver, minorver = string.find(verstr, "^(%d+)%.(%d+)") + if majorver and minorver then + return tonumber(majorver) * 100 + tonumber(minorver) + end + end + local minver = verstr2num("$2") + local _, _, trimver = string.find(_VERSION, "^Lua (.*)") + local ver = verstr2num(trimver) + local maxver = verstr2num("$3") or 1e9 + if minver <= ver and ver < maxver then + print("yes") + else + print("no") + end'`] + AS_IF([test "x$_ax_lua_good_version" = "xyes"], + [$4], [$5]) +]) + + +dnl ========================================================================= +dnl _AX_LUA_FND_PRFX_PTH(PROG, PREFIX, SCRIPT-OR-MODULE-DIR) +dnl ========================================================================= +AC_DEFUN([_AX_LUA_FND_PRFX_PTH], +[ + dnl Get the script or module directory by querying the Lua interpreter, + dnl filtering on the given prefix, and selecting the shallowest path. If no + dnl path is found matching the prefix, the result will be an empty string. + dnl The third argument determines the type of search, it can be 'script' or + dnl 'module'. Supplying 'script' will perform the search with package.path + dnl and LUA_PATH, and supplying 'module' will search with package.cpath and + dnl LUA_CPATH. This is done for compatibility with Lua 5.0. + + ax_lua_prefixed_path=[`$1 -e ' + -- get the path based on search type + local searchtype = "$3" + local paths = "" + if searchtype == "script" then + paths = (package and package.path) or LUA_PATH + elseif searchtype == "module" then + paths = (package and package.cpath) or LUA_CPATH + end + -- search for the prefix + local prefix = "'$2'" + local minpath = "" + local mindepth = 1e9 + string.gsub(paths, "(@<:@^;@:>@+)", + function (path) + path = string.gsub(path, "%?.*$", "") + path = string.gsub(path, "/@<:@^/@:>@*$", "") + if string.find(path, prefix) then + local depth = string.len(string.gsub(path, "@<:@^/@:>@", "")) + if depth < mindepth then + minpath = path + mindepth = depth + end + end + end) + print(minpath)'`] +]) + + +dnl ========================================================================= +dnl AX_LUA_HEADERS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ========================================================================= +AC_DEFUN([AX_LUA_HEADERS], +[ + dnl Check for LUA_VERSION. + AC_MSG_CHECKING([if LUA_VERSION is defined]) + AS_IF([test "x$LUA_VERSION" != 'x'], + [AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot check Lua headers without knowing LUA_VERSION]) + ]) + + dnl Make LUA_INCLUDE a precious variable. + AC_ARG_VAR([LUA_INCLUDE], [The Lua includes, e.g. -I/usr/include/lua5.1]) + + dnl Some default directories to search. + LUA_SHORT_VERSION=`echo "$LUA_VERSION" | $SED 's|\.||'` + m4_define_default([_AX_LUA_INCLUDE_LIST], + [ /usr/include/lua$LUA_VERSION \ + /usr/include/lua-$LUA_VERSION \ + /usr/include/lua/$LUA_VERSION \ + /usr/include/lua$LUA_SHORT_VERSION \ + /usr/local/include/lua$LUA_VERSION \ + /usr/local/include/lua-$LUA_VERSION \ + /usr/local/include/lua/$LUA_VERSION \ + /usr/local/include/lua$LUA_SHORT_VERSION \ + ]) + + dnl Try to find the headers. + _ax_lua_saved_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LUA_INCLUDE" + AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h]) + CPPFLAGS=$_ax_lua_saved_cppflags + + dnl Try some other directories if LUA_INCLUDE was not set. + AS_IF([test "x$LUA_INCLUDE" = 'x' && + test "x$ac_cv_header_lua_h" != 'xyes'], + [ dnl Try some common include paths. + for _ax_include_path in _AX_LUA_INCLUDE_LIST; do + test ! -d "$_ax_include_path" && continue + + AC_MSG_CHECKING([for Lua headers in]) + AC_MSG_RESULT([$_ax_include_path]) + + AS_UNSET([ac_cv_header_lua_h]) + AS_UNSET([ac_cv_header_lualib_h]) + AS_UNSET([ac_cv_header_lauxlib_h]) + AS_UNSET([ac_cv_header_luaconf_h]) + + _ax_lua_saved_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$_ax_include_path" + AC_CHECK_HEADERS([lua.h lualib.h lauxlib.h luaconf.h]) + CPPFLAGS=$_ax_lua_saved_cppflags + + AS_IF([test "x$ac_cv_header_lua_h" = 'xyes'], + [ LUA_INCLUDE="-I$_ax_include_path" + break + ]) + done + ]) + + AS_IF([test "x$ac_cv_header_lua_h" = 'xyes'], + [ dnl Make a program to print LUA_VERSION defined in the header. + dnl TODO It would be really nice if we could do this without compiling a + dnl program, then it would work when cross compiling. But I'm not sure how + dnl to do this reliably. For now, assume versions match when cross compiling. + + AS_IF([test "x$cross_compiling" != 'xyes'], + [ AC_CACHE_CHECK([for Lua header version], + [ax_cv_lua_header_version], + [ _ax_lua_saved_cppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $LUA_INCLUDE" + AC_RUN_IFELSE( + [ AC_LANG_SOURCE([[ +#include +#include +#include +int main(int argc, char ** argv) +{ + if(argc > 1) printf("%s", LUA_VERSION); + exit(EXIT_SUCCESS); +} +]]) + ], + [ ax_cv_lua_header_version=`./conftest$EXEEXT p | \ + $SED -n "s|^Lua \(@<:@0-9@:>@\{1,\}\.@<:@0-9@:>@\{1,\}\).\{0,\}|\1|p"` + ], + [ax_cv_lua_header_version='unknown']) + CPPFLAGS=$_ax_lua_saved_cppflags + ]) + + dnl Compare this to the previously found LUA_VERSION. + AC_MSG_CHECKING([if Lua header version matches $LUA_VERSION]) + AS_IF([test "x$ax_cv_lua_header_version" = "x$LUA_VERSION"], + [ AC_MSG_RESULT([yes]) + ax_header_version_match='yes' + ], + [ AC_MSG_RESULT([no]) + ax_header_version_match='no' + ]) + ], + [ AC_MSG_WARN([cross compiling so assuming header version number matches]) + ax_header_version_match='yes' + ]) + ]) + + dnl Was LUA_INCLUDE specified? + AS_IF([test "x$ax_header_version_match" != 'xyes' && + test "x$LUA_INCLUDE" != 'x'], + [AC_MSG_ERROR([cannot find headers for specified LUA_INCLUDE])]) + + dnl Test the final result and run user code. + AS_IF([test "x$ax_header_version_match" = 'xyes'], [$1], + [m4_default([$2], [AC_MSG_ERROR([cannot find Lua includes])])]) +]) + +dnl AX_LUA_HEADERS_VERSION no longer exists, use AX_LUA_HEADERS. +AC_DEFUN([AX_LUA_HEADERS_VERSION], +[ + AC_MSG_WARN([[$0 is deprecated, please use AX_LUA_HEADERS instead]]) +]) + + +dnl ========================================================================= +dnl AX_LUA_LIBS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ========================================================================= +AC_DEFUN([AX_LUA_LIBS], +[ + dnl TODO Should this macro also check various -L flags? + + dnl Check for LUA_VERSION. + AC_MSG_CHECKING([if LUA_VERSION is defined]) + AS_IF([test "x$LUA_VERSION" != 'x'], + [AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot check Lua libs without knowing LUA_VERSION]) + ]) + + dnl Make LUA_LIB a precious variable. + AC_ARG_VAR([LUA_LIB], [The Lua library, e.g. -llua5.1]) + + AS_IF([test "x$LUA_LIB" != 'x'], + [ dnl Check that LUA_LIBS works. + _ax_lua_saved_libs=$LIBS + LIBS="$LIBS $LUA_LIB" + AC_SEARCH_LIBS([lua_load], [], + [_ax_found_lua_libs='yes'], + [_ax_found_lua_libs='no']) + LIBS=$_ax_lua_saved_libs + + dnl Check the result. + AS_IF([test "x$_ax_found_lua_libs" != 'xyes'], + [AC_MSG_ERROR([cannot find libs for specified LUA_LIB])]) + ], + [ dnl First search for extra libs. + _ax_lua_extra_libs='' + + _ax_lua_saved_libs=$LIBS + LIBS="$LIBS $LUA_LIB" + AC_SEARCH_LIBS([exp], [m]) + AC_SEARCH_LIBS([dlopen], [dl]) + LIBS=$_ax_lua_saved_libs + + AS_IF([test "x$ac_cv_search_exp" != 'xno' && + test "x$ac_cv_search_exp" != 'xnone required'], + [_ax_lua_extra_libs="$_ax_lua_extra_libs $ac_cv_search_exp"]) + + AS_IF([test "x$ac_cv_search_dlopen" != 'xno' && + test "x$ac_cv_search_dlopen" != 'xnone required'], + [_ax_lua_extra_libs="$_ax_lua_extra_libs $ac_cv_search_dlopen"]) + + dnl Try to find the Lua libs. + _ax_lua_saved_libs=$LIBS + LIBS="$LIBS $LUA_LIB" + AC_SEARCH_LIBS([lua_load], + [ lua$LUA_VERSION \ + lua$LUA_SHORT_VERSION \ + lua-$LUA_VERSION \ + lua-$LUA_SHORT_VERSION \ + lua \ + ], + [_ax_found_lua_libs='yes'], + [_ax_found_lua_libs='no'], + [$_ax_lua_extra_libs]) + LIBS=$_ax_lua_saved_libs + + AS_IF([test "x$ac_cv_search_lua_load" != 'xno' && + test "x$ac_cv_search_lua_load" != 'xnone required'], + [LUA_LIB="$ac_cv_search_lua_load $_ax_lua_extra_libs"]) + ]) + + dnl Test the result and run user code. + AS_IF([test "x$_ax_found_lua_libs" = 'xyes'], [$1], + [m4_default([$2], [AC_MSG_ERROR([cannot find Lua libs])])]) +]) + + +dnl ========================================================================= +dnl AX_LUA_READLINE([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ========================================================================= +AC_DEFUN([AX_LUA_READLINE], +[ + AX_LIB_READLINE + AS_IF([test "x$ac_cv_header_readline_readline_h" != 'x' && + test "x$ac_cv_header_readline_history_h" != 'x'], + [ LUA_LIBS_CFLAGS="-DLUA_USE_READLINE $LUA_LIBS_CFLAGS" + $1 + ], + [$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_luarocks_rock.m4 projectm-3.1.0/m4/autoconf-archive/ax_luarocks_rock.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_luarocks_rock.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_luarocks_rock.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,53 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_luarocks_rock.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_LUAROCKS_ROCK([ROCK]) +# +# DESCRIPTION +# +# Checks for a rock, and fails if it is not installed. +# +# Example usage: +# +# AX_LUAROCKS_ROCK(stdlib) +# +# Note: use of this macro is not normally recommended. Normally, LuaRocks +# should be used to drive the build system, and it takes care of rock +# dependencies. Use this macro only if LuaRocks cannot be used at the top +# level, for example, in a build system that uses Lua only incidentally. +# +# LICENSE +# +# Copyright (c) 2016 Reuben Thomas +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_LUAROCKS_ROCK],[ + # Make sure we have luarocks + if test -z "$LUAROCKS"; then + AX_WITH_PROG(LUAROCKS,luarocks) + if test -z "$LUAROCKS"; then + AC_MSG_ERROR([can't find luarocks]) + fi + fi + + AC_PREREQ([2.61]) + + pushdef([ROCK],$1) + AC_MSG_CHECKING(whether LuaRock ROCK is installed) + AS_IF(["$LUAROCKS" show ROCK > /dev/null],[ + AC_MSG_RESULT(yes) + ],[ + AC_MSG_FAILURE([LuaRock ROCK not found]) + ]) + + popdef([ROCK]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_maintainer_mode_auto_silent.m4 projectm-3.1.0/m4/autoconf-archive/ax_maintainer_mode_auto_silent.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_maintainer_mode_auto_silent.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_maintainer_mode_auto_silent.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_maintainer_mode_auto_silent.html +# =================================================================================== +# +# SYNOPSIS +# +# AX_MAINTAINER_MODE_AUTO_SILENT +# +# DESCRIPTION +# +# Set autotools to error/sleep settings so that they are not run when +# being erroneously triggered. Likewise make libtool-silent when libtool +# has been used. +# +# I use the macro quite a lot since some automake versions have the +# tendency to try to rerun some autotools on a mere make even when not +# quite in --maintainer-mode. That is very annoying. Likewise, a user who +# installs from source does not want to see doubled compiler messages. +# +# I did not put an AC_REQUIRE(MAINTAINER_MODE) in here - should I? +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_MAINTAINER_MODE_AUTO_SILENT],[dnl +dnl ac_REQUIRE([am_MAINTAINER_MODE])dn +AC_MSG_CHECKING(auto silent in maintainer mode) +if test "$USE_MAINTAINER_MODE" = "no" ; then + test ".$TIMEOUT" = "." && TIMEOUT="9" + AUTOHEADER="sleep $TIMEOUT ; true || autoheader || skipped" + AUTOMAKE="sleep $TIMEOUT ; true || automake || skipped" + AUTOCONF="sleep $TIMEOUT ; true || autoconf || skipped" + if test ".$LIBTOOL" != "." ; then + LIBTOOL="$LIBTOOL --silent" + AC_MSG_RESULT([libtool-silent, auto-sleep-9]) + else + AC_MSG_RESULT([auto-sleep-9]) + fi +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_missing_prog.m4 projectm-3.1.0/m4/autoconf-archive/ax_missing_prog.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_missing_prog.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_missing_prog.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_missing_prog.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_MISSING_PROG(VARIABLE,PROGRAM,[MESSAGE]) +# +# DESCRIPTION +# +# Simple wrapper for the AM_MISSING_PROG which displays a warning MESSAGE +# if provided. A typical use is the following: +# +# AC_PROG_AWK +# AS_IF([test -z "$AWK"],[ +# AX_MISSING_PROG(AWK,[awk],[awk seems missing ...]) +# ]) +# +# Programs wrapped with AX_MISSING_PROG should be used only in the package +# building phase (because they will be wrapped with the automake 'missing' +# script, which will not be installed). +# +# LICENSE +# +# Copyright (c) 2008 Francesco Salvestrini +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_MISSING_PROG],[dnl + AS_IF([ test ! -z "$3" ],[ + AC_MSG_WARN([$3]) + ]) + AM_MISSING_PROG([$1],[$2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_mpi.m4 projectm-3.1.0/m4/autoconf-archive/ax_mpi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_mpi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_mpi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,176 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_mpi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_MPI([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro tries to find out how to compile programs that use MPI +# (Message Passing Interface), a standard API for parallel process +# communication (see http://www-unix.mcs.anl.gov/mpi/) +# +# On success, it sets the MPICC, MPICXX, MPIF77, or MPIFC output variable +# to the name of the MPI compiler, depending upon the current language. +# (This may just be $CC/$CXX/$F77/$FC, but is more often something like +# mpicc/mpiCC/mpif77/mpif90.) It also sets MPILIBS to any libraries that +# are needed for linking MPI (e.g. -lmpi or -lfmpi, if a special +# MPICC/MPICXX/MPIF77/MPIFC was not found). +# +# Note that this macro should be used only if you just have a few source +# files that need to be compiled using MPI. In particular, you should +# neither overwrite CC/CXX/F77/FC with the values of +# MPICC/MPICXX/MPIF77/MPIFC, nor assume that you can use the same flags +# etc. as the standard compilers. If you want to compile a whole program +# using the MPI compiler commands, use one of the macros +# AX_PROG_{CC,CXX,FC}_MPI. +# +# ACTION-IF-FOUND is a list of shell commands to run if an MPI library is +# found, and ACTION-IF-NOT-FOUND is a list of commands to run if it is not +# found. If ACTION-IF-FOUND is not specified, the default action will +# define HAVE_MPI. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Julian C. Cummings +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AU_ALIAS([ACX_MPI], [AX_MPI]) +AC_DEFUN([AX_MPI], [ +AC_PREREQ(2.50) dnl for AC_LANG_CASE + +AC_LANG_CASE([C], [ + AC_REQUIRE([AC_PROG_CC]) + AC_ARG_VAR(MPICC,[MPI C compiler command]) + AC_CHECK_PROGS(MPICC, mpicc hcc mpxlc_r mpxlc mpcc cmpicc, $CC) + ax_mpi_save_CC="$CC" + CC="$MPICC" + AC_SUBST(MPICC) +], +[C++], [ + AC_REQUIRE([AC_PROG_CXX]) + AC_ARG_VAR(MPICXX,[MPI C++ compiler command]) + AC_CHECK_PROGS(MPICXX, mpic++ mpicxx mpiCC hcp mpxlC_r mpxlC mpCC cmpic++, $CXX) + ax_mpi_save_CXX="$CXX" + CXX="$MPICXX" + AC_SUBST(MPICXX) +], +[Fortran 77], [ + AC_REQUIRE([AC_PROG_F77]) + AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command]) + AC_CHECK_PROGS(MPIF77, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc, $F77) + ax_mpi_save_F77="$F77" + F77="$MPIF77" + AC_SUBST(MPIF77) +], +[Fortran], [ + AC_REQUIRE([AC_PROG_FC]) + AC_ARG_VAR(MPIFC,[MPI Fortran compiler command]) + AC_CHECK_PROGS(MPIFC, mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC) + ax_mpi_save_FC="$FC" + FC="$MPIFC" + AC_SUBST(MPIFC) +]) + +if test x = x"$MPILIBS"; then + AC_LANG_CASE([C], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], + [C++], [AC_CHECK_FUNC(MPI_Init, [MPILIBS=" "])], + [Fortran 77], [AC_MSG_CHECKING([for MPI_Init]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[ call MPI_Init])],[MPILIBS=" " + AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])], + [Fortran], [AC_MSG_CHECKING([for MPI_Init]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([],[ call MPI_Init])],[MPILIBS=" " + AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no)])]) +fi +AC_LANG_CASE([Fortran 77], [ + if test x = x"$MPILIBS"; then + AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"]) + fi + if test x = x"$MPILIBS"; then + AC_CHECK_LIB(fmpich, MPI_Init, [MPILIBS="-lfmpich"]) + fi +], +[Fortran], [ + if test x = x"$MPILIBS"; then + AC_CHECK_LIB(fmpi, MPI_Init, [MPILIBS="-lfmpi"]) + fi + if test x = x"$MPILIBS"; then + AC_CHECK_LIB(mpichf90, MPI_Init, [MPILIBS="-lmpichf90"]) + fi +]) +if test x = x"$MPILIBS"; then + AC_CHECK_LIB(mpi, MPI_Init, [MPILIBS="-lmpi"]) +fi +if test x = x"$MPILIBS"; then + AC_CHECK_LIB(mpich, MPI_Init, [MPILIBS="-lmpich"]) +fi + +dnl We have to use AC_TRY_COMPILE and not AC_CHECK_HEADER because the +dnl latter uses $CPP, not $CC (which may be mpicc). +AC_LANG_CASE([C], [if test x != x"$MPILIBS"; then + AC_MSG_CHECKING([for mpi.h]) + AC_TRY_COMPILE([#include ],[],[AC_MSG_RESULT(yes)], [MPILIBS="" + AC_MSG_RESULT(no)]) +fi], +[C++], [if test x != x"$MPILIBS"; then + AC_MSG_CHECKING([for mpi.h]) + AC_TRY_COMPILE([#include ],[],[AC_MSG_RESULT(yes)], [MPILIBS="" + AC_MSG_RESULT(no)]) +fi], +[Fortran 77], [if test x != x"$MPILIBS"; then + AC_MSG_CHECKING([for mpif.h]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS="" + AC_MSG_RESULT(no)]) +fi], +[Fortran], [if test x != x"$MPILIBS"; then + AC_MSG_CHECKING([for mpif.h]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[ include 'mpif.h'])],[AC_MSG_RESULT(yes)], [MPILIBS="" + AC_MSG_RESULT(no)]) +fi]) + +AC_LANG_CASE([C], [CC="$ax_mpi_save_CC"], + [C++], [CXX="$ax_mpi_save_CXX"], + [Fortran 77], [F77="$ax_mpi_save_F77"], + [Fortran], [FC="$ax_mpi_save_FC"]) + +AC_SUBST(MPILIBS) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x = x"$MPILIBS"; then + $2 + : +else + ifelse([$1],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$1]) + : +fi +])dnl AX_MPI diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_mpip.m4 projectm-3.1.0/m4/autoconf-archive/ax_mpip.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_mpip.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_mpip.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,105 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_mpip.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_MPIP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Test for mpiP: Lightweight, Scalable MPI Profiling +# (http://mpip.sourceforge.net/) +# +# Provides a --with-mpiP=DIR option. Searches --with-mpiP location and the +# usual places for mpiP and required libraries. Marks MPIP as a precious +# environment variable. +# +# On success, sets MPIP_LDFLAGS, MPIP_LIBS, #defines HAVE_MPIP, and calls +# ACTION-IF-FOUND. When ACTION-IF-NOT-FOUND is not specified, the default +# behavior is for configure to fail. +# +# LICENSE +# +# Copyright (c) 2010 Rhys Ulerich +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Macro Archive. When you make and +# distribute a modified version of the Autoconf Macro, you may extend this +# special exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_MPIP], [ +AC_PREREQ(2.60) +AC_REQUIRE([ACX_MPI]) +AC_ARG_VAR([MPIP],[mpiP options]) + +AC_ARG_WITH( + [mpiP], + [AS_HELP_STRING([--with-mpiP@<:@=DIR@:>@], + [use mpiP profiler; optional install prefix])], + [with_mpiP=$withval], + [with_mpiP=no]) + +if test "${with_mpiP}" != no ; then + ax_mpiP_save_CC="$CC" + ax_mpiP_save_LDFLAGS="$LDFLAGS" + ax_mpiP_save_LIBS="$LIBS" + + MPIP_LDFLAGS="" + MPIP_LIBS="-lmpiP -lbfd -liberty" + if test "${with_mpiP}" != yes; then + if test -d "${with_mpiP}/lib"; then + MPIP_LDFLAGS="-L${with_mpiP}/lib" + else + AC_MSG_WARN([--with-mpiP expected ${with_mpiP}/lib to be a directory]) + fi + fi + LDFLAGS="${MPIP_LDFLAGS} ${LDFLAGS}" + CC=$MPICC + + AC_LANG_PUSH([C]) + AC_CHECK_LIB([mpiP], + [mpiPi], + [ax_mpiP_cv_found=yes], + [ax_mpiP_cv_found=no], + [-lbfd -liberty]) + AC_LANG_POP([C]) + + CC="$ax_mpiP_save_CC" + LDFLAGS="$ax_mpiP_save_LDFLAGS" + LIBS="$ax_mpiP_save_LIBS" + + if test "$ax_mpiP_cv_found" = no; then + ifelse([$2],,AC_MSG_ERROR([mpiP not found. Try --with-mpiP=DIR.]), + [$2]) + else + AC_DEFINE(HAVE_MPIP,1,[Define if mpiP is available]) + AC_SUBST(MPIP_LDFLAGS) + AC_SUBST(MPIP_LIBS) + ifelse([$1],,,[$1]) + fi +fi +])dnl AX_MPIP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_need_awk.m4 projectm-3.1.0/m4/autoconf-archive/ax_need_awk.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_need_awk.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_need_awk.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,36 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_need_awk.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_NEED_AWK +# +# DESCRIPTION +# +# Check if an awk implementation is available. Bail-out if not found. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_NEED_AWK],[ + AC_REQUIRE([AC_PROG_AWK]) + + AS_IF([test "x$AWK" = "x"],[ + AC_MSG_ERROR([cannot find awk, bailing out]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_normalize_path.m4 projectm-3.1.0/m4/autoconf-archive/ax_normalize_path.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_normalize_path.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_normalize_path.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,115 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_normalize_path.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_NORMALIZE_PATH(VARNAME, [REFERENCE_STRING]) +# +# DESCRIPTION +# +# Perform some cleanups on the value of $VARNAME (interpreted as a path): +# +# - empty paths are changed to '.' +# - trailing slashes are removed +# - repeated slashes are squeezed except a leading doubled slash '//' +# (which might indicate a networked disk on some OS). +# +# REFERENCE_STRING is used to turn '/' into '\' and vice-versa: if +# REFERENCE_STRING contains some backslashes, all slashes and backslashes +# are turned into backslashes, otherwise they are all turned into slashes. +# +# This makes processing of DOS filenames quite easier, because you can +# turn a filename to the Unix notation, make your processing, and turn it +# back to original notation. +# +# filename='A:\FOO\\BAR\' +# old_filename="$filename" +# # Switch to the unix notation +# AX_NORMALIZE_PATH([filename], ["/"]) +# # now we have $filename = 'A:/FOO/BAR' and we can process it as if +# # it was a Unix path. For instance let's say that you want +# # to append '/subpath': +# filename="$filename/subpath" +# # finally switch back to the original notation +# AX_NORMALIZE_PATH([filename], ["$old_filename"]) +# # now $filename equals to 'A:\FOO\BAR\subpath' +# +# One good reason to make all path processing with the unix convention is +# that backslashes have a special meaning in many cases. For instance +# +# expr 'A:\FOO' : 'A:\Foo' +# +# will return 0 because the second argument is a regex in which +# backslashes have to be backslashed. In other words, to have the two +# strings to match you should write this instead: +# +# expr 'A:\Foo' : 'A:\\Foo' +# +# Such behavior makes DOS filenames extremely unpleasant to work with. So +# temporary turn your paths to the Unix notation, and revert them to the +# original notation after the processing. See the macro +# AX_COMPUTE_RELATIVE_PATHS for a concrete example of this. +# +# REFERENCE_STRING defaults to $VARIABLE, this means that slashes will be +# converted to backslashes if $VARIABLE already contains some backslashes +# (see $thirddir below). +# +# firstdir='/usr/local//share' +# seconddir='C:\Program Files\\' +# thirddir='C:\home/usr/' +# AX_NORMALIZE_PATH([firstdir]) +# AX_NORMALIZE_PATH([seconddir]) +# AX_NORMALIZE_PATH([thirddir]) +# # $firstdir = '/usr/local/share' +# # $seconddir = 'C:\Program Files' +# # $thirddir = 'C:\home\usr' +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AU_ALIAS([ADL_NORMALIZE_PATH], [AX_NORMALIZE_PATH]) +AC_DEFUN([AX_NORMALIZE_PATH], +[case ":[$]$1:" in +# change empty paths to '.' + ::) $1='.' ;; +# strip trailing slashes + :*[[\\/]]:) $1=`echo "[$]$1" | sed 's,[[\\/]]*[$],,'` ;; + :*:) ;; +esac +# squeeze repeated slashes +case ifelse($2,,"[$]$1",$2) in +# if the path contains any backslashes, turn slashes into backslashes + *\\*) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1\\\\,g'` ;; +# if the path contains slashes, also turn backslashes into slashes + *) $1=`echo "[$]$1" | sed 's,\(.\)[[\\/]][[\\/]]*,\1/,g'` ;; +esac]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_not_enable_frame_pointer.m4 projectm-3.1.0/m4/autoconf-archive/ax_not_enable_frame_pointer.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_not_enable_frame_pointer.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_not_enable_frame_pointer.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# ================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_not_enable_frame_pointer.html +# ================================================================================ +# +# SYNOPSIS +# +# AX_NOT_ENABLE_FRAME_POINTER ([shellvar]) +# +# DESCRIPTION +# +# add --enable-frame-pointer option, the default will add the gcc +# -fomit-frame-pointer option to the shellvar (per default CFLAGS) and +# remove the " -g " debuginfo option from it. In other words, the default +# is "--disable-frame-pointer" +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_NOT_ENABLE_FRAME_POINTER],[dnl +AS_VAR_PUSHDEF([VAR],[enable_frame_pointer])dnl +AC_MSG_CHECKING([m4_ifval($1,$1,CFLAGS) frame-pointer]) +AC_ARG_ENABLE([frame-pointer], AS_HELP_STRING( + [--enable-frame-pointer],[enable callframe generation for debugging])) +case ".$VAR" in + .|.no|.no,*) test ".$VAR" = "." && VAR="no" + m4_ifval($1,$1,CFLAGS)=`echo dnl + " $m4_ifval($1,$1,CFLAGS) " | sed -e 's/ -g / /'` + if test ".$GCC" = ".yes" ; then + m4_ifval($1,$1,CFLAGS)="$m4_ifval($1,$1,CFLAGS) -fomit-frame-pointer" + AC_MSG_RESULT([$VAR, -fomit-frame-pointer added]) + else + AC_MSG_RESULT([$VAR, -g removed]) + fi ;; + *) AC_MSG_RESULT([$VAR, kept]) ;; +esac +AS_VAR_POPDEF([VAR])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_numeric_namedlevel.m4 projectm-3.1.0/m4/autoconf-archive/ax_numeric_namedlevel.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_numeric_namedlevel.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_numeric_namedlevel.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_numeric_namedlevel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_NUMERIC_NAMEDLEVEL(VARNAME [,FROMVAR [,DEFAULT [,YESLEVEL]]]) +# +# DESCRIPTION +# +# The levelstring FROMVAR is expanded and checked for verbal names that +# will map on to eight different levels - the VARNAME will receive this +# numeric level where "all" maps to 7 (lower three bits set) higher levels +# for 8 and 9 exist too. This macro is a nice helper to convert user input +# of a --with-opt=level into a numeric form that can be simply pushed as a +# #define like with AC_DEFINE: +# +# default YESLEVEL = 2 /* including unknown levelspec */ +# default DEFAULT = 0 /* when named level is empty */ +# default FROMVAR = VARNAME +# +# The DEFAULT value is used if the NAMED levelstring has become empty and +# it is copied without further conversion - a default of "0" is used if +# absent - identical to "no". A "yes" will be set to the YESLEVEL - and +# note that "yes" has "2" as its default value not "1". (which comes from +# its original use to set a "gcc -O2"). +# +# the mnemonic names are: +# +# 9| insane |ultrasome|experimentalplus +# 8| ultra |ultra|experimental) +# 7| all |muchmore|somemanymore|manymoreplus +# 6| most |manymore|most) +# 5| strict |somemore|almost +# 4| more |more +# 3| extra |manyplus|plusmuch|somemany|plusmany +# 2| many |many|much|(yes) +# 1| some |some|plus +# +# note that a level can be constructed of (some|plus) = bit-0, (many|much) +# = bit-1, (more) = bit-2, (ultra|experimental) = bit-3 at least in a +# left-to-right order, ie. plusmanymore=7 +# +# Example usage: +# +# AX_NUMERIC_NAMEDLEVEL(OPTLEVEL,with_optlevel,1,3) +# AC_DEFINE(OPTLEVEL) +# test "$GCC" = "yes" && CFLAGS="$CFLAGS -O$OPTLEVEL) +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_NUMERIC_NAMEDLEVEL], [AX_NUMERIC_NAMEDLEVEL]) +AC_DEFUN([AX_NUMERIC_NAMEDLEVEL], +[dnl the names to be defined... +$1="ifelse($1,,[$]$2,[$]$1)" ; $1="[$]$1" +$1="[$]$1" ; $1="[$]$1" +if test "_[$]$1" = "_" ; then + $1="ifelse([$3],,0,[$3])" +elif test "_[$]$1" = "_yes" ; then + $1="ifelse([$4],,2,[$4])" +else + $1=`echo [$]$1 | sed -e 's,some,plus,' -e 's,experimental,ultra,' -e 's,over,ultra,' -e 's,much,many,'` + case "[$]$1" in + 0*|1*|2*|3*|4*|5*|6*|7*|8*|9*|-*|+*) ;; # leave as is + insane|ultraplus|plusultra) $1="9" ;; + ultra) $1="8" ;; + manymoreplus|manyplusmore|plusmanymore|all) $1="7" ;; + moremanyplus|moreplusmany|plusmoremany) $1="7" ;; + manymore|moremany|most) $1="6" ;; + somemore|moresome|almost) $1="5" ;; + more) $1="4" ;; + manyplus|plusmany|extra) $1="3" ;; + many) $1="2" ;; + plus) $1="1" ;; + no) $1="0" ;; + yes) $1="ifelse([$4],,2,[$4])" ;; + *) $1="ifelse([$3],,1,[$3])" ;; # for other unkown stuff. + esac +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_open62541_check_h.m4 projectm-3.1.0/m4/autoconf-archive/ax_open62541_check_h.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_open62541_check_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_open62541_check_h.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_open62541_check_h.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_OPEN62541_CHECK_H([HEADERS = `...see_below...'], [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Searches for the header file(s) of the open62541 library [1]. +# +# The open62541 library is a cmake-based project, that provides its header +# files in one of two layouts: +# +# 1) As individual files, e.g. ua_config.h, ua_server.h, ua_types.h, ... +# 2) As a single amalgamation file open62541.h +# +# The second case is enabled when configuring open62541 with the options +# "-D UA_ENABLE_AMALGAMATION=true to" cmake, which seems to be preferred. +# Code using the library can distinguish which layout is used by checking +# for the macro "UA_NO_AMALGAMATION": if it is defined, the first layout +# is used. +# +# The AX_OPEN62541_CHECK_H macro checks first for the amalgamation and, if +# that is not found, for the individual headers. It defines +# "UA_NO_AMALGAMATION" if necessary. +# +# The individual headers to check for if no amalgamation is found can be +# provided as a space-separated list in the first argument. If that is +# empty, it defaults to all files known to be contained in the +# amalgamation as of v0.2.0 of the library: +# +# * ms_stdint.h +# * ua_client.h +# * ua_client_highlevel.h +# * ua_config.h +# * ua_config_standard.h +# * ua_connection.h +# * ua_constants.h +# * ua_job.h +# * ua_log.h +# * ua_log_stdout.h +# * ua_network_tcp.h +# * ua_nodeids.h +# * ua_server.h +# * ua_server_external_ns.h +# * ua_types.h +# * ua_types_generated.h +# * ua_types_generated_handling.h +# +# If the with_open62541 shell variable is set to "no" (e.g. from running +# the AX_OPEN62541_PATH macro and the user giving configure the option +# "--without-open62541"), then expands ACTION-IF-NOT-FOUND without any +# checks. +# +# [1]: +# +# LICENSE +# +# Copyright (c) 2016,2017 Olaf Mandel +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +# AX_OPEN62541_CHECK_H([HEADERS], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------------------------------------- +AC_DEFUN([AX_OPEN62541_CHECK_H], +[m4_pushdef([headers], m4_normalize([$1]))dnl +m4_ifblank(m4_defn([headers]), [m4_define([headers], + [ms_stdint.h]dnl + [ua_client.h]dnl + [ua_client_highlevel.h]dnl + [ua_config.h]dnl + [ua_config_standard.h]dnl + [ua_connection.h]dnl + [ua_constants.h]dnl + [ua_job.h]dnl + [ua_log.h]dnl + [ua_log_stdout.h]dnl + [ua_network_tcp.h]dnl + [ua_nodeids.h]dnl + [ua_server.h]dnl + [ua_server_external_ns.h]dnl + [ua_types.h]dnl + [ua_types_generated.h]dnl + [ua_types_generated_handling.h])])dnl +dnl ua_server_external_ns.h depends on ua_server.h but fails to include it: +dnl so specify the includes: +pushdef([includes], +[#ifdef HAVE_UA_SERVER_H +# include +#endif])dnl +dnl +AS_IF([test x${with_open62541:+set} != xset -o "x$with_open62541" != xno], + [AC_CHECK_HEADERS([open62541.h], [$2], + [AC_CHECK_HEADERS(m4_defn([headers]), [$2]dnl +[AC_DEFINE([UA_NO_AMALGAMATION], [1], + [Use individual open62541 headers instead of the amalgamation.])], + [$3], + [m4_defn([includes])])], + [AC_INCLUDES_DEFAULT])], + [$3]) +m4_popdef([headers], [includes])dnl +])# AX_OPEN62541_CHECK_H diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_open62541_check_lib.m4 projectm-3.1.0/m4/autoconf-archive/ax_open62541_check_lib.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_open62541_check_lib.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_open62541_check_lib.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,100 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_open62541_check_lib.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_OPEN62541_CHECK_LIB([STATIC-FIRST = `no'], [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Searches for the library file of the open62541 library [1]. +# +# The open62541 library is a cmake-based project, that supplies both a +# shared and a static library (with different names). The +# AX_OPEN62541_CHECK_LIB macro can search for both and adds the first one +# found to the LIBS Makefile variable. The search can be in either order +# (shared first or static first), which is selectable on macro invocation +# with the STATIC-FIRST parameter. The user can change this default by +# invoking configure with either the --with-open62541-shared or +# --with-open62541-static option (the named one is checked first). +# +# Either shared or static library can be excluded from checking completely +# with the options --without-open62541-shared and +# --without-open62541-static. +# +# If the with_open62541 shell variable is set to "no" (e.g. from running +# the AX_OPEN62541_PATH macro and the user giving configure the option +# "--without-open62541"), then expands ACTION-IF-NOT-FOUND without any +# checks. The same is true if both --without-open62541-shared and +# --without-open62541-static are given. +# +# [1]: +# +# LICENSE +# +# Copyright (c) 2016 Olaf Mandel +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +# _AX_OPEN62541_CHECK_LIB_arg(THIS, OTHER) +# ---------------------------------------- +# Define the option --with-open62541-THIS, including checking that no +# unknown argument is given or that both --with-open62541-THIS and +# --with-open62541-OTHER are called. +m4_define([_AX_OPEN62541_CHECK_LIB_arg], +[AC_ARG_WITH([open62541-$1], + [AS_HELP_STRING([--with-open62541-$1], + [search for the $1 open62541 library first])], + [], [])dnl +AS_IF([test x${with_open62541_$1:+set} == xset]dnl +[ -a "x$with_open62541_$1" != xno -a "x$with_open62541_$1" != xyes], + [AC_MSG_FAILURE([--with-open62541-$1 does not take an argument])], + [test x${with_open62541_$1:+set} == xset]dnl +[ -a "x$with_open62541_$1" == xyes -a x${with_open62541_$2:+set} == xset]dnl +[ -a "x$with_open62541_$2" == xyes], + [AC_MSG_FAILURE([--with-open62541-$1 and --with-open62541-$2 are]dnl +[ mutually exclusive])]) +])# _AX_OPEN62541_CHECK_LIB_arg + +# _AX_OPEN62541_CHECK_LIB_1(SHARED-STATIC, ACTION-IF-FOUND, +# ACTION-IF-NOT-FOUND) +# --------------------------------------------------------- +# Checks for the desired library if not forbidden by +# with_open62541_(shared|static) shell variables. +m4_define([_AX_OPEN62541_CHECK_LIB_1], +[m4_pushdef([lib], m4_if([$1], [shared], [open62541], + [$1], [static], [open62541-static]))dnl +AS_IF([test "x$with_open62541_$1" != xno], + [AC_CHECK_LIB(m4_defn([lib]), [UA_Server_new], [$2], [$3])], + [$3]) +m4_popdef([lib])dnl +])# _AX_OPEN62541_CHECK_LIB_1 + +# AX_OPEN62541_CHECK_LIB([STATIC-FIRST], [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# --------------------------------------------------------- +AC_DEFUN([AX_OPEN62541_CHECK_LIB], +[m4_pushdef([staticfirst], m4_normalize([$1]))dnl +m4_bmatch(m4_defn([staticfirst]), + [^\([Nn][Oo]?\|0\)$], [m4_define([staticfirst], [])])dnl +m4_pushdef([first], m4_ifblank(m4_defn([staticfirst]), [shared], [static]))dnl +m4_pushdef([secnd], m4_ifblank(m4_defn([staticfirst]), [static], [shared]))dnl +dnl +_AX_OPEN62541_CHECK_LIB_arg([shared], [static])dnl +_AX_OPEN62541_CHECK_LIB_arg([static], [shared])dnl +AS_IF([test x${with_open62541:+set} == xset -a "x$with_open62541" == xno], + [$3], + [test "x$with_open62541_]m4_defn([secnd])[" != xyes], + [_AX_OPEN62541_CHECK_LIB_1(m4_defn([first]), [$2], + [_AX_OPEN62541_CHECK_LIB_1(m4_defn([secnd]), [$2], [$3])])], + [_AX_OPEN62541_CHECK_LIB_1(m4_defn([secnd]), [$2], + [_AX_OPEN62541_CHECK_LIB_1(m4_defn([first]), [$2], [$3])])])dnl +m4_popdef([staticfirst], [first], [secnd])dnl +])# AX_OPEN62541_CHECK_LIB diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_open62541_path.m4 projectm-3.1.0/m4/autoconf-archive/ax_open62541_path.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_open62541_path.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_open62541_path.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,112 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_open62541_path.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_OPEN62541_PATH() +# +# DESCRIPTION +# +# Sets pre-processor and linker search paths for the open62541 library +# [1]. +# +# The open62541 library is a cmake-based project, that is not always +# installed to the system: it does not even provide an install target by +# default. In that case, the location of several directories need to be +# added to the pre-processor and linker search paths: +# +# * -I/deps +# * -I/include +# * -I/plugins +# * -I/src_generated +# * -I +# * -L +# +# Here "src" indicates the location of the library source directory and +# "build" the location of the out-of-source build. +# +# This macro provides the configure options --with-open62541=dir and +# --with-open62541-build=dir to set the two directories. This macro will +# append to CPPFLAGS and LDFLAGS if a dir is supplied. It will also export +# LD_LIBRARY_PATH with the absolute path of the build dir for the rest of +# the configure script to use and define a Makefile variable +# OPEN62541_LDPATH, which contains +# LD_LIBRARY_PATH=$LD_LIBRARY_PATH: : this is intended +# to be used for all commands that need to execute a program using the +# library (e.g. make check). If paths are set, they are forwarded to +# distcheck. +# +# For --with-open62541, the dir is optional: if either the values "no" +# (from --without-open62541) or "yes" (for no argument) are specified, +# this macro does nothing but these values may be used by other code. If +# --with-open62541 is not specified, the variable with_open62541 is not +# set. +# +# For --with-open62541-build, the dir is compulsory. +# --with-open62541-build must not be given without also specifying +# --with-open62541. If --with-open62541 is given but +# --with-open62541-build is not, the default value is "/build". +# +# [1]: +# +# LICENSE +# +# Copyright (c) 2016,2017 Olaf Mandel +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 5 + +# AX_OPEN62541_PATH() +# ------------------- +AC_DEFUN([AX_OPEN62541_PATH], +[AC_ARG_WITH([open62541], + [AS_HELP_STRING([--with-open62541@<:@=dir@:>@], + [set the open62541 library source location])], + [], [])dnl +AC_ARG_WITH([open62541-build], + [AS_HELP_STRING([--with-open62541-build=dir], + [set the open62541 build dir location]dnl +[ (@<:@default=$src/build@:>@)])], + [], [])dnl +[with_open62541=${with_open62541%/}] +AS_IF([test x${with_open62541_build:+set} != xset], + [AS_IF([test x${with_open62541:+set} == xset]dnl +[ -a "x$with_open62541" != xno -a "x$with_open62541" != xyes], + [with_open62541_build=$with_open62541/build])], + [test "x$with_open62541_build" == xno]dnl +[ -o "x$with_open62541_build" == xyes], + [AC_MSG_FAILURE([--with-open62541-build needs its argument])], + [test x${with_open62541:+set} != xset -o "x$with_open62541" == xyes], + [AC_MSG_FAILURE([--with-open62541-build also requires]dnl +[ --with-open62541 to set a directory])], + [with_open62541_build=${with_open62541_build%/}]) +dnl +AS_IF([test x${with_open62541:+set} == xset -a "x$with_open62541" != xno]dnl +[ -a "x$with_open62541" != xyes], + [CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-I$with_open62541/deps]dnl +[ -I$with_open62541/include -I$with_open62541/plugins]dnl +[ -I$with_open62541_build/src_generated -I$with_open62541_build" +LDFLAGS="$LDFLAGS${LDFLAGS:+ }-L$with_open62541_build" +with_open62541_abs=`( + cd "$with_open62541" + pwd)` +with_open62541_build_abs=`( + cd "$with_open62541_build" + pwd)` +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH${LD_LIBRARY_PATH:+:}]dnl +[$with_open62541_build_abs" +AC_SUBST([OPEN62541_LDPATH], ["LD_LIBRARY_PATH=\$\$LD_LIBRARY_PATH]dnl +[\$\${LD_LIBRARY_PATH:+:}$with_open62541_build_abs"]) +AC_SUBST([AM_DISTCHECK_CONFIGURE_FLAGS], ["$AM_DISTCHECK_CONFIGURE_FLAGS]dnl +[${AM_DISTCHECK_CONFIGURE_FLAGS:+ }--with-open62541=$with_open62541_abs"]) +AS_IF([test x$with_open62541/build != xwith_open62541_build], + [AC_SUBST([AM_DISTCHECK_CONFIGURE_FLAGS], + ["$AM_DISTCHECK_CONFIGURE_FLAGS]dnl +[ --with-open62541-build=$with_open62541_build_abs"])]) +]) +])# AX_OPEN62541_PATH diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_openmp.m4 projectm-3.1.0/m4/autoconf-archive/ax_openmp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_openmp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_openmp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,123 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_openmp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_OPENMP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro tries to find out how to compile programs that use OpenMP a +# standard API and set of compiler directives for parallel programming +# (see http://www-unix.mcs/) +# +# On success, it sets the OPENMP_CFLAGS/OPENMP_CXXFLAGS/OPENMP_F77FLAGS +# output variable to the flag (e.g. -omp) used both to compile *and* link +# OpenMP programs in the current language. +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also link it with them as well. +# +# If you want to compile everything with OpenMP, you should set: +# +# CFLAGS="$CFLAGS $OPENMP_CFLAGS" +# #OR# CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" +# #OR# FFLAGS="$FFLAGS $OPENMP_FFLAGS" +# +# (depending on the selected language). +# +# The user can override the default choice by setting the corresponding +# environment variable (e.g. OPENMP_CFLAGS). +# +# ACTION-IF-FOUND is a list of shell commands to run if an OpenMP flag is +# found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is +# not found. If ACTION-IF-FOUND is not specified, the default action will +# define HAVE_OPENMP. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2015 John W. Peterson +# Copyright (c) 2016 Nick R. Papior +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 13 + +AC_DEFUN([AX_OPENMP], [ +AC_PREREQ([2.69]) dnl for _AC_LANG_PREFIX + +AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS +ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown +# Flags to try: -fopenmp (gcc), -mp (SGI & PGI), +# -qopenmp (icc>=15), -openmp (icc), +# -xopenmp (Sun), -omp (Tru64), +# -qsmp=omp (AIX), +# none +ax_openmp_flags="-fopenmp -openmp -qopenmp -mp -xopenmp -omp -qsmp=omp none" +if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then + ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags" +fi +for ax_openmp_flag in $ax_openmp_flags; do + case $ax_openmp_flag in + none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;; + *) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;; + esac + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +@%:@include + +static void +parallel_fill(int * data, int n) +{ + int i; +@%:@pragma omp parallel for + for (i = 0; i < n; ++i) + data[i] = i; +} + +int +main() +{ + int arr[100000]; + omp_set_num_threads(2); + parallel_fill(arr, 100000); + return 0; +} +]])],[ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break],[]) +done +[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS +]) +if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then + m4_default([$2],:) +else + if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then + OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp + fi + m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])]) +fi +])dnl AX_OPENMP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_patch_libtool_changing_cmds_ifs.m4 projectm-3.1.0/m4/autoconf-archive/ax_patch_libtool_changing_cmds_ifs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_patch_libtool_changing_cmds_ifs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_patch_libtool_changing_cmds_ifs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,92 @@ +# ======================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_patch_libtool_changing_cmds_ifs.html +# ======================================================================================= +# +# SYNOPSIS +# +# AX_PATCH_LIBTOOL_CHANGING_CMDS_IFS +# +# DESCRIPTION +# +# Do a `grep "^[a-z]*_cmds=" libtool` - these are "subroutines" encoded by +# libtool.m4 into the generated libtool script. Since libtool assumes that +# there is no subroutine-facility in the shell invoked, these are not +# actually subroutines, but actually a "list of commands". This looks +# correct, but the command separator is not ";" - it is "~", the tilde +# character. +# +# Now, grep again, look for `grep 'IFS="~"' libtool` and see that libtool +# scripting uses a for-loop on the command-list, i.e for cmd in +# $some_cmds. This works correctly when the IFS was modified, where IFS +# stands for "input field separator" which is whitespace characters by +# default. +# +# The problem: I have some real-world filesystems where there are +# directories using "~" inside of them, to be more to the point, it is a +# change control management software that uses source repositories of the +# form "path/master/project~version/src" and libtool has the tendency to +# resolve any symlinks so that it will paste such path into the $_cmds +# script when it gets evaluated a number of times. +# +# This script is a workaround: I do not know why the ";" was not chosen as +# the IFS, perhaps it has some weird interactions in some shells since it +# is also the default record separator being one time bigger in context +# than the argument separator. I have made good success however with using +# "?" as the IFS, since there is no path-name that uses a question mark, +# and there is no _cmds ever around that uses "?" for some thing. +# +# Oh yes, there are some usages of "*" to match shell-wise at the output +# file of some tool, so that might have triggered the choice to not use +# "?" in the first place - but in real life it never occured that a _cmds +# script was created that has gone to use "?". And so, this ac-macro +# exchanges the s/~/?/g in configured _cmds variables and replaces all +# occurences of s/IFS="~"/IFS="?"/ - and it all works smooth now. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([PATCH_LIBTOOL_CHANGING_CMDS_IFS], [AX_PATCH_LIBTOOL_CHANGING_CMDS_IFS]) +AC_DEFUN([AX_PATCH_LIBTOOL_CHANGING_CMDS_IFS], +[# patch libtool to change $_cmds IFS from ~ to ? character +if grep "^[[_$as_cr_letters]]_cmds=.*[[?]]" libtool >/dev/null; then + AC_MSG_WARN(dnl + [patching libtool skipped - _cmds already contain question marks]) +else + AC_MSG_RESULT([patching libtool to change cmds IFS from ~ to ?]) + test -f libtool.old || (mv libtool libtool.old && cp libtool.old libtool) + sed -e "/^[[_$as_cr_letters]]*_cmds=/s/~/?/g" -e 's/IFS="~"/IFS="?"/g' \ + -e "s/IFS='~'/IFS='?'/g" libtool > libtool.new + (test -s libtool.new || rm libtool.new) 2>/dev/null + test -f libtool.new && mv libtool.new libtool # not 2>/dev/null !! + test -f libtool || mv libtool.old libtool +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_bdb.m4 projectm-3.1.0/m4/autoconf-archive/ax_path_bdb.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_bdb.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_path_bdb.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,591 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_path_bdb.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PATH_BDB([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro finds the latest version of Berkeley DB on the system, and +# ensures that the header file and library versions match. If +# MINIMUM-VERSION is specified, it will ensure that the library found is +# at least that version. +# +# It determines the name of the library as well as the path to the header +# file and library. It will check both the default environment as well as +# the default Berkeley DB install location. When found, it sets BDB_LIBS, +# BDB_CPPFLAGS, and BDB_LDFLAGS to the necessary values to add to LIBS, +# CPPFLAGS, and LDFLAGS, as well as setting BDB_VERSION to the version +# found. HAVE_DB_H is defined also. +# +# The option --with-bdb-dir=DIR can be used to specify a specific Berkeley +# DB installation to use. +# +# An example of it's use is: +# +# AX_PATH_BDB([3],[ +# LIBS="$BDB_LIBS $LIBS" +# LDFLAGS="$BDB_LDFLAGS $LDFLAGS" +# CPPFLAGS="$CPPFLAGS $BDB_CPPFLAGS" +# ]) +# +# which will locate the latest version of Berkeley DB on the system, and +# ensure that it is version 3.0 or higher. +# +# Details: This macro does not use either AC_CHECK_HEADERS or AC_CHECK_LIB +# because, first, the functions inside the library are sometimes renamed +# to contain a version code that is only available from the db.h on the +# system, and second, because it is common to have multiple db.h and libdb +# files on a system it is important to make sure the ones being used +# correspond to the same version. Additionally, there are many different +# possible names for libdb when installed by an OS distribution, and these +# need to be checked if db.h does not correspond to libdb. +# +# When cross compiling, only header versions are verified since it would +# be difficult to check the library version. Additionally the default +# Berkeley DB installation locations /usr/local/BerkeleyDB* are not +# searched for higher versions of the library. +# +# The format for the list of library names to search came from the Cyrus +# IMAP distribution, although they are generated dynamically here, and +# only for the version found in db.h. +# +# The macro AX_COMPARE_VERSION is required to use this macro, and should +# be available from the Autoconf Macro Archive. +# +# The author would like to acknowledge the generous and valuable feedback +# from Guido Draheim, without which this macro would be far less robust, +# and have poor and inconsistent cross compilation support. +# +# Changes: +# +# 1/5/05 applied patch from Rafal Rzepecki to eliminate compiler +# warning about unused variable, argv +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 15 + +dnl ######################################################################### +AC_DEFUN([AX_PATH_BDB], [ + dnl # Used to indicate success or failure of this function. + ax_path_bdb_ok=no + + # Add --with-bdb-dir option to configure. + AC_ARG_WITH([bdb-dir], + [AS_HELP_STRING([--with-bdb-dir=DIR], + [Berkeley DB installation directory])]) + + # Check if --with-bdb-dir was specified. + if test "x$with_bdb_dir" = "x" ; then + # No option specified, so just search the system. + AX_PATH_BDB_NO_OPTIONS([$1], [HIGHEST], [ + ax_path_bdb_ok=yes + ]) + else + # Set --with-bdb-dir option. + ax_path_bdb_INC="$with_bdb_dir/include" + ax_path_bdb_LIB="$with_bdb_dir/lib" + + dnl # Save previous environment, and modify with new stuff. + ax_path_bdb_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I$ax_path_bdb_INC $CPPFLAGS" + + ax_path_bdb_save_LDFLAGS=$LDFLAGS + LDFLAGS="-L$ax_path_bdb_LIB $LDFLAGS" + + # Check for specific header file db.h + AC_MSG_CHECKING([db.h presence in $ax_path_bdb_INC]) + if test -f "$ax_path_bdb_INC/db.h" ; then + AC_MSG_RESULT([yes]) + # Check for library + AX_PATH_BDB_NO_OPTIONS([$1], [ENVONLY], [ + ax_path_bdb_ok=yes + BDB_CPPFLAGS="-I$ax_path_bdb_INC" + BDB_LDFLAGS="-L$ax_path_bdb_LIB" + ]) + else + AC_MSG_RESULT([no]) + AC_MSG_NOTICE([no usable Berkeley DB not found]) + fi + + dnl # Restore the environment. + CPPFLAGS="$ax_path_bdb_save_CPPFLAGS" + LDFLAGS="$ax_path_bdb_save_LDFLAGS" + + fi + + dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. + if test "$ax_path_bdb_ok" = "yes" ; then + m4_ifvaln([$2],[$2],[:])dnl + m4_ifvaln([$3],[else $3])dnl + fi + +]) dnl AX_PATH_BDB + +dnl ######################################################################### +dnl Check for berkeley DB of at least MINIMUM-VERSION on system. +dnl +dnl The OPTION argument determines how the checks occur, and can be one of: +dnl +dnl HIGHEST - Check both the environment and the default installation +dnl directories for Berkeley DB and choose the version that +dnl is highest. (default) +dnl ENVFIRST - Check the environment first, and if no satisfactory +dnl library is found there check the default installation +dnl directories for Berkeley DB which is /usr/local/BerkeleyDB* +dnl ENVONLY - Check the current environment only. +dnl +dnl Requires AX_PATH_BDB_PATH_GET_VERSION, AX_PATH_BDB_PATH_FIND_HIGHEST, +dnl AX_PATH_BDB_ENV_CONFIRM_LIB, AX_PATH_BDB_ENV_GET_VERSION, and +dnl AX_COMPARE_VERSION macros. +dnl +dnl Result: sets ax_path_bdb_no_options_ok to yes or no +dnl sets BDB_LIBS, BDB_CPPFLAGS, BDB_LDFLAGS, BDB_VERSION +dnl +dnl AX_PATH_BDB_NO_OPTIONS([MINIMUM-VERSION], [OPTION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +AC_DEFUN([AX_PATH_BDB_NO_OPTIONS], [ + dnl # Used to indicate success or failure of this function. + ax_path_bdb_no_options_ok=no + + # Values to add to environment to use Berkeley DB. + BDB_VERSION='' + BDB_LIBS='' + BDB_CPPFLAGS='' + BDB_LDFLAGS='' + + # Check cross compilation here. + if test "x$cross_compiling" = "xyes" ; then + # If cross compiling, can't use AC_RUN_IFELSE so do these tests. + # The AC_PREPROC_IFELSE confirms that db.h is preprocessable, + # and extracts the version number from it. + AC_MSG_CHECKING([for db.h]) + + AS_VAR_PUSHDEF([HEADER_VERSION],[ax_path_bdb_no_options_HEADER_VERSION])dnl + HEADER_VERSION='' + AC_PREPROC_IFELSE([ + AC_LANG_SOURCE([[ +#include +AX_PATH_BDB_STUFF DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH + ]]) + ],[ + # Extract version from preprocessor output. + HEADER_VERSION=`eval "$ac_cpp conftest.$ac_ext" 2> /dev/null \ + | grep AX_PATH_BDB_STUFF | sed 's/[[^0-9,]]//g;s/,/./g;1q'` + ],[]) + + if test "x$HEADER_VERSION" = "x" ; then + AC_MSG_RESULT([no]) + else + AC_MSG_RESULT([$HEADER_VERSION]) + + # Check that version is high enough. + AX_COMPARE_VERSION([$HEADER_VERSION],[ge],[$1],[ + # get major and minor version numbers + AS_VAR_PUSHDEF([MAJ],[ax_path_bdb_no_options_MAJOR])dnl + MAJ=`echo $HEADER_VERSION | sed 's,\..*,,'` + AS_VAR_PUSHDEF([MIN],[ax_path_bdb_no_options_MINOR])dnl + MIN=`echo $HEADER_VERSION | sed 's,^[[0-9]]*\.,,;s,\.[[0-9]]*$,,'` + + dnl # Save LIBS. + ax_path_bdb_no_options_save_LIBS="$LIBS" + + # Check that we can link with the library. + AC_SEARCH_LIBS([db_version], + [db db-$MAJ.$MIN db$MAJ.$MIN db$MAJ$MIN db-$MAJ db$MAJ],[ + # Successfully found library. + ax_path_bdb_no_options_ok=yes + BDB_VERSION=$HEADER_VERSION + + # Extract library from LIBS + ax_path_bdb_no_options_LEN=` \ + echo "x$ax_path_bdb_no_options_save_LIBS" \ + | awk '{print(length)}'` + BDB_LIBS=`echo "x$LIBS " \ + | sed "s/.\{$ax_path_bdb_no_options_LEN\}\$//;s/^x//;s/ //g"` + ],[]) + + dnl # Restore LIBS + LIBS="$ax_path_bdb_no_options_save_LIBS" + + AS_VAR_POPDEF([MAJ])dnl + AS_VAR_POPDEF([MIN])dnl + ]) + fi + + AS_VAR_POPDEF([HEADER_VERSION])dnl + else + # Not cross compiling. + # Check version of Berkeley DB in the current environment. + AX_PATH_BDB_ENV_GET_VERSION([ + AX_COMPARE_VERSION([$ax_path_bdb_env_get_version_VERSION],[ge],[$1],[ + # Found acceptable version in current environment. + ax_path_bdb_no_options_ok=yes + BDB_VERSION="$ax_path_bdb_env_get_version_VERSION" + BDB_LIBS="$ax_path_bdb_env_get_version_LIBS" + ]) + ]) + + # Determine if we need to search /usr/local/BerkeleyDB* + ax_path_bdb_no_options_DONE=no + if test "x$2" = "xENVONLY" ; then + ax_path_bdb_no_options_DONE=yes + elif test "x$2" = "xENVFIRST" ; then + ax_path_bdb_no_options_DONE=$ax_path_bdb_no_options_ok + fi + + if test "$ax_path_bdb_no_options_DONE" = "no" ; then + # Check for highest in /usr/local/BerkeleyDB* + AX_PATH_BDB_PATH_FIND_HIGHEST([ + if test "$ax_path_bdb_no_options_ok" = "yes" ; then + # If we already have an acceptable version use this if higher. + AX_COMPARE_VERSION( + [$ax_path_bdb_path_find_highest_VERSION],[gt],[$BDB_VERSION]) + else + # Since we didn't have an acceptable version check if this one is. + AX_COMPARE_VERSION( + [$ax_path_bdb_path_find_highest_VERSION],[ge],[$1]) + fi + ]) + + dnl # If result from _AX_COMPARE_VERSION is true we want this version. + if test "$ax_compare_version" = "true" ; then + ax_path_bdb_no_options_ok=yes + BDB_LIBS="-ldb" + if test "x$ax_path_bdb_path_find_highest_DIR" != x ; then + BDB_CPPFLAGS="-I$ax_path_bdb_path_find_highest_DIR/include" + BDB_LDFLAGS="-L$ax_path_bdb_path_find_highest_DIR/lib" + fi + BDB_VERSION="$ax_path_bdb_path_find_highest_VERSION" + fi + fi + fi + + dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. + if test "$ax_path_bdb_no_options_ok" = "yes" ; then + AC_MSG_NOTICE([using Berkeley DB version $BDB_VERSION]) + AC_DEFINE([HAVE_DB_H],[1], + [Define to 1 if you have the header file.]) + m4_ifvaln([$3],[$3])dnl + else + AC_MSG_NOTICE([no Berkeley DB version $1 or higher found]) + m4_ifvaln([$4],[$4])dnl + fi +]) dnl AX_PATH_BDB_NO_OPTIONS + +dnl ######################################################################### +dnl Check the default installation directory for Berkeley DB which is +dnl of the form /usr/local/BerkeleyDB* for the highest version. +dnl +dnl Result: sets ax_path_bdb_path_find_highest_ok to yes or no, +dnl sets ax_path_bdb_path_find_highest_VERSION to version, +dnl sets ax_path_bdb_path_find_highest_DIR to directory. +dnl +dnl AX_PATH_BDB_PATH_FIND_HIGHEST([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +AC_DEFUN([AX_PATH_BDB_PATH_FIND_HIGHEST], [ + dnl # Used to indicate success or failure of this function. + ax_path_bdb_path_find_highest_ok=no + + AS_VAR_PUSHDEF([VERSION],[ax_path_bdb_path_find_highest_VERSION])dnl + VERSION='' + + ax_path_bdb_path_find_highest_DIR='' + + # find highest version in default install directory for Berkeley DB + AS_VAR_PUSHDEF([CURDIR],[ax_path_bdb_path_find_highest_CURDIR])dnl + AS_VAR_PUSHDEF([CUR_VERSION],[ax_path_bdb_path_get_version_VERSION])dnl + + for CURDIR in `ls -d /usr/local/BerkeleyDB* 2> /dev/null` + do + AX_PATH_BDB_PATH_GET_VERSION([$CURDIR],[ + AX_COMPARE_VERSION([$CUR_VERSION],[gt],[$VERSION],[ + ax_path_bdb_path_find_highest_ok=yes + ax_path_bdb_path_find_highest_DIR="$CURDIR" + VERSION="$CUR_VERSION" + ]) + ]) + done + + AS_VAR_POPDEF([VERSION])dnl + AS_VAR_POPDEF([CUR_VERSION])dnl + AS_VAR_POPDEF([CURDIR])dnl + + dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. + if test "$ax_path_bdb_path_find_highest_ok" = "yes" ; then + m4_ifvaln([$1],[$1],[:])dnl + m4_ifvaln([$2],[else $2])dnl + fi + +]) dnl AX_PATH_BDB_PATH_FIND_HIGHEST + +dnl ######################################################################### +dnl Checks for Berkeley DB in specified directory's lib and include +dnl subdirectories. +dnl +dnl Result: sets ax_path_bdb_path_get_version_ok to yes or no, +dnl sets ax_path_bdb_path_get_version_VERSION to version. +dnl +dnl AX_PATH_BDB_PATH_GET_VERSION(BDB-DIR, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +AC_DEFUN([AX_PATH_BDB_PATH_GET_VERSION], [ + dnl # Used to indicate success or failure of this function. + ax_path_bdb_path_get_version_ok=no + + # Indicate status of checking for Berkeley DB header. + AC_MSG_CHECKING([in $1/include for db.h]) + ax_path_bdb_path_get_version_got_header=no + test -f "$1/include/db.h" && ax_path_bdb_path_get_version_got_header=yes + AC_MSG_RESULT([$ax_path_bdb_path_get_version_got_header]) + + # Indicate status of checking for Berkeley DB library. + AC_MSG_CHECKING([in $1/lib for library -ldb]) + + ax_path_bdb_path_get_version_VERSION='' + + if test -d "$1/include" && test -d "$1/lib" && + test "$ax_path_bdb_path_get_version_got_header" = "yes" ; then + dnl # save and modify environment + ax_path_bdb_path_get_version_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-I$1/include $CPPFLAGS" + + ax_path_bdb_path_get_version_save_LIBS="$LIBS" + LIBS="$LIBS -ldb" + + ax_path_bdb_path_get_version_save_LDFLAGS="$LDFLAGS" + LDFLAGS="-L$1/lib $LDFLAGS" + + # Compile and run a program that compares the version defined in + # the header file with a version defined in the library function + # db_version. + AC_RUN_IFELSE([ + AC_LANG_SOURCE([[ +#include +#include +int main(int argc,char **argv) +{ + int major,minor,patch; + (void) argv; + db_version(&major,&minor,&patch); + if (argc > 1) + printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); + if (DB_VERSION_MAJOR == major && DB_VERSION_MINOR == minor && + DB_VERSION_PATCH == patch) + return 0; + else + return 1; +} + ]]) + ],[ + # Program compiled and ran, so get version by adding argument. + ax_path_bdb_path_get_version_VERSION=`./conftest$ac_exeext x` + ax_path_bdb_path_get_version_ok=yes + ],[],[]) + + dnl # restore environment + CPPFLAGS="$ax_path_bdb_path_get_version_save_CPPFLAGS" + LIBS="$ax_path_bdb_path_get_version_save_LIBS" + LDFLAGS="$ax_path_bdb_path_get_version_save_LDFLAGS" + fi + + dnl # Finally, execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. + if test "$ax_path_bdb_path_get_version_ok" = "yes" ; then + AC_MSG_RESULT([$ax_path_bdb_path_get_version_VERSION]) + m4_ifvaln([$2],[$2])dnl + else + AC_MSG_RESULT([no]) + m4_ifvaln([$3],[$3])dnl + fi +]) dnl AX_PATH_BDB_PATH_GET_VERSION + +############################################################################# +dnl Checks if version of library and header match specified version. +dnl Only meant to be used by AX_PATH_BDB_ENV_GET_VERSION macro. +dnl +dnl Requires AX_COMPARE_VERSION macro. +dnl +dnl Result: sets ax_path_bdb_env_confirm_lib_ok to yes or no. +dnl +dnl AX_PATH_BDB_ENV_CONFIRM_LIB(VERSION, [LIBNAME]) +AC_DEFUN([AX_PATH_BDB_ENV_CONFIRM_LIB], [ + dnl # Used to indicate success or failure of this function. + ax_path_bdb_env_confirm_lib_ok=no + + dnl # save and modify environment to link with library LIBNAME + ax_path_bdb_env_confirm_lib_save_LIBS="$LIBS" + LIBS="$LIBS $2" + + # Compile and run a program that compares the version defined in + # the header file with a version defined in the library function + # db_version. + AC_RUN_IFELSE([ + AC_LANG_SOURCE([[ +#include +#include +int main(int argc,char **argv) +{ + int major,minor,patch; + (void) argv; + db_version(&major,&minor,&patch); + if (argc > 1) + printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); + if (DB_VERSION_MAJOR == major && DB_VERSION_MINOR == minor && + DB_VERSION_PATCH == patch) + return 0; + else + return 1; +} + ]]) + ],[ + # Program compiled and ran, so get version by giving an argument, + # which will tell the program to print the output. + ax_path_bdb_env_confirm_lib_VERSION=`./conftest$ac_exeext x` + + # If the versions all match up, indicate success. + AX_COMPARE_VERSION([$ax_path_bdb_env_confirm_lib_VERSION],[eq],[$1],[ + ax_path_bdb_env_confirm_lib_ok=yes + ]) + ],[],[]) + + dnl # restore environment + LIBS="$ax_path_bdb_env_confirm_lib_save_LIBS" + +]) dnl AX_PATH_BDB_ENV_CONFIRM_LIB + +############################################################################# +dnl Finds the version and library name for Berkeley DB in the +dnl current environment. Tries many different names for library. +dnl +dnl Requires AX_PATH_BDB_ENV_CONFIRM_LIB macro. +dnl +dnl Result: set ax_path_bdb_env_get_version_ok to yes or no, +dnl set ax_path_bdb_env_get_version_VERSION to the version found, +dnl and ax_path_bdb_env_get_version_LIBNAME to the library name. +dnl +dnl AX_PATH_BDB_ENV_GET_VERSION([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +AC_DEFUN([AX_PATH_BDB_ENV_GET_VERSION], [ + dnl # Used to indicate success or failure of this function. + ax_path_bdb_env_get_version_ok=no + + ax_path_bdb_env_get_version_VERSION='' + ax_path_bdb_env_get_version_LIBS='' + + AS_VAR_PUSHDEF([HEADER_VERSION],[ax_path_bdb_env_get_version_HEADER_VERSION])dnl + AS_VAR_PUSHDEF([TEST_LIBNAME],[ax_path_bdb_env_get_version_TEST_LIBNAME])dnl + + # Indicate status of checking for Berkeley DB library. + AC_MSG_CHECKING([for db.h]) + + # Compile and run a program that determines the Berkeley DB version + # in the header file db.h. + HEADER_VERSION='' + AC_RUN_IFELSE([ + AC_LANG_SOURCE([[ +#include +#include +int main(int argc,char **argv) +{ + (void) argv; + if (argc > 1) + printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); + return 0; +} + ]]) + ],[ + # Program compiled and ran, so get version by adding an argument. + HEADER_VERSION=`./conftest$ac_exeext x` + AC_MSG_RESULT([$HEADER_VERSION]) + ],[AC_MSG_RESULT([no])],[AC_MSG_RESULT([no])]) + + # Have header version, so try to find corresponding library. + # Looks for library names in the order: + # nothing, db, db-X.Y, dbX.Y, dbXY, db-X, dbX + # and stops when it finds the first one that matches the version + # of the header file. + if test "x$HEADER_VERSION" != "x" ; then + AC_MSG_CHECKING([for library containing Berkeley DB $HEADER_VERSION]) + + AS_VAR_PUSHDEF([MAJOR],[ax_path_bdb_env_get_version_MAJOR])dnl + AS_VAR_PUSHDEF([MINOR],[ax_path_bdb_env_get_version_MINOR])dnl + + # get major and minor version numbers + MAJOR=`echo $HEADER_VERSION | sed 's,\..*,,'` + MINOR=`echo $HEADER_VERSION | sed 's,^[[0-9]]*\.,,;s,\.[[0-9]]*$,,'` + + # see if it is already specified in LIBS + TEST_LIBNAME='' + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + + if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then + # try format "db" + TEST_LIBNAME='-ldb' + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + fi + + if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then + # try format "db-X.Y" + TEST_LIBNAME="-ldb-${MAJOR}.$MINOR" + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + fi + + if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then + # try format "dbX.Y" + TEST_LIBNAME="-ldb${MAJOR}.$MINOR" + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + fi + + if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then + # try format "dbXY" + TEST_LIBNAME="-ldb$MAJOR$MINOR" + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + fi + + if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then + # try format "db-X" + TEST_LIBNAME="-ldb-$MAJOR" + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + fi + + if test "$ax_path_bdb_env_confirm_lib_ok" = "no" ; then + # try format "dbX" + TEST_LIBNAME="-ldb$MAJOR" + AX_PATH_BDB_ENV_CONFIRM_LIB([$HEADER_VERSION], [$TEST_LIBNAME]) + fi + + dnl # Found a valid library. + if test "$ax_path_bdb_env_confirm_lib_ok" = "yes" ; then + if test "x$TEST_LIBNAME" = "x" ; then + AC_MSG_RESULT([none required]) + else + AC_MSG_RESULT([$TEST_LIBNAME]) + fi + ax_path_bdb_env_get_version_VERSION="$HEADER_VERSION" + ax_path_bdb_env_get_version_LIBS="$TEST_LIBNAME" + ax_path_bdb_env_get_version_ok=yes + else + AC_MSG_RESULT([no]) + fi + + AS_VAR_POPDEF([MAJOR])dnl + AS_VAR_POPDEF([MINOR])dnl + fi + + AS_VAR_POPDEF([HEADER_VERSION])dnl + AS_VAR_POPDEF([TEST_LIBNAME])dnl + + dnl # Execute ACTION-IF-FOUND / ACTION-IF-NOT-FOUND. + if test "$ax_path_bdb_env_confirm_lib_ok" = "yes" ; then + m4_ifvaln([$1],[$1],[:])dnl + m4_ifvaln([$2],[else $2])dnl + fi + +]) dnl BDB_ENV_GET_VERSION + +############################################################################# diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_generic.m4 projectm-3.1.0/m4/autoconf-archive/ax_path_generic.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_generic.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_path_generic.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,164 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_path_generic.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PATH_GENERIC(LIBRARY,[MINIMUM-VERSION,[SED-EXPR-EXTRACTOR]],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],[CONFIG-SCRIPTS],[CFLAGS-ARG],[LIBS-ARG]) +# +# DESCRIPTION +# +# Runs the LIBRARY-config script and defines LIBRARY_CFLAGS and +# LIBRARY_LIBS unless the user had predefined them in the environment. +# +# The script must support `--cflags' and `--libs' args. If MINIMUM-VERSION +# is specified, the script must also support the `--version' arg. If the +# `--with-library-[exec-]prefix' arguments to ./configure are given, it +# must also support `--prefix' and `--exec-prefix'. Preferably use +# CONFIG-SCRIPTS as config script, CFLAGS-ARG instead of `--cflags` and +# LIBS-ARG instead of `--libs`, if given. +# +# The SED-EXPR-EXTRACTOR parameter represents the expression used in sed +# to extract the version number. Use it if your 'foo-config --version' +# dumps something like 'Foo library v1.0.0 (alfa)' instead of '1.0.0'. +# +# The macro respects LIBRARY_CONFIG, LIBRARY_CFLAGS and LIBRARY_LIBS +# variables. If the first one is defined, it specifies the name of the +# config script to use. If the latter two are defined, the script is not +# ran at all and their values are used instead (if only one of them is +# defined, the empty value of the remaining one is still used). +# +# Example: +# +# AX_PATH_GENERIC(Foo, 1.0.0) +# +# would run `foo-config --version' and check that it is at least 1.0.0, if +# successful the following variables would be defined and substituted: +# +# FOO_CFLAGS to `foo-config --cflags` +# FOO_LIBS to `foo-config --libs` +# +# Example: +# +# AX_PATH_GENERIC([Bar],,,[ +# AC_MSG_ERROR([Cannot find Bar library]) +# ]) +# +# would check for bar-config program, defining and substituting the +# following variables: +# +# BAR_CFLAGS to `bar-config --cflags` +# BAR_LIBS to `bar-config --libs` +# +# Example: +# +# ./configure BAZ_LIBS=/usr/lib/libbaz.a +# +# would link with a static version of baz library even if `baz-config +# --libs` returns just "-lbaz" that would normally result in using the +# shared library. +# +# This macro is a rearranged version of AC_PATH_GENERIC from Angus Lees. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 17 + +AU_ALIAS([AC_PATH_GENERIC], [AX_PATH_GENERIC]) +AC_DEFUN([AX_PATH_GENERIC],[ + AC_REQUIRE([AC_PROG_SED]) + + dnl we're going to need uppercase and lowercase versions of the + dnl string `LIBRARY' + pushdef([UP], translit([$1], [a-z], [A-Z]))dnl + pushdef([DOWN], translit([$1], [A-Z], [a-z]))dnl + + AC_ARG_WITH(DOWN-prefix,[AS_HELP_STRING([--with-]DOWN[-prefix=PREFIX], [Prefix where $1 is installed (optional)])], + DOWN[]_config_prefix="$withval", DOWN[]_config_prefix="") + AC_ARG_WITH(DOWN-exec-prefix,[AS_HELP_STRING([--with-]DOWN[-exec-prefix=EPREFIX], [Exec prefix where $1 is installed (optional)])], + DOWN[]_config_exec_prefix="$withval", DOWN[]_config_exec_prefix="") + + AC_ARG_VAR(UP[]_CONFIG, [config script used for $1]) + AC_ARG_VAR(UP[]_CFLAGS, [CFLAGS used for $1]) + AC_ARG_VAR(UP[]_LIBS, [LIBS used for $1]) + + AS_IF([test x"$UP[]_CFLAGS" != x -o x"$UP[]_LIBS" != x],[ + dnl Don't run config script at all, use user-provided values instead. + AC_SUBST(UP[]_CFLAGS) + AC_SUBST(UP[]_LIBS) + : + $4 + ],[ + AS_IF([test x$DOWN[]_config_exec_prefix != x],[ + DOWN[]_config_args="$DOWN[]_config_args --exec-prefix=$DOWN[]_config_exec_prefix" + AS_IF([test x${UP[]_CONFIG+set} != xset],[ + UP[]_CONFIG=$DOWN[]_config_exec_prefix/bin/DOWN-config + ]) + ]) + AS_IF([test x$DOWN[]_config_prefix != x],[ + DOWN[]_config_args="$DOWN[]_config_args --prefix=$DOWN[]_config_prefix" + AS_IF([test x${UP[]_CONFIG+set} != xset],[ + UP[]_CONFIG=$DOWN[]_config_prefix/bin/DOWN-config + ]) + ]) + + AC_PATH_PROGS(UP[]_CONFIG,[$6 DOWN-config],[no]) + AS_IF([test "$UP[]_CONFIG" = "no"],[ + : + $5 + ],[ + dnl Get the CFLAGS from LIBRARY-config script + AS_IF([test x"$7" = x],[ + UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args --cflags`" + ],[ + UP[]_CFLAGS="`$UP[]_CONFIG $DOWN[]_config_args $7`" + ]) + + dnl Get the LIBS from LIBRARY-config script + AS_IF([test x"$8" = x],[ + UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args --libs`" + ],[ + UP[]_LIBS="`$UP[]_CONFIG $DOWN[]_config_args $8`" + ]) + + AS_IF([test x"$2" != x],[ + dnl Check for provided library version + AS_IF([test x"$3" != x],[ + dnl Use provided sed expression + DOWN[]_version="`$UP[]_CONFIG $DOWN[]_config_args --version | $SED -e $3`" + ],[ + DOWN[]_version="`$UP[]_CONFIG $DOWN[]_config_args --version | $SED -e 's/^\ *\(.*\)\ *$/\1/'`" + ]) + + AC_MSG_CHECKING([for $1 ($DOWN[]_version) >= $2]) + AX_COMPARE_VERSION($DOWN[]_version,[ge],[$2],[ + AC_MSG_RESULT([yes]) + + AC_SUBST(UP[]_CFLAGS) + AC_SUBST(UP[]_LIBS) + : + $4 + ],[ + AC_MSG_RESULT([no]) + : + $5 + ]) + ],[ + AC_SUBST(UP[]_CFLAGS) + AC_SUBST(UP[]_LIBS) + : + $4 + ]) + ]) + ]) + + popdef([UP]) + popdef([DOWN]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_lib_pcre.m4 projectm-3.1.0/m4/autoconf-archive/ax_path_lib_pcre.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_lib_pcre.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_path_lib_pcre.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,90 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_path_lib_pcre.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PATH_LIB_PCRE [(A/NA)] +# +# DESCRIPTION +# +# check for pcre lib and set PCRE_LIBS and PCRE_CFLAGS accordingly. +# +# also provide --with-pcre option that may point to the $prefix of the +# pcre installation - the macro will check $pcre/include and $pcre/lib to +# contain the necessary files. +# +# the usual two ACTION-IF-FOUND / ACTION-IF-NOT-FOUND are supported and +# they can take advantage of the LIBS/CFLAGS additions. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_PATH_LIB_PCRE],[dnl +AC_MSG_CHECKING([lib pcre]) +AC_ARG_WITH(pcre, +[ --with-pcre[[=prefix]] compile xmlpcre part (via libpcre check)],, + with_pcre="yes") +if test ".$with_pcre" = ".no" ; then + AC_MSG_RESULT([disabled]) + m4_ifval($2,$2) +else + AC_MSG_RESULT([(testing)]) + AC_CHECK_LIB(pcre, pcre_study) + if test "$ac_cv_lib_pcre_pcre_study" = "yes" ; then + PCRE_LIBS="-lpcre" + AC_MSG_CHECKING([lib pcre]) + AC_MSG_RESULT([$PCRE_LIBS]) + m4_ifval($1,$1) + else + OLDLDFLAGS="$LDFLAGS" ; LDFLAGS="$LDFLAGS -L$with_pcre/lib" + OLDCPPFLAGS="$CPPFLAGS" ; CPPFLAGS="$CPPFLAGS -I$with_pcre/include" + AC_CHECK_LIB(pcre, pcre_compile) + CPPFLAGS="$OLDCPPFLAGS" + LDFLAGS="$OLDLDFLAGS" + if test "$ac_cv_lib_pcre_pcre_compile" = "yes" ; then + AC_MSG_RESULT(.setting PCRE_LIBS -L$with_pcre/lib -lpcre) + PCRE_LIBS="-L$with_pcre/lib -lpcre" + test -d "$with_pcre/include" && PCRE_CFLAGS="-I$with_pcre/include" + AC_MSG_CHECKING([lib pcre]) + AC_MSG_RESULT([$PCRE_LIBS]) + m4_ifval($1,$1) + else + AC_MSG_CHECKING([lib pcre]) + AC_MSG_RESULT([no, (WARNING)]) + m4_ifval($2,$2) + fi + fi +fi +AC_SUBST([PCRE_LIBS]) +AC_SUBST([PCRE_CFLAGS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_milter.m4 projectm-3.1.0/m4/autoconf-archive/ax_path_milter.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_milter.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_path_milter.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,332 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_path_milter.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PATH_MILTER([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to automatically find the library libmilter.a and the +# header file "libmilter/mfapi.h", which are required when compiling a +# milter for Sendmail. When successful, it sets the output variable +# MILTER_LIBS to "-lmilter", MILTER_LDFLAGS to contain an -Lpathtolib +# option, and MILTER_CPPFLAGS to contain an -Ipathtoinclude option, if +# they are necessary. +# +# The easiest way to use this macro is something like: +# +# AX_PATH_MILTER([8.12],[ +# LIBS="$MILTER_LIBS $LIBS" +# LDFLAGS="$MILTER_LDFLAGS $LDFLAGS" +# CPPFLAGS="$CPPFLAGS $MILTER_CPPFLAGS" +# ],[ +# AC_MSG_ERROR([required milter library and header not found]) +# ]) +# +# If the macro is successful, it just adds any flags to the necessary +# environment. If it is not successful, it would likely be a fatal error, +# because if an application is linking with libmilter.a, it is probably +# because it is a milter. +# +# There are two optional "--with" options for configure which are added. +# If they are specified, they override any searching that is done. They +# are: +# +# --with-sendmail-base= This option is used to explicitly +# specify the base of the sendmail distribution. +# +# --with-sendmail-obj= The option is used to explicitly specify +# the "obj.*" subdirectory in the sendmail distribution +# that should be used. +# +# When sendmail-base is not specified, the current environment is first +# tested to see if the header and library are available, and if so +# MILTER_LDFLAGS and MILTER_CPPFLAGS are left empty. +# +# There are two places that are searched for the sendmail base directory. +# The first location is one directory down from the current directory. It +# checks if there is a directory of the form sendmail-8.1*, limited to +# version 8.12.x or higher, then chooses the directory with the highest +# version number. If that method does not succeed, it then looks in the +# file /etc/mail/sendmail.cf for the directory it was built from, and uses +# the base of that distribution. If neither of these methods work, then it +# fails. +# +# There are two methods for finding the "obj.*" directory when it is not +# specified. The first is to try to run sendmail's Build program with the +# -M option which will print out the name of the obj. directory for the +# tool in the directory where it is run from. If this does not work, is +# looks for the newest directory of the form "obj.*" in the sendmail base +# directory. +# +# Two addition output variables that are defined, whether or not the files +# are found are SENDMAIL_BASE_DIR and SENDMAIL_OBJ_DIR, which are the +# suspected location of the sendmail base directory and obj.* +# subdirectory. +# +# NOTE: POSIX threads MUST be configured BEFORE this function is called or +# it will not find libmilter.a even if it exists. The easiest way is to +# use the AX_PTHREAD macro by Steven G. Johnson and Alejandro Forero +# Cuervo which is available from the Autoconf Macro Archive. +# +# LICENSE +# +# Copyright (c) 2008 Tim Toolan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +############################################################################### +AC_DEFUN([AX_PATH_MILTER], [ + +# Used to indicate success or failure of this function. +ax_path_milter_ok=no + +# Convert sections of MINIMUM-VERSION to three digit numbers by adding zeros. +# For example 8.12.9 would become 008.012.009 +ac_milter_minimum_version=`echo "$1" | sed 's,\([[0-9]]*\),x\1x,g;s,x\([[0-9]]\)x,x0\1x,g;s,x\([[0-9]][[0-9]]\)x,x0\1x,g;s,x,,g'` + +# Add options --with-sendmail-base and --with-sendmail-obj to configure. +AC_ARG_WITH([sendmail-base], + [ --with-sendmail-base= base directory of sendmail distribution]) +AC_ARG_WITH([sendmail-obj], + [ --with-sendmail-obj= obj.* subdirectory in sendmail distribution]) + +# Check for functions required by libmilter. +AC_CHECK_FUNC(inet_aton, [], [AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])]) +AC_CHECK_FUNC(socket, [], [AC_SEARCH_LIBS(socket, [socket nsl])]) +AC_CHECK_FUNC(gethostbyname, [], [AC_SEARCH_LIBS(gethostbyname, [socket nsl])]) + +############################################################################### +# +# If neither --with-sendmail-base or --with-sendmail-obj is specified +# check the existing environment first for mfapi.h and libmilter without +# modifying CPPFLAGS, LDFLAGS, and LIBS first. +# +if test "x$with_sendmail_base$with_sendmail_obj" = "x" ; then + AC_CHECK_HEADER([libmilter/mfapi.h],[ + AC_CHECK_LIB([milter],[smfi_main],[ + # both tests succeeded so indicate success + ax_path_milter_ok=yes + + # add -lmilter to the libraries to link + MILTER_LIBS="-lmilter" + ]) + ]) + + if test "$ax_path_milter_ok" = "no" ; then + # Unset the cached test results because we will be trying them again later. + ac_milter_tmp=abcdefg + if unset ac_milter_tmp 2> /dev/null ; then + unset ac_cv_header_libmilter_mfapi_h + unset ac_cv_lib_milter_smfi_main + else + AC_MSG_WARN( + [system doesn't have unset so either use --with-sendmail-base + or set LDFLAGS and CPPFLAGS with the necessary -L and -I options]) + fi + fi +fi + +############################################################################### +# +# If didn't already fine necessary files then search. +# +if test "$ax_path_milter_ok" = "no" ; then + ############################################################################# + # + # Determine the sendmail base directory and set SENDMAIL_BASE_DIR. + # + if test "x$with_sendmail_base" != "x" ; then + # set SENDMAIL_BASE_DIR to the one specified by--with-sendmail-base + SENDMAIL_BASE_DIR="$with_sendmail_base" + else + AC_MSG_CHECKING([for sendmail base directory in ../ ]) + # + # --with-sendmail-base is not used, so we will try to determine it + # + # 1) List all directories one level down that look like sendmail. + # 2) Select ones that are sendmail 8.12 or higher (including 8.13 + # versions when they come out). + # 3) Replace any single digit last version numbers with a two digit + # version number (ie. 8.12.9 becomes 8.12.09). + # 4) Sort all of the directories found in reverse order. + # 5) Take the first one (the highest version). + # 6) Restore the single digit version numbers. + # + ac_milter_tmp=`ls -d ../sendmail-8.1* 2> /dev/null | grep '../sendmail-8.1[[2-9]]' | sed 's,\.\([[0-9]]\)$,.0\1,' | sort -r | sed '1q' | sed 's,\.0\([[0-9]]\)$,.\1,'` + + # Convert found version sections to three digit numbers by adding zeros. + ac_milter_found_version=`echo "$ac_milter_tmp" | sed 's,.*/sendmail-,,;s,\([[0-9]]*\),x\1x,g;s,x\([[0-9]]\)x,x0\1x,g;s,x\([[0-9]][[0-9]]\)x,x0\1x,g;s,x,,g'` + + # If ac_milter_minimum_version is equal to ac_milter_lower_version, then + # the found version is greater than or equal to the minimum version. + # Pick the version string that is the lesser of the two. + # An empty string would be less than anything. + # In short, ac_milter_version_ok will equal yes if the version is ok, + # and no otherwise. + ac_milter_version_ok=`echo "x$ac_milter_minimum_version +x$ac_milter_found_version" | sort | sed '1q' | sed "s,x${ac_milter_minimum_version},yes,;s,x${ac_milter_found_version},no," ` + + # If we have something add the current directory to it. + if test "x$ac_milter_tmp" != "x" ; then + ac_milter_tmp="`pwd`/$ac_milter_tmp" + fi + + if test -r "${ac_milter_tmp}/include/libmilter/mfapi.h" && \ + test "$ac_milter_version_ok" = "yes" ; then + # The file mfapi.h exists so we will use this as SENDMAIL_BASE_DIR. + AC_MSG_RESULT([yes]) + SENDMAIL_BASE_DIR="$ac_milter_tmp" + else + AC_MSG_RESULT([no]) + AC_MSG_CHECKING([for sendmail base from /etc/mail/sendmail.cf]) + # + # The previous method to find SENDMAIL_BASE_DIR failed, so we will + # try this method. + # + # 1) Check for a line in /etc/mail/sendmail.cf of the form: + # ##### in /some/path/sendmail-8.x.x/more/path + # This is the directory that the sendmail.cf file was built in. + # 2) Take the first occurrence if there are more than one. + # 3) Remove the leading "##### in ". + # 4) Remove everything after the sendmail-8.x.x path component. + # +dnl # Note that the following expression only should not use double +dnl # square brackets because for some reason, possibly having to +dnl # do with the pound sign, m4 doesn't convert them to single brackets. +dnl # + ac_milter_tmp=`grep "^##### in /" /etc/mail/sendmail.cf 2> /dev/null | grep "/sendmail-8.1" | sed '1q' | sed 's,^##### in ,,' | sed 's,\(/sendmail-8\.[0-9.]*\).*,\1,'` + + # Convert found version sections to three digit numbers by adding zeros. + ac_milter_found_version=`echo "$ac_milter_tmp" | sed 's,.*/sendmail-,,;s,\([[0-9]]*\),x\1x,g;s,x\([[0-9]]\)x,x0\1x,g;s,x\([[0-9]][[0-9]]\)x,x0\1x,g;s,x,,g'` + + # ac_milter_version_ok will equal yes if the version is ok, otherwise no. + ac_milter_version_ok=`echo "x$ac_milter_minimum_version +x$ac_milter_found_version" | sort | sed '1q' | sed "s,x${ac_milter_minimum_version},yes,;s,x${ac_milter_found_version},no," ` + + if test -r "${ac_milter_tmp}/include/libmilter/mfapi.h" && \ + test "$ac_milter_version_ok" = "yes" ; then + # The file mfapi.h exists so we will use this as SENDMAIL_BASE_DIR. + AC_MSG_RESULT([yes]) + SENDMAIL_BASE_DIR="$ac_milter_tmp" + else + AC_MSG_RESULT([no]) + fi + fi + fi + + ############################################################################# + # + # Determine the sendmail obj.* directory and set SENDMAIL_OBJ_DIR. + # We can only do this if we found SENDMAIL_BASE_DIR. + # + if test "x$SENDMAIL_BASE_DIR" != "x" ; then + if test "x$with_sendmail_obj" != "x" ; then + # set SENDMAIL_OBJ_DIR to the one specified by--with-sendmail-obj + SENDMAIL_OBJ_DIR="$with_sendmail_obj" + else + AC_MSG_CHECKING([for sendmail obj.* subdirectory using Build -M]) + # + # --with-sendmail-obj is not used, so we will try to determine it + # + # Try to run sendmail's Build program with the -M option which will + # print out the name of the obj. directory for the tool in the + # directory where it is run from. + # + ac_milter_tmp=`(cd ${SENDMAIL_BASE_DIR}/libmilter 1> /dev/null ; ./Build -M ) 2> /dev/null` + + if test -f "${ac_milter_tmp}/libmilter.a" ; then + # libmilter.a exists so this is the one we will choose + AC_MSG_RESULT([yes]) + # Remove beginning and end of path from obj.* directory. + SENDMAIL_OBJ_DIR=`echo "$ac_milter_tmp" | sed 's,/libmilter$,,;s,.*/,,'` + else + AC_MSG_RESULT([no]) + AC_MSG_CHECKING([for sendmail obj.* subdirectory using ls]) + # + # List all directories of the form "obj." in the sendmail base + # directory, and choose the one with the latest modification date. + # + ac_milter_tmp=`ls -dt ${SENDMAIL_BASE_DIR}/obj.*/libmilter 2> /dev/null | sed '1q'` + + if test -f "${ac_milter_tmp}/libmilter.a" ; then + # libmilter.a exists so this is the one we will choose + AC_MSG_RESULT([yes]) + # Remove beginning and end of path from obj.* directory. + SENDMAIL_OBJ_DIR=`echo "$ac_milter_tmp" | sed 's,/libmilter$,,;s,.*/,,'` + else + AC_MSG_RESULT([no]) + fi + fi + fi + fi + + ############################################################################# + # + # If we have both SENDMAIL_BASE_DIR and SENDMAIL_OBJ_DIR we will check + # for the necessary files. + # + if test "x$SENDMAIL_BASE_DIR" != "x" && \ + test "x$SENDMAIL_OBJ_DIR" != "x" ; then + + # Save and modify CPPFLAGS. + ac_milter_save_CPPFLAGS="$CPPFLAGS" + MILTER_CPPFLAGS="-I$SENDMAIL_BASE_DIR/include" + CPPFLAGS="$CPPFLAGS $MILTER_CPPFLAGS" + + # Save and modify LDFLAGS. + ac_milter_save_LDFLAGS="$LDLFAGS" + MILTER_LDFLAGS="-L${SENDMAIL_BASE_DIR}/${SENDMAIL_OBJ_DIR}/libmilter" + LDFLAGS="$MILTER_LDFLAGS $LDFLAGS" + + AC_CHECK_HEADER([libmilter/mfapi.h],[ + AC_CHECK_LIB([milter],[smfi_main],[ + # both tests succeeded so add -lmilter to the libraries to link + MILTER_LIBS="-lmilter" + + # indicate success + ax_path_milter_ok=yes + ]) + ]) + + # Restore the modified environment + CPPFLAGS="$ac_milter_save_CPPFLAGS" + LDFLAGS="$ac_milter_save_LDFLAGS" + + fi +fi + +# If failure, clear MILTER_LIBS, MILTER_LDFLAGS and MILTER_CPPFLAGS. +if test "$ax_path_milter_ok" = "no" ; then + MILTER_CPPFLAGS="" + MILTER_LIBS="" + MILTER_LDFLAGS="" +fi + +# export these to the make environment +AC_SUBST([MILTER_LIBS]) +AC_SUBST([MILTER_CPPFLAGS]) +AC_SUBST([MILTER_LDFLAGS]) +AC_SUBST([SENDMAIL_BASE_DIR]) +AC_SUBST([SENDMAIL_OBJ_DIR]) + +# Indicate status of checking for libmilter stuff. +AC_MSG_CHECKING([if files required by libmilter are present]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND. +if test "$ax_path_milter_ok" = "yes" ; then + AC_MSG_RESULT([yes]) + $2 +else + AC_MSG_RESULT([no]) + $3 +fi + +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_missing.m4 projectm-3.1.0/m4/autoconf-archive/ax_path_missing.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_path_missing.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_path_missing.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,42 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_path_missing.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PATH_MISSING(VARIABLE, PROG-TO-CHECK-FOR, WARNING-IF-NOT-FOUND, PATH) +# +# DESCRIPTION +# +# Check whether program PROG-TO-CHECK-FOR exists in path. If it is found, +# set VARIABLE to the full path of PROG-TO-CHECK-FOR, otherwise warn using +# the string WARNING-IF-NOT-FOUND and set VARIABLE to the full path of the +# Automake missing script with PROG-TO-CHECK-FOR as the command to run. +# +# A typical use is the following: +# +# AX_PATH_MISSING([AUTOGEN],[autogen],[autogen seems missing ...]) +# +# This macro is the combination of AC_PATH_PROG and AX_MISSING_PROG. If +# you do not want to run AC_PATH_PROG, simply use AX_MISSING_PROG or +# AM_MISSING. +# +# LICENSE +# +# Copyright (c) 2008 Noah Slater +# Copyright (c) 2008 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_PATH_MISSING], [ + AC_PATH_PROG([$1],[$2],[$4]) + AS_IF([ test -z "${$1}" ],[ + unset $1 + AX_MISSING_PROG([$1],[$2],[$3]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_perl_ext_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_perl_ext_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_perl_ext_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_perl_ext_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,116 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_perl_ext_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PERL_EXT_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [EXTRA-MODULES]) +# AX_PERL_EXT_CFLAGS([CFLAGS-VARIABLE]) +# AX_PERL_EXT_LDFLAGS([LDFLAGS-VARIABLE], [EXTRA-MODULES]) +# +# DESCRIPTION +# +# Fetches the linker flags and C compiler flags for compiling and linking +# programs that embed a Perl interpreter. If the EXTRA-MODULES argument is +# submitted, it is a space separated list of extra modules to link. The +# flags will be stored in the provided variables. +# +# Examples: +# +# AX_PERL_EXT_FLAGS([PERLXS_CFLAGS], [PERLXS_LDFLAGS]) +# AC_SUBST([PERLXS_CFLAGS]) +# AC_SUBST([PERLXS_LDFLAGS]) +# +# AX_PERL_EXT_CFLAGS([PERLXS_CFLAGS]) +# AC_SUBST([PERLXS_CFLAGS]) +# +# AX_PERL_EXT_LDFLAGS([PERLXS_LDFLAGS], [-std Socket]) +# +# LICENSE +# +# Copyright (c) 2009 Mats Kindahl of Sun Microsystems +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, +# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. + +#serial 8 + +AC_DEFUN([AX_PERL_EXT_CFLAGS], +[AC_CHECK_PROG(PERL,perl,perl) + _AX_PERL_EXT_MODULE_CHECK([ExtUtils::Embed], [have_embed=yes], + [have_embed=no]) + AS_IF([test $have_embed = no], + AC_MSG_ERROR([Require ExtUtils::Embed to proceed])) + _AX_PERL_EXT_EMBED_CHECK([$1],[ccopts]) +]) + + +AC_DEFUN([AX_PERL_EXT_LDFLAGS], +[AC_CHECK_PROG(PERL,perl,perl) + _AX_PERL_EXT_MODULE_CHECK([ExtUtils::Embed], [have_embed=yes], + [have_embed=no]) + AS_IF([test $have_embed = no], + AC_MSG_ERROR([Require ExtUtils::Embed to proceed])) + _AX_PERL_EXT_EMBED_CHECK([$1],[ldopts],[$2]) +]) + + +AC_DEFUN([AX_PERL_EXT_FLAGS], +[AC_CHECK_PROG(PERL,perl,perl) + _AX_PERL_EXT_MODULE_CHECK([ExtUtils::Embed], [have_embed=yes], + [have_embed=no]) + AS_IF([test $have_embed = no], + AC_MSG_ERROR([Require ExtUtils::Embed to proceed])) + _AX_PERL_EXT_EMBED_CHECK([$1],[ccopts]) + _AX_PERL_EXT_EMBED_CHECK([$2],[ldopts],[$3]) +]) + + +dnl _AX_PERL_EXT_MODULE_CHECK(MODULE-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) +dnl +dnl Check for the existence of the perl module given by MODULE-NAME. +dnl +AC_DEFUN([_AX_PERL_EXT_MODULE_CHECK], +[AC_MSG_CHECKING([for perl module $1]) + $PERL "-M$1" -e exit > /dev/null 2>&1 + AS_IF([test $? -eq 0], + [AC_MSG_RESULT(yes) + $2], + [AC_MSG_RESULT(no) + $3]) +]) + +dnl _AX_PERL_EXT_EMBED_CHECK(VARIABLE, COMMAND, [EXTRA-FLAGS]) Use +dnl +dnl ExtUtils::Embed fetch flags for embedding Perl in a C/C++ +dnl application +dnl +AC_DEFUN([_AX_PERL_EXT_EMBED_CHECK], +[AC_MSG_CHECKING([for perl $2 embed flags]) + ax_c_perlxs_extras="$3" + $1=`$PERL -MExtUtils::Embed -e $2 ${ax_c_perlxs_extras:+"-- $3"}` + AC_MSG_RESULT($$1) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_perl_ext.m4 projectm-3.1.0/m4/autoconf-archive/ax_perl_ext.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_perl_ext.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_perl_ext.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,145 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_perl_ext.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PERL_EXT +# +# DESCRIPTION +# +# Fetches the linker flags and C compiler flags for compiling and linking +# Perl binary extensions. The macro substitutes PERL_EXT_PREFIX, +# PERL_EXT_INC, PERL_EXT_LIB, PERL_EXT_CPPFLAGS, PERL_EXT_LDFLAGS and +# PERL_EXT_DLEXT variables if Perl executable was found. It also checks +# the same variables before trying to retrieve them from the Perl +# configuration. +# +# PERL_EXT_PREFIX: top-level perl installation path (--prefix) +# PERL_EXT_INC: XS include directory +# PERL_EXT_LIB: Perl extensions destination directory +# PERL_EXT_CPPFLAGS: C preprocessor flags to compile extensions +# PERL_EXT_LDFLAGS: linker flags to build extensions +# PERL_EXT_DLEXT: extensions suffix for perl modules (e.g. ".so") +# +# Examples: +# +# AX_PERL_EXT +# if test x"$PERL" = x; then +# AC_ERROR(["cannot find Perl"]) +# fi +# +# LICENSE +# +# Copyright (c) 2011 Stanislav Sedov +# Copyright (c) 2014 Thomas Klausner +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +#serial 3 + +AC_DEFUN([AX_PERL_EXT],[ + + # + # Check if perl executable exists. + # + AC_PATH_PROGS(PERL, ["${PERL-perl}"], []) + + if test -n "$PERL" ; then + + # + # Check for Perl prefix. + # + AC_ARG_VAR(PERL_EXT_PREFIX, [Perl PREFIX]) + AC_MSG_CHECKING([for Perl prefix]) + if test -z "$PERL_EXT_PREFIX" ; then + [PERL_EXT_PREFIX=`$PERL -MConfig -e 'print $Config{prefix};'`]; + fi + AC_MSG_RESULT([$PERL_EXT_PREFIX]) + AC_SUBST(PERL_EXT_PREFIX) + + # + # Check for Perl extensions include path. + # + AC_ARG_VAR(PERL_EXT_INC, [Directory to include XS headers from]) + AC_MSG_CHECKING([for Perl extension include path]) + if test -z "$PERL_EXT_INC" ; then + [PERL_EXT_INC=`$PERL -MConfig -e 'print $Config{archlibexp}, "/CORE";'`]; + fi + AC_MSG_RESULT([$PERL_EXT_INC]) + AC_SUBST(PERL_EXT_INC) + + # + # Check for the extensions target directory. + # + AC_ARG_VAR(PERL_EXT_LIB, [Directory to install perl files into]) + AC_MSG_CHECKING([for Perl extension target directory]) + if test -z "$PERL_EXT_LIB" ; then + [PERL_EXT_LIB=`$PERL -MConfig -e 'print $Config{sitearch};'`]; + fi + AC_MSG_RESULT([$PERL_EXT_LIB]) + AC_SUBST(PERL_EXT_LIB) + + # + # Check for Perl CPP flags. + # + AC_ARG_VAR(PERL_EXT_CPPFLAGS, [CPPFLAGS to compile perl extensions]) + AC_MSG_CHECKING([for Perl extensions C preprocessor flags]) + if test -z "$PERL_EXT_CPPFLAGS" ; then + [PERL_EXT_CPPFLAGS=`$PERL -MConfig -e 'print $Config{cppflags};'`]; + fi + AC_MSG_RESULT([$PERL_EXT_CPPFLAGS]) + AC_SUBST(PERL_EXT_CPPFLAGS) + + # + # Check for Perl extension link flags. + # + AC_ARG_VAR(PERL_EXT_LDFLAGS, [LDFLAGS to build perl extensions]) + AC_MSG_CHECKING([for Perl extensions linker flags]) + if test -z "$PERL_EXT_LDFLAGS" ; then + [PERL_EXT_LDFLAGS=`$PERL -MConfig -e 'print $Config{lddlflags};'`]; + fi + # Fix LDFLAGS for OS X. We don't want any -arch flags here, otherwise + # linking will fail. Also, OS X Perl LDFLAGS contains "-arch ppc" which + # is not supported by XCode anymore. + case "${host}" in + *darwin*) + PERL_EXT_LDFLAGS=`echo ${PERL_EXT_LDFLAGS} | sed -e "s,-arch [[^ ]]*,,g"` + ;; + esac + AC_MSG_RESULT([$PERL_EXT_LDFLAGS]) + AC_SUBST(PERL_EXT_LDFLAGS) + + # + # Check for Perl dynamic library extension. + # + AC_ARG_VAR(PERL_EXT_DLEXT, [Perl dynamic library extension]) + AC_MSG_CHECKING([for Perl dynamic library extension]) + if test -z "$PERL_EXT_DLEXT" ; then + [PERL_EXT_DLEXT=`$PERL -MConfig -e 'print ".", $Config{'dlext'};'`]; + fi + AC_MSG_RESULT([$PERL_EXT_DLEXT]) + AC_SUBST(PERL_EXT_DLEXT) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_perl_module_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_perl_module_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_perl_module_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_perl_module_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,85 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_perl_module_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PERL_MODULE_VERSION([MODULE VERSION], [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Checks to see if the list of 'Module Version' are available in the +# system. If all the modules in the list are available ACTION-IF-TRUE is +# executed. Case one module is not available ACTION-IF-FALSE is executed +# and the macro execution is aborted. NOTE: Perl is needed. +# +# Example: +# +# AX_PERL_MODULE_VERSION(CGI::Test 0.104 CGI::Ajax 0.694, , +# AC_MSG_ERROR(Need some Perl modules)) +# +# LICENSE +# +# Copyright (c) 2009 Marco Gomes +# Copyright (c) 2009 Ruben Fonseca +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([AC_PERL_MODULE_VERSION], [AX_PERL_MODULE_VERSION]) +AC_DEFUN([AX_PERL_MODULE_VERSION],[dnl +ac_perl_list_modules="$1" +# Make sure we have perl +if test -z "$PERL"; then +AC_CHECK_PROG(PERL,perl,perl) +fi + +# Check the number of arguments +args_num=`echo $ac_perl_list_modules | wc -w` +check_args=$(( $args_num % 2 )) +if test "$check_args" = "1" ; then + AC_MSG_ERROR(syntax error) +else + eval +fi + +if test "x$PERL" != x; then + ac_failed=0 + while test ${#ac_perl_list_modules} -gt 2 ; do + module_name=`echo $ac_perl_list_modules | cut -d " " -f 1` + module_version=`echo $ac_perl_list_modules | cut -d " " -f 2` + ac_perl_list_modules=`echo $ac_perl_list_modules | cut -d " " -f 3-` + AC_MSG_CHECKING(for perl module $module_name version $module_version) + + $PERL "-M$module_name" -e exit > /dev/null 2>&1 + if test $? -ne 0; then + AC_MSG_RESULT(no); + ac_failed=1 + ac_perl_list_modules="" + else + version=`$PERL "-M$module_name" -e 'print $'"$module_name::VERSION" 2>&1` + $PERL -e 'exit(shift cmp shift)' "$version" "$module_version" + if test $? -eq 0 -o $? -eq 1 ; then + AC_MSG_RESULT(ok); + else + AC_MSG_RESULT(no) + ac_failed=1 + ac_perl_list_modules="" + fi + fi; + done + + if test "$ac_failed" = 0; then + : + $2 + else + : + $3 + fi +else + AC_MSG_ERROR(could not find perl) +fi])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pgsql_priv_root.m4 projectm-3.1.0/m4/autoconf-archive/ax_pgsql_priv_root.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pgsql_priv_root.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_pgsql_priv_root.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_pgsql_priv_root.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PGSQL_PRIV_ROOT(DB, USER, [HOST], [PASSWORD], [ACTION_IF_FAILED], [ACTION_IF_OK]) +# +# DESCRIPTION +# +# This macro checks wether the given PostgreSQL user has root privileges +# (can create and drop databases) It is recommended to first call +# AX_CHECK_PGSQL_DB, this makes it easier to locate the cause of error. +# The macro AX_PROG_PGCLIENT is required by this one. +# +# The variable $pgclient_root_call is set for later use in Makefiles, if +# you'd like to make use of this, you must do +# +# AC_SUBST(pgclient_root_call) +# +# after having called AX_CHECK_PGSQL_PRIV_ROOT. You can then do something +# like the following in your Makefile.am: +# +# @pgclient_root_call@ -f file.sql +# +# If you want the user to set the data, you should support something like +# these configure options: +# +# AC_ARG_WITH(pgsql-host, +# [ --with-pgsql-host=HOST server is running on HOST @<:@local socket@:>@], +# [pg_host=$withval], [pg_host=]) +# +# AC_ARG_WITH(pgsql-db, +# [ --with-pgsql-db=DBNAME use database DBNAME @<:@test@:>@], +# [pg_db=$withval], [pg_db=test]) +# +# AC_ARG_WITH(pgsql-root-user, +# [ --with-pgsql-root-user=USER use user USER, must have root (all) privileges @<:@postgres@:>@], +# [pg_root_user=$withval], [pg_root_user=postgres]) +# +# AC_ARG_WITH(pgsql-password, +# [ --with-pgsql-password=PASSWORD use password PASSWORD @<:@none@:>@], +# [pg_password=$withval], [pg_password=""]) +# +# You can then call the macro like this: +# +# AX_CHECK_PGSQL_PRIV_ROOT([$pg_db], [$pg_root_user], [$pg_host], [$pg_password], [AC_MSG_ERROR([We need root privileges on database!])]) +# +# LICENSE +# +# Copyright (c) 2008 Moritz Sinn +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([AX_CHECK_PGSQL_PRIV_ROOT], [ +AC_REQUIRE([AX_PROG_PGCLIENT])dnl +AC_REQUIRE([AX_CHECK_PGSQL_DB])dnl +AC_MSG_CHECKING([if PostgreSQL user $2 has root privileges]) + +pgclient_root_call="$pgclient" + +if test "x$1" != "x"; then + pgclient_root_call="$pgclient_root_call dbname=$1"; +fi +if test "x$2" != "x"; then + pgclient_root_call="$pgclient_root_call user=$2"; +fi +if test "x$3" != "x"; then + pgclient_root_call="$pgclient_root_call host=$3"; +fi +if test "x$4" != "x"; then + pgclient_root_call="$pgclient_root_call password=$4"; +fi + +testdb="test`date +%s`" +echo "CREATE DATABASE $testdb; DROP DATABASE $testdb;" | $pgclient_root_call > /dev/null 2>&1 +if test "x$?" = "x0"; then + AC_MSG_RESULT([yes]) + $6 +else + AC_MSG_RESULT([no]) + $5 +fi; +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pkg_check_modules.m4 projectm-3.1.0/m4/autoconf-archive/ax_pkg_check_modules.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pkg_check_modules.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_pkg_check_modules.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_pkg_check_modules.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PKG_CHECK_MODULES(PREFIX, PUBLIC-MODULES, PRIVATE-MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], [PUBLIC-VARIABLE], [PRIVATE-VARIABLE]) +# +# DESCRIPTION +# +# A wrapper around PKG_CHECK_MODULES which splits the list of modules into +# public and private dependencies, and produces two variables listing the +# dependencies across all invocations of AX_PKG_CHECK_MODULES. These two +# variables are exposed via AC_SUBST, and should be used in a pkg-config +# file as the substituted values for Requires and Requires.private. +# +# The PREFIX, PUBLIC-MODULES and PRIVATE-MODULES arguments should be +# specified as for PKG_CHECK_MODULES, with the concatenation of +# PUBLIC-MODULES and PRIVATE-MODULES equaling the LIST-OF-MODULES from +# PKG_CHECK_MODULES. The ACTION-IF-FOUND and ACTION-IF-NOT-FOUND +# arguments are optional, and should also be specified as for +# PKG_CHECK_MODULES. ACTION-IF-FOUND is evaluated if the full +# LIST-OF-MODULES is found; ACTION-IF-NOT-FOUND similarly. +# +# PUBLIC-VARIABLE defaults to AX_PACKAGE_REQUIRES, and PRIVATE-VARIABLE +# defaults to AX_PACKAGE_REQUIRES_PRIVATE. Both variables are AC_SUBST-ed +# by this macro. +# +# For example: +# +# AX_PKG_CHECK_MODULES([GLIB],[glib-2.0 gio-2.0],[gthread-2.0]) +# AX_PKG_CHECK_MODULES([DBUS],[],[dbus-glib-1 >= 0.98 dbus-1]) +# +# results in the substitutions: +# +# AX_PACKAGE_REQUIRES="glib-2.0 gio-2.0" +# AX_PACKAGE_REQUIRES_PRIVATE="gthread-2.0 dbus-glib-1 >= 0.98 dbus-1" +# +# and can be used with a template pkg-config file (.pc.in) using: +# +# Requires: @AX_PACKAGE_REQUIRES@ +# Requires.private: @AX_PACKAGE_REQUIRES_PRIVATE@ +# +# LICENSE +# +# Copyright (c) 2014 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_PKG_CHECK_MODULES],[ + m4_define([ax_package_requires], + [m4_default_quoted([$6],[AX_PACKAGE_REQUIRES])]) + m4_define([ax_package_requires_private], + [m4_default_quoted([$7],[AX_PACKAGE_REQUIRES_PRIVATE])]) + + ax_package_requires="$[]ax_package_requires m4_normalize($2)" + ax_package_requires_private="$[]ax_package_requires_private m4_normalize($3)" + + PKG_CHECK_MODULES([$1],[$2 $3],[$4],[$5]) + + # Substitute output. + AC_SUBST(ax_package_requires) + AC_SUBST(ax_package_requires_private) +])dnl AX_PKG_CHECK_MODULES diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pkg_mico.m4 projectm-3.1.0/m4/autoconf-archive/ax_pkg_mico.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pkg_mico.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_pkg_mico.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,219 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_pkg_mico.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PKG_MICO([X.X.X optional required]) +# +# DESCRIPTION +# +# This macro searches for a MICO installation on your system. MICO (Mico +# Is COrba) installs the file 'mico-setup.sh' under MICO_INSTALL_BASE/lib, +# where MICO_INSTALL_BASE is probably /usr/local or /usr. If nothing was +# specified when calling configure or just --with-mico, it searches in +# $prefix/lib:/usr/local/lib:/usr/lib The argument of s--with-mico +# specifies the full pathname of the mico-setup.sh file. For instance +# --with-mico=/usr/local/mico-2.2.6/lib/mico-setup.sh. +# +# If the version argument is given (e.g. 2.2.6), AX_PKG_MICO checks that +# the mico package is this version number or higher. +# +# The other optional argument to AX_PKG_MICO are 'optional' and +# 'required'. by default, placing AX_PKG_MICO in your configure.in does +# not enforce using mico, if it is not found on the system. If MICO +# existence is critical for the building of your package, then you +# probably want to specify something like "AX_PKG_MICO(2.2.6 required)". +# Then, even if the --with-mico was not specified on the command line of +# the configure script, an error will be raised if mico was not found. +# +# If the mico package is not found, abort configuration with error +# message. +# +# It defines the symbol MICOSETUP, MICOVERSION, MICOSHAREDDIR +# MICO_INCLUDE, MICO_LIB and MICO_CXX if mico is found. In addition, the +# mico script mico-c++ (set in (MICO_CXX) is scaned for a string match +# "-I.*ministl" and if foundMICO_USE_MINISTL is set to 1, otherwise to 0. +# +# Example of use of these variables in your Makefile.in: +# +# INCLUDES += @MICO_INCLUDE@ +# LDFLAGS += @MICO_LIB@ +# +# LICENSE +# +# Copyright (c) 2008 Tal Shalif +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_PKG_MICO], [AX_PKG_MICO]) +AC_DEFUN([AX_PKG_MICO], +[ +# +# first parse the argument given in configure.in to AX_PKG_MICO +# +MICO_REQUEST_VERSION= +MICO_URGENCY="optional" + +changequote(<<, >>) + +for a in $1 $2 $3 $4 $5 $6 $7 $8 $9 x; do + case "$a" in + x) break;; + [0-9]*.[0-9]*.[0-9]*) MICO_REQUEST_VERSION="$a";; + optional|required) MICO_URGENCY="$a";; + *) argerror="argument to the PKG_MICO macro must be one of 'X.X.X' 'required' or 'optional'";; + esac +done + +changequote([, ]) + +if test -n "$argerror"; then + AC_MSG_ERROR($argerror) +fi; + +AC_MSG_CHECKING(if mico is wanted) +AC_ARG_WITH(mico, + [ --with-mico=PATH absolute path name of mico's configuration file 'mico-setup.sh' (default is to search in \$prefix/lib:/usr/local/lib:/usr/lib), + --without-mico to disable mico detection], + [ + # + # Run this if -with or -without was specified + # + case "$withval" in + yes) MICO_URGENCY=required;; + no) if test x$MICO_URGENCY = xrequired; then + AC_MSG_ERROR("PKG_MICO was configured with the 'required' option. You cannot override it from the command line") + fi; + ;; + *) MICO_URGENCY=required; MICOSETUP="$withval" ;; + esac + + ],[]) + +AC_MSG_RESULT($MICO_URGENCY) + +# +# Now we know if we want mico or not, only go further if +# it's wanted. +# +if test x$MICO_URGENCY = xrequired -o x$MICO_URGENCY = xoptional; then + # + # If not specified by caller, search in standard places + # + if test -z "$MICOSETUP" ; then + AC_PATH_PROG(MICOSETUP, mico-setup.sh, , $prefix/lib:/usr/local/lib:/usr/lib) + fi + if test -z "$MICOSETUP" ; then + if test x$MICO_URGENCY = xrequired ; then + AC_MSG_ERROR("mico setup file mico-setup.sh not found") + else + AC_MSG_RESULT("mico setup file mico-setup.sh not found") + fi + else + # source mico-setup.sh + # Collect mico version number. + # But be carefull - mico-setup.sh + # unsets prefix and exec_prefix so save them first + sh -c ". $MICOSETUP; echo MICOVERSION=\${MICOVERSION}; echo MICOSHAREDDIR=\${MICOSHAREDDIR}; echo MICODIR=\${MICODIR}" > conftest.mico-setup + + eval `cat conftest.mico-setup` + + if test -z "$MICOVERSION" ; then + AC_MSG_ERROR("panic: could not read the MICOVERSION variable"); + fi + # + # Check that mico version matches requested version or above + # + if test -n "$MICO_REQUEST_VERSION" ; then + changequote(<<, >>)dnl + MICO_MAJOR=`expr $MICOVERSION : '\([0-9]*\)\.[0-9]*\.[0-9]*'` + MICO_MINOR=`expr $MICOVERSION : '[0-9]*\.\([0-9]*\)\.[0-9]*'` + MICO_RELEASE=`expr $MICOVERSION : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + MICO_REQUEST_MAJOR=`expr $MICO_REQUEST_VERSION : '\([0-9]*\)\.[0-9]*\.[0-9]*'` + MICO_REQUEST_MINOR=`expr $MICO_REQUEST_VERSION : '[0-9]*\.\([0-9]*\)\.[0-9]*'` + MICO_REQUEST_RELEASE=`expr $MICO_REQUEST_VERSION : '[0-9]*\.[0-9]*\.\([0-9]*\)'` + changequote([, ])dnl + + AC_MSG_CHECKING(mico version >= $MICO_REQUEST_VERSION) + + version_ok=yes + for verpair in "$MICO_MAJOR:$MICO_REQUEST_MAJOR" "$MICO_MINOR:$MICO_REQUEST_MINOR" "$MICO_RELEASE:$MICO_REQUEST_RELEASE"; do + if eval "test `echo $verpair | sed 's,:, -gt ,'`"; then + break + fi + if eval "test `echo $verpair | sed 's,:, -lt ,'`"; then + version_ok=no + break + fi + done + if test x$version_ok = xno; then + AC_MSG_RESULT(no) + AC_MSG_ERROR(mico version is $MICOVERSION) + else + AC_MSG_RESULT(yes) + fi + fi + # + # look for mico-c++ and scan it for a string match + # to "-I*ministl" + # + AC_PATH_PROG(MICO_CXX, mico-c++, , ${MICODIR}/bin:${MICOSHAREDDIR}/bin) + if test -z "$MICO_CXX"; then + AC_MSG_ERROR("panic: cannot locate and scan the mico script mico-c++") + fi + + AC_MSG_CHECKING(if mico was compiled using ministl) + + if test -z "`grep '\-I.*ministl' $MICO_CXX`"; then + MICO_USE_MINISTL=0 + AC_MSG_RESULT(no) + else + MICO_USE_MINISTL=1 + AC_MSG_RESULT(yes) + fi + # + # look for mico-ld and scan it for -l* libraries + # needed to link with mico + # + AC_PATH_PROG(MICO_LD, mico-ld, , ${MICODIR}/bin:${MICOSHAREDDIR}/bin) + + if test -z "$MICO_LD"; then + AC_MSG_ERROR("panic: cannot locate and scan the mico script mico-ld") + fi + + AC_MSG_CHECKING(mico dependencies) + + micodeps= + for item in `grep -- -l $MICO_LD | tr '"' ' '` ; do + case $item in + -l*) micodeps="$micodeps $item" ;; + esac + done + + if test -z "$micodeps" ;then + AC_MSG_RESULT(none) + else + AC_MSG_RESULT($micodeps) + fi + + AC_MSG_CHECKING(how to link with the mico library) + MICO_LIB="-L${MICODIR}/lib -lmico${MICOVERSION} $micodeps" + AC_MSG_RESULT($MICO_LIB) + + MICO_INCLUDE="-I${MICOSHAREDDIR}/include" + + AC_SUBST(MICODIR) + AC_SUBST(MICOVERSION) + AC_SUBST(MICOSHAREDDIR) + AC_SUBST(MICO_INCLUDE) + AC_SUBST(MICO_LIB) + AC_SUBST(MICO_USE_MINISTL) + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pkg_swig.m4 projectm-3.1.0/m4/autoconf-archive/ax_pkg_swig.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pkg_swig.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_pkg_swig.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,135 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found]) +# +# DESCRIPTION +# +# This macro searches for a SWIG installation on your system. If found, +# then SWIG is AC_SUBST'd; if not found, then $SWIG is empty. If SWIG is +# found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd. +# +# You can use the optional first argument to check if the version of the +# available SWIG is greater than or equal to the value of the argument. It +# should have the format: N[.N[.N]] (N is a number between 0 and 999. Only +# the first N is mandatory.) If the version argument is given (e.g. +# 1.3.17), AX_PKG_SWIG checks that the swig package is this version number +# or higher. +# +# As usual, action-if-found is executed if SWIG is found, otherwise +# action-if-not-found is executed. +# +# In configure.in, use as: +# +# AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ]) +# AX_SWIG_ENABLE_CXX +# AX_SWIG_MULTI_MODULE_SUPPORT +# AX_SWIG_PYTHON +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# Copyright (c) 2011 Murray Cumming +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 13 + +AC_DEFUN([AX_PKG_SWIG],[ + # Find path to the "swig" executable. + AC_PATH_PROGS([SWIG],[swig swig3.0 swig2.0]) + if test -z "$SWIG" ; then + m4_ifval([$3],[$3],[:]) + elif test -n "$1" ; then + AC_MSG_CHECKING([SWIG version]) + [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] + AC_MSG_RESULT([$swig_version]) + if test -n "$swig_version" ; then + # Calculate the required version number components + [required=$1] + [required_major=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_major" ; then + [required_major=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_minor=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_minor" ; then + [required_minor=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_patch=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_patch" ; then + [required_patch=0] + fi + # Calculate the available version number components + [available=$swig_version] + [available_major=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_major" ; then + [available_major=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_minor=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_minor" ; then + [available_minor=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_patch=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_patch" ; then + [available_patch=0] + fi + # Convert the version tuple into a single number for easier comparison. + # Using base 100 should be safe since SWIG internally uses BCD values + # to encode its version number. + required_swig_vernum=`expr $required_major \* 10000 \ + \+ $required_minor \* 100 \+ $required_patch` + available_swig_vernum=`expr $available_major \* 10000 \ + \+ $available_minor \* 100 \+ $available_patch` + + if test $available_swig_vernum -lt $required_swig_vernum; then + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version.]) + SWIG='' + m4_ifval([$3],[$3],[]) + else + AC_MSG_CHECKING([for SWIG library]) + SWIG_LIB=`$SWIG -swiglib` + AC_MSG_RESULT([$SWIG_LIB]) + m4_ifval([$2],[$2],[]) + fi + else + AC_MSG_WARN([cannot determine SWIG version]) + SWIG='' + m4_ifval([$3],[$3],[]) + fi + fi + AC_SUBST([SWIG_LIB]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prefix_config_h.m4 projectm-3.1.0/m4/autoconf-archive/ax_prefix_config_h.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prefix_config_h.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prefix_config_h.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,203 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prefix_config_h.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PREFIX_CONFIG_H [(OUTPUT-HEADER [,PREFIX [,ORIG-HEADER]])] +# +# DESCRIPTION +# +# Generate an installable config.h. +# +# A package should not normally install its config.h as a system header, +# but if it must, this macro can be used to avoid namespace pollution by +# making a copy of config.h with a prefix added to all the macro names. +# +# Each "#define SOMEDEF" line of the configuration header has the given +# prefix added, in the same case as the first character of the macro name. +# +# Defaults: +# +# OUTPUT-HEADER = $PACKAGE-config.h +# PREFIX = $PACKAGE +# ORIG-HEADER, from AM_CONFIG_HEADER(config.h) +# +# Your configure.ac script should contain both macros in this order. +# +# Example: +# +# AC_INIT(config.h.in) # config.h.in as created by "autoheader" +# AM_INIT_AUTOMAKE(testpkg, 0.1.1) # makes #undef VERSION and PACKAGE +# AM_CONFIG_HEADER(config.h) # prep config.h from config.h.in +# AX_PREFIX_CONFIG_H(mylib/_config.h) # prep mylib/_config.h from it.. +# AC_MEMORY_H # makes "#undef NEED_MEMORY_H" +# AC_C_CONST_H # makes "#undef const" +# AC_OUTPUT(Makefile) # creates the "config.h" now +# # and also mylib/_config.h +# +# If the argument to AX_PREFIX_CONFIG_H would have been omitted then the +# default output file would have been called simply "testpkg-config.h", +# but even under the name "mylib/_config.h" it contains prefix-defines +# like +# +# #ifndef TESTPKG_VERSION +# #define TESTPKG_VERSION "0.1.1" +# #endif +# #ifndef TESTPKG_NEED_MEMORY_H +# #define TESTPKG_NEED_MEMORY_H 1 +# #endif +# #ifndef _testpkg_const +# #define _testpkg_const _const +# #endif +# +# and this "mylib/_config.h" can be installed along with other header +# files, which is most convenient when creating a shared library (that has +# some headers) whose functionality depends on features detected at +# compile-time. No need to invent some "mylib-confdefs.h.in" manually. +# +# Note that some AC_DEFINEs that end up in the config.h file are actually +# self-referential - e.g. AC_C_INLINE, AC_C_CONST, and the AC_TYPE_OFF_T +# say that they "will define inline|const|off_t if the system does not do +# it by itself". You might want to clean up about these - consider an +# extra mylib/conf.h that reads something like: +# +# #include +# #ifndef _testpkg_const +# #define _testpkg_const const +# #endif +# +# and then start using _testpkg_const in the header files. That is also a +# good thing to differentiate whether some library-user has starting to +# take up with a different compiler, so perhaps it could read something +# like this: +# +# #ifdef _MSC_VER +# #include +# #else +# #include +# #endif +# #ifndef _testpkg_const +# #define _testpkg_const const +# #endif +# +# LICENSE +# +# Copyright (c) 2014 Reuben Thomas +# Copyright (c) 2008 Guido U. Draheim +# Copyright (c) 2008 Marten Svantesson +# Copyright (c) 2008 Gerald Point +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 16 + +AC_DEFUN([AX_PREFIX_CONFIG_H],[dnl +AC_PREREQ([2.62]) +AC_BEFORE([AC_CONFIG_HEADERS],[$0])dnl +AC_CONFIG_COMMANDS(m4_default([$1], [$PACKAGE-config.h]),[dnl +AS_VAR_PUSHDEF([_OUT],[ac_prefix_conf_OUT])dnl +AS_VAR_PUSHDEF([_DEF],[ac_prefix_conf_DEF])dnl +AS_VAR_PUSHDEF([_PKG],[ac_prefix_conf_PKG])dnl +AS_VAR_PUSHDEF([_LOW],[ac_prefix_conf_LOW])dnl +AS_VAR_PUSHDEF([_UPP],[ac_prefix_conf_UPP])dnl +AS_VAR_PUSHDEF([_INP],[ac_prefix_conf_INP])dnl +m4_pushdef([_script],[conftest.prefix])dnl +m4_pushdef([_symbol],[m4_cr_Letters[]m4_cr_digits[]_])dnl +_OUT=`echo m4_default([$1], [$PACKAGE-config.h])` +_DEF=`echo _$_OUT | sed -e "y:m4_cr_letters:m4_cr_LETTERS[]:" -e "s/@<:@^m4_cr_Letters@:>@/_/g"` +_PKG=`echo m4_default([$2], [$PACKAGE])` +_LOW=`echo _$_PKG | sed -e "y:m4_cr_LETTERS-:m4_cr_letters[]_:"` +_UPP=`echo $_PKG | sed -e "y:m4_cr_letters-:m4_cr_LETTERS[]_:" -e "/^@<:@m4_cr_digits@:>@/s/^/_/"` +_INP=`echo "$3" | sed -e 's/ *//'` +if test ".$_INP" = "."; then + for ac_file in : $CONFIG_HEADERS; do test "_$ac_file" = _: && continue + case "$ac_file" in + *.h) _INP=$ac_file ;; + *) + esac + test ".$_INP" != "." && break + done +fi +if test ".$_INP" = "."; then + case "$_OUT" in + */*) _INP=`basename "$_OUT"` + ;; + *-*) _INP=`echo "$_OUT" | sed -e "s/@<:@_symbol@:>@*-//"` + ;; + *) _INP=config.h + ;; + esac +fi +if test -z "$_PKG" ; then + AC_MSG_ERROR([no prefix for _PREFIX_PKG_CONFIG_H]) +else + if test ! -f "$_INP" ; then if test -f "$srcdir/$_INP" ; then + _INP="$srcdir/$_INP" + fi fi + AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines) + if test -f $_INP ; then + AS_ECHO(["s/^@%:@undef *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/"]) > _script + AS_ECHO(["s/^@%:@undef *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/"]) >> _script + AS_ECHO(["s/^@%:@def[]ine *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1\\"]) >> _script + AS_ECHO(["@%:@def[]ine $_UPP""_\\1\\2\\"]) >> _script + AS_ECHO(["@%:@endif/"]) >> _script + AS_ECHO(["s/^@%:@def[]ine *\\(@<:@m4_cr_letters@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_LOW""_\\1\\"]) >> _script + AS_ECHO(["@%:@define $_LOW""_\\1\\2\\"]) >> _script + AS_ECHO(["@%:@endif/"]) >> _script + # now executing _script on _DEF input to create _OUT output file + echo "@%:@ifndef $_DEF" >$tmp/pconfig.h + echo "@%:@def[]ine $_DEF 1" >>$tmp/pconfig.h + echo ' ' >>$tmp/pconfig.h + echo /'*' $_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h + + sed -f _script $_INP >>$tmp/pconfig.h + echo ' ' >>$tmp/pconfig.h + echo '/* once:' $_DEF '*/' >>$tmp/pconfig.h + echo "@%:@endif" >>$tmp/pconfig.h + if cmp -s $_OUT $tmp/pconfig.h 2>/dev/null; then + AC_MSG_NOTICE([$_OUT is unchanged]) + else + ac_dir=`AS_DIRNAME(["$_OUT"])` + AS_MKDIR_P(["$ac_dir"]) + rm -f "$_OUT" + mv $tmp/pconfig.h "$_OUT" + fi + else + AC_MSG_ERROR([input file $_INP does not exist - skip generating $_OUT]) + fi + rm -f conftest.* +fi +m4_popdef([_symbol])dnl +m4_popdef([_script])dnl +AS_VAR_POPDEF([_INP])dnl +AS_VAR_POPDEF([_UPP])dnl +AS_VAR_POPDEF([_LOW])dnl +AS_VAR_POPDEF([_PKG])dnl +AS_VAR_POPDEF([_DEF])dnl +AS_VAR_POPDEF([_OUT])dnl +],[PACKAGE="$PACKAGE"])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_printf_size_t.m4 projectm-3.1.0/m4/autoconf-archive/ax_printf_size_t.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_printf_size_t.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_printf_size_t.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,92 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_printf_size_t.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PRINTF_SIZE_T +# +# DESCRIPTION +# +# Check for the appropriate printf() format string modifier to use with a +# size_t argument. If a suitable modifier is found, it is AC_DEFINE'd as +# PRI_SIZE_T_MODIFIER, and can be used in C code as e.g. +# +# printf("Size = %" PRI_SIZE_T_MODIFIER "u bytes.\n", sizeof(foo)); +# +# If you use the PRIxNN macros from ISO C99's , you may wish +# to define a supplemental set of macros along similar lines: +# +# #define PRIdSIZE PRI_SIZE_T_MODIFIER "d" +# #define PRIiSIZE PRI_SIZE_T_MODIFIER "i" +# #define PRIoSIZE PRI_SIZE_T_MODIFIER "o" +# #define PRIuSIZE PRI_SIZE_T_MODIFIER "u" +# #define PRIxSIZE PRI_SIZE_T_MODIFIER "x" +# #define PRIXSIZE PRI_SIZE_T_MODIFIER "X" +# +# Note: This macro invokes a test program to check whether a given format +# modifier is understood by the system's sprintf() function. If the user +# is cross-compiling, then this check cannot be performed, and thereby +# PRI_SIZE_T_MODIFIER will remain undefined. +# +# LICENSE +# +# Copyright (c) 2012 Daniel Richard G. +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_PRINTF_SIZE_T], [ + +AC_MSG_CHECKING([for printf() modifier to use with size_t]) +AC_LANG_PUSH([C]) + +save_CFLAGS="$CFLAGS" +if test "_$GCC" = _yes +then + # Take advantage of GCC's format-string checking + CFLAGS="$CFLAGS -Wformat -pedantic -Werror" +fi + +result=unknown + +for mod in z l "" ll +do + AC_RUN_IFELSE([AC_LANG_SOURCE([[#include +int main(void) +{ + char buf[64]; + sprintf(buf, "%]${mod}[u", sizeof(buf)); + if (buf[0] == '6' && buf[1] == '4' && buf[2] == '\0') + return 0; + return 1; +}]])], + [result="\"$mod\""; break], + [], + [result=cross-compile; break]) +done + +CFLAGS="$save_CFLAGS" + +AC_LANG_POP +AC_MSG_RESULT([$result]) + +case "$result" in + cross-compile) + AC_MSG_WARN([cannot test printf() compatibility when cross-compiling]) + ;; + + unknown) + AC_MSG_ERROR([cannot find a suitable modifier]) + ;; + + *) + AC_DEFINE_UNQUOTED([PRI_SIZE_T_MODIFIER], [$result], [Define to the printf() modifier to use with size_t.]) + ;; +esac + +])dnl AX_PRINTF_SIZE_T diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_print_to_file.m4 projectm-3.1.0/m4/autoconf-archive/ax_print_to_file.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_print_to_file.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_print_to_file.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,27 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_print_to_file.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PRINT_TO_FILE([FILE],[DATA]) +# +# DESCRIPTION +# +# Writes the specified data to the specified file. +# +# LICENSE +# +# Copyright (c) 2008 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_PRINT_TO_FILE],[ +AC_REQUIRE([AX_FILE_ESCAPES]) +printf "$2" > "$1" +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_apache.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_apache.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_apache.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_apache.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,169 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_apache.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_APACHE([version]) +# +# DESCRIPTION +# +# This macro searches for an installed apache server. If nothing was +# specified when calling configure or just --with-apache, it searches in +# /usr/local/apache/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin +# The argument of --with-apache specifies the full pathname of the httpd +# argument. For instance --with-apache=/usr/sbin/httpd. +# +# If the version argument is given, AX_PROG_APACHE checks that the apache +# server is this version number or higher. +# +# If the apache server is not found, abort configuration with error +# message. +# +# It defines the symbol APACHE if the server is found. +# +# Files using apache should do the following: +# +# @APACHE@ -d /etc/httpd +# +# It defines the symbol APACHE_MODULES if a directory containing mod_env.* +# is found in the default server root directory (obtained with httpd -V). +# +# The httpd.conf file listing modules to be loaded dynamically can use +# @APACHE_MODULES@ to grab them in the appropriate sub directory. For +# instance: +# +# ... +# +# LoadModule env_module @APACHE_MODULES@/mod_env.so +# LoadModule config_log_module @APACHE_MODULES@/mod_log_config.so +# ... +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_PROG_APACHE], [AX_PROG_APACHE]) +AC_DEFUN([AX_PROG_APACHE], +# +# Handle user hints +# +[ + AC_MSG_CHECKING(if apache is wanted) + AC_ARG_WITH(apache, + [ --with-apache=PATH absolute path name of apache server (default is to search httpd in + /usr/local/apache/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin), + --without-apache to disable apache detection], + [ + # + # Run this if -with or -without was specified + # + if test "$withval" != no ; then + AC_MSG_RESULT(yes) + APACHE_WANTED=yes + if test "$withval" != yes ; then + APACHE="$withval" + fi + else + APACHE_WANTED=no + AC_MSG_RESULT(no) + fi + ], [ + # + # Run this if nothing was said + # + APACHE_WANTED=yes + AC_MSG_RESULT(yes) + ]) + # + # Now we know if we want apache or not, only go further if + # it's wanted. + # + if test $APACHE_WANTED = yes ; then + # + # If not specified by caller, search in standard places + # + if test -z "$APACHE" ; then + AC_PATH_PROG(APACHE, httpd, , /usr/local/apache/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin) + fi + AC_SUBST(APACHE) + if test -z "$APACHE" ; then + AC_MSG_ERROR("apache server executable not found"); + fi + # + # Collect apache version number. If for nothing else, this + # guaranties that httpd is a working apache executable. + # + changequote(<<, >>)dnl + APACHE_READABLE_VERSION=`$APACHE -v | grep 'Server version' | sed -e 's;.*Apache/\([0-9\.][0-9\.]*\).*;\1;'` + changequote([, ])dnl + APACHE_VERSION=`echo $APACHE_READABLE_VERSION | sed -e 's/\.//g'` + if test -z "$APACHE_VERSION" ; then + AC_MSG_ERROR("could not determine apache version number"); + fi + APACHE_MAJOR=`expr $APACHE_VERSION : '\(..\)'` + APACHE_MINOR=`expr $APACHE_VERSION : '..\(.*\)'` + # + # Check that apache version matches requested version or above + # + if test -n "$1" ; then + AC_MSG_CHECKING(apache version >= $1) + APACHE_REQUEST=`echo $1 | sed -e 's/\.//g'` + APACHE_REQUEST_MAJOR=`expr $APACHE_REQUEST : '\(..\)'` + APACHE_REQUEST_MINOR=`expr $APACHE_REQUEST : '..\(.*\)'` + if test "$APACHE_MAJOR" -lt "$APACHE_REQUEST_MAJOR" -o "$APACHE_MINOR" -lt "$APACHE_REQUEST_MINOR" ; then + AC_MSG_RESULT(no) + AC_MSG_ERROR(apache version is $APACHE_READABLE_VERSION) + else + AC_MSG_RESULT(yes) + fi + fi + # + # Find out if .so modules are in libexec/module.so or modules/module.so + # + HTTP_ROOT=`$APACHE -V | grep HTTPD_ROOT | sed -e 's/.*"\(.*\)"/\1/'` + AC_MSG_CHECKING(apache modules) + for dir in libexec modules + do + if test -f $HTTP_ROOT/$dir/mod_env.* + then + APACHE_MODULES=$dir + fi + done + if test -z "$APACHE_MODULES" + then + AC_MSG_RESULT(not found) + else + AC_MSG_RESULT(in $HTTP_ROOT/$APACHE_MODULES) + fi + AC_SUBST(APACHE_MODULES) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_bison.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_bison.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_bison.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_bison.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_bison.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_BISON(ACTION-IF-TRUE,ACTION-IF-FALSE) +# +# DESCRIPTION +# +# Check whether bison is the parser generator. Run ACTION-IF-TRUE if +# successful, ACTION-IF-FALSE otherwise +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# Copyright (c) 2010 Diego Elio Petteno` +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_BISON], [ + AC_REQUIRE([AC_PROG_YACC]) + AC_REQUIRE([AC_PROG_EGREP]) + + AC_CACHE_CHECK([if bison is the parser generator],[ax_cv_prog_bison],[ + AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '], + [ax_cv_prog_bison=yes], [ax_cv_prog_bison=no]) + ]) + AS_IF([test "$ax_cv_prog_bison" = "yes"], [ + dnl replace the yacc-compatible compiler with the real bison, as + dnl otherwise autoconf limits us to the POSIX yacc. + dnl We also change the generated filename to the old one, so that + dnl automake's ylwrap can deal with it. + YACC="${YACC% -y} -o y.tab.c" + ] m4_ifnblank([$1], [[$1]]), + m4_ifnblank([$2], [[$2]]) + ) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_bison_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_bison_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_bison_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_bison_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_bison_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_BISON_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that bison version is greater or equal to the version +# indicated. If true the shell commands in ACTION-IF-TRUE are executed. If +# not the shell commands in commands in ACTION-IF-TRUE are executed. If +# not the shell commands in ACTION-IF-FALSE are run. Note if $BISON is not +# set (for example by running AC_CHECK_PROG or AC_PATH_PROG) the macro +# will fail. +# +# Example: +# +# AC_PATH_PROG([BISON],[bison]) +# AX_PROG_BISON_VERSION([3.0.2],[ ... ],[ ... ]) +# +# This will check to make sure that the bison you have is at least version +# 3.0.2 or greater. +# +# NOTE: This macro uses the $BISON variable to perform the check. +# +# LICENSE +# +# Copyright (c) 2015 Jonathan Rajotte-Julien +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_PROG_BISON_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$BISON"],[ + ax_bison_version="$1" + + AC_MSG_CHECKING([for bison version]) + changequote(<<,>>) + bison_version=`$BISON --version 2>&1 \ + | $SED -n -e '/bison (GNU Bison)/b inspect +b +: inspect +s/.* (\{0,1\}\([0-9]*\.[0-9]*\.[0-9]*\))\{0,1\}.*/\1/;p'` + changequote([,]) + AC_MSG_RESULT($bison_version) + + AC_SUBST([BISON_VERSION],[$bison_version]) + + AX_COMPARE_VERSION([$bison_version],[ge],[$ax_bison_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find bison]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cc_char_subscripts.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_cc_char_subscripts.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cc_char_subscripts.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_cc_char_subscripts.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,121 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_char_subscripts.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_PROG_CC_CHAR_SUBSCRIPTS(substvar [,hard]) +# +# DESCRIPTION +# +# Try to find a compiler option that enables usage of char-type to index a +# value-field. This one needs unsigned-chars and it must suppress warnings +# about usage of chars for subscripting. for gcc -funsigned-char +# -Wno-char-subscripts +# +# Currently this macro knows about GCC. hopefully will evolve to use: +# Solaris C compiler, Digital Unix C compiler, C for AIX Compiler, HP-UX C +# compiler, and IRIX C compiler. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AU_ALIAS([AC_PROG_CC_CHAR_SUBSCRIPTS], [AX_PROG_CC_CHAR_SUBSCRIPTS]) +AC_DEFUN([AX_PROG_CC_CHAR_SUBSCRIPTS], [ + pushdef([CV],ac_cv_prog_cc_char_subscripts)dnl + hard=$2 + if test -z "$hard"; then + msg="C to enable char subscripts" + else + msg="C to ensure char subscripts" + fi + AC_CACHE_CHECK($msg, CV, [ + cat > conftest.c <&1`" ; then + CV="suppressed: did not work" + fi + + dnl Solaris C compiler + # Solaris sunpro has no option for unsignedchar but + # signedchar is the default for char. Duhh. + + dnl HP-UX C compiler + + dnl Digital Unix C compiler + elif ! $CC > /dev/null 2>&1 && + $CC -c -unsigned conftest.c > /dev/null 2>&1 && + test -f conftest.o + then + # char : unsigned char + CV="-unsigned" + + rm conftest.o + if test -n "`${CC-cc} -c $CV conftest.c 2>&1`" ; then + CV="suppressed: did not work" + fi + + dnl C for AIX Compiler + + dnl IRIX C compiler + # char is unsigned by default for IRIX C. + + fi + rm -f conftest.* + ]) + if test -z "[$]$1" ; then + if test -n "$CV" ; then + case "$CV" in + suppressed*) $1="" ;; # known but suppressed + *) $1="$CV" ;; + esac + fi + fi + AC_SUBST($1) + popdef([CV])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cc_for_build.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_cc_for_build.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cc_for_build.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_cc_for_build.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,125 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CC_FOR_BUILD +# +# DESCRIPTION +# +# This macro searches for a C compiler that generates native executables, +# that is a C compiler that surely is not a cross-compiler. This can be +# useful if you have to generate source code at compile-time like for +# example GCC does. +# +# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything +# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). +# The value of these variables can be overridden by the user by specifying +# a compiler with an environment variable (like you do for standard CC). +# +# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object +# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if +# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are +# substituted in the Makefile. +# +# LICENSE +# +# Copyright (c) 2008 Paolo Bonzini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) +AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_CPP])dnl +AC_REQUIRE([AC_EXEEXT])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl + +dnl Use the standard macros, but make them use other variable names +dnl +pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl +pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl +pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl +pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl +pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl +pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl +pushdef([ac_cv_objext], ac_cv_build_objext)dnl +pushdef([ac_exeext], ac_build_exeext)dnl +pushdef([ac_objext], ac_build_objext)dnl +pushdef([CC], CC_FOR_BUILD)dnl +pushdef([CPP], CPP_FOR_BUILD)dnl +pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl +pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl +pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl +pushdef([host], build)dnl +pushdef([host_alias], build_alias)dnl +pushdef([host_cpu], build_cpu)dnl +pushdef([host_vendor], build_vendor)dnl +pushdef([host_os], build_os)dnl +pushdef([ac_cv_host], ac_cv_build)dnl +pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl +pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl +pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl +pushdef([ac_cv_host_os], ac_cv_build_os)dnl +pushdef([ac_cpp], ac_build_cpp)dnl +pushdef([ac_compile], ac_build_compile)dnl +pushdef([ac_link], ac_build_link)dnl + +save_cross_compiling=$cross_compiling +save_ac_tool_prefix=$ac_tool_prefix +cross_compiling=no +ac_tool_prefix= + +AC_PROG_CC +AC_PROG_CPP +AC_EXEEXT + +ac_tool_prefix=$save_ac_tool_prefix +cross_compiling=$save_cross_compiling + +dnl Restore the old definitions +dnl +popdef([ac_link])dnl +popdef([ac_compile])dnl +popdef([ac_cpp])dnl +popdef([ac_cv_host_os])dnl +popdef([ac_cv_host_vendor])dnl +popdef([ac_cv_host_cpu])dnl +popdef([ac_cv_host_alias])dnl +popdef([ac_cv_host])dnl +popdef([host_os])dnl +popdef([host_vendor])dnl +popdef([host_cpu])dnl +popdef([host_alias])dnl +popdef([host])dnl +popdef([LDFLAGS])dnl +popdef([CPPFLAGS])dnl +popdef([CFLAGS])dnl +popdef([CPP])dnl +popdef([CC])dnl +popdef([ac_objext])dnl +popdef([ac_exeext])dnl +popdef([ac_cv_objext])dnl +popdef([ac_cv_exeext])dnl +popdef([ac_cv_prog_cc_g])dnl +popdef([ac_cv_prog_cc_cross])dnl +popdef([ac_cv_prog_cc_works])dnl +popdef([ac_cv_prog_gcc])dnl +popdef([ac_cv_prog_CPP])dnl + +dnl Finally, set Makefile variables +dnl +BUILD_EXEEXT=$ac_build_exeext +BUILD_OBJEXT=$ac_build_objext +AC_SUBST(BUILD_EXEEXT)dnl +AC_SUBST(BUILD_OBJEXT)dnl +AC_SUBST([CFLAGS_FOR_BUILD])dnl +AC_SUBST([CPPFLAGS_FOR_BUILD])dnl +AC_SUBST([LDFLAGS_FOR_BUILD])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cc_mpi.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_cc_mpi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cc_mpi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_cc_mpi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,171 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_mpi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CC_MPI([MPI-WANTED-TEST[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to find out how to compile C programs that use MPI +# (Message Passing Interface), a standard API for parallel process +# communication (see http://www-unix.mcs.anl.gov/mpi/). The macro has to +# be used instead of the standard macro AC_PROG_CC and will replace the +# standard variable CC with the found compiler. +# +# MPI-WANTED-TEST is used to test whether MPI is actually wanted by the +# user. If MPI-WANTED_TEST is omitted or if it succeeds, the macro will +# try to find out how to use MPI, if it fails, the macro will call +# AC_PROG_CC to find a standard C compiler instead. +# +# When MPI is found, ACTION-IF-FOUND will be executed, if MPI is not found +# (or MPI-WANTED-TEST fails) ACTION-IF-NOT-FOUND is executed. If +# ACTION-IF-FOUND is not set, the macro will define HAVE_MPI. +# +# The following example demonstrates usage of the macro: +# +# # If --with-mpi=auto is used, try to find MPI, but use standard C compiler if it is not found. +# # If --with-mpi=yes is used, try to find MPI and fail if it isn't found. +# # If --with-mpi=no is used, use a standard C compiler instead. +# AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi], +# [compile with MPI (parallelization) support. If none is found, +# MPI is not used. Default: auto]) +# ],,[with_mpi=auto]) +# # +# AX_PROG_CC_MPI([test x"$with_mpi" != xno],[use_mpi=yes],[ +# use_mpi=no +# if test x"$with_mpi" = xyes; then +# AC_MSG_FAILURE([MPI compiler requested, but couldn't use MPI.]) +# else +# AC_MSG_WARN([No MPI compiler found, won't use MPI.]) +# fi +# ]) +# +# LICENSE +# +# Copyright (c) 2010,2011 Olaf Lenz +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_PROG_CC_MPI], [ +AC_PREREQ(2.50) + +# Check for compiler +# Needs to be split off into an extra macro to ensure right expansion +# order. +AC_REQUIRE([_AX_PROG_CC_MPI],[_AX_PROG_CC_MPI([$1])]) + +AS_IF([test x"$_ax_prog_cc_mpi_mpi_wanted" = xno], + [ _ax_prog_cc_mpi_mpi_found=no ], + [ + AC_LANG_PUSH([C]) + # test whether MPI_Init is available + # We do not use AC_SEARCH_LIBS here, as it caches its outcome and + # thus disallows corresponding calls in the other AX_PROG_*_MPI + # macros. + for lib in NONE mpi mpich; do + save_LIBS=$LIBS + if test x"$lib" = xNONE; then + AC_MSG_CHECKING([for function MPI_Init]) + else + AC_MSG_CHECKING([for function MPI_Init in -l$lib]) + LIBS="-l$lib $LIBS" + fi + AC_LINK_IFELSE([AC_LANG_CALL([],[MPI_Init])], + [ _ax_prog_cc_mpi_mpi_found=yes ], + [ _ax_prog_cc_mpi_mpi_found=no ]) + AC_MSG_RESULT($_ax_prog_cc_mpi_mpi_found) + if test "x$_ax_prog_cc_mpi_mpi_found" = "xyes"; then + break; + fi + LIBS=$save_LIBS + done + + # Check for header + AS_IF([test x"$_ax_prog_cc_mpi_mpi_found" = xyes], [ + AC_MSG_CHECKING([for mpi.h]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ])], + [ AC_MSG_RESULT(yes)], + [ AC_MSG_RESULT(no) + _ax_prog_cc_mpi_mpi_found=no + ]) + ]) + AC_LANG_POP([C]) +]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +AS_IF([test x"$_ax_prog_cc_mpi_mpi_found" = xyes], [ + ifelse([$2],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$2]) + : +],[ + $3 + : +]) + +])dnl AX_PROG_CC_MPI + +dnl _AX_PROG_CC_MPI is an internal macro required by AX_PROG_CC_MPI. +dnl To ensure the right expansion order, the main function AX_PROG_CC_MPI +dnl has to be split into two parts. +dnl +dnl Known MPI C compilers: +dnl mpicc +dnl mpixlc_r +dnl mpixlc +dnl hcc +dnl mpxlc_r +dnl mpxlc +dnl sxmpicc NEC SX +dnl mpifcc Fujitsu +dnl mpgcc +dnl mpcc +dnl cmpicc +dnl cc +dnl +AC_DEFUN([_AX_PROG_CC_MPI], [ + AC_ARG_VAR(MPICC,[MPI C compiler command]) + ifelse([$1],,[_ax_prog_cc_mpi_mpi_wanted=yes],[ + AC_MSG_CHECKING([whether to compile using MPI]) + if $1; then + _ax_prog_cc_mpi_mpi_wanted=yes + else + _ax_prog_cc_mpi_mpi_wanted=no + fi + AC_MSG_RESULT($_ax_prog_cc_mpi_mpi_wanted) + ]) + if test x"$_ax_prog_cc_mpi_mpi_wanted" = xyes; then + if test -z "$CC" && test -n "$MPICC"; then + CC="$MPICC" + else + AC_CHECK_TOOLS([CC], [mpicc mpixlc_r mpixlc hcc mpxlc_r mpxlc sxmpicc mpifcc mpgcc mpcc cmpicc cc gcc]) + fi + fi + AC_PROG_CC +])dnl _AX_PROG_CC_MPI diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cp_s.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_cp_s.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cp_s.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_cp_s.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cp_s.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CP_S +# +# DESCRIPTION +# +# Check how to make a copy by creating a symbolic link to the original - +# it defines the variable CP_S for further use, which you should in fact +# treat like it used to be with be LN_S. The actual value is assured to be +# either LN_S (if the filesystem supports symbolic links) or CP (if the +# filesystem does not know about symbolic links and you need a copy of +# original file to have the same text in both places). In a gnu +# environment it will simply set CP_S="cp -s" since the gnu "cp"-command +# has the "-s" flag. You shall not try to use this command on directories +# since it would require a "-r" in the case of a copy that is not +# supported explicitly here. (I'm not sure if some "cp"-commands out there +# would barf at usage of "-r" on a normal file). +# +# Use CP_S to create a copy of read-only data - if your filesystem +# supports it then a symbolic link is created - a process that is quicker +# and space-saving. However, if the target fs does not support symbolic +# links, just copy the data. Unlike ac_prog_ln_s this macro will never +# fail to set the CP_S ac_subst to something that works. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_CP_S], [AX_PROG_CP_S]) +AC_DEFUN([AX_PROG_CP_S], +[AC_REQUIRE([AC_PROG_LN_S])dnl +AC_MSG_CHECKING(whether cp -s works) +AC_CACHE_VAL(ac_cv_prog_CP_S, +[rm -f conftestdata +if cp -s X conftestdata 2>/dev/null +then + rm -f conftestdata + ac_cv_prog_CP_S="cp -s" +else + ac_cv_prog_CP_S=cp +fi +if test "$LN_S" = "ln -s" ; then + ac_cv_prog_CP_S="ln -s" +fi])dnl +CP_S="$ac_cv_prog_CP_S" +if test "$ac_cv_prog_CP_S" = "ln -s"; then + AC_MSG_RESULT(using ln -s) +elif test "$ac_cv_prog_CP_S" = "cp -s"; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no, using cp) +fi +AC_SUBST(CP_S)dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_crontab.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_crontab.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_crontab.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_crontab.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_crontab.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CRONTAB +# +# DESCRIPTION +# +# Check for the program crontab, if exists let script continue, else pops +# an error message +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# CRONTAB = which crontab +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_CRONTAB], [AX_PROG_CRONTAB]) +AC_DEFUN([AX_PROG_CRONTAB],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(CRONTAB, crontab$EXEEXT, nocommand) +if test "$CRONTAB" = nocommand; then + AC_MSG_ERROR([crontab (needed for scheduled job) not found in $PATH]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cxx_for_build.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_cxx_for_build.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cxx_for_build.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_cxx_for_build.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,110 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cxx_for_build.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CXX_FOR_BUILD +# +# DESCRIPTION +# +# This macro searches for a C++ compiler that generates native +# executables, that is a C++ compiler that surely is not a cross-compiler. +# This can be useful if you have to generate source code at compile-time +# like for example GCC does. +# +# The macro sets the CXX_FOR_BUILD and CXXCPP_FOR_BUILD macros to anything +# needed to compile or link (CXX_FOR_BUILD) and preprocess +# (CXXCPP_FOR_BUILD). The value of these variables can be overridden by +# the user by specifying a compiler with an environment variable (like you +# do for standard CXX). +# +# LICENSE +# +# Copyright (c) 2008 Paolo Bonzini +# Copyright (c) 2012 Avionic Design GmbH +# +# Based on the AX_PROG_CC_FOR_BUILD macro by Paolo Bonzini. +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) +AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl +AC_REQUIRE([AX_PROG_CC_FOR_BUILD])dnl +AC_REQUIRE([AC_PROG_CXX])dnl +AC_REQUIRE([AC_PROG_CXXCPP])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl + +dnl Use the standard macros, but make them use other variable names +dnl +pushdef([ac_cv_prog_CXXCPP], ac_cv_build_prog_CXXCPP)dnl +pushdef([ac_cv_prog_gxx], ac_cv_build_prog_gxx)dnl +pushdef([ac_cv_prog_cxx_works], ac_cv_build_prog_cxx_works)dnl +pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl +pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl +pushdef([CXX], CXX_FOR_BUILD)dnl +pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl +pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl +pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl +pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl +pushdef([host], build)dnl +pushdef([host_alias], build_alias)dnl +pushdef([host_cpu], build_cpu)dnl +pushdef([host_vendor], build_vendor)dnl +pushdef([host_os], build_os)dnl +pushdef([ac_cv_host], ac_cv_build)dnl +pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl +pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl +pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl +pushdef([ac_cv_host_os], ac_cv_build_os)dnl +pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl +pushdef([ac_compile], ac_build_compile)dnl +pushdef([ac_link], ac_build_link)dnl + +save_cross_compiling=$cross_compiling +save_ac_tool_prefix=$ac_tool_prefix +cross_compiling=no +ac_tool_prefix= + +AC_PROG_CXX +AC_PROG_CXXCPP + +ac_tool_prefix=$save_ac_tool_prefix +cross_compiling=$save_cross_compiling + +dnl Restore the old definitions +dnl +popdef([ac_link])dnl +popdef([ac_compile])dnl +popdef([ac_cxxcpp])dnl +popdef([ac_cv_host_os])dnl +popdef([ac_cv_host_vendor])dnl +popdef([ac_cv_host_cpu])dnl +popdef([ac_cv_host_alias])dnl +popdef([ac_cv_host])dnl +popdef([host_os])dnl +popdef([host_vendor])dnl +popdef([host_cpu])dnl +popdef([host_alias])dnl +popdef([host])dnl +popdef([CXXCPPFLAGS])dnl +popdef([CPPFLAGS])dnl +popdef([CXXFLAGS])dnl +popdef([CXXCPP])dnl +popdef([CXX])dnl +popdef([ac_cv_prog_cxx_g])dnl +popdef([ac_cv_prog_cxx_cross])dnl +popdef([ac_cv_prog_cxx_works])dnl +popdef([ac_cv_prog_gxx])dnl +popdef([ac_cv_prog_CXXCPP])dnl + +dnl Finally, set Makefile variables +dnl +AC_SUBST([CXXFLAGS_FOR_BUILD])dnl +AC_SUBST([CXXCPPFLAGS_FOR_BUILD])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cxx_mpi.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_cxx_mpi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_cxx_mpi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_cxx_mpi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,178 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cxx_mpi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CXX_MPI([MPI-WANTED-TEST[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to find out how to compile C++ programs that use MPI +# (Message Passing Interface), a standard API for parallel process +# communication (see http://www-unix.mcs.anl.gov/mpi/). The macro has to +# be used instead of the standard macro AC_PROG_CXX and will replace the +# standard variable CXX with the found compiler. +# +# MPI-WANTED-TEST is used to test whether MPI is actually wanted by the +# user. If MPI-WANTED_TEST is omitted or if it succeeds, the macro will +# try to find out how to use MPI, if it fails, the macro will call +# AC_PROG_CC to find a standard C compiler instead. +# +# When MPI is found, ACTION-IF-FOUND will be executed, if MPI is not found +# (or MPI-WANTED-TEST fails) ACTION-IF-NOT-FOUND is executed. If +# ACTION-IF-FOUND is not set, the macro will define HAVE_MPI. +# +# The following example demonstrates usage of the macro: +# +# # If --with-mpi=auto is used, try to find MPI, but use standard C compiler if it is not found. +# # If --with-mpi=yes is used, try to find MPI and fail if it isn't found. +# # If --with-mpi=no is used, use a standard C compiler instead. +# AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi], +# [compile with MPI (parallelization) support. If none is found, +# MPI is not used. Default: auto]) +# ],,[with_mpi=auto]) +# +# AX_PROG_CXX_MPI([test x"$with_mpi" != xno],[use_mpi=yes],[ +# use_mpi=no +# if test x"$with_mpi" = xyes; then +# AC_MSG_FAILURE([MPI compiler requested, but couldn't use MPI.]) +# else +# AC_MSG_WARN([No MPI compiler found, won't use MPI.]) +# fi +# ]) +# +# LICENSE +# +# Copyright (c) 2010,2011 Olaf Lenz +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_PROG_CXX_MPI], [ +AC_PREREQ(2.50) + +# Check for compiler +# Needs to be split off into an extra macro to ensure right expansion +# order. +AC_REQUIRE([_AX_PROG_CXX_MPI],[_AX_PROG_CXX_MPI([$1])]) + +AS_IF([test x"$_ax_prog_cxx_mpi_mpi_wanted" = xno], + [ _ax_prog_cxx_mpi_mpi_found=no ], + [ + AC_LANG_PUSH([C++]) + + # test whether MPI_Init() is available + # We do not use AC_SEARCH_LIBS here, as it caches its outcome and + # thus disallows corresponding calls in the other AX_PROG_*_MPI + # macros. + for lib in NONE mpi mpich; do + save_LIBS=$LIBS + if test x"$lib" = xNONE; then + AC_MSG_CHECKING([for function MPI_Init]) + else + AC_MSG_CHECKING([for function MPI_Init in -l$lib]) + LIBS="-l$lib $LIBS" + fi + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ +extern "C" { void MPI_Init(); } +],[MPI_Init();])], + [ _ax_prog_cxx_mpi_mpi_found=yes ], + [ _ax_prog_cxx_mpi_mpi_found=no ]) + AC_MSG_RESULT($_ax_prog_cxx_mpi_mpi_found) + if test "x$_ax_prog_cxx_mpi_mpi_found" = "xyes"; then + break; + fi + LIBS=$save_LIBS + done + + # Check for header + AS_IF([test x"$_ax_prog_cxx_mpi_mpi_found" = xyes], [ + AC_MSG_CHECKING([for mpi.h]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ])], + [ AC_MSG_RESULT(yes)], + [ AC_MSG_RESULT(no) + _ax_prog_cxx_mpi_mpi_found=no + ]) + ]) + AC_LANG_POP([C++]) +]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +AS_IF([test x"$_ax_prog_cxx_mpi_mpi_found" = xyes], [ + ifelse([$2],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$2]) + : +],[ + $3 + : +]) + +])dnl AX_PROG_CXX_MPI + +dnl _AX_PROG_CXX_MPI is an internal macro required by AX_PROG_CXX_MPI. +dnl To ensure the right expansion order, the main function AX_PROG_CXX_MPI +dnl has to be split into two parts. +dnl +dnl Known MPI C++ compilers: +dnl mpic++ +dnl mpicxx +dnl mpiCC +dnl sxmpic++ NEC SX +dnl hcp +dnl mpxlC_r +dnl mpxlC +dnl mpixlcxx_r +dnl mpixlcxx +dnl mpg++ +dnl mpc++ +dnl mpCC +dnl cmpic++ +dnl mpiFCC Fujitsu +dnl CC +dnl +AC_DEFUN([_AX_PROG_CXX_MPI], [ + AC_ARG_VAR(MPICXX,[MPI C++ compiler command]) + ifelse([$1],,[_ax_prog_cxx_mpi_mpi_wanted=yes],[ + AC_MSG_CHECKING([whether to compile using MPI]) + if $1; then + _ax_prog_cxx_mpi_mpi_wanted=yes + else + _ax_prog_cxx_mpi_mpi_wanted=no + fi + AC_MSG_RESULT($_ax_prog_cxx_mpi_mpi_wanted) + ]) + if test x"$_ax_prog_cxx_mpi_mpi_wanted" = xyes; then + if test -z "$CXX" && test -n "$MPICXX"; then + CXX="$MPICXX" + else + AC_CHECK_TOOLS([CXX], [mpic++ mpicxx mpiCC sxmpic++ hcp mpxlC_r mpxlC mpixlcxx_r mpixlcxx mpg++ mpc++ mpCC cmpic++ mpiFCC CCicpc pgCC pathCC sxc++ xlC_r xlC bgxlC_r bgxlC openCC sunCC crayCC g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC]) + fi + fi + AC_PROG_CXX +])dnl _AX_PROG_CXX_MPI diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_date.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_date.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_date.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_date.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,137 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_date.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_DATE() +# +# DESCRIPTION +# +# This macro tries to determine the type of the date (1) command and some +# of its non-standard capabilities. +# +# The type is determined as follow: +# +# * If the version string contains "GNU", then: +# - The variable ax_cv_prog_date_gnu is set to "yes". +# - The variable ax_cv_prog_date_type is set to "gnu". +# +# * If date supports the "-v 1d" option, then: +# - The variable ax_cv_prog_date_bsd is set to "yes". +# - The variable ax_cv_prog_date_type is set to "bsd". +# +# * If both previous checks fail, then: +# - The variable ax_cv_prog_date_type is set to "unknown". +# +# The following capabilities of GNU date are checked: +# +# * If date supports the --date arg option, then: +# - The variable ax_cv_prog_date_gnu_date is set to "yes". +# +# * If date supports the --utc arg option, then: +# - The variable ax_cv_prog_date_gnu_utc is set to "yes". +# +# The following capabilities of BSD date are checked: +# +# * If date supports the -v 1d option, then: +# - The variable ax_cv_prog_date_bsd_adjust is set to "yes". +# +# * If date supports the -r arg option, then: +# - The variable ax_cv_prog_date_bsd_date is set to "yes". +# +# All the aforementioned variables are set to "no" before a check is +# performed. +# +# LICENSE +# +# Copyright (c) 2017 Enrico M. Crisostomo +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_PROG_DATE], [dnl + AC_CACHE_CHECK([for GNU date], [ax_cv_prog_date_gnu], [ + ax_cv_prog_date_gnu=no + if date --version 2>/dev/null | head -1 | grep -q GNU + then + ax_cv_prog_date_gnu=yes + fi + ]) + AC_CACHE_CHECK([for BSD date], [ax_cv_prog_date_bsd], [ + ax_cv_prog_date_bsd=no + if date -v 1d > /dev/null 2>&1 + then + ax_cv_prog_date_bsd=yes + fi + ]) + AC_CACHE_CHECK([for date type], [ax_cv_prog_date_type], [ + ax_cv_prog_date_type=unknown + if test "x${ax_cv_prog_date_gnu}" = "xyes" + then + ax_cv_prog_date_type=gnu + elif test "x${ax_cv_prog_date_bsd}" = "xyes" + then + ax_cv_prog_date_type=bsd + fi + ]) + AS_VAR_IF([ax_cv_prog_date_gnu], [yes], [ + AC_CACHE_CHECK([whether GNU date supports --date], [ax_cv_prog_date_gnu_date], [ + ax_cv_prog_date_gnu_date=no + if date --date=@1512031231 > /dev/null 2>&1 + then + ax_cv_prog_date_gnu_date=yes + fi + ]) + AC_CACHE_CHECK([whether GNU date supports --utc], [ax_cv_prog_date_gnu_utc], [ + ax_cv_prog_date_gnu_utc=no + if date --utc > /dev/null 2>&1 + then + ax_cv_prog_date_gnu_utc=yes + fi + ]) + ]) + AS_VAR_IF([ax_cv_prog_date_bsd], [yes], [ + AC_CACHE_CHECK([whether BSD date supports -r], [ax_cv_prog_date_bsd_date], [ + ax_cv_prog_date_bsd_date=no + if date -r 1512031231 > /dev/null 2>&1 + then + ax_cv_prog_date_bsd_date=yes + fi + ]) + ]) + AS_VAR_IF([ax_cv_prog_date_bsd], [yes], [ + AC_CACHE_CHECK([whether BSD date supports -v], [ax_cv_prog_date_bsd_adjust], [ + ax_cv_prog_date_bsd_adjust=no + if date -v 1d > /dev/null 2>&1 + then + ax_cv_prog_date_bsd_adjust=yes + fi + ]) + ]) +])dnl AX_PROG_DATE diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_dotnetcore_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_dotnetcore_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_dotnetcore_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_dotnetcore_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_dotnetcore_version.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_PROG_DOTNETCORE_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that .NET Core supports the version indicated. If true the +# shell commands in ACTION-IF-TRUE are executed. If not the shell commands +# in ACTION-IF-FALSE are run. The $dotnetcore_version variable will be +# filled with the detected version. +# +# This macro uses the $DOTNETCORE variable to perform the check. If +# $DOTNETCORE is not set prior to calling this macro, the macro will fail. +# +# Example: +# +# AC_PATH_PROG([DOTNETCORE],[dotnet]) +# AC_PROG_DOTNETCORE_VERSION([1.0.2],[ ... ],[ ... ]) +# +# Searches for .NET Core, then checks if at least version 1.0.2 is +# present. +# +# LICENSE +# +# Copyright (c) 2016 Jens Geyer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_PROG_DOTNETCORE_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + + AS_IF([test -n "$DOTNETCORE"],[ + ax_dotnetcore_version="$1" + + AC_MSG_CHECKING([for .NET Core version]) + dotnetcore_version=`$DOTNETCORE --version 2>&1 | $SED -e 's/\(@<:@0-9@:>@*\.@<:@0-9@:>@*\.@<:@0-9@:>@*\)\(.*\)/\1/'` + AC_MSG_RESULT($dotnetcore_version) + + AC_SUBST([DOTNETCORE_VERSION],[$dotnetcore_version]) + + AX_COMPARE_VERSION([$ax_dotnetcore_version],[le],[$dotnetcore_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find .NET Core]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_doxygen.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_doxygen.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_doxygen.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_doxygen.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,586 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_doxygen.html +# =========================================================================== +# +# SYNOPSIS +# +# DX_INIT_DOXYGEN(PROJECT-NAME, [DOXYFILE-PATH], [OUTPUT-DIR], ...) +# DX_DOXYGEN_FEATURE(ON|OFF) +# DX_DOT_FEATURE(ON|OFF) +# DX_HTML_FEATURE(ON|OFF) +# DX_CHM_FEATURE(ON|OFF) +# DX_CHI_FEATURE(ON|OFF) +# DX_MAN_FEATURE(ON|OFF) +# DX_RTF_FEATURE(ON|OFF) +# DX_XML_FEATURE(ON|OFF) +# DX_PDF_FEATURE(ON|OFF) +# DX_PS_FEATURE(ON|OFF) +# +# DESCRIPTION +# +# The DX_*_FEATURE macros control the default setting for the given +# Doxygen feature. Supported features are 'DOXYGEN' itself, 'DOT' for +# generating graphics, 'HTML' for plain HTML, 'CHM' for compressed HTML +# help (for MS users), 'CHI' for generating a separate .chi file by the +# .chm file, and 'MAN', 'RTF', 'XML', 'PDF' and 'PS' for the appropriate +# output formats. The environment variable DOXYGEN_PAPER_SIZE may be +# specified to override the default 'a4wide' paper size. +# +# By default, HTML, PDF and PS documentation is generated as this seems to +# be the most popular and portable combination. MAN pages created by +# Doxygen are usually problematic, though by picking an appropriate subset +# and doing some massaging they might be better than nothing. CHM and RTF +# are specific for MS (note that you can't generate both HTML and CHM at +# the same time). The XML is rather useless unless you apply specialized +# post-processing to it. +# +# The macros mainly control the default state of the feature. The use can +# override the default by specifying --enable or --disable. The macros +# ensure that contradictory flags are not given (e.g., +# --enable-doxygen-html and --enable-doxygen-chm, +# --enable-doxygen-anything with --disable-doxygen, etc.) Finally, each +# feature will be automatically disabled (with a warning) if the required +# programs are missing. +# +# Once all the feature defaults have been specified, call DX_INIT_DOXYGEN +# with the following parameters: a one-word name for the project for use +# as a filename base etc., an optional configuration file name (the +# default is '$(srcdir)/Doxyfile', the same as Doxygen's default), and an +# optional output directory name (the default is 'doxygen-doc'). To run +# doxygen multiple times for different configuration files and output +# directories provide more parameters: the second, forth, sixth, etc +# parameter are configuration file names and the third, fifth, seventh, +# etc parameter are output directories. No checking is done to catch +# duplicates. +# +# Automake Support +# +# The DX_RULES substitution can be used to add all needed rules to the +# Makefile. Note that this is a substitution without being a variable: +# only the @DX_RULES@ syntax will work. +# +# The provided targets are: +# +# doxygen-doc: Generate all doxygen documentation. +# +# doxygen-run: Run doxygen, which will generate some of the +# documentation (HTML, CHM, CHI, MAN, RTF, XML) +# but will not do the post processing required +# for the rest of it (PS, PDF). +# +# doxygen-ps: Generate doxygen PostScript documentation. +# +# doxygen-pdf: Generate doxygen PDF documentation. +# +# Note that by default these are not integrated into the automake targets. +# If doxygen is used to generate man pages, you can achieve this +# integration by setting man3_MANS to the list of man pages generated and +# then adding the dependency: +# +# $(man3_MANS): doxygen-doc +# +# This will cause make to run doxygen and generate all the documentation. +# +# The following variable is intended for use in Makefile.am: +# +# DX_CLEANFILES = everything to clean. +# +# Then add this variable to MOSTLYCLEANFILES. +# +# LICENSE +# +# Copyright (c) 2009 Oren Ben-Kiki +# Copyright (c) 2015 Olaf Mandel +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 23 + +## ----------## +## Defaults. ## +## ----------## + +DX_ENV="" +AC_DEFUN([DX_FEATURE_doc], ON) +AC_DEFUN([DX_FEATURE_dot], OFF) +AC_DEFUN([DX_FEATURE_man], OFF) +AC_DEFUN([DX_FEATURE_html], ON) +AC_DEFUN([DX_FEATURE_chm], OFF) +AC_DEFUN([DX_FEATURE_chi], OFF) +AC_DEFUN([DX_FEATURE_rtf], OFF) +AC_DEFUN([DX_FEATURE_xml], OFF) +AC_DEFUN([DX_FEATURE_pdf], ON) +AC_DEFUN([DX_FEATURE_ps], ON) + +## --------------- ## +## Private macros. ## +## --------------- ## + +# DX_ENV_APPEND(VARIABLE, VALUE) +# ------------------------------ +# Append VARIABLE="VALUE" to DX_ENV for invoking doxygen and add it +# as a substitution (but not a Makefile variable). The substitution +# is skipped if the variable name is VERSION. +AC_DEFUN([DX_ENV_APPEND], +[AC_SUBST([DX_ENV], ["$DX_ENV $1='$2'"])dnl +m4_if([$1], [VERSION], [], [AC_SUBST([$1], [$2])dnl +AM_SUBST_NOTMAKE([$1])])dnl +]) + +# DX_DIRNAME_EXPR +# --------------- +# Expand into a shell expression prints the directory part of a path. +AC_DEFUN([DX_DIRNAME_EXPR], + [[expr ".$1" : '\(\.\)[^/]*$' \| "x$1" : 'x\(.*\)/[^/]*$']]) + +# DX_IF_FEATURE(FEATURE, IF-ON, IF-OFF) +# ------------------------------------- +# Expands according to the M4 (static) status of the feature. +AC_DEFUN([DX_IF_FEATURE], [ifelse(DX_FEATURE_$1, ON, [$2], [$3])]) + +# DX_REQUIRE_PROG(VARIABLE, PROGRAM) +# ---------------------------------- +# Require the specified program to be found for the DX_CURRENT_FEATURE to work. +AC_DEFUN([DX_REQUIRE_PROG], [ +AC_PATH_TOOL([$1], [$2]) +if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then + AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) + AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +fi +]) + +# DX_TEST_FEATURE(FEATURE) +# ------------------------ +# Expand to a shell expression testing whether the feature is active. +AC_DEFUN([DX_TEST_FEATURE], [test "$DX_FLAG_$1" = 1]) + +# DX_CHECK_DEPEND(REQUIRED_FEATURE, REQUIRED_STATE) +# ------------------------------------------------- +# Verify that a required features has the right state before trying to turn on +# the DX_CURRENT_FEATURE. +AC_DEFUN([DX_CHECK_DEPEND], [ +test "$DX_FLAG_$1" = "$2" \ +|| AC_MSG_ERROR([doxygen-DX_CURRENT_FEATURE ifelse([$2], 1, + requires, contradicts) doxygen-DX_CURRENT_FEATURE]) +]) + +# DX_CLEAR_DEPEND(FEATURE, REQUIRED_FEATURE, REQUIRED_STATE) +# ---------------------------------------------------------- +# Turn off the DX_CURRENT_FEATURE if the required feature is off. +AC_DEFUN([DX_CLEAR_DEPEND], [ +test "$DX_FLAG_$1" = "$2" || AC_SUBST(DX_FLAG_[]DX_CURRENT_FEATURE, 0) +]) + +# DX_FEATURE_ARG(FEATURE, DESCRIPTION, +# CHECK_DEPEND, CLEAR_DEPEND, +# REQUIRE, DO-IF-ON, DO-IF-OFF) +# -------------------------------------------- +# Parse the command-line option controlling a feature. CHECK_DEPEND is called +# if the user explicitly turns the feature on (and invokes DX_CHECK_DEPEND), +# otherwise CLEAR_DEPEND is called to turn off the default state if a required +# feature is disabled (using DX_CLEAR_DEPEND). REQUIRE performs additional +# requirement tests (DX_REQUIRE_PROG). Finally, an automake flag is set and +# DO-IF-ON or DO-IF-OFF are called according to the final state of the feature. +AC_DEFUN([DX_ARG_ABLE], [ + AC_DEFUN([DX_CURRENT_FEATURE], [$1]) + AC_DEFUN([DX_CURRENT_DESCRIPTION], [$2]) + AC_ARG_ENABLE(doxygen-$1, + [AS_HELP_STRING(DX_IF_FEATURE([$1], [--disable-doxygen-$1], + [--enable-doxygen-$1]), + DX_IF_FEATURE([$1], [don't $2], [$2]))], + [ +case "$enableval" in +#( +y|Y|yes|Yes|YES) + AC_SUBST([DX_FLAG_$1], 1) + $3 +;; #( +n|N|no|No|NO) + AC_SUBST([DX_FLAG_$1], 0) +;; #( +*) + AC_MSG_ERROR([invalid value '$enableval' given to doxygen-$1]) +;; +esac +], [ +AC_SUBST([DX_FLAG_$1], [DX_IF_FEATURE([$1], 1, 0)]) +$4 +]) +if DX_TEST_FEATURE([$1]); then + $5 + : +fi +if DX_TEST_FEATURE([$1]); then + $6 + : +else + $7 + : +fi +]) + +## -------------- ## +## Public macros. ## +## -------------- ## + +# DX_XXX_FEATURE(DEFAULT_STATE) +# ----------------------------- +AC_DEFUN([DX_DOXYGEN_FEATURE], [AC_DEFUN([DX_FEATURE_doc], [$1])]) +AC_DEFUN([DX_DOT_FEATURE], [AC_DEFUN([DX_FEATURE_dot], [$1])]) +AC_DEFUN([DX_MAN_FEATURE], [AC_DEFUN([DX_FEATURE_man], [$1])]) +AC_DEFUN([DX_HTML_FEATURE], [AC_DEFUN([DX_FEATURE_html], [$1])]) +AC_DEFUN([DX_CHM_FEATURE], [AC_DEFUN([DX_FEATURE_chm], [$1])]) +AC_DEFUN([DX_CHI_FEATURE], [AC_DEFUN([DX_FEATURE_chi], [$1])]) +AC_DEFUN([DX_RTF_FEATURE], [AC_DEFUN([DX_FEATURE_rtf], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_XML_FEATURE], [AC_DEFUN([DX_FEATURE_xml], [$1])]) +AC_DEFUN([DX_PDF_FEATURE], [AC_DEFUN([DX_FEATURE_pdf], [$1])]) +AC_DEFUN([DX_PS_FEATURE], [AC_DEFUN([DX_FEATURE_ps], [$1])]) + +# DX_INIT_DOXYGEN(PROJECT, [CONFIG-FILE], [OUTPUT-DOC-DIR], ...) +# -------------------------------------------------------------- +# PROJECT also serves as the base name for the documentation files. +# The default CONFIG-FILE is "$(srcdir)/Doxyfile" and OUTPUT-DOC-DIR is +# "doxygen-doc". +# More arguments are interpreted as interleaved CONFIG-FILE and +# OUTPUT-DOC-DIR values. +AC_DEFUN([DX_INIT_DOXYGEN], [ + +# Files: +AC_SUBST([DX_PROJECT], [$1]) +AC_SUBST([DX_CONFIG], ['ifelse([$2], [], [$(srcdir)/Doxyfile], [$2])']) +AC_SUBST([DX_DOCDIR], ['ifelse([$3], [], [doxygen-doc], [$3])']) +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 4, m4_count($@), 2, + [AC_SUBST([DX_CONFIG]m4_eval(DX_i[/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [$(srcdir)/Doxyfile])')])])dnl +m4_if(m4_eval(3 < m4_count($@)), 1, [m4_for([DX_i], 5, m4_count($@,), 2, + [AC_SUBST([DX_DOCDIR]m4_eval([(]DX_i[-1)/2]), + 'm4_default_nblank_quoted(m4_argn(DX_i, $@), + [doxygen-doc])')])])dnl +m4_define([DX_loop], m4_dquote(m4_if(m4_eval(3 < m4_count($@)), 1, + [m4_for([DX_i], 4, m4_count($@), 2, [, m4_eval(DX_i[/2])])], + [])))dnl + +# Environment variables used inside doxygen.cfg: +DX_ENV_APPEND(SRCDIR, $srcdir) +DX_ENV_APPEND(PROJECT, $DX_PROJECT) +DX_ENV_APPEND(VERSION, $PACKAGE_VERSION) + +# Doxygen itself: +DX_ARG_ABLE(doc, [generate any doxygen documentation], + [], + [], + [DX_REQUIRE_PROG([DX_DOXYGEN], doxygen) + DX_REQUIRE_PROG([DX_PERL], perl)], + [DX_ENV_APPEND(PERL_PATH, $DX_PERL)]) + +# Dot for graphics: +DX_ARG_ABLE(dot, [generate graphics for doxygen documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_DOT], dot)], + [DX_ENV_APPEND(HAVE_DOT, YES) + DX_ENV_APPEND(DOT_PATH, [`DX_DIRNAME_EXPR($DX_DOT)`])], + [DX_ENV_APPEND(HAVE_DOT, NO)]) + +# Man pages generation: +DX_ARG_ABLE(man, [generate doxygen manual pages], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_MAN, YES)], + [DX_ENV_APPEND(GENERATE_MAN, NO)]) + +# RTF file generation: +DX_ARG_ABLE(rtf, [generate doxygen RTF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_RTF, YES)], + [DX_ENV_APPEND(GENERATE_RTF, NO)]) + +# XML file generation: +DX_ARG_ABLE(xml, [generate doxygen XML documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [], + [DX_ENV_APPEND(GENERATE_XML, YES)], + [DX_ENV_APPEND(GENERATE_XML, NO)]) + +# (Compressed) HTML help generation: +DX_ARG_ABLE(chm, [generate doxygen compressed HTML help documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_HHC], hhc)], + [DX_ENV_APPEND(HHC_PATH, $DX_HHC) + DX_ENV_APPEND(GENERATE_HTML, YES) + DX_ENV_APPEND(GENERATE_HTMLHELP, YES)], + [DX_ENV_APPEND(GENERATE_HTMLHELP, NO)]) + +# Separate CHI file generation. +DX_ARG_ABLE(chi, [generate doxygen separate compressed HTML help index file], + [DX_CHECK_DEPEND(chm, 1)], + [DX_CLEAR_DEPEND(chm, 1)], + [], + [DX_ENV_APPEND(GENERATE_CHI, YES)], + [DX_ENV_APPEND(GENERATE_CHI, NO)]) + +# Plain HTML pages generation: +DX_ARG_ABLE(html, [generate doxygen plain HTML documentation], + [DX_CHECK_DEPEND(doc, 1) DX_CHECK_DEPEND(chm, 0)], + [DX_CLEAR_DEPEND(doc, 1) DX_CLEAR_DEPEND(chm, 0)], + [], + [DX_ENV_APPEND(GENERATE_HTML, YES)], + [DX_TEST_FEATURE(chm) || DX_ENV_APPEND(GENERATE_HTML, NO)]) + +# PostScript file generation: +DX_ARG_ABLE(ps, [generate doxygen PostScript documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_LATEX], latex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_DVIPS], dvips) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# PDF file generation: +DX_ARG_ABLE(pdf, [generate doxygen PDF documentation], + [DX_CHECK_DEPEND(doc, 1)], + [DX_CLEAR_DEPEND(doc, 1)], + [DX_REQUIRE_PROG([DX_PDFLATEX], pdflatex) + DX_REQUIRE_PROG([DX_MAKEINDEX], makeindex) + DX_REQUIRE_PROG([DX_EGREP], egrep)]) + +# LaTeX generation for PS and/or PDF: +if DX_TEST_FEATURE(ps) || DX_TEST_FEATURE(pdf); then + DX_ENV_APPEND(GENERATE_LATEX, YES) +else + DX_ENV_APPEND(GENERATE_LATEX, NO) +fi + +# Paper size for PS and/or PDF: +AC_ARG_VAR(DOXYGEN_PAPER_SIZE, + [a4wide (default), a4, letter, legal or executive]) +case "$DOXYGEN_PAPER_SIZE" in +#( +"") + AC_SUBST(DOXYGEN_PAPER_SIZE, "") +;; #( +a4wide|a4|letter|legal|executive) + DX_ENV_APPEND(PAPER_SIZE, $DOXYGEN_PAPER_SIZE) +;; #( +*) + AC_MSG_ERROR([unknown DOXYGEN_PAPER_SIZE='$DOXYGEN_PAPER_SIZE']) +;; +esac + +# Rules: +AS_IF([[test $DX_FLAG_html -eq 1]], +[[DX_SNIPPET_html="## ------------------------------- ## +## Rules specific for HTML output. ## +## ------------------------------- ## + +DX_CLEAN_HTML = \$(DX_DOCDIR)/html]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/html]])[ + +"]], +[[DX_SNIPPET_html=""]]) +AS_IF([[test $DX_FLAG_chi -eq 1]], +[[DX_SNIPPET_chi=" +DX_CLEAN_CHI = \$(DX_DOCDIR)/\$(PACKAGE).chi]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).chi]])["]], +[[DX_SNIPPET_chi=""]]) +AS_IF([[test $DX_FLAG_chm -eq 1]], +[[DX_SNIPPET_chm="## ------------------------------ ## +## Rules specific for CHM output. ## +## ------------------------------ ## + +DX_CLEAN_CHM = \$(DX_DOCDIR)/chm]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/chm]])[\ +${DX_SNIPPET_chi} + +"]], +[[DX_SNIPPET_chm=""]]) +AS_IF([[test $DX_FLAG_man -eq 1]], +[[DX_SNIPPET_man="## ------------------------------ ## +## Rules specific for MAN output. ## +## ------------------------------ ## + +DX_CLEAN_MAN = \$(DX_DOCDIR)/man]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/man]])[ + +"]], +[[DX_SNIPPET_man=""]]) +AS_IF([[test $DX_FLAG_rtf -eq 1]], +[[DX_SNIPPET_rtf="## ------------------------------ ## +## Rules specific for RTF output. ## +## ------------------------------ ## + +DX_CLEAN_RTF = \$(DX_DOCDIR)/rtf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/rtf]])[ + +"]], +[[DX_SNIPPET_rtf=""]]) +AS_IF([[test $DX_FLAG_xml -eq 1]], +[[DX_SNIPPET_xml="## ------------------------------ ## +## Rules specific for XML output. ## +## ------------------------------ ## + +DX_CLEAN_XML = \$(DX_DOCDIR)/xml]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/xml]])[ + +"]], +[[DX_SNIPPET_xml=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1]], +[[DX_SNIPPET_ps="## ----------------------------- ## +## Rules specific for PS output. ## +## ----------------------------- ## + +DX_CLEAN_PS = \$(DX_DOCDIR)/\$(PACKAGE).ps]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps]])[ + +DX_PS_GOAL = doxygen-ps + +doxygen-ps: \$(DX_CLEAN_PS) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).ps: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_LATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_LATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_LATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + \$(DX_DVIPS) -o ../\$(PACKAGE).ps refman.dvi + +]])["]], +[[DX_SNIPPET_ps=""]]) +AS_IF([[test $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_pdf="## ------------------------------ ## +## Rules specific for PDF output. ## +## ------------------------------ ## + +DX_CLEAN_PDF = \$(DX_DOCDIR)/\$(PACKAGE).pdf]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf]])[ + +DX_PDF_GOAL = doxygen-pdf + +doxygen-pdf: \$(DX_CLEAN_PDF) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).pdf: \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag + \$(DX_V_LATEX)cd \$(DX_DOCDIR]DX_i[)/latex; \\ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \\ + \$(DX_PDFLATEX) refman.tex; \\ + \$(DX_MAKEINDEX) refman.idx; \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=5; \\ + while \$(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \\ + refman.log > /dev/null 2>&1 \\ + && test \$\$countdown -gt 0; do \\ + \$(DX_PDFLATEX) refman.tex; \\ + countdown=\`expr \$\$countdown - 1\`; \\ + done; \\ + mv refman.pdf ../\$(PACKAGE).pdf + +]])["]], +[[DX_SNIPPET_pdf=""]]) +AS_IF([[test $DX_FLAG_ps -eq 1 -o $DX_FLAG_pdf -eq 1]], +[[DX_SNIPPET_latex="## ------------------------------------------------- ## +## Rules specific for LaTeX (shared for PS and PDF). ## +## ------------------------------------------------- ## + +DX_V_LATEX = \$(_DX_v_LATEX_\$(V)) +_DX_v_LATEX_ = \$(_DX_v_LATEX_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_LATEX_0 = @echo \" LATEX \" \$][@; + +DX_CLEAN_LATEX = \$(DX_DOCDIR)/latex]dnl +m4_foreach([DX_i], [m4_shift(DX_loop)], [[\\ + \$(DX_DOCDIR]DX_i[)/latex]])[ + +"]], +[[DX_SNIPPET_latex=""]]) + +AS_IF([[test $DX_FLAG_doc -eq 1]], +[[DX_SNIPPET_doc="## --------------------------------- ## +## Format-independent Doxygen rules. ## +## --------------------------------- ## + +${DX_SNIPPET_html}\ +${DX_SNIPPET_chm}\ +${DX_SNIPPET_man}\ +${DX_SNIPPET_rtf}\ +${DX_SNIPPET_xml}\ +${DX_SNIPPET_ps}\ +${DX_SNIPPET_pdf}\ +${DX_SNIPPET_latex}\ +DX_V_DXGEN = \$(_DX_v_DXGEN_\$(V)) +_DX_v_DXGEN_ = \$(_DX_v_DXGEN_\$(AM_DEFAULT_VERBOSITY)) +_DX_v_DXGEN_0 = @echo \" DXGEN \" \$<; + +.PHONY: doxygen-run doxygen-doc \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +.INTERMEDIATE: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +doxygen-run:]m4_foreach([DX_i], [DX_loop], + [[ \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag]])[ + +doxygen-doc: doxygen-run \$(DX_PS_GOAL) \$(DX_PDF_GOAL) + +]m4_foreach([DX_i], [DX_loop], +[[\$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag: \$(DX_CONFIG]DX_i[) \$(pkginclude_HEADERS) + \$(A""M_V_at)rm -rf \$(DX_DOCDIR]DX_i[) + \$(DX_V_DXGEN)\$(DX_ENV) DOCDIR=\$(DX_DOCDIR]DX_i[) \$(DX_DOXYGEN) \$(DX_CONFIG]DX_i[) + \$(A""M_V_at)echo Timestamp >\$][@ + +]])dnl +[DX_CLEANFILES = \\] +m4_foreach([DX_i], [DX_loop], +[[ \$(DX_DOCDIR]DX_i[)/doxygen_sqlite3.db \\ + \$(DX_DOCDIR]DX_i[)/\$(PACKAGE).tag \\ +]])dnl +[ -r \\ + \$(DX_CLEAN_HTML) \\ + \$(DX_CLEAN_CHM) \\ + \$(DX_CLEAN_CHI) \\ + \$(DX_CLEAN_MAN) \\ + \$(DX_CLEAN_RTF) \\ + \$(DX_CLEAN_XML) \\ + \$(DX_CLEAN_PS) \\ + \$(DX_CLEAN_PDF) \\ + \$(DX_CLEAN_LATEX)"]], +[[DX_SNIPPET_doc=""]]) +AC_SUBST([DX_RULES], +["${DX_SNIPPET_doc}"])dnl +AM_SUBST_NOTMAKE([DX_RULES]) + +#For debugging: +#echo DX_FLAG_doc=$DX_FLAG_doc +#echo DX_FLAG_dot=$DX_FLAG_dot +#echo DX_FLAG_man=$DX_FLAG_man +#echo DX_FLAG_html=$DX_FLAG_html +#echo DX_FLAG_chm=$DX_FLAG_chm +#echo DX_FLAG_chi=$DX_FLAG_chi +#echo DX_FLAG_rtf=$DX_FLAG_rtf +#echo DX_FLAG_xml=$DX_FLAG_xml +#echo DX_FLAG_pdf=$DX_FLAG_pdf +#echo DX_FLAG_ps=$DX_FLAG_ps +#echo DX_ENV=$DX_ENV +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_emacs.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_emacs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_emacs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_emacs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,68 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_emacs.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_EMACS +# +# DESCRIPTION +# +# This macro allows the end user to specify a particular Emacs executable +# via a configure script command-line arg. For example: +# +# ./configure EMACS=$HOME/build/GNU/emacs/src/emacs +# +# It also arranges to mention env var EMACS in the './configure --help' +# output. See info node "(autoconf) Generic Programs" for details. +# +# More precisely... +# +# If env var EMACS is set, try to use its value directly, but avoid +# getting fooled by value 't' (set by older Emacsen for subprocesses). If +# no joy from the environment, search for "emacs" via AC_CHECK_PROG. If +# still no joy, display "Emacs not found; required!" and make configure +# exit failurefully. Otherwise, set shell var EMACS and AC_SUBST it, too. +# +# LICENSE +# +# Copyright (c) 2016-2017 Thien-Thi Nguyen +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_PROG_EMACS],[dnl +AC_ARG_VAR([EMACS],[Use this Emacs to byte-compile the Emacs Lisp files.]) +dnl Allow env override but do not get fooled by 'EMACS=t'. +test t = "$EMACS" && unset EMACS +dnl The next line does nothing if var 'EMACS' is already set. +AC_CHECK_PROG([EMACS], [emacs], [emacs]) +AS_IF([test "x$EMACS" = x],[AC_MSG_ERROR([Emacs not found; required!])]) +])dnl + +dnl ax_prog_emacs.m4 ends here diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_f77_mpi.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_f77_mpi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_f77_mpi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_f77_mpi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,175 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_f77_mpi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_F77_MPI([MPI-WANTED-TEST[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to find out how to compile Fortran77 programs that use +# MPI (Message Passing Interface), a standard API for parallel process +# communication (see http://www-unix.mcs.anl.gov/mpi/). The macro has to +# be used instead of the standard macro AC_PROG_F77 and will replace the +# standard variable F77 with the found compiler. +# +# MPI-WANTED-TEST is used to test whether MPI is actually wanted by the +# user. If MPI-WANTED_TEST is omitted or if it succeeds, the macro will +# try to find out how to use MPI, if it fails, the macro will call +# AC_PROG_CC to find a standard C compiler instead. +# +# When MPI is found, ACTION-IF-FOUND will be executed, if MPI is not found +# (or MPI-WANTED-TEST fails) ACTION-IF-NOT-FOUND is executed. If +# ACTION-IF-FOUND is not set, the macro will define HAVE_MPI. +# +# The following example demonstrates usage of the macro: +# +# # If --with-mpi=auto is used, try to find MPI, but use standard F77 compiler if it is not found. +# # If --with-mpi=yes is used, try to find MPI and fail if it isn't found. +# # If --with-mpi=no is used, use a standard F77 compiler instead. +# AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi], +# [compile with MPI (parallelization) support. If none is found, +# MPI is not used. Default: auto]) +# ],,[with_mpi=auto]) +# +# AX_PROG_F77_MPI([test x"$with_mpi" != xno],[use_mpi=yes],[ +# use_mpi=no +# if test x"$with_mpi" = xyes; then +# AC_MSG_FAILURE([MPI compiler requested, but couldn't use MPI.]) +# else +# AC_MSG_WARN([No MPI compiler found, won't use MPI.]) +# fi +# ]) +# +# LICENSE +# +# Copyright (c) 2010,2011 Olaf Lenz +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_PROG_F77_MPI], [ +AC_PREREQ(2.50) + +# Check for compiler +# Needs to be split off into an extra macro to ensure right expansion +# order. +AC_REQUIRE([_AX_PROG_F77_MPI],[_AX_PROG_F77_MPI([$1])]) + +AS_IF([test x"$_ax_prog_f77_mpi_mpi_wanted" = xno], + [ _ax_prog_f77_mpi_mpi_found=no ], + [ + AC_LANG_PUSH([Fortran 77]) + + # test whether MPI_INIT is available + # We do not use AC_SEARCH_LIBS here, as it caches its outcome and + # thus disallows corresponding calls in the other AX_PROG_*_MPI + # macros. + for lib in NONE fmpi fmpich; do + save_LIBS=$LIBS + if test x"$lib" = xNONE; then + AC_MSG_CHECKING([for function MPI_INIT]) + else + AC_MSG_CHECKING([for function MPI_INIT in -l$lib]) + LIBS="-l$lib $LIBS" + fi + AC_LINK_IFELSE([AC_LANG_CALL([],[MPI_INIT])], + [ _ax_prog_f77_mpi_mpi_found=yes ], + [ _ax_prog_f77_mpi_mpi_found=no ]) + AC_MSG_RESULT($_ax_prog_f77_mpi_mpi_found) + if test "x$_ax_prog_f77_mpi_mpi_found" = "xyes"; then + break; + fi + LIBS=$save_LIBS + done + + # Check for header + AS_IF([test x"$_ax_prog_f77_mpi_mpi_found" = xyes], [ + AC_MSG_CHECKING([for mpif.h]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[[ + include 'mpif.h' +]])], + [ AC_MSG_RESULT(yes)], + [ AC_MSG_RESULT(no) + _ax_prog_f77_mpi_mpi_found=no + ]) + ]) + AC_LANG_POP([Fortran 77]) +]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +AS_IF([test x"$_ax_prog_f77_mpi_mpi_found" = xyes], [ + ifelse([$2],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$2]) + : +],[ + $3 + : +]) + +])dnl AX_PROG_F77_MPI + +dnl _AX_PROG_F77_MPI is an internal macro required by AX_PROG_F77_MPI. +dnl To ensure the right expansion order, the main function AX_PROG_F77_MPI +dnl has to be split into two parts. This part looks for the MPI +dnl compiler, while the other one tests whether an MPI program can be +dnl compiled. +dnl +dnl Known Fortran 77 compilers: +dnl af77 Apogee F77 compiler for Intergraph hardware running CLIX +dnl blrts_xlf IBM BlueGene/L F77 cross-compiler +dnl cf77 native F77 compiler under older Crays (prefer over fort77) +dnl f77 generic compiler names +dnl fl32 Microsoft Fortran 77 "PowerStation" compiler +dnl fort77 native F77 compiler under HP-UX (and some older Crays) +dnl frt Fujitsu F77 compiler +dnl g77 GNU Fortran 77 compiler +dnl pgf77 Portland Group F77 compiler +dnl xlf IBM (AIX) F77 compiler +dnl pathf77 PathScale +dnl +AC_DEFUN([_AX_PROG_F77_MPI], [ + AC_ARG_VAR(MPIF77,[MPI Fortran77 compiler command]) + ifelse([$1],,[_ax_prog_f77_mpi_mpi_wanted=yes],[ + AC_MSG_CHECKING([whether to compile using MPI]) + if $1; then + _ax_prog_f77_mpi_mpi_wanted=yes + else + _ax_prog_f77_mpi_mpi_wanted=no + fi + AC_MSG_RESULT($_ax_prog_f77_mpi_mpi_wanted) + ]) + if test x"$_ax_prog_f77_mpi_mpi_wanted" = xyes; then + if test -z "$F77" && test -n "$MPIF77"; then + F77="$MPIF77" + else + AC_CHECK_TOOLS([F77], [mpif77 hf77 mpxlf_r mpxlf mpifrt mpf77 cmpifc xlf f77 frt pgf77 pathf77 g77 cf77 fort77 fl32 af77]) + fi + fi + AC_PROG_F77 +])dnl _AX_PROG_F77_MPI diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fasm.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_fasm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fasm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_fasm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_fasm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FASM([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the FASM assembler and sets the variable "fasm" +# to the name of the application or to "no" if not found. If +# ACTION-IF-NOT-FOUND is not specified, configure will fail when the +# program is not found. +# +# Example: +# +# AX_PROG_FASM() +# AX_PROG_FASM([fasm_avail="no"]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_FASM],[ +AC_CHECK_PROGS(fasm,[fasm],no) +if test "x$fasm" = "xno" ; +then + ifelse($#,0,[AC_MSG_ERROR([FASM assembler not found])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fasm_opt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_fasm_opt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fasm_opt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_fasm_opt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_fasm_opt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FASM_OPT(option, var_name) +# +# DESCRIPTION +# +# This macro checks if the FASM assembler accepts the given option. If +# yes, the option is appended to the variable 'var_name', otherwise +# 'var_name' is unchanged. +# +# Example: +# +# AX_PROG_FASM_OPT([-m 256], [FASM_OPTS]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_PROG_FASM_OPT],[ +AC_REQUIRE([AX_PROG_FASM])dnl +AC_MSG_CHECKING([if $fasm accepts $1]) +echo '' > conftest.asm +if $fasm $$2 $1 conftest.asm > conftest.err; then + $2="$$2 $1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fc_mpi.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_fc_mpi.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fc_mpi.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_fc_mpi.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,162 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_fc_mpi.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FC_MPI([MPI-WANTED-TEST[, ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# This macro tries to find out how to compile Fortran77 programs that use +# MPI (Message Passing Interface), a standard API for parallel process +# communication (see http://www-unix.mcs.anl.gov/mpi/). The macro has to +# be used instead of the standard macro AC_PROG_FC and will replace the +# standard variable FC with the found compiler. +# +# MPI-WANTED-TEST is used to test whether MPI is actually wanted by the +# user. If MPI-WANTED_TEST is omitted or if it succeeds, the macro will +# try to find out how to use MPI, if it fails, the macro will call +# AC_PROG_CC to find a standard C compiler instead. +# +# When MPI is found, ACTION-IF-FOUND will be executed, if MPI is not found +# (or MPI-WANTED-TEST fails) ACTION-IF-NOT-FOUND is executed. If +# ACTION-IF-FOUND is not set, the macro will define HAVE_MPI. +# +# The following example demonstrates usage of the macro: +# +# # If --with-mpi=auto is used, try to find MPI, but use standard FC compiler if it is not found. +# # If --with-mpi=yes is used, try to find MPI and fail if it isn't found. +# # If --with-mpi=no is used, use a standard FC compiler instead. +# AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi], +# [compile with MPI (parallelization) support. If none is found, +# MPI is not used. Default: auto]) +# ],,[with_mpi=auto]) +# +# AX_PROG_FC_MPI([test x"$with_mpi" != xno],[use_mpi=yes],[ +# use_mpi=no +# if test x"$with_mpi" = xyes; then +# AC_MSG_FAILURE([MPI compiler requested, but couldn't use MPI.]) +# else +# AC_MSG_WARN([No MPI compiler found, won't use MPI.]) +# fi +# ]) +# +# LICENSE +# +# Copyright (c) 2010,2011 Olaf Lenz +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_PROG_FC_MPI], [ +AC_PREREQ(2.50) + +# Check for compiler +# Needs to be split off into an extra macro to ensure right expansion +# order. +AC_REQUIRE([_AX_PROG_FC_MPI],[_AX_PROG_FC_MPI([$1])]) + +AS_IF([test x"$_ax_prog_fc_mpi_mpi_wanted" = xno], + [ _ax_prog_fc_mpi_mpi_found=no ], + [ + AC_LANG_PUSH([Fortran]) + + # test whether MPI_INIT is available + # We do not use AC_SEARCH_LIBS here, as it caches its outcome and + # thus disallows corresponding calls in the other AX_PROG_*_MPI + # macros. + for lib in NONE mpichf90 fmpi fmpich; do + save_LIBS=$LIBS + if test x"$lib" = xNONE; then + AC_MSG_CHECKING([for function MPI_INIT]) + else + AC_MSG_CHECKING([for function MPI_INIT in -l$lib]) + LIBS="-l$lib $LIBS" + fi + AC_LINK_IFELSE([AC_LANG_CALL([],[MPI_INIT])], + [ _ax_prog_fc_mpi_mpi_found=yes ], + [ _ax_prog_fc_mpi_mpi_found=no ]) + AC_MSG_RESULT($_ax_prog_fc_mpi_mpi_found) + if test "x$_ax_prog_fc_mpi_mpi_found" = "xyes"; then + break; + fi + LIBS=$save_LIBS + done + + # Check for header + AS_IF([test x"$_ax_prog_fc_mpi_mpi_found" = xyes], [ + AC_MSG_CHECKING([for mpif.h]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[[ + include 'mpif.h' +]])], + [ AC_MSG_RESULT(yes)], + [ AC_MSG_RESULT(no) + _ax_prog_fc_mpi_mpi_found=no + ]) + ]) + AC_LANG_POP([Fortran]) +]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +AS_IF([test x"$_ax_prog_fc_mpi_mpi_found" = xyes], [ + ifelse([$2],,[AC_DEFINE(HAVE_MPI,1,[Define if you have the MPI library.])],[$2]) + : +],[ + $3 + : +]) + +])dnl AX_PROG_FC_MPI + +dnl _AX_PROG_FC_MPI is an internal macro required by AX_PROG_FC_MPI. +dnl To ensure the right expansion order, the main function AX_PROG_FC_MPI +dnl has to be split into two parts. This part looks for the MPI +dnl compiler, while the other one tests whether an MPI program can be +dnl compiled. +dnl +AC_DEFUN([_AX_PROG_FC_MPI], [ + AC_ARG_VAR(MPIFC,[MPI Fortran compiler command]) + ifelse([$1],,[_ax_prog_fc_mpi_mpi_wanted=yes],[ + AC_MSG_CHECKING([whether to compile using MPI]) + if $1; then + _ax_prog_fc_mpi_mpi_wanted=yes + else + _ax_prog_fc_mpi_mpi_wanted=no + fi + AC_MSG_RESULT($_ax_prog_fc_mpi_mpi_wanted) + ]) + if test x"$_ax_prog_fc_mpi_mpi_wanted" = xyes; then + if test -z "$FC" && test -n "$MPIFC"; then + FC="$MPIFC" + else + AC_CHECK_TOOLS([FC], [mpif95 mpxlf95_r mpxlf95 ftn mpif90 mpxlf90_r mpxlf90 mpf90 cmpif90c sxmpif90 mpif77 hf77 mpxlf_r mpxlf mpifrt mpf77 cmpifc xlf95 pgf95 pathf95 ifort g95 f95 fort ifc efc openf95 sunf95 crayftn gfortran lf95 ftn xlf90 f90 pgf90 pghpf pathf90 epcf90 sxf90 openf90 sunf90 xlf f77 frt pgf77 pathf77 g77 cf77 fort77 fl32 af77]) + fi + fi + AC_PROG_FC +])dnl _AX_PROG_FC_MPI diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fig2dev.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_fig2dev.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_fig2dev.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_fig2dev.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_fig2dev.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FIG2DEV +# +# DESCRIPTION +# +# If `fig2dev' is found, sets the output variable `FIG2DEV' to `fig2dev', +# and `FIG2DEV_ESPLANG' to the graphics language which can be used to +# produce Encapsulated PostScript. Older versions of `fig2dev' produce EPS +# with `-Lps' and new versions with `-Leps', this macro finds out the +# correct language option automatically. +# +# LICENSE +# +# Copyright (c) 2008 Ville Laurikari +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([VL_PROG_FIG2DEV], [AX_PROG_FIG2DEV]) +AC_DEFUN([AX_PROG_FIG2DEV], [ + AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev) + if test "x$FIG2DEV" != "x"; then + AC_CACHE_CHECK(how to produce EPS with fig2dev, + ax_cv_sys_fig2dev_epslang, [ + if "$FIG2DEV" -Leps /dev/null 2>&1 | grep Unknown > /dev/null; then + ax_cv_sys_fig2dev_epslang=ps + else + ax_cv_sys_fig2dev_epslang=eps + fi + ]) + FIG2DEV_EPSLANG=$ax_cv_sys_fig2dev_epslang + AC_SUBST(FIG2DEV_EPSLANG) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_flex.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_flex.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_flex.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_flex.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,59 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_flex.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FLEX(ACTION-IF-TRUE,ACTION-IF-FALSE) +# +# DESCRIPTION +# +# Check whether flex is the scanner generator. Run ACTION-IF-TRUE if +# successful, ACTION-IF-FALSE otherwise +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# Copyright (c) 2010 Diego Elio Petteno` +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 13 + +AC_DEFUN([AX_PROG_FLEX], [ + AC_REQUIRE([AM_PROG_LEX]) + AC_REQUIRE([AC_PROG_EGREP]) + + AC_CACHE_CHECK([if flex is the lexer generator],[ax_cv_prog_flex],[ + AS_IF([$LEX --version 2>/dev/null | $EGREP -qw '^g?flex'], + [ax_cv_prog_flex=yes], [ax_cv_prog_flex=no]) + ]) + AS_IF([test "$ax_cv_prog_flex" = "yes"], + m4_ifnblank([$1], [[$1]]), + m4_ifnblank([$2], [[$2]]) + ) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_flex_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_flex_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_flex_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_flex_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_flex_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_FLEX_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that flex version is greater or equal to the version +# indicated. If true the shell commands in ACTION-IF-TRUE are executed. If +# not the shell commands in commands in ACTION-IF-TRUE are executed. If +# not the shell commands in ACTION-IF-FALSE are run. Note if $FLEX is not +# set (for example by running AC_CHECK_PROG or AC_PATH_PROG) the macro +# will fail. +# +# Example: +# +# AC_PATH_PROG([FLEX],[flex]) +# AX_PROG_FLEX_VERSION([2.5.39],[ ... ],[ ... ]) +# +# This will check to make sure that the flex you have is at least version +# 2.5.39 or greater. +# +# NOTE: This macro uses the $FLEX variable to perform the check. +# +# LICENSE +# +# Copyright (c) 2015 Jonathan Rajotte-Julien +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_PROG_FLEX_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$FLEX"],[ + ax_flex_version="$1" + + AC_MSG_CHECKING([for flex version]) + changequote(<<,>>) + flex_version=`$FLEX --version 2>&1 \ + | $SED -n -e '/flex /b inspect +b +: inspect +s/.* (\{0,1\}\([0-9]*\.[0-9]*\.[0-9]*\))\{0,1\}.*/\1/;p'` + changequote([,]) + AC_MSG_RESULT($flex_version) + + AC_SUBST([FLEX_VERSION],[$flex_version]) + + AX_COMPARE_VERSION([$flex_version],[ge],[$ax_flex_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find flex]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_gjs.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_gjs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_gjs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_gjs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_gjs.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_GJS +# +# DESCRIPTION +# +# AX_PROG_GJS checks for the presence of the JavaScript interpreter GJS +# (https://wiki.gnome.org/Projects/Gjs) in pkg-config or in the path. If +# it is not found, an error is issued and configure is halted. If it is +# found, the path of the interpreter is placed into a variable named GJS, +# which is declared precious. +# +# LICENSE +# +# Copyright (c) 2013, 2016 Endless Mobile, Inc.; contributed by Philip Chimento +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN_ONCE([AX_PROG_GJS], [ + AC_REQUIRE([PKG_PROG_PKG_CONFIG]) + AC_ARG_VAR([GJS], [Path to GJS interpreter]) + AC_MSG_CHECKING([for GJS]) + AS_IF([pkg-config --exists gjs-1.0], [ + GJS=`pkg-config --variable=gjs_console gjs-1.0` + AC_MSG_RESULT([(pkg-config) $GJS]) + ], [ + AC_PATH_PROG([GJS], [gjs], [notfound]) + AC_MSG_RESULT([(path) $GJS]) + ]) + AS_IF([test "x$GJS" = "xnotfound"], + [AC_MSG_ERROR([GJS is required, but was not found. If GJS is +installed, try passing its path in an environment variable, +for example GJS=/path/to/gjs.])]) +]) + +# _AX_GJS_IFELSE(program, [action-if-true], [action-if-false]) +# ------------------------------------------------------------- +# Comparable to AC_RUN_IFELSE(), but runs the program using GJS +# instead of trying to compile it and link it. +# Used by AX_CHECK_GIRS_GJS and AX_CHECK_GIR_SYMBOLS_GJS. + +AC_DEFUN([_AX_GJS_IFELSE], [ + AC_REQUIRE([AX_PROG_GJS]) + echo "$1" >conftest.js + $GJS conftest.js >>config.log 2>&1 + AS_IF([test $? -eq 0], [$2], [$3]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_guile_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_guile_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_guile_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_guile_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,65 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_guile_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_GUILE_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that guile supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $GUILE is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([GUILE],[guile]) +# AC_PROG_GUILE_VERSION([1.6.0],[ ... ],[ ... ]) +# +# This will check to make sure that the guile you have supports at least +# version 1.6.0. +# +# NOTE: This macro uses the $GUILE variable to perform the check. +# AX_WITH_GUILE can be used to set that variable prior to running this +# macro. The $GUILE_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_PROG_GUILE_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + + AS_IF([test -n "$GUILE"],[ + ax_guile_version="$1" + + AC_MSG_CHECKING([for guile version]) + changequote(<<,>>) + guile_version=`$GUILE -q --version 2>&1 | head -n 1 | $SED -e 's/.* \([0-9]*\.[0-9]*\.[0-9]*\)/\1/'` + changequote([,]) + AC_MSG_RESULT($guile_version) + + AC_SUBST([GUILE_VERSION],[$guile_version]) + + AX_COMPARE_VERSION([$ax_guile_version],[le],[$guile_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the guile interpreter]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_haxe_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_haxe_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_haxe_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_haxe_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_haxe_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_HAXE_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that haxe supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. The $HAXE_VERSION variable will be filled with +# the detected version. +# +# This macro uses the $HAXE variable to perform the check. If $HAXE is not +# set prior to calling this macro, the macro will fail. +# +# Example: +# +# AC_PATH_PROG([HAXE],[haxe]) +# AC_PROG_HAXE_VERSION([3.1.3],[ ... ],[ ... ]) +# +# Searches for Haxe, then checks if at least version 3.1.3 is present. +# +# LICENSE +# +# Copyright (c) 2015 Jens Geyer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_PROG_HAXE_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + + AS_IF([test -n "$HAXE"],[ + ax_haxe_version="$1" + + AC_MSG_CHECKING([for haxe version]) + haxe_version=`$HAXE -version 2>&1 | $SED -e 's/^.* \( @<:@0-9@:>@*\.@<:@0-9@:>@*\.@<:@0-9@:>@*\) .*/\1/'` + AC_MSG_RESULT($haxe_version) + + AC_SUBST([HAXE_VERSION],[$haxe_version]) + + AX_COMPARE_VERSION([$ax_haxe_version],[le],[$haxe_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find Haxe]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_help2man.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_help2man.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_help2man.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_help2man.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,212 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_help2man.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_HELP2MAN([program list], [man directory prefix], [binary prefix]) +# +# DESCRIPTION +# +# AX_PROG_HELP2MAN is a macro designed to facilitate usage of help2man. It +# may take three optional arguments: +# +# 1. : comma-separated m4 list of input programs +# +# Specifies the list of input programs which shall be used to produce man +# pages using help2man. If no value is specified, the macro assumes that +# the sole target will be named $(PACKAGE_NAME). Thus, the two following +# lines are equivalent: +# +# AX_PROG_HELP2MAN +# AX_PROG_HELP2MAN([\$(PACKAGE_NAME)]) +# +# 2. : directory prefix of the man pages directory +# +# Sets AX_HELP2MAN_PREFIX_MANS to . Defaults to +# 'doc/man/man1' if no value is provided. Note that +# AX_HELP2MAN_PREFIX_MANS will always be a subdirectory of the build +# directory. +# +# 3. : +# +# Sets AX_HELP2MAN_PREFIX_BIN to . Defaults to +# '$(top_builddir)' if no value is provided. The two following lines are +# equivalent: +# +# AX_PROG_HELP2MAN([subdir/program1, subdir/program2]) +# AX_PROG_HELP2MAN([program1, program2], [], [\$(top_builddir)/subdir]) +# +# The macro: +# +# - checks that help2man is available on the system. +# +# - provides the configure option --disable-help2man. +# +# - sets the output variable ax_help2man_MANS to the list of man pages +# that shall be generated. +# +# - sets the automake conditional HAVE_HELP2MAN +# +# - sets the substitution variable AX_HELP2MAN_RULES to the required make +# rules, targets and recipes. +# +# Further detail on the macro can be found after the minimal working +# example. Here is a minimal working example: +# +# # configure.ac: +# AX_PROG_HELP2MAN +# +# # Makefile.am: +# if HAVE_HELP2MAN +# man1_MANS = $(ax_help2man_MANS) +# @AX_HELP2MAN_RULES@ +# endif +# +# This minimal working example shall work under the following assumptions: +# +# 1. the aforementioned binary has the same name as the project +# +# 2. the project produces a single binary at the root of the build +# directory +# +# 3. the man page shall be generated into the doc/man/man1 directory +# +# Note that adding ax_help2man_MANS to man1_MANS is not needed if the man +# page generation is not mandatory. +# +# The AX_HELP2MAN_RULES substitution variable shall contain: +# +# - a recipe to create, if necessary, the destination directory. +# +# - a generic rule to produce the manpages. +# +# This rule targets the contents of the variable ax_help2man_MANS and its +# recipe shall be akin to the following: +# +# $(HELP2MAN) -l -N --output="$@" --name="$(shell basename $<)" "$(shell dirname $<)/$(shell basename $<)" +# +# Errors from this rule are ignored. +# +# - rules for each input program and target man page. +# +# For each input program, a rule akin to the following shall be available: +# +# $(AX_HELP2MAN_PREFIX_MANS)/program.1: $(AX_HELP2MAN_PREFIX_BIN)/path/to/program +# +# The macro assumes that all man pages shall be generated into the same +# directory (AX_HELP2MAN_PREFIX_MANS) and that all input programs can be +# found in the same directory (AX_HELP2MAN_PREFIX_BIN). If a subset of the +# inputs or outputs have different paths (for instance one of the inputs +# is a script available in $(top_srcdir) whereas the other inputs are +# programs compiled at build time), it can be customized in the +# Makefile.am: the target man page must be added to ax_help2man_MANS, so +# that it becomes a target of the generic rule for man pages and a rule +# must be added to specify its prerequisite: +# +# ax_help2man_MANS += path/to/output/man/page.1 +# path/to/output/man/page.1: path/to/input/program.1 +# +# Here is a full example for a project where binaries 'program1' and +# 'program2' are compiled at build time whereas 'script' is available in +# the source tree: +# +# # configure.ac: +# AX_PROG_HELP2MAN([program1, program2]) +# +# # Makefile.am: +# if HAVE_HELP2MAN +# man1_MANS = $(ax_help2man_MANS) +# @AX_HELP2MAN_RULES@ +# ax_help2man_MANS += $(AX_HELP2MAN_PREFIX_MANS)/script.1 +# $(AX_HELP2MAN_PREFIX_MANS)/script.1: $(top_srcdir)/script +# endif +# +# Note that this macro should not be called more than once. +# +# LICENSE +# +# Copyright (c) 2017 Harenome Ranaivoarivony-Razanajato +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# Under Section 7 of GPL version 3, you are granted additional permissions +# described in the Autoconf Configure Script Exception, version 3.0, as +# published by the Free Software Foundation. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . + +#serial 2 + +AC_DEFUN_ONCE([AX_PROG_HELP2MAN], +[ + dnl The make rules use 'AM_V_P' and 'AM_V_at' which may not be known. + m4_pattern_allow(AM_V_P) + m4_pattern_allow(AM_V_at) + + dnl Provide an option for the configure script, and check whether help2man + dnl is available and whether the user wants to use it. + AC_ARG_ENABLE(help2man, + [AS_HELP_STRING([--disable-help2man], [Disable help2man man generation])]) + AC_PATH_PROG(HELP2MAN, help2man, false) + AS_IF([test "x$enable_help2man" = "xno"], [HELP2MAN="false"]) + AM_CONDITIONAL([HAVE_HELP2MAN], [test "x$HELP2MAN" != "xfalse"]) + + dnl Default to 'doc' and $(top_builddir) if no prefixes were provided + AC_SUBST(AX_HELP2MAN_PREFIX_MANS, "\$(top_builddir)/m4_ifblank([$2], [doc/man/man1], [$2])") + AC_SUBST(AX_HELP2MAN_PREFIX_BIN, "m4_ifblank([$3], [\$(top_builddir)], [$3])") + + ax_help2man_targets_text="" + m4_ifblank([$1], + dnl if no executable path was specified, default to $(PACKAGE_NAME) + [ + ax_help2man_mans_list='$(AX_HELP2MAN_PREFIX_MANS)/$(PACKAGE_NAME).1' + ax_help2man_targets_text='$(AX_HELP2MAN_PREFIX_MANS)/$(PACKAGE_NAME).1: $(AX_HELP2MAN_PREFIX_BIN)/$(PACKAGE_NAME)' + ], + dnl else, (if executable path(s) were specified), create rules for each target + [ + m4_foreach(target, [$1], + [ + ax_help2man_target="target" + ax_help2man_target_name=$(basename "${ax_help2man_target}") + ax_help2man_mans_list="${ax_help2man_mans_list} "'$(AX_HELP2MAN_PREFIX_MANS)/'"${ax_help2man_target_name}"'.1' + ax_help2man_targets_text="${ax_help2man_targets_text} +"'$(AX_HELP2MAN_PREFIX_MANS)/'"${ax_help2man_target_name}"'.1: $(AX_HELP2MAN_PREFIX_BIN)/'"${ax_help2man_target}" + ]) + ]) + + dnl Reminder for $ax_help2man_rules_text: + dnl Do not insert spaces here, make rules require tabs for indentation! + dnl + dnl $(shell dirname $<)/$(shell basename $<) instead of merely $<: + dnl if the make rule prerequisite + dnl (i.e the input program for help2man) is at the root of the directory, the + dnl prerequisite text will only contain the name of the file. However, + dnl help2man needs the leading './'... Fortunately, dirname returns '.' if its + dnl input does not contain slashes! + ax_help2man_rules_text=' +# Rule to create the directory for man 1 pages +$(AX_HELP2MAN_PREFIX_MANS): + $(AM_V_at)$(MKDIR_P) @S|@@ + +# Generic rule to create manpages using help2man +$(ax_help2man_MANS): | $(AX_HELP2MAN_PREFIX_MANS) + @if ! $(AM_V_P); then printf " %-8s %s\n" "HELP2MAN" "@S|@@"; fi + $(AM_V_at)-$(HELP2MAN) -l -N --output="@S|@@" --name="$(shell basename $<)" "$(shell dirname $<)/$(shell basename $<)" + +# Targets +'"${ax_help2man_targets_text}" + + AC_SUBST([ax_help2man_MANS], ["${ax_help2man_mans_list}"]) + AC_SUBST([AX_HELP2MAN_RULES], ["${ax_help2man_rules_text}"]) + AM_SUBST_NOTMAKE([AX_HELP2MAN_RULES]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_hla.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_hla.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_hla.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_hla.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_hla.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_HLA([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the HLA assembler and sets the variable "hla" to +# the name of the application or to "no" if not found. If +# ACTION-IF-NOT-FOUND is not specified, configure will fail when the +# program is not found. +# +# Example: +# +# AX_PROG_HLA() +# AX_PROG_HLA([hla_avail="no"]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_HLA],[ +AC_CHECK_PROGS(hla,[hla],no) +if test "x$hla" = "xno" ; +then + ifelse($#,0,[AC_MSG_ERROR([HLA assembler not found])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_hla_opt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_hla_opt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_hla_opt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_hla_opt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_hla_opt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_HLA_OPT(option, var_name) +# +# DESCRIPTION +# +# This macro checks if the HLA assembler accepts the given option. If yes, +# the option is appended to the variable 'var_name', otherwise 'var_name' +# is unchanged. +# +# Example: +# +# AX_PROG_HLA_OPT([-v], [HLA_OPTS]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_PROG_HLA_OPT],[ +AC_REQUIRE([AX_PROG_HLA])dnl +AC_MSG_CHECKING([if $hla accepts $1]) +echo '' > conftest.hla +if $hla $$2 $1 conftest.hla > conftest.err; then + $2="$$2 $1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_httpd.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_httpd.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_httpd.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_httpd.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,84 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_httpd.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_HTTPD +# +# DESCRIPTION +# +# Check for Apache's 'httpd', let script continue if exists & works, pops +# up error message if not. +# +# Testing of functionality is by checking its compile settings +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# HTTPD = which httpd +# HTTPD_ROOT = Apache's root directory, specified when compiled / run with -d option +# HTTPD_SERVER_ROOT = Directory for Apache's essential files, e.g. access logs / error logs / modules / scripts. +# HTTPD_SERVER_CONFIG_FILE = Full-path of the 'httpd.conf' file +# HTTPD_USER = Which user that httpd runs as +# HTTPD_GROUP = Which group that httpd runs as +# HTTPD_DOC_HOME = Document directory, taken as the first DocumentRoot path found in httpd.conf +# HTTPD_SCRIPT_HOME = CGI script directory, taken as the first ScriptAlias path found in httpd.conf +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_HTTPD], [AX_PROG_HTTPD]) +AC_DEFUN([AX_PROG_HTTPD],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(HTTPD, httpd$EXEEXT, nocommand) +if test "$HTTPD" = nocommand; then + AC_MSG_ERROR([httpd not found in $PATH]) +fi +HTTPD_ROOT=`httpd -V | grep HTTPD_ROOT | sed 's/^.*HTTPD_ROOT[[[:blank:]]]*=[[[:blank:]]]*"\(.*\)"$/\1/'` +HTTPD_SERVER_CONFIG_FILE=`httpd -V | grep SERVER_CONFIG_FILE | sed 's/^.*SERVER_CONFIG_FILE[[[:blank:]]]*=[[[:blank:]]]*"\(.*\)"$/\1/'` +if echo $HTTPD_SERVER_CONFIG_FILE | grep ^[[^/]] > /dev/null; then + HTTPD_SERVER_CONFIG_FILE=$HTTPD_ROOT/$HTTPD_SERVER_CONFIG_FILE +fi +SERVER_ROOT_PATTERN='^[[[:blank:]]]*ServerRoot[[[:blank:]]][[[:blank:]]]*"\([[^"]]*\)"$' +HTTPD_USER_PATTERN='^User[[[:blank:]]][[[:blank:]]]*\([[^[:blank:]]][[^[:blank:]]]*\)$' +HTTPD_GROUP_PATTERN='^Group[[[:blank:]]][[[:blank:]]]*\([[^[:blank:]]][[^[:blank:]]]*\)$' +DOCUMENT_ROOT_PATTERN='^[[[:blank:]]]*DocumentRoot[[[:blank:]]][[[:blank:]]]*"\([[^"]]*\)"$' +SCRIPT_ALIAS_PATTERN='^[[[:blank:]]]*ScriptAlias[[[:blank:]]][[[:blank:]]]*[[^[:blank:]]][[^[:blank:]]]*[[[:blank:]]][[[:blank:]]]*"\([[^"]]*\)"$' +AC_CHECK_FILE($HTTPD_SERVER_CONFIG_FILE, + [HTTPD_SERVER_ROOT=`grep $SERVER_ROOT_PATTERN $HTTPD_SERVER_CONFIG_FILE | head -n 1 | sed "s/$SERVER_ROOT_PATTERN/\1/" | sed s/[[/]]$//`; + HTTPD_USER=`grep $HTTPD_USER_PATTERN $HTTPD_SERVER_CONFIG_FILE | sed "s/$HTTPD_USER_PATTERN/\1/"`; + HTTPD_GROUP=`grep $HTTPD_GROUP_PATTERN $HTTPD_SERVER_CONFIG_FILE | sed "s/$HTTPD_GROUP_PATTERN/\1/"`; + HTTPD_DOC_HOME=`grep $DOCUMENT_ROOT_PATTERN $HTTPD_SERVER_CONFIG_FILE | head -n 1 | sed "s/$DOCUMENT_ROOT_PATTERN/\1/" | sed s/[[/]]$//`; + HTTPD_SCRIPT_HOME=`grep $SCRIPT_ALIAS_PATTERN $HTTPD_SERVER_CONFIG_FILE | head -n 1 | sed "s/$SCRIPT_ALIAS_PATTERN/\1/" | sed s/[[/]]$//`], + AC_MSG_ERROR([httpd server-config-file (detected as $HTTPD_SERVER_CONFIG_FILE by httpd -V) cannot be found]))dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_jar.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_jar.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_jar.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_jar.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_jar.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAR +# +# DESCRIPTION +# +# AX_PROG_JAR tests for an existing jar program. It uses the environment +# variable JAR then tests in sequence various common jar programs. +# +# If you want to force a specific compiler: +# +# - at the configure.in level, set JAR=yourcompiler before calling +# AX_PROG_JAR +# +# - at the configure level, setenv JAR +# +# You can use the JAR variable in your Makefile.in, with @JAR@. +# +# Note: This macro depends on the autoconf M4 macros for Java programs. It +# is VERY IMPORTANT that you download that whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. +# +# The general documentation of those macros, as well as the sample +# configure.in, is included in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Egon Willighagen +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_PROG_JAR], [AX_PROG_JAR]) +AC_DEFUN([AX_PROG_JAR],[ +AS_IF([test "x$JAVAPREFIX" = x], + [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar])], + [test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar], [], [$JAVAPREFIX/bin])]) +test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH]) +AC_PROVIDE([$0])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_java_cc.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_java_cc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_java_cc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_java_cc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,104 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_java_cc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVA_CC +# +# DESCRIPTION +# +# Finds the appropriate java compiler on your path. By preference the java +# compiler is gcj, then jikes then javac. +# +# The macro can take one argument specifying a space separated list of +# java compiler names. +# +# For example: +# +# AX_PROG_JAVA_CC(javac, gcj) +# +# The macro also sets the compiler options variable: JAVA_CC_OPTS to +# something sensible: +# +# - for GCJ it sets it to: @GCJ_OPTS@ +# (if GCJ_OPTS is not yet defined then it is set to "-C") +# +# - no other compiler has applicable options yet +# +# Here's an example configure.in: +# +# AC_INIT(Makefile.in) +# AX_PROG_JAVA_CC() +# AC_OUTPUT(Makefile) +# dnl End. +# +# And here's the start of the Makefile.in: +# +# PROJECT_ROOT := @srcdir@ +# # Tool definitions. +# JAVAC := @JAVA_CC@ +# JAVAC_OPTS := @JAVA_CC_OPTS@ +# JAR_TOOL := @jar_tool@ +# +# LICENSE +# +# Copyright (c) 2008 Nic Ferrier +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +# AX_PROG_JAVA_CC([COMPILER ...]) +# -------------------------- +# COMPILER ... is a space separated list of java compilers to search for. +# This just gives the user an opportunity to specify an alternative +# search list for the java compiler. +AU_ALIAS([AC_PROG_JAVA_CC], [AX_PROG_JAVA_CC]) +AC_DEFUN([AX_PROG_JAVA_CC], +[AC_ARG_VAR([JAVA_CC], [java compiler command])dnl +AC_ARG_VAR([JAVA_CC_FLAGS], [java compiler flags])dnl +m4_ifval([$1], + [AC_CHECK_TOOLS(JAVA_CC, [$1])], +[AC_CHECK_TOOL(JAVA_CC, gcj) +if test -z "$JAVA_CC"; then + AC_CHECK_TOOL(JAVA_CC, javac) +fi +if test -z "$JAVA_CC"; then + AC_CHECK_TOOL(JAVA_CC, jikes) +fi +]) + +if test "$JAVA_CC" = "gcj"; then + if test "$GCJ_OPTS" = ""; then + AC_SUBST(GCJ_OPTS,-C) + fi + AC_SUBST(JAVA_CC_OPTS, @GCJ_OPTS@, + [Define the compilation options for GCJ]) +fi +test -z "$JAVA_CC" && AC_MSG_ERROR([no acceptable java compiler found in \$PATH]) +])# AX_PROG_JAVA_CC diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javac.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_javac.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javac.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_javac.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,79 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_javac.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVAC +# +# DESCRIPTION +# +# AX_PROG_JAVAC tests an existing Java compiler. It uses the environment +# variable JAVAC then tests in sequence various common Java compilers. For +# political reasons, it starts with the free ones. +# +# If you want to force a specific compiler: +# +# - at the configure.in level, set JAVAC=yourcompiler before calling +# AX_PROG_JAVAC +# +# - at the configure level, setenv JAVAC +# +# You can use the JAVAC variable in your Makefile.in, with @JAVAC@. +# +# *Warning*: its success or failure can depend on a proper setting of the +# CLASSPATH env. variable. +# +# TODO: allow to exclude compilers (rationale: most Java programs cannot +# compile with some compilers like guavac). +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AU_ALIAS([AC_PROG_JAVAC], [AX_PROG_JAVAC]) +AC_DEFUN([AX_PROG_JAVAC],[ +m4_define([m4_ax_prog_javac_list],["gcj -C" guavac jikes javac])dnl +AS_IF([test "x$JAVAPREFIX" = x], + [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list])], + [test "x$JAVAC" = x && AC_CHECK_PROGS([JAVAC], [m4_ax_prog_javac_list], [], [$JAVAPREFIX/bin])]) +m4_undefine([m4_ax_prog_javac_list])dnl +test "x$JAVAC" = x && AC_MSG_ERROR([no acceptable Java compiler found in \$PATH]) +AX_PROG_JAVAC_WORKS +AC_PROVIDE([$0])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javac_works.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_javac_works.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javac_works.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_javac_works.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_javac_works.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVAC_WORKS +# +# DESCRIPTION +# +# Internal use ONLY. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_PROG_JAVAC_WORKS], [AX_PROG_JAVAC_WORKS]) +AC_DEFUN([AX_PROG_JAVAC_WORKS],[ +AC_CACHE_CHECK([if $JAVAC works], ac_cv_prog_javac_works, [ +JAVA_TEST=Test.java +CLASS_TEST=Test.class +cat << \EOF > $JAVA_TEST +/* [#]line __oline__ "configure" */ +public class Test { +} +EOF +if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) >/dev/null 2>&1; then + ac_cv_prog_javac_works=yes +else + AC_MSG_ERROR([The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)]) + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat $JAVA_TEST >&AS_MESSAGE_LOG_FD +fi +rm -f $JAVA_TEST $CLASS_TEST +]) +AC_PROVIDE([$0])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javadoc.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_javadoc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javadoc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_javadoc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_javadoc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVADOC +# +# DESCRIPTION +# +# AX_PROG_JAVADOC tests for an existing javadoc generator. It uses the +# environment variable JAVADOC then tests in sequence various common +# javadoc generator. +# +# If you want to force a specific compiler: +# +# - at the configure.in level, set JAVADOC=yourgenerator before calling +# AX_PROG_JAVADOC +# +# - at the configure level, setenv JAVADOC +# +# You can use the JAVADOC variable in your Makefile.in, with @JAVADOC@. +# +# Note: This macro depends on the autoconf M4 macros for Java programs. It +# is VERY IMPORTANT that you download that whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. +# +# The general documentation of those macros, as well as the sample +# configure.in, is included in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Egon Willighagen +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_PROG_JAVADOC], [AX_PROG_JAVADOC]) +AC_DEFUN([AX_PROG_JAVADOC],[ +AS_IF([test "x$JAVAPREFIX" = x], + [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc])], + [test "x$JAVADOC" = x && AC_CHECK_PROGS([JAVADOC], [javadoc], [], [$JAVAPREFIX/bin])]) +test "x$JAVADOC" = x && AC_MSG_ERROR([no acceptable javadoc generator found in \$PATH]) +AC_PROVIDE([$0])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javah.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_javah.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_javah.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_javah.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_javah.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVAH +# +# DESCRIPTION +# +# AX_PROG_JAVAH tests the availability of the javah header generator and +# looks for the jni.h header file. If available, JAVAH is set to the full +# path of javah and CPPFLAGS is updated accordingly. +# +# LICENSE +# +# Copyright (c) 2008 Luc Maisonobe +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([AC_PROG_JAVAH], [AX_PROG_JAVAH]) +AC_DEFUN([AX_PROG_JAVAH],[ +AC_REQUIRE([AC_CANONICAL_BUILD])dnl +AC_REQUIRE([AC_PROG_CPP])dnl +AC_PATH_PROG(JAVAH,javah) +AS_IF([test -n "$ac_cv_path_JAVAH"], + [ + AC_TRY_CPP([#include ],,[ + ac_save_CPPFLAGS="$CPPFLAGS" + _ACJAVAH_FOLLOW_SYMLINKS("$ac_cv_path_JAVAH") + ax_prog_javah_bin_dir=`AS_DIRNAME([$_ACJAVAH_FOLLOWED])` + ac_dir="`AS_DIRNAME([$ax_prog_javah_bin_dir])`/include" + AS_CASE([$build_os], + [cygwin*|mingw*], + [ac_machdep=win32], + [ac_machdep=`AS_ECHO($build_os) | sed 's,[[-0-9]].*,,'`]) + CPPFLAGS="$ac_save_CPPFLAGS -I$ac_dir -I$ac_dir/$ac_machdep" + AC_TRY_CPP([#include ], + ac_save_CPPFLAGS="$CPPFLAGS", + AC_MSG_WARN([unable to include ])) + CPPFLAGS="$ac_save_CPPFLAGS"]) + ]) +]) + +AC_DEFUN([_ACJAVAH_FOLLOW_SYMLINKS],[ +# find the include directory relative to the javac executable +_cur="$1" +while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do + AC_MSG_CHECKING([symlink for $_cur]) + _slink=`ls -ld "$_cur" | sed 's/.* -> //'` + case "$_slink" in + /*) _cur="$_slink";; + # 'X' avoids triggering unwanted echo options. + *) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";; + esac + AC_MSG_RESULT([$_cur]) +done +_ACJAVAH_FOLLOWED="$_cur" +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_java.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_java.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_java.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_java.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,115 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_java.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVA +# +# DESCRIPTION +# +# Here is a summary of the main macros: +# +# AX_PROG_JAVAC: finds a Java compiler. +# +# AX_PROG_JAVA: finds a Java virtual machine. +# +# AX_CHECK_CLASS: finds if we have the given class (beware of CLASSPATH!). +# +# AX_CHECK_RQRD_CLASS: finds if we have the given class and stops +# otherwise. +# +# AX_TRY_COMPILE_JAVA: attempt to compile user given source. +# +# AX_TRY_RUN_JAVA: attempt to compile and run user given source. +# +# AX_JAVA_OPTIONS: adds Java configure options. +# +# AX_PROG_JAVA tests an existing Java virtual machine. It uses the +# environment variable JAVA then tests in sequence various common Java +# virtual machines. For political reasons, it starts with the free ones. +# You *must* call [AX_PROG_JAVAC] before. +# +# If you want to force a specific VM: +# +# - at the configure.in level, set JAVA=yourvm before calling AX_PROG_JAVA +# +# (but after AC_INIT) +# +# - at the configure level, setenv JAVA +# +# You can use the JAVA variable in your Makefile.in, with @JAVA@. +# +# *Warning*: its success or failure can depend on a proper setting of the +# CLASSPATH env. variable. +# +# TODO: allow to exclude virtual machines (rationale: most Java programs +# cannot run with some VM like kaffe). +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. +# +# A Web page, with a link to the latest CVS snapshot is at +# . +# +# This is a sample configure.in Process this file with autoconf to produce +# a configure script. +# +# AC_INIT(UnTag.java) +# +# dnl Checks for programs. +# AC_CHECK_CLASSPATH +# AX_PROG_JAVAC +# AX_PROG_JAVA +# +# dnl Checks for classes +# AX_CHECK_RQRD_CLASS(org.xml.sax.Parser) +# AX_CHECK_RQRD_CLASS(com.jclark.xml.sax.Driver) +# +# AC_OUTPUT(Makefile) +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_PROG_JAVA], [AX_PROG_JAVA]) +AC_DEFUN([AX_PROG_JAVA],[ +m4_define([m4_ax_prog_java_list], [kaffe java])dnl +AS_IF([test "x$JAVAPREFIX" = x], + [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list])], + [test x$JAVA = x && AC_CHECK_PROGS([JAVA], [m4_ax_prog_java_list], [], [$JAVAPREFIX/bin])]) +test x$JAVA = x && AC_MSG_ERROR([no acceptable Java virtual machine found in \$PATH]) +m4_undefine([m4_ax_prog_java_list])dnl +AX_PROG_JAVA_WORKS +AC_PROVIDE([$0])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_java_works.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_java_works.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_java_works.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_java_works.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,91 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_java_works.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_JAVA_WORKS +# +# DESCRIPTION +# +# Internal use ONLY. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([AC_PROG_JAVA_WORKS], [AX_PROG_JAVA_WORKS]) +AC_DEFUN([AX_PROG_JAVA_WORKS], [ + if test x$ac_cv_prog_javac_works = xno; then + AC_MSG_ERROR([Cannot compile java source. $JAVAC does not work properly]) + fi + if test x$ac_cv_prog_javac_works = x; then + AX_PROG_JAVAC + fi +AC_CACHE_CHECK(if $JAVA works, ac_cv_prog_java_works, [ +JAVA_TEST=Test.java +CLASS_TEST=Test.class +TEST=Test +changequote(, )dnl +cat << \EOF > $JAVA_TEST +/* [#]line __oline__ "configure" */ +public class Test { +public static void main (String args[]) { + System.exit (0); +} } +EOF +changequote([, ])dnl + if AC_TRY_COMMAND($JAVAC $JAVACFLAGS $JAVA_TEST) && test -s $CLASS_TEST; then + : + else + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat $JAVA_TEST >&AS_MESSAGE_LOG_FD + AC_MSG_ERROR(The Java compiler $JAVAC failed (see config.log, check the CLASSPATH?)) + fi +if AC_TRY_COMMAND($JAVA -classpath . $JAVAFLAGS $TEST) >/dev/null 2>&1; then + ac_cv_prog_java_works=yes +else + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat $JAVA_TEST >&AS_MESSAGE_LOG_FD + AC_MSG_ERROR(The Java VM $JAVA failed (see config.log, check the CLASSPATH?)) +fi +rm -f $JAVA_TEST $CLASS_TEST +]) +AC_PROVIDE([$0])dnl +] +) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_masm.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_masm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_masm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_masm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_masm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MASM([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the MASM assembler and sets the variable "masm" +# to the name of the application or to "no" if not found. If +# ACTION-IF-NOT-FOUND is not specified, configure will fail when the +# program is not found. +# +# Example: +# +# AX_PROG_MASM() +# AX_PROG_MASM([masm_avail="no"]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_MASM],[ +AC_CHECK_PROGS(masm,[ml masm ml32 ml64 masm32],no) +if test "x$masm" = "xno" ; +then + ifelse($#,0,[AC_MSG_ERROR([MASM assembler not found])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_masm_opt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_masm_opt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_masm_opt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_masm_opt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_masm_opt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MASM_OPT(option, var_name) +# +# DESCRIPTION +# +# This macro checks if the MASM assembler accepts the given option. If +# yes, the option is appended to the variable 'var_name', otherwise +# 'var_name' is unchanged. +# +# Example: +# +# AX_PROG_MASM_OPT([/coff], [MASM_OPTS]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_PROG_MASM_OPT],[ +AC_REQUIRE([AX_PROG_MASM])dnl +AC_MSG_CHECKING([if $masm accepts $1]) +echo '' > conftest.asm +if $masm $$2 $1 conftest.asm > conftest.err; then + $2="$$2 $1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_md5sum.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_md5sum.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_md5sum.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_md5sum.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,34 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_md5sum.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MD5SUM([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro find a md5sum application and set the variable md5sum to the +# name of the application or to no if not found if ACTION-IF-NOT-FOUND is +# not specified, configure fail when then application is not found. +# +# LICENSE +# +# Copyright (c) 2009 Gabriele Bartolini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_PROG_MD5SUM],[ +# Mac users have md5 instead of md5sum +AC_CHECK_PROGS(md5sum,[md5sum md5],no) +if test $md5sum = "no" ; +then + ifelse($#,0,[AC_MSG_ERROR([Unable to find the md5sum application (or equivalent)])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_modprobe.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_modprobe.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_modprobe.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_modprobe.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_modprobe.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MODPROBE +# +# DESCRIPTION +# +# This macro searches for a modprobe command, such as can be found on +# Linux systems with loadable kernel module support. PATH is checked +# first, then the default location(s). +# +# This is one of several autoconf macros intended to assist in configuring +# and installing loadable kernel modules. +# +# LICENSE +# +# Copyright (c) 2008 Kaelin Colclasure +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_PROG_MODPROBE], [AX_PROG_MODPROBE]) +AC_DEFUN([AX_PROG_MODPROBE],[ +AC_PATH_PROG(MODPROBE, modprobe, , $PATH:/sbin) +if test -z "$MODPROBE"; then + AC_MSG_WARN([no support for loadable kernel modules]) +else + AC_MSG_CHECKING([for module_prefix]) + module_prefix=`$MODPROBE -c | grep path.kernel.= \ + | sed -e '2,$d' -e 's/.*=//' -e 's/.kernel//'` + AC_MSG_RESULT($module_prefix) + AC_SUBST(module_prefix) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqladmin.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqladmin.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqladmin.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqladmin.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_mysqladmin.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MYSQLADMIN +# +# DESCRIPTION +# +# Check for the program 'mysqladmin' let script continue if exists & works +# pops up error message if not. +# +# Testing of functionality is by invoking it with root password 'rootpass' +# and a 'flush-privileges' command. +# +# Besides checking mysql, this macro also set these environment variables +# upon completion: +# +# MYSQLADMIN = which mysqladmin +# MYSQL_DATADIR = directory containing mysql database +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_PROG_MYSQLADMIN], [AX_PROG_MYSQLADMIN]) +AC_DEFUN([AX_PROG_MYSQLADMIN],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(MYSQLADMIN, mysqladmin$EXEEXT, nocommand) +if test "$MYSQLADMIN" = nocommand; then + AC_MSG_ERROR([mysqladmin not found in $PATH]) +fi +AC_MSG_CHECKING([if mysqladmin works]) +if $MYSQLADMIN -u root -prootpass flush-privileges; then + AC_MSG_RESULT([yes]) +else + AC_MSG_NOTICE([Before installation, set MySQL root password to rootpass; restore your root password afterwards.]) + AC_MSG_ERROR([mysqladmin cannot run with root password = rootpass]) +fi +DATADIR_PATTERN='^|[[[:blank:]]]*datadir[[[:blank:]]]*|[[[:blank:]]]*\([[^[:blank:]]][[^[:blank:]]]*\)[[[:blank:]]]*|' +MYSQL_DATADIR=`$MYSQLADMIN -u root -prootpass variables 2> /dev/null | grep $DATADIR_PATTERN | sed "s/$DATADIR_PATTERN/\1/"`;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqld.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqld.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqld.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqld.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_mysqld.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MYSQLD +# +# DESCRIPTION +# +# Check for the program 'mysqld' let script continue if exists & works +# pops up error message if not. +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# MYSQLD = which mysqld +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_PROG_MYSQLD], [AX_PROG_MYSQLD]) +AC_DEFUN([AX_PROG_MYSQLD],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(MYSQLD, mysqld$EXEEXT, nocommand) +if test "$MYSQLD" = nocommand; then + AC_MSG_ERROR([mysqld not found in $PATH]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqlimport.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqlimport.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqlimport.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqlimport.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_mysqlimport.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MYSQLIMPORT +# +# DESCRIPTION +# +# Check for the program 'mysqlimport', let script continue if exists, pops +# up error message if not. +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# MYSQLIMPORT = which mysqlimport +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_MYSQLIMPORT], [AX_PROG_MYSQLIMPORT]) +AC_DEFUN([AX_PROG_MYSQLIMPORT],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(MYSQLIMPORT, mysqlimport$EXEEXT, nocommand) +if test "$MYSQLIMPORT" = nocommand; then + AC_MSG_ERROR([mysqlimport not found in $PATH]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysql.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_mysql.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysql.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_mysql.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_mysql.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MYSQL +# +# DESCRIPTION +# +# Check for the program 'mysql' let script continue if exists & works pops +# up error message if not. +# +# Testing of functionality is by invoking it with root password 'rootpass' +# and a 'SELECT * FROM user' SQL statement. That SQL statement will select +# all user information from the 'user' privileges table, and should work +# on every proper MySQL server. +# +# Besides checking mysql, this macro also set these environment variables +# upon completion: +# +# MYSQL = which mysql +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_MYSQL], [AX_PROG_MYSQL]) +AC_DEFUN([AX_PROG_MYSQL],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(MYSQL, mysql$EXEEXT, nocommand) +if test "$MYSQL" = nocommand; then + AC_MSG_ERROR([mysql not found in $PATH]) +fi +AC_MSG_CHECKING([if mysql works]) +if echo 'SELECT * FROM user' | $MYSQL -u root -prootpass mysql > /dev/null; then + AC_MSG_RESULT([yes]) +else + AC_MSG_NOTICE([Before installation, set MySQL root password to rootpass; restore your root password afterwards.]) + AC_MSG_ERROR([mysql cannot execute SELECT with root password = rootpass]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqlshow.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqlshow.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_mysqlshow.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_mysqlshow.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_mysqlshow.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_MYSQLSHOW +# +# DESCRIPTION +# +# Check for the program 'mysqlshow' let script continue if exists & works +# pops up error message if not. +# +# Testing of functionality is by invoking it with root password +# 'rootpass'. If it works, it should show all databases currently in +# system. +# +# Besides checking mysql, this macro also set these environment variables +# upon completion: +# +# MYSQLSHOW = which mysqlshow +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_MYSQLSHOW], [AX_PROG_MYSQLSHOW]) +AC_DEFUN([AX_PROG_MYSQLSHOW],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(MYSQLSHOW, mysqlshow$EXEEXT, nocommand) +if test "$MYSQLSHOW" = nocommand; then + AC_MSG_ERROR([mysqlshow not found in $PATH]) +fi +AC_MSG_CHECKING([if mysqlshow works]) +if $MYSQLSHOW -u root -prootpass > /dev/null; then + AC_MSG_RESULT([yes]) +else + AC_MSG_NOTICE([Before installation, set MySQL root password to rootpass; restore your root password afterwards.]) + AC_MSG_ERROR([mysqlshow cannot run with root password = rootpass]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_nasm.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_nasm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_nasm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_nasm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_nasm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_NASM([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the NASM assembler and sets the variable "nasm" +# to the name of the application or to "no" if not found. If +# ACTION-IF-NOT-FOUND is not specified, configure will fail when the +# program is not found. +# +# Example: +# +# AX_PROG_NASM() +# AX_PROG_NASM([nasm_avail="no"]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_NASM],[ +AC_CHECK_PROGS(nasm,[nasm nasmw],no) +if test "x$nasm" = "xno" ; +then + ifelse($#,0,[AC_MSG_ERROR([NASM assembler not found])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_nasm_opt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_nasm_opt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_nasm_opt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_nasm_opt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_nasm_opt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_NASM_OPT(option, var_name) +# +# DESCRIPTION +# +# This macro checks if the NASM assembler accepts the given option. If +# yes, the option is appended to the variable 'var_name', otherwise +# 'var_name' is unchanged. +# +# Example: +# +# AX_PROG_NASM_OPT([-f obj], [NASM_OPTS]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_PROG_NASM_OPT],[ +AC_REQUIRE([AX_PROG_NASM])dnl +AC_MSG_CHECKING([if $nasm accepts $1]) +echo '' > conftest.asm +if $nasm $$2 $1 conftest.asm > conftest.err; then + $2="$$2 $1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_perl_modules.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_perl_modules.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_perl_modules.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_perl_modules.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,77 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_perl_modules.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PERL_MODULES([MODULES], [ACTION-IF-TRUE], [ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Checks to see if the given perl modules are available. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by +# calling AC_CHECK_PROG, or AC_PATH_PROG), AC_CHECK_PROG(PERL, perl, perl) +# will be run. +# +# MODULES is a space separated list of module names. To check for a +# minimum version of a module, append the version number to the module +# name, separated by an equals sign. +# +# Example: +# +# AX_PROG_PERL_MODULES( Text::Wrap Net::LDAP=1.0.3, , +# AC_MSG_WARN(Need some Perl modules) +# +# LICENSE +# +# Copyright (c) 2009 Dean Povey +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([AC_PROG_PERL_MODULES], [AX_PROG_PERL_MODULES]) +AC_DEFUN([AX_PROG_PERL_MODULES],[dnl + +m4_define([ax_perl_modules]) +m4_foreach([ax_perl_module], m4_split(m4_normalize([$1])), + [ + m4_append([ax_perl_modules], + [']m4_bpatsubst(ax_perl_module,=,[ ])[' ]) + ]) + +# Make sure we have perl +if test -z "$PERL"; then +AC_CHECK_PROG(PERL,perl,perl) +fi + +if test "x$PERL" != x; then + ax_perl_modules_failed=0 + for ax_perl_module in ax_perl_modules; do + AC_MSG_CHECKING(for perl module $ax_perl_module) + + # Would be nice to log result here, but can't rely on autoconf internals + $PERL -e "use $ax_perl_module; exit" > /dev/null 2>&1 + if test $? -ne 0; then + AC_MSG_RESULT(no); + ax_perl_modules_failed=1 + else + AC_MSG_RESULT(ok); + fi + done + + # Run optional shell commands + if test "$ax_perl_modules_failed" = 0; then + : + $2 + else + : + $3 + fi +else + AC_MSG_WARN(could not find perl) +fi])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_perl_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_perl_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_perl_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_perl_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_perl_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PERL_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that perl supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PERL is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([PERL],[perl]) +# AX_PROG_PERL_VERSION([5.8.0],[ ... ],[ ... ]) +# +# This will check to make sure that the perl you have supports at least +# version 5.8.0. +# +# NOTE: This macro uses the $PERL variable to perform the check. +# AX_WITH_PERL can be used to set that variable prior to running this +# macro. The $PERL_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +AC_DEFUN([AX_PROG_PERL_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$PERL"],[ + ax_perl_version="$1" + + AC_MSG_CHECKING([for perl version]) + changequote(<<,>>) + perl_version=`$PERL --version 2>&1 \ + | $SED -n -e '/This is perl/b inspect +b +: inspect +s/.* (\{0,1\}v\([0-9]*\.[0-9]*\.[0-9]*\))\{0,1\} .*/\1/;p'` + changequote([,]) + AC_MSG_RESULT($perl_version) + + AC_SUBST([PERL_VERSION],[$perl_version]) + + AX_COMPARE_VERSION([$ax_perl_version],[le],[$perl_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the perl interpreter]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_pgclient.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_pgclient.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_pgclient.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_pgclient.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_pgclient.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PGCLIENT() +# +# DESCRIPTION +# +# This macro searches for a program called 'pgclient'. If found the +# variable $pgclient is set to its path. Else it is set to 0. An option is +# added to the configure script for setting an search path instead of +# $PATH ($pgclient_dir). If pgclient is necessary for installing your +# program, you can do something like the following to stop configure with +# an error if pgclient wasn't found: +# +# if test "x$pgclient" = "x0"; then AC_MSG_ERROR([We need that to setup the database!]); fi +# +# pgclient can be found at http://pgclient.freesources.org +# +# LICENSE +# +# Copyright (c) 2008 Moritz Sinn +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([MS_PROG_PGCLIENT], [AX_PROG_PGCLIENT]) +AC_DEFUN([AX_PROG_PGCLIENT], [ +AC_ARG_WITH(pgclient, [ --with-pgclient=DIR where to find pgclient (default: $PATH)], [pgclient_dir=$withval], [pgclient_dir=$PATH]) +AC_PATH_PROG([pgclient], [pgclient], [0], $pgclient_dir) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_python_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_python_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_python_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_python_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_python_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_PYTHON_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that python supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $PYTHON is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([PYTHON],[python]) +# AX_PROG_PYTHON_VERSION([2.4.4],[ ... ],[ ... ]) +# +# This will check to make sure that the python you have supports at least +# version 2.4.4. +# +# NOTE: This macro uses the $PYTHON variable to perform the check. +# AX_WITH_PYTHON can be used to set that variable prior to running this +# macro. The $PYTHON_VERSION variable will be valorized with the detected +# version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_PROG_PYTHON_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$PYTHON"],[ + ax_python_version="$1" + + AC_MSG_CHECKING([for python version]) + changequote(<<,>>) + python_version=`$PYTHON -V 2>&1 | $GREP "^Python " | $SED -e 's/^.* \([0-9]*\.[0-9]*\.[0-9]*\)/\1/'` + changequote([,]) + AC_MSG_RESULT($python_version) + + AC_SUBST([PYTHON_VERSION],[$python_version]) + + AX_COMPARE_VERSION([$ax_python_version],[le],[$python_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the python interpreter]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_ruby_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_ruby_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_ruby_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_ruby_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_ruby_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_RUBY_VERSION([VERSION],[ACTION-IF-TRUE],[ACTION-IF-FALSE]) +# +# DESCRIPTION +# +# Makes sure that ruby supports the version indicated. If true the shell +# commands in ACTION-IF-TRUE are executed. If not the shell commands in +# ACTION-IF-FALSE are run. Note if $RUBY is not set (for example by +# running AC_CHECK_PROG or AC_PATH_PROG) the macro will fail. +# +# Example: +# +# AC_PATH_PROG([RUBY],[ruby]) +# AC_PROG_RUBY_VERSION([1.8.0],[ ... ],[ ... ]) +# +# This will check to make sure that the ruby you have supports at least +# version 1.6.0. +# +# NOTE: This macro uses the $RUBY variable to perform the check. +# AX_WITH_PROG([RUBY],[ruby],[VALUE-IF-NOT-FOUND],[PATH]) can be used to +# set that variable prior to running this macro. The $RUBY_VERSION +# variable will be valorized with the detected version. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +AC_DEFUN([AX_PROG_RUBY_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AC_REQUIRE([AC_PROG_GREP]) + + AS_IF([test -n "$RUBY"],[ + ax_ruby_version="$1" + + AC_MSG_CHECKING([for ruby version]) + changequote(<<,>>) + ruby_version=`$RUBY --version 2>&1 | $GREP "^ruby " | $SED -e 's/^.* \([0-9]*\.[0-9]*\.[0-9]*\) .*/\1/'` + changequote([,]) + AC_MSG_RESULT($ruby_version) + + AC_SUBST([RUBY_VERSION],[$ruby_version]) + + AX_COMPARE_VERSION([$ax_ruby_version],[le],[$ruby_version],[ + : + $2 + ],[ + : + $3 + ]) + ],[ + AC_MSG_WARN([could not find the ruby interpreter]) + $3 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_scalac.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_scalac.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_scalac.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_scalac.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,49 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_scalac.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_SCALAC +# +# DESCRIPTION +# +# AX_PROG_SCALAC will check that a scala compiler is available, that it +# works and set SCALAC for the Makefile. +# +# AX_PROG_SCALAC will search the path for a Scala compiler. To choose +# another compiler use the environment variable SCALAC. +# +# LICENSE +# +# Copyright (c) 2013 Sveinung Kvilhaugsvik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_ARG_VAR(SCALAC, [scala compiler]) + +AC_DEFUN([AX_PROG_SCALAC], [ + AC_CHECK_PROGS(SCALAC, [scalac]) + AS_IF([test x"$SCALAC" != x], [ + AC_CACHE_VAL(ax_cv_scalac_works, [ + AC_MSG_CHECKING([if the Scala compiler works]) + + TESTFILE=conftest.scala + echo ["object conftest {"] > $TESTFILE + echo [" def main(args: Array[String]): Unit = return"] >> $TESTFILE + echo ["}"] >> $TESTFILE + + [$SCALAC $TESTFILE && ax_cv_scalac_works=yes || ax_cv_scalac_works=no] + AC_MSG_RESULT($ax_cv_scalac_works) + + AS_IF([test x"$ax_cv_scalac_works" != xyes], [ + AC_MSG_ERROR([Scala compiler does not work. Unable to compile $TESTFILE]) + ]) + ]) + ], AC_MSG_WARN([Scala compiler not found])) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_scala.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_scala.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_scala.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_scala.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,35 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_scala.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_SCALA +# +# DESCRIPTION +# +# AX_PROG_SCALA will check that scala is available. If it is SCALA will be +# set to its path and SCALA_VERSION will be set to its version. +# +# Hint: AX_COMPARE_VERSION can be used to check if SCALA_VERSION has an +# acceptable value. +# +# LICENSE +# +# Copyright (c) 2013 Sveinung Kvilhaugsvik +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_ARG_VAR(SCALA, [scala runner]) + +AC_DEFUN([AX_PROG_SCALA], [ + AC_CHECK_PROGS(SCALA, [scala]) + AS_IF([test x"$SCALA" != x], [ + AC_SUBST(SCALA_VERSION, `"$SCALA" -e "println(util.Properties.versionString.split(\" \")(1))"`) + AC_MSG_NOTICE([Scala version $SCALA_VERSION found]) + ], AC_MSG_WARN([Scala not found]))]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_scp.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_scp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_scp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_scp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_scp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_SCP +# +# DESCRIPTION +# +# Check for the program 'scp', let script continue if exists, pops up +# error message if not. +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# SCP = which scp +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_SCP], [AX_PROG_SCP]) +AC_DEFUN([AX_PROG_SCP],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(SCP, scp$EXEEXT, nocommand) +if test "$SCP" = nocommand; then + AC_MSG_ERROR([scp not found in $PATH]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_splint.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_splint.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_splint.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_splint.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,98 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_splint.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_SPLINT([AX_SPLINTFLAGS]) +# +# DESCRIPTION +# +# Check for program splint, the static C code checking tool. The splint +# URL is given by http://www.splint.org. This macro should be use together +# with automake. +# +# Enables following environment variables: +# +# SPLINT +# SPLINTFLAGS +# +# and AX_SPLINTFLAGS is given by AC_SUBST. If AX_SPLINTFLAGS is not given +# by AX_PROG_SPLINT it defaults to "-weak". +# +# Enables the following make target: +# +# splint-check +# +# which runs splint per PROGRAMS and LIBRARIES. Output from splint run is +# collected in file ***_splint.log where *** is given by the PROGRAMS or +# LIBRARIES name. +# +# The following line is required in Makefile.am: +# +# include aminclude_static.am +# +# LICENSE +# +# Copyright (c) 2011 Henrik Uhrenholt +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_PROG_SPLINT], +[ +AC_REQUIRE([AX_ADD_AM_MACRO_STATIC]) +AC_ARG_VAR([SPLINT], [splint executable]) +AC_ARG_VAR([SPLINTFLAGS], [splint flags]) +if test "x$SPLINT" = "x"; then + AC_CHECK_PROGS([SPLINT], [splint]) +fi +if test "x$SPLINT" != "x"; then + ax_splintflags=$1 + if test "x$1" = "x"; then + ax_splintflags=-weak + fi + AC_SUBST([AX_SPLINTFLAGS], [$ax_splintflags]) + ax_prog_splint_enable=yes +else + AC_MSG_WARN([splint support disabled]) + ax_prog_splint_enable=no +fi +AM_CONDITIONAL([ax_prog_splint_enable], [test x"$ax_prog_splint_enable" = x"yes"]) + +AX_ADD_AM_MACRO_STATIC([ +if ax_prog_splint_enable + +define splint_rules +\$(1)_splint.log: \$${AX_DOLLAR}(\$(1)_OBJECTS) + -\$(SPLINT) \$(AX_SPLINTFLAGS) \$(SPLINTFLAGS) \$(AM_SPLINTFLAGS) \$(DEFAULT_INCLUDES) \$(AM_CPPFLAGS) +error-stream-stdout +warning-stream-stdout \$${AX_DOLLAR}(addprefix \$(srcdir)/,\$${AX_DOLLAR}(\$(1)_SOURCES)) > \$${AX_DOLLAR}@ +endef + + +SPLINT_BIN=\$(subst /,_,\$(PROGRAMS:\$(EXEEXT)=)) +SPLINT_LIB=\$(subst /,_,\$(LIBRARIES:.a=_a)) +SPLINT_LTLIB=\$(subst /,_,\$(LTLIBRARIES:.la=_la)) +SPLINTFILES=\$(addsuffix _splint.log,\$(SPLINT_LIB) \$(SPLINT_BIN) \$(SPLINT_LTLIB)) + +splint-check: all \$(SPLINTFILES) + +\$(foreach bin, \$(SPLINT_BIN) \$(SPLINT_LIB) \$(SPLINT_LTLIB),\$(eval \$(call splint_rules,\$(bin)))) + + + + +endif + +.PHONY: clean-local-splint distclean-local-splint +clean-local: clean-local-splint +clean-local-splint: + -test -z \"\$(SPLINTFILES)\" || rm -f \$(SPLINTFILES) + +distclean-local: distclean-local-splint +distclean-local-splint: clean-local-splint +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_ssh.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_ssh.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_ssh.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_ssh.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,58 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_ssh.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_SSH +# +# DESCRIPTION +# +# Check for the program 'ssh', let script continue if exists, pops up +# error message if not. +# +# Besides checking existence, this macro also set these environment +# variables upon completion: +# +# SSH = which ssh +# +# LICENSE +# +# Copyright (c) 2008 Gleen Salmon +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROG_SSH], [AX_PROG_SSH]) +AC_DEFUN([AX_PROG_SSH],[ +AC_REQUIRE([AC_EXEEXT])dnl +AC_PATH_PROG(SSH, ssh$EXEEXT, nocommand) +if test "$SSH" = nocommand; then + AC_MSG_ERROR([ssh not found in $PATH]) +fi;dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_tasm.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_tasm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_tasm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_tasm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_tasm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_TASM([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the TASM assembler and sets the variable "tasm" +# to the name of the application or to "no" if not found. If +# ACTION-IF-NOT-FOUND is not specified, configure will fail when the +# program is not found. +# +# Example: +# +# AX_PROG_TASM() +# AX_PROG_TASM([tasm_avail="no"]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_TASM],[ +AC_CHECK_PROGS(tasm,[tasm tasm32 tasmx],no) +if test "x$tasm" = "xno" ; +then + ifelse($#,0,[AC_MSG_ERROR([TASM assembler not found])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_tasm_opt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_tasm_opt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_tasm_opt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_tasm_opt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_tasm_opt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_TASM_OPT(option, var_name) +# +# DESCRIPTION +# +# This macro checks if the TASM assembler accepts the given option. If +# yes, the option is appended to the variable 'var_name', otherwise +# 'var_name' is unchanged. +# +# Example: +# +# AX_PROG_TASM_OPT([/z], [TASM_OPTS]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_PROG_TASM_OPT],[ +AC_REQUIRE([AX_PROG_TASM])dnl +AC_MSG_CHECKING([if $tasm accepts $1]) +echo '' > conftest.asm +if $tasm $$2 $1 conftest.asm > conftest.err; then + $2="$$2 $1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_tcl.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_tcl.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_tcl.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_tcl.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_tcl.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_TCL([min-version]) +# +# DESCRIPTION +# +# Searches for tcl (tclsh and wish) in PATH and checks which version is +# installed. The macro bails out if either tcl is not found or the minimum +# version is not satisfied, unless minimum version is "0". +# +# Example: +# +# AX_PROG_TCL +# +# This checks for tcl and if not found, exits with an error. If found, it +# prints tcl path and version number. +# +# AX_PROG_TCL([8.0]) +# +# Checks for tcl and exits with an error if its not found or the version +# is below 8.0. +# +# LICENSE +# +# Copyright (c) 2008 David Cluytens +# Copyright (c) 2008 Uwe Mayer +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_PROG_TCL], [ +#-- check for tclsh in PATH +AC_PATH_PROG([TCLSH], [tclsh], [no]) +if [(test x"$TCLSH" == x"no") && (test x"$1" != x"0")]; then + AC_MSG_ERROR([tclsh not found]) +fi + +#-- check for wish in PATH +AC_PATH_PROG([WISH], [wish], [no]) + +#-- check vor tcl version +AC_MSG_CHECKING([tcl version]) +version=`echo "puts [[set tcl_version]]" | tclsh -` +AC_MSG_RESULT([$version]) + +#-- compare tcl version with min-version +required=$1 +if [(test x"$1" != x"") && (test "${required/./}" -gt "${version/./}")]; then + AC_MSG_ERROR([tcl version $1 required]) +fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_xsltproc.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_xsltproc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_xsltproc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_xsltproc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,97 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_xsltproc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_XSLTPROC([default-flags]) +# +# DESCRIPTION +# +# Find an xsltproc executable. +# +# Input: +# +# "default-flags" is the default $XSLTPROC_FLAGS, which will be overridden +# if the user specifies --with-xsltproc-flags. +# +# Output: +# +# $XSLTPROC contains the path to xsltproc, or is empty if none was found +# or the user specified --without-xsltproc. $XSLTPROC_FLAGS contains the +# flags to use with xsltproc. +# +# LICENSE +# +# Copyright (c) 2008,2009 Zmanda Inc. +# Copyright (c) 2008,2009 Dustin J. Mitchell +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AU_ALIAS([AC_PROG_XSLTPROC], [AX_PROG_XSLTPROC]) +AC_DEFUN([AX_PROG_XSLTPROC], +[ +XSLTPROC_FLAGS="$1" +AC_SUBST(XSLTPROC_FLAGS) + +# The (lack of) whitespace and overquoting here are all necessary for +# proper formatting. +AC_ARG_WITH(xsltproc, +AS_HELP_STRING([--with-xsltproc[[[[[=PATH]]]]]], + [Use the xsltproc binary in PATH.]), + [ ac_with_xsltproc=$withval; ], + [ ac_with_xsltproc=maybe; ]) + +AC_ARG_WITH(xsltproc-flags, +AS_HELP_STRING([ --with-xsltproc-flags=FLAGS], + [Flags to pass to xsltproc (default $1)]), + [ if test "x$withval" = "xno"; then + XSLTPROC_FLAGS='' + else + if test "x$withval" != "xyes"; then + XSLTPROC_FLAGS="$withval" + fi + fi + ]) + +# search for xsltproc if it wasn't specified +if test "$ac_with_xsltproc" = "yes" -o "$ac_with_xsltproc" = "maybe"; then + AC_PATH_PROGS(XSLTPROC,xsltproc) +else + if test "$ac_with_xsltproc" != "no"; then + if test -x "$ac_with_xsltproc"; then + XSLTPROC="$ac_with_xsltproc"; + else + AC_MSG_WARN([Specified xsltproc of $ac_with_xsltproc isn't]) + AC_MSG_WARN([executable; searching for an alternative.]) + AC_PATH_PROGS(XSLTPROC,xsltproc) + fi + fi +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_yasm.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_yasm.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_yasm.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_yasm.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_yasm.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_YASM([ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro searches for the YASM assembler and sets the variable "yasm" +# to the name of the application or to "no" if not found. If +# ACTION-IF-NOT-FOUND is not specified, configure will fail when the +# program is not found. +# +# Example: +# +# AX_PROG_YASM() +# AX_PROG_YASM([yasm_avail="no"]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_PROG_YASM],[ +AC_CHECK_PROGS(yasm,[yasm],no) +if test "x$yasm" = "xno" ; +then + ifelse($#,0,[AC_MSG_ERROR([YASM assembler not found])], + $1) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_yasm_opt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prog_yasm_opt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prog_yasm_opt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prog_yasm_opt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_yasm_opt.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_YASM_OPT(option, var_name) +# +# DESCRIPTION +# +# This macro checks if the YASM assembler accepts the given option. If +# yes, the option is appended to the variable 'var_name', otherwise +# 'var_name' is unchanged. +# +# Example: +# +# AX_PROG_YASM_OPT([-f bin], [YASM_OPTS]) +# +# LICENSE +# +# Copyright (c) 2007,2009 Bogdan Drozdowski +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation, either version 3 of the License, or (at +# your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_PROG_YASM_OPT],[ +AC_REQUIRE([AX_PROG_YASM])dnl +AC_MSG_CHECKING([if $yasm accepts $1]) +echo '' > conftest.asm +if $yasm $$2 $1 conftest.asm > conftest.err; then + $2="$$2 $1" + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype_accept.m4 projectm-3.1.0/m4/autoconf-archive/ax_prototype_accept.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype_accept.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prototype_accept.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prototype_accept.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROTOTYPE_ACCEPT +# +# DESCRIPTION +# +# Requires the AX_PROTOTYPE macro. FIXME: Put this in the code! +# +# Find the type of argument two and three of accept. User must include the +# following in acconfig.h: +# +# /* Type of second argument of accept */ +# #undef ACCEPT_ARG2 +# +# /* Type of third argument of accept */ +# #undef ACCEPT_ARG3 +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROTOTYPE_ACCEPT], [AX_PROTOTYPE_ACCEPT]) +AC_DEFUN([AX_PROTOTYPE_ACCEPT],[ +AX_PROTOTYPE(accept, + [ + #include + #include + ], + [ + int a = 0; + ARG2 * b = 0; + ARG3 * c = 0; + accept(a, b, c); + ], + ARG2, [struct sockaddr, void], + ARG3, [socklen_t, size_t, int, unsigned int, long unsigned int]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype_getsockname.m4 projectm-3.1.0/m4/autoconf-archive/ax_prototype_getsockname.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype_getsockname.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prototype_getsockname.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,69 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_prototype_getsockname.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_PROTOTYPE_GETSOCKNAME +# +# DESCRIPTION +# +# Requires the AX_PROTOTYPE macro. FIXME: Put this in the code! +# +# Find the type of argument two and three of getsockname. User must +# include the following in acconfig.h: +# +# /* Type of second argument of getsockname */ +# #undef GETSOCKNAME_ARG2 +# +# /* Type of third argument of getsockname */ +# #undef GETSOCKNAME_ARG3 +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROTOTYPE_GETSOCKNAME], [AX_PROTOTYPE_GETSOCKNAME]) +AC_DEFUN([AX_PROTOTYPE_GETSOCKNAME],[ +AX_PROTOTYPE(getsockname, + [ + #include + #include + ], + [ + int a = 0; + ARG2 * b = 0; + ARG3 * c = 0; + getsockname(a, b, c); + ], + ARG2, [struct sockaddr, void], + ARG3, [socklen_t, size_t, int, unsigned int, long unsigned int]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype.m4 projectm-3.1.0/m4/autoconf-archive/ax_prototype.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prototype.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,233 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prototype.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROTOTYPE(function, includes, code, TAG1, values1 [, TAG2, values2 [...]]) +# +# DESCRIPTION +# +# Try all the combinations of , ... to successfully compile +# . , , ... are substituted in and with +# values found in , , ... respectively. , +# , ... contain a list of possible values for each corresponding +# tag and all combinations are tested. When AC_TRY_COMPILE(include, code) +# is successful for a given substitution, the macro stops and defines the +# following macros: FUNCTION_TAG1, FUNCTION_TAG2, ... using AC_DEFINE() +# with values set to the current values of , , ... If no +# combination is successful the configure script is aborted with a +# message. +# +# Intended purpose is to find which combination of argument types is +# acceptable for a given function . It is recommended to list +# the most specific types first. For instance ARG1, [size_t, int] instead +# of ARG1, [int, size_t]. +# +# Generic usage pattern: +# +# 1) add a call in configure.in +# +# AX_PROTOTYPE(...) +# +# 2) call autoheader to see which symbols are not covered +# +# 3) add the lines in acconfig.h +# +# /* Type of Nth argument of function */ +# #undef FUNCTION_ARGN +# +# 4) Within the code use FUNCTION_ARGN instead of an hardwired type +# +# Complete example: +# +# 1) configure.in +# +# AX_PROTOTYPE(getpeername, +# [ +# #include +# #include +# ], +# [ +# int a = 0; +# ARG2 * b = 0; +# ARG3 * c = 0; +# getpeername(a, b, c); +# ], +# ARG2, [struct sockaddr, void], +# ARG3, [socklen_t, size_t, int, unsigned int, long unsigned int]) +# +# 2) call autoheader +# +# autoheader: Symbol `GETPEERNAME_ARG2' is not covered by ./acconfig.h +# autoheader: Symbol `GETPEERNAME_ARG3' is not covered by ./acconfig.h +# +# 3) acconfig.h +# +# /* Type of second argument of getpeername */ +# #undef GETPEERNAME_ARG2 +# +# /* Type of third argument of getpeername */ +# #undef GETPEERNAME_ARG3 +# +# 4) in the code +# +# ... +# GETPEERNAME_ARG2 name; +# GETPEERNAME_ARG3 namelen; +# ... +# ret = getpeername(socket, &name, &namelen); +# ... +# +# Implementation notes: generating all possible permutations of the +# arguments is not easily done with the usual mixture of shell and m4, +# that is why this macro is almost 100% m4 code. It generates long but +# simple to read code. +# +# LICENSE +# +# Copyright (c) 2009 Loic Dachary +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AU_ALIAS([AC_PROTOTYPE], [AX_PROTOTYPE]) +AC_DEFUN([AX_PROTOTYPE],[ +dnl +dnl Upper case function name +dnl + pushdef([function],translit([$1], [a-z], [A-Z])) +dnl +dnl Collect tags that will be substituted +dnl + pushdef([tags],[AX_PROTOTYPE_TAGS(builtin([shift],builtin([shift],builtin([shift],$@))))]) +dnl +dnl Wrap in a 1 time loop, when a combination is found break to stop the combinatory exploration +dnl + for i in 1 + do + AX_PROTOTYPE_LOOP(AX_PROTOTYPE_REVERSE($1, AX_PROTOTYPE_SUBST($2,tags),AX_PROTOTYPE_SUBST($3,tags),builtin([shift],builtin([shift],builtin([shift],$@))))) + AC_MSG_ERROR($1 unable to find a working combination) + done + popdef([tags]) + popdef([function]) +]) + +dnl +dnl AX_PROTOTYPE_REVERSE(list) +dnl +dnl Reverse the order of the +dnl +AC_DEFUN([AX_PROTOTYPE_REVERSE],[ifelse($#,0,,$#,1,[[$1]],[AX_PROTOTYPE_REVERSE(builtin([shift],$@)),[$1]])]) + +dnl +dnl AX_PROTOTYPE_SUBST(string, tag) +dnl +dnl Substitute all occurence of in with _VAL. +dnl Assumes that tag_VAL is a macro containing the value associated to tag. +dnl +AC_DEFUN([AX_PROTOTYPE_SUBST],[ifelse($2,,[$1],[AX_PROTOTYPE_SUBST(patsubst([$1],[$2],[$2[]_VAL]),builtin([shift],builtin([shift],$@)))])]) + +dnl +dnl AX_PROTOTYPE_TAGS([tag, values, [tag, values ...]]) +dnl +dnl Generate a list of by skipping . +dnl +AC_DEFUN([AX_PROTOTYPE_TAGS],[ifelse($1,,[],[$1, AX_PROTOTYPE_TAGS(builtin([shift],builtin([shift],$@)))])]) + +dnl +dnl AX_PROTOTYPE_DEFINES(tags) +dnl +dnl Generate a AC_DEFINE(function_tag, tag_VAL) for each tag in list +dnl Assumes that function is a macro containing the name of the function in upper case +dnl and that tag_VAL is a macro containing the value associated to tag. +dnl +AC_DEFUN([AX_PROTOTYPE_DEFINES],[ifelse($1,,[], + [AC_DEFINE(function[]_$1, $1_VAL) + AC_SUBST(function[]_$1, "$1_VAL") + AX_PROTOTYPE_DEFINES(builtin([shift],$@))])]) + +dnl +dnl AX_PROTOTYPE_STATUS(tags) +dnl +dnl Generates a message suitable for argument to AC_MSG_* macros. For each tag +dnl in the list the message tag => tag_VAL is generated. +dnl Assumes that tag_VAL is a macro containing the value associated to tag. +dnl +AC_DEFUN([AX_PROTOTYPE_STATUS],[ifelse($1,,[],[$1 => $1_VAL AX_PROTOTYPE_STATUS(builtin([shift],$@))])]) + +dnl +dnl AX_PROTOTYPE_EACH(tag, values) +dnl +dnl Call AX_PROTOTYPE_LOOP for each values and define the macro tag_VAL to +dnl the current value. +dnl +AC_DEFUN([AX_PROTOTYPE_EACH],[ + ifelse($2,, [ + ], [ + pushdef([$1_VAL], $2) + AX_PROTOTYPE_LOOP(rest) + popdef([$1_VAL]) + AX_PROTOTYPE_EACH($1, builtin([shift], builtin([shift], $@))) + ]) +]) + +dnl +dnl AX_PROTOTYPE_LOOP([tag, values, [tag, values ...]], code, include, function) +dnl +dnl If there is a tag/values pair, call AX_PROTOTYPE_EACH with it. +dnl If there is no tag/values pair left, tries to compile the code and include +dnl using AC_TRY_COMPILE. If it compiles, AC_DEFINE all the tags to their +dnl current value and exit with success. +dnl +AC_DEFUN([AX_PROTOTYPE_LOOP],[ + ifelse(builtin([eval], $# > 3), 1, + [ + pushdef([rest],[builtin([shift],builtin([shift],$@))]) + AX_PROTOTYPE_EACH($2,$1) + popdef([rest]) + ], [ + AC_MSG_CHECKING($3 AX_PROTOTYPE_STATUS(tags)) +dnl +dnl Activate fatal warnings if possible, gives better guess +dnl + ac_save_CPPFLAGS="$CPPFLAGS" + ifelse(AC_LANG,CPLUSPLUS,if test "$GXX" = "yes" ; then CPPFLAGS="$CPPFLAGS -Werror" ; fi) + ifelse(AC_LANG,C,if test "$GCC" = "yes" ; then CPPFLAGS="$CPPFLAGS -Werror" ; fi) + AC_TRY_COMPILE($2, $1, [ + CPPFLAGS="$ac_save_CPPFLAGS" + AC_MSG_RESULT(ok) + AX_PROTOTYPE_DEFINES(tags) + break; + ], [ + CPPFLAGS="$ac_save_CPPFLAGS" + AC_MSG_RESULT(not ok) + ]) + ] + ) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype_setsockopt.m4 projectm-3.1.0/m4/autoconf-archive/ax_prototype_setsockopt.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_prototype_setsockopt.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_prototype_setsockopt.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# ============================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_prototype_setsockopt.html +# ============================================================================ +# +# SYNOPSIS +# +# AX_PROTOTYPE_SETSOCKOPT +# +# DESCRIPTION +# +# Requires the AX_PROTOTYPE macro. FIXME: Put this in the code! +# +# Find the type of argument three of setsockopt. User must include the +# following in acconfig.h: +# +# /* Type of third argument of setsockopt */ +# #undef SETSOCKOPT_ARG3 +# +# LICENSE +# +# Copyright (c) 2008 Loic Dachary +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 6 + +AU_ALIAS([AC_PROTOTYPE_SETSOCKOPT], [AX_PROTOTYPE_SETSOCKOPT]) +AC_DEFUN([AX_PROTOTYPE_SETSOCKOPT],[ +AX_PROTOTYPE(setsockopt, + [ + #include + #include + ], + [ + int a = 0; + ARG3 b = 0; + setsockopt(a, SOL_SOCKET, SO_REUSEADDR, b, sizeof(a)); + ], + ARG3, [const void*, const char*, void*, char*]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pthread.m4 projectm-3.1.0/m4/autoconf-archive/ax_pthread.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_pthread.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_pthread.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,485 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_pthread.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) +# +# Also sets PTHREAD_CC to any special C compiler that is needed for +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) +# +# NOTE: You are assumed to not only compile your program with these flags, +# but also to link with them as well. For example, you might link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS +# +# If you are only building threaded programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: +# +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" +# +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to +# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +# +# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the +# PTHREAD_PRIO_INHERIT symbol is defined when compiling with +# PTHREAD_CFLAGS. +# +# ACTION-IF-FOUND is a list of shell commands to run if a threads library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_PTHREAD. +# +# Please let the authors know if this macro fails on any platform, or if +# you have any other suggestions or comments. This macro was based on work +# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help +# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by +# Alejandro Forero Cuervo to the autoconf macro repository. We are also +# grateful for the helpful feedback of numerous users. +# +# Updated for Autoconf 2.68 by Daniel Richard G. +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2011 Daniel Richard G. +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 24 + +AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) +AC_DEFUN([AX_PTHREAD], [ +AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([AC_PROG_CC]) +AC_REQUIRE([AC_PROG_SED]) +AC_LANG_PUSH([C]) +ax_pthread_ok=no + +# We used to check for pthread.h first, but this fails if pthread.h +# requires special compiler flags (e.g. on Tru64 or Sequent). +# It gets checked for in the link test anyway. + +# First of all, check if the user has set any of the PTHREAD_LIBS, +# etcetera environment variables, and if threads linking works using +# them: +if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then + ax_pthread_save_CC="$CC" + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) + AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) + AC_MSG_RESULT([$ax_pthread_ok]) + if test "x$ax_pthread_ok" = "xno"; then + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" + fi + CC="$ax_pthread_save_CC" + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" +fi + +# We must check for the threads library under a number of different +# names; the ordering is very important because some systems +# (e.g. DEC) have both -lpthread and -lpthreads, where one of the +# libraries is broken (non-POSIX). + +# Create a list of thread flags to try. Items starting with a "-" are +# C compiler flags, and other items are library names, except for "none" +# which indicates that we try without any flags at all, and "pthread-config" +# which is a program returning the flags for the Pth emulation library. + +ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" + +# The ordering *is* (sometimes) important. Some notes on the +# individual items follow: + +# pthreads: AIX (must check this before -lpthread) +# none: in case threads are in libc; should be tried before -Kthread and +# other compiler flags to prevent continual compiler warnings +# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) +# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 +# (Note: HP C rejects this with "bad form for `-t' option") +# -pthreads: Solaris/gcc (Note: HP C also rejects) +# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it +# doesn't hurt to check since this sometimes defines pthreads and +# -D_REENTRANT too), HP C (must be checked before -lpthread, which +# is present but should not be used directly; and before -mthreads, +# because the compiler interprets this as "-mt" + "-hreads") +# -mthreads: Mingw32/gcc, Lynx/gcc +# pthread: Linux, etcetera +# --thread-safe: KAI C++ +# pthread-config: use pthread-config program (for GNU Pth library) + +case $host_os in + + freebsd*) + + # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) + # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) + + ax_pthread_flags="-kthread lthread $ax_pthread_flags" + ;; + + hpux*) + + # From the cc(1) man page: "[-mt] Sets various -D flags to enable + # multi-threading and also sets -lpthread." + + ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" + ;; + + openedition*) + + # IBM z/OS requires a feature-test macro to be defined in order to + # enable POSIX threads at all, so give the user a hint if this is + # not set. (We don't define these ourselves, as they can affect + # other portions of the system API in unpredictable ways.) + + AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], + [ +# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) + AX_PTHREAD_ZOS_MISSING +# endif + ], + [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) + ;; + + solaris*) + + # On Solaris (at least, for some versions), libc contains stubbed + # (non-functional) versions of the pthreads routines, so link-based + # tests will erroneously succeed. (N.B.: The stubs are missing + # pthread_cleanup_push, or rather a function called by this macro, + # so we could check for that, but who knows whether they'll stub + # that too in a future libc.) So we'll check first for the + # standard Solaris way of linking pthreads (-mt -lpthread). + + ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" + ;; +esac + +# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) + +AS_IF([test "x$GCC" = "xyes"], + [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) + +# The presence of a feature test macro requesting re-entrant function +# definitions is, on some systems, a strong hint that pthreads support is +# correctly enabled + +case $host_os in + darwin* | hpux* | linux* | osf* | solaris*) + ax_pthread_check_macro="_REENTRANT" + ;; + + aix*) + ax_pthread_check_macro="_THREAD_SAFE" + ;; + + *) + ax_pthread_check_macro="--" + ;; +esac +AS_IF([test "x$ax_pthread_check_macro" = "x--"], + [ax_pthread_check_cond=0], + [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) + +# Are we compiling with Clang? + +AC_CACHE_CHECK([whether $CC is Clang], + [ax_cv_PTHREAD_CLANG], + [ax_cv_PTHREAD_CLANG=no + # Note that Autoconf sets GCC=yes for Clang as well as GCC + if test "x$GCC" = "xyes"; then + AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], + [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ +# if defined(__clang__) && defined(__llvm__) + AX_PTHREAD_CC_IS_CLANG +# endif + ], + [ax_cv_PTHREAD_CLANG=yes]) + fi + ]) +ax_pthread_clang="$ax_cv_PTHREAD_CLANG" + +ax_pthread_clang_warning=no + +# Clang needs special handling, because older versions handle the -pthread +# option in a rather... idiosyncratic way + +if test "x$ax_pthread_clang" = "xyes"; then + + # Clang takes -pthread; it has never supported any other flag + + # (Note 1: This will need to be revisited if a system that Clang + # supports has POSIX threads in a separate library. This tends not + # to be the way of modern systems, but it's conceivable.) + + # (Note 2: On some systems, notably Darwin, -pthread is not needed + # to get POSIX threads support; the API is always present and + # active. We could reasonably leave PTHREAD_CFLAGS empty. But + # -pthread does define _REENTRANT, and while the Darwin headers + # ignore this macro, third-party headers might not.) + + PTHREAD_CFLAGS="-pthread" + PTHREAD_LIBS= + + ax_pthread_ok=yes + + # However, older versions of Clang make a point of warning the user + # that, in an invocation where only linking and no compilation is + # taking place, the -pthread option has no effect ("argument unused + # during compilation"). They expect -pthread to be passed in only + # when source code is being compiled. + # + # Problem is, this is at odds with the way Automake and most other + # C build frameworks function, which is that the same flags used in + # compilation (CFLAGS) are also used in linking. Many systems + # supported by AX_PTHREAD require exactly this for POSIX threads + # support, and in fact it is often not straightforward to specify a + # flag that is used only in the compilation phase and not in + # linking. Such a scenario is extremely rare in practice. + # + # Even though use of the -pthread flag in linking would only print + # a warning, this can be a nuisance for well-run software projects + # that build with -Werror. So if the active version of Clang has + # this misfeature, we search for an option to squash it. + + AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], + [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], + [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown + # Create an alternate version of $ac_link that compiles and + # links in two steps (.c -> .o, .o -> exe) instead of one + # (.c -> exe), because the warning occurs only in the second + # step + ax_pthread_save_ac_link="$ac_link" + ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' + ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` + ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" + ax_pthread_save_CFLAGS="$CFLAGS" + for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do + AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) + CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" + ac_link="$ax_pthread_save_ac_link" + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], + [ac_link="$ax_pthread_2step_ac_link" + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], + [break]) + ]) + done + ac_link="$ax_pthread_save_ac_link" + CFLAGS="$ax_pthread_save_CFLAGS" + AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) + ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" + ]) + + case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in + no | unknown) ;; + *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; + esac + +fi # $ax_pthread_clang = yes + +if test "x$ax_pthread_ok" = "xno"; then +for ax_pthread_try_flag in $ax_pthread_flags; do + + case $ax_pthread_try_flag in + none) + AC_MSG_CHECKING([whether pthreads work without any flags]) + ;; + + -mt,pthread) + AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) + PTHREAD_CFLAGS="-mt" + PTHREAD_LIBS="-lpthread" + ;; + + -*) + AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) + PTHREAD_CFLAGS="$ax_pthread_try_flag" + ;; + + pthread-config) + AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) + AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; + + *) + AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) + PTHREAD_LIBS="-l$ax_pthread_try_flag" + ;; + esac + + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Check for various functions. We must include pthread.h, + # since some functions may be macros. (On the Sequent, we + # need a special flag -Kthread to make this header compile.) + # We check for pthread_join because it is in -lpthread on IRIX + # while pthread_create is in libc. We check for pthread_attr_init + # due to DEC craziness with -lpthreads. We check for + # pthread_cleanup_push because it is one of the few pthread + # functions on Solaris that doesn't have a non-functional libc stub. + # We try pthread_create on general principles. + + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include +# if $ax_pthread_check_cond +# error "$ax_pthread_check_macro must be defined" +# endif + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */])], + [ax_pthread_ok=yes], + []) + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + AC_MSG_RESULT([$ax_pthread_ok]) + AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) + + PTHREAD_LIBS="" + PTHREAD_CFLAGS="" +done +fi + +# Various other checks: +if test "x$ax_pthread_ok" = "xyes"; then + ax_pthread_save_CFLAGS="$CFLAGS" + ax_pthread_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LIBS="$PTHREAD_LIBS $LIBS" + + # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. + AC_CACHE_CHECK([for joinable pthread attribute], + [ax_cv_PTHREAD_JOINABLE_ATTR], + [ax_cv_PTHREAD_JOINABLE_ATTR=unknown + for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int attr = $ax_pthread_attr; return attr /* ; */])], + [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], + []) + done + ]) + AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ + test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ + test "x$ax_pthread_joinable_attr_defined" != "xyes"], + [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], + [$ax_cv_PTHREAD_JOINABLE_ATTR], + [Define to necessary symbol if this constant + uses a non-standard name on your system.]) + ax_pthread_joinable_attr_defined=yes + ]) + + AC_CACHE_CHECK([whether more special flags are required for pthreads], + [ax_cv_PTHREAD_SPECIAL_FLAGS], + [ax_cv_PTHREAD_SPECIAL_FLAGS=no + case $host_os in + solaris*) + ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" + ;; + esac + ]) + AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ + test "x$ax_pthread_special_flags_added" != "xyes"], + [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" + ax_pthread_special_flags_added=yes]) + + AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], + [ax_cv_PTHREAD_PRIO_INHERIT], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[int i = PTHREAD_PRIO_INHERIT;]])], + [ax_cv_PTHREAD_PRIO_INHERIT=yes], + [ax_cv_PTHREAD_PRIO_INHERIT=no]) + ]) + AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ + test "x$ax_pthread_prio_inherit_defined" != "xyes"], + [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) + ax_pthread_prio_inherit_defined=yes + ]) + + CFLAGS="$ax_pthread_save_CFLAGS" + LIBS="$ax_pthread_save_LIBS" + + # More AIX lossage: compile with *_r variant + if test "x$GCC" != "xyes"; then + case $host_os in + aix*) + AS_CASE(["x/$CC"], + [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], + [#handle absolute path differently from PATH based program lookup + AS_CASE(["x$CC"], + [x/*], + [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], + [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) + ;; + esac + fi +fi + +test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" + +AC_SUBST([PTHREAD_LIBS]) +AC_SUBST([PTHREAD_CFLAGS]) +AC_SUBST([PTHREAD_CC]) + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test "x$ax_pthread_ok" = "xyes"; then + ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) + : +else + ax_pthread_ok=no + $2 +fi +AC_LANG_POP +])dnl AX_PTHREAD diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_config_var.m4 projectm-3.1.0/m4/autoconf-archive/ax_python_config_var.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_config_var.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_python_config_var.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,114 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python_config_var.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_CONFIG_VAR(PYTHON_VARIABLE, [SHELL_VARIABLE]) +# AX_PYTHON_CONFIG_H +# AX_PYTHON_MAKEFILE +# +# DESCRIPTION +# +# AX_PYTHON_CONFIG_VAR: +# +# Using the Python module distutils.sysconfig[1], return a Python +# configuration variable. PYTHON_VARIABLE is the name of the variable to +# request from Python, and SHELL_VARIABLE is the name of the shell +# variable into which the results should be deposited. If SHELL_VARIABLE +# is not specified, the macro wil prefix PY_ to the PYTHON_VARIABLE, e.g., +# LIBS -> PY_LIBS. +# +# SHELL_VARIABLE is AC_SUBST'd. No action is taken if an error occurs. +# Note if $PYTHON is not set, AC_CHECK_PROG(PYTHON, python, python) will +# be run. +# +# Example: +# +# AX_PYTHON_CONFIG_VAR(LINKFORSHARED, PY_LFS) +# +# AX_PYTHON_CONFIG_H: +# +# Using the Python module distutils.sysconfig[1], put the full pathname of +# the config.h file used to compile Python into the shell variable +# PY_CONFIG_H. PY_CONFIG_H is AC_SUBST'd. Note if $PYTHON is not set, +# AC_CHECK_PROG(PYTHON, python, python) will be run. +# +# AX_PYTHON_MAKEFILE: +# +# Using the Python module distutils.sysconfig[1], put the full pathname of +# the Makefile file used to compile Python into the shell variable +# PY_MAKEFILE. PY_MAKEFILE is AC_SUBST'd. Note if $PYTHON is not set, +# AC_CHECK_PROG(PYTHON, python, python) will be run. +# +# [1] +# http://www.python.org/doc/current/dist/module-distutils.sysconfig.html +# +# LICENSE +# +# Copyright (c) 2008 Dustin J. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_PYTHON_CONFIG_VAR], +[ + AC_MSG_CHECKING(for Python config variable $1) + if test -z "$PYTHON" + then + AC_CHECK_PROG(PYTHON,python,python) + fi + py_error="no" + pyval=`$PYTHON -c "from distutils import sysconfig;dnl +print sysconfig.get_config_var('$1')"` || py_error="yes" + if test "$py_error" = "yes" + then + AC_MSG_RESULT(no - an error occurred) + else + AC_MSG_RESULT($pyval) + m4_ifval([$2],[$2],[PY_$1])="$pyval" + AC_SUBST(m4_ifval([$2],[$2],[PY_$1])) + fi +]) + +AC_DEFUN([AX_PYTHON_CONFIG_H], +[ + AC_MSG_CHECKING(location of Python's config.h) + if test -z "$PYTHON" + then + AC_CHECK_PROG(PYTHON,python,python) + fi + py_error="no" + PY_CONFIG_H=`$PYTHON -c "from distutils import sysconfig;dnl +print sysconfig.get_config_h_filename()"` || py_error = "yes" + if test "$py_error" = "yes" + then + AC_MSG_RESULT(no - an error occurred) + else + AC_MSG_RESULT($PY_CONFIG_H) + AC_SUBST(PY_CONFIG_H) + fi +]) + +AC_DEFUN([AX_PYTHON_MAKEFILE], +[ + AC_MSG_CHECKING(location of Python's Makefile) + if test -z "$PYTHON" + then + AC_CHECK_PROG(PYTHON,python,python) + fi + py_error="no" + PY_MAKEFILE=`$PYTHON -c "from distutils import sysconfig;dnl +print sysconfig.get_makefile_filename()"` || py_error = "yes" + if test "$py_error" = "yes" + then + AC_MSG_RESULT(no - an error occurred) + else + AC_MSG_RESULT($PY_MAKEFILE) + AC_SUBST(PY_MAKEFILE) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_devel.m4 projectm-3.1.0/m4/autoconf-archive/ax_python_devel.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_devel.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_python_devel.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,327 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_DEVEL([version]) +# +# DESCRIPTION +# +# Note: Defines as a precious variable "PYTHON_VERSION". Don't override it +# in your configure.ac. +# +# This macro checks for Python and tries to get the include path to +# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output +# variables. It also exports $(PYTHON_EXTRA_LIBS) and +# $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. +# +# You can search for some particular version of Python by passing a +# parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please +# note that you *have* to pass also an operator along with the version to +# match, and pay special attention to the single quotes surrounding the +# version number. Don't use "PYTHON_VERSION" for this: that environment +# variable is declared as precious and thus reserved for the end-user. +# +# This macro should work for all versions of Python >= 2.1.0. As an end +# user, you can disable the check for the python version by setting the +# PYTHON_NOVERSIONCHECK environment variable to something else than the +# empty string. +# +# If you need to use this macro for an older Python version, please +# contact the authors. We're always open for feedback. +# +# LICENSE +# +# Copyright (c) 2009 Sebastian Huber +# Copyright (c) 2009 Alan W. Irwin +# Copyright (c) 2009 Rafael Laboissiere +# Copyright (c) 2009 Andrew Collier +# Copyright (c) 2009 Matteo Settenvini +# Copyright (c) 2009 Horst Knorr +# Copyright (c) 2013 Daniel Mullner +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 21 + +AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) +AC_DEFUN([AX_PYTHON_DEVEL],[ + # + # Allow the use of a (user set) custom python version + # + AC_ARG_VAR([PYTHON_VERSION],[The installed Python + version to use, for example '2.3'. This string + will be appended to the Python interpreter + canonical name.]) + + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) + if test -z "$PYTHON"; then + AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) + PYTHON_VERSION="" + fi + + # + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver >= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) + AC_MSG_FAILURE([ +This version of the AC@&t@_PYTHON_DEVEL macro +doesn't work properly with versions of Python before +2.1.0. You may need to re-run configure, setting the +variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, +PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +Moreover, to disable this check, set PYTHON_NOVERSIONCHECK +to something else than an empty string. +]) + else + AC_MSG_RESULT([skip at user request]) + fi + else + AC_MSG_RESULT([yes]) + fi + + # + # if the macro parameter ``version'' is set, honour it + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) + ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver $1)"` + if test "$ac_supports_python_ver" = "True"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([this package requires Python $1. +If you have it installed, but it isn't the default Python +interpreter in your system path, please pass the PYTHON_VERSION +variable to configure. See ``configure --help'' for reference. +]) + PYTHON_VERSION="" + fi + fi + + # + # Check if you have distutils, else fail + # + AC_MSG_CHECKING([for the distutils Python package]) + ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + if test $? -eq 0; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Python module "distutils". +Please check your Python installation. The error was: +$ac_distutils_result]) + PYTHON_VERSION="" + fi + + # + # Check for Python include path + # + AC_MSG_CHECKING([for Python include path]) + if test -z "$PYTHON_CPPFLAGS"; then + python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc ());"` + plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ + print (distutils.sysconfig.get_python_inc (plat_specific=1));"` + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" + else + python_path="-I$python_path" + fi + fi + PYTHON_CPPFLAGS=$python_path + fi + AC_MSG_RESULT([$PYTHON_CPPFLAGS]) + AC_SUBST([PYTHON_CPPFLAGS]) + + # + # Check for Python library path + # + AC_MSG_CHECKING([for Python library path]) + if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<]], + [[Py_Initialize();]]) + ],[pythonexists=yes],[pythonexists=no]) + AC_LANG_POP([C]) + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + LDFLAGS="$ac_save_LDFLAGS" + + AC_MSG_RESULT([$pythonexists]) + + if test ! "x$pythonexists" = "xyes"; then + AC_MSG_FAILURE([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, + via the LIBS environment variable. + Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ + ]) + PYTHON_VERSION="" + fi + + # + # all done! + # +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_embed.m4 projectm-3.1.0/m4/autoconf-archive/ax_python_embed.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_embed.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_python_embed.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,518 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python_embed.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_DEFAULT +# AX_PYTHON_ENABLE +# AX_PYTHON_WITH +# AX_PYTHON_PATH +# AX_PYTHON_VERSION_ENSURE( [2.2] ) +# AX_PYTHON_CSPEC +# AX_PYTHON_LSPEC +# +# DESCRIPTION +# +# This file provides autoconf support for those applications that want to +# embed python. It supports all pythons >= 2.2 which is the first official +# release containing distutils. Version 2.2 of python was released +# December 21, 2001. Since it actually executes the python, cross platform +# configuration will probably not work. Also, most of the platforms +# supported are consistent until you look into Mac OS X. The python +# included with it is installed as a framework which is a very different +# environment to set up the normal tools such as gcc and libtool to deal +# with. Therefore, once we establish which python that we are going to +# use, we use its distutils to actually compile and link our modules or +# applications. +# +# At this time, it does NOT support linking with Python statically. It +# does support dynamic linking. +# +# This set of macros help define $PYTHON, $PYTHON_USE, $PYTHON_CSPEC and +# $PYTHON_LSPEC. $PYTHON defines the full executable path for the Python +# being linked to and is used within these macros to determine if that has +# been specified or found. These macros do execute this python version so +# it must be present on the system at configure time. +# +# $PYTHON_USE is an automake variable that defines whether Python support +# should be included or not in your application. $PYTHON_CSPEC is a +# variable that supplies additional CFLAGS for the compilation of the +# application/shared library. $PYTHON_LSPEC is a variable that supplies +# additional LDFLAGS for linking the application/shared library. +# +# The following is an example of how to set up for python usage within +# your application in your configure.in: +# +# AX_PYTHON_DEFAULT( ) +# AX_PYTHON_ENABLE( ) # Optional +# AX_PYTHON_WITH( ) # Optional +# AX_PYTHON_PATH( ) # or AX_PYTHON_INSIST( ) +# # if $PYTHON is not defined, then the following do nothing. +# AX_PYTHON_VERSION_ENSURE( [2.2] ) +# AX_PYTHON_CSPEC +# AX_PYTHON_LSPEC +# +# The AX_PYTHON_DEFAULT sets the $PYTHON_USE to false. Thereby, excluding +# it if it was optional. +# +# The AX_PYTHON_ENABLE looks for the optional configure parameters of +# --enable-python/--disable-python and establishes the $PYTHON and +# $PYTHON_USE variables accordingly. +# +# The AX_PYTHON_WITH looks for the optional configure parameters of +# --with-python/--without-python and establishes the $PYTHON and +# $PYTHON_USE variables accordingly. +# +# The AX_PYTHON_PATH looks for python assuming that none has been +# previously found or defined and issues an error if it does not find it. +# If it does find it, it establishes the $PYTHON and $PYTHON_USE variables +# accordingly. AX_PYTHON_INSIST could be used here instead if you want to +# insist that Python support be included using the --enable-python or +# --with-python checks previously done. +# +# The AX_PYTHON_VERSION_ENSURE issues an error if the Python previously +# found is not of version 2.2 or greater. +# +# Once that these macros have be run, we can use PYTHON_USE within the +# makefile.am file to conditionally add the Python support such as: +# +# Makefile.am example showing optional inclusion of directories: +# +# if PYTHON_USE +# plugins = plugins +# src = src +# else +# plugins = +# src = +# endif +# +# SUBDIRS = . $(plugins) $(src) +# +# Makefile.am example showing optional shared library build: +# +# if PYTHON_USE +# lib_LTLIBRARIES = libElemList.la +# libElemList_la_SOURCES = libElemList.c +# libElemList_la_CFLAGS = @PYTHON_CSPEC@ +# libElemList_la_LDFLAGS = @PYTHON_LSPEC@ +# endif +# +# Makefile.am example showing optional program build: +# +# if PYTHON_USE +# bin_PROGRAMS = runFunc +# runFunc_SOURCES = runFunc.c +# runFunc_CFLAGS = @PYTHON_CSPEC@ +# runFunc_LDFLAGS = @PYTHON_LSPEC@ +# endif +# +# The above compiles the modules only if PYTHON_USE was specified as true. +# Also, the else portion of the if was optional. +# +# LICENSE +# +# Copyright (c) 2008 Robert White +# Copyright (c) 2008 Dustin J. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 15 + +# AX_PYTHON_DEFAULT( ) +# ----------------- +# Sets the default to not include Python support. + +AC_DEFUN([AX_PYTHON_DEFAULT], +[ + ax_python_use=false + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") +]) + + + +# AX_PYTHON_ENABLE( [path] ) +# ----------------------------------------------------------------- +# Handles the various --enable-python commands. +# Input: +# $1 is the optional search path for the python executable if needed +# Output: +# PYTHON_USE (AM_CONDITIONAL) is true if python executable found +# and --enable-python was requested; otherwise false. +# $PYTHON contains the full executable path to python if PYTHON_ENABLE_USE +# is true. +# +# Example: +# AX_PYTHON_ENABLE( ) +# or +# AX_PYTHON_ENABLE( "/usr/bin" ) + +AC_DEFUN([AX_PYTHON_ENABLE], +[ + AC_ARG_VAR([PYTHON],[Python Executable Path]) + + # unless PYTHON was supplied to us (as a precious variable), + # see if --enable-python[=PythonExecutablePath], --enable-python, + # --disable-python or --enable-python=no was given. + if test -z "$PYTHON" + then + AC_MSG_CHECKING(for --enable-python) + AC_ARG_ENABLE( + python, + AS_HELP_STRING([--enable-python@<:@=PYTHON@:>@], + [absolute path name of Python executable] + ), + [ + if test "$enableval" = "yes" + then + # "yes" was specified, but we don't have a path + # for the executable. + # So, let's search the PATH Environment Variable. + AC_MSG_RESULT(yes) + AC_PATH_PROG( + [PYTHON], + python, + [], + $1 + ) + if test -z "$PYTHON" + then + AC_MSG_ERROR(no path to python found) + fi + ax_python_use=true + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + AX_PYTHON_PREFIX( ) + elif test "$enableval" = "no" + then + AC_MSG_RESULT(no) + ax_python_use=false + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + else + # $enableval must be the executable path then. + AC_SUBST([PYTHON], ["${enableval}"]) + AC_MSG_RESULT($withval) + ax_python_use=true + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + AX_PYTHON_PREFIX( ) + fi + ], + [ + # --with-python was not specified. + AC_MSG_RESULT(no) + ax_python_use=false + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + ] + ) + fi + +]) + + + +# AX_PYTHON_CSPEC( ) +# ----------------- +# Set up the c compiler options to compile Python +# embedded programs/libraries in $PYTHON_CSPEC if +# $PYTHON has been defined. + +AC_DEFUN([AX_PYTHON_CSPEC], +[ + AC_ARG_VAR( [PYTHON], [Python Executable Path] ) + if test -n "$PYTHON" + then + ax_python_prefix=`${PYTHON} -c "import sys; print(sys.prefix)"` + if test -z "$ax_python_prefix" + then + AC_MSG_ERROR([Python Prefix is not known]) + fi + ax_python_execprefix=`${PYTHON} -c "import sys; print(sys.exec_prefix)"` + ax_python_version=`$PYTHON -c "import sys; print(sys.version[[:3]])"` + ax_python_includespec="-I${ax_python_prefix}/include/python${ax_python_version}" + if test x"$python_prefix" != x"$python_execprefix"; then + ax_python_execspec="-I${ax_python_execprefix}/include/python${ax_python_version}" + ax_python_includespec="${ax_python_includespec} $ax_python_execspec" + fi + ax_python_ccshared=`${PYTHON} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('CFLAGSFORSHARED'))"` + ax_python_cspec="${ax_python_ccshared} ${ax_python_includespec}" + AC_SUBST([PYTHON_CSPEC], [${ax_python_cspec}]) + AC_MSG_NOTICE([PYTHON_CSPEC=${ax_python_cspec}]) + fi +]) + + + +# AX_PYTHON_INSIST( ) +# ----------------- +# Look for Python and set the output variable 'PYTHON' +# to 'python' if found, empty otherwise. + +AC_DEFUN([AX_PYTHON_INSIST], +[ + AC_ARG_VAR( [PYTHON], [Python Executable Path] ) + if test -z "$PYTHON" + then + AC_MSG_ERROR([Python Executable not found]) + fi +]) + + + +# AX_PYTHON_LSPEC( ) +# ----------------- +# Set up the linker options to link Python embedded +# programs/libraries in $PYTHON_LSPEC if $PYTHON +# has been defined. + +AC_DEFUN([AX_PYTHON_LSPEC], +[ + AC_ARG_VAR( [PYTHON], [Python Executable Path] ) + if test -n "$PYTHON" + then + AX_PYTHON_RUN([ +import sys +import distutils.sysconfig +strUseFrameWork = "--enable-framework" +dictConfig = distutils.sysconfig.get_config_vars( ) +strConfigArgs = dictConfig.get("CONFIG_ARGS") +strLinkSpec = dictConfig.get('LDFLAGS') +if -1 == strConfigArgs.find(strUseFrameWork): + strLibPL = dictConfig.get("LIBPL") + if strLibPL and (strLibPL != ""): + strLinkSpec += " -L%s" % (strLibPL) + strSys = dictConfig.get("SYSLIBS") + if strSys and (strSys != ""): + strLinkSpec += " %s" % (strSys) + strSHL = dictConfig.get("SHLIBS") + if strSHL and (strSHL != ""): + strLinkSpec += " %s" % (strSHL) + # Construct the Python Library Name. + strTmplte = " -lpython%d.%d" + if (sys.platform == "win32") or (sys.platform == "os2emx"): + strTmplte = " -lpython%d%d" + strWrk = strTmplte % ( (sys.hexversion >> 24), + ((sys.hexversion >> 16) & 0xff)) + strLinkSpec += strWrk +else: + # This is not ideal since it changes the search path + # for Frameworks which could have side-effects on + # other included Frameworks. However, it is necessary + # where someone has installed more than one frameworked + # Python. Frameworks are really only used in MacOSX. + strLibFW = dictConfig.get("PYTHONFRAMEWORKPREFIX") + if strLibFW and (strLibFW != ""): + strLinkSpec += " -F%s" % (strLibFW) +strLinkSpec += " %s" % (dictConfig.get('LINKFORSHARED')) +print(strLinkSpec) + ]) + AC_SUBST([PYTHON_LSPEC], [${ax_python_output}]) + AC_MSG_NOTICE([PYTHON_LSPEC=${ax_python_output}]) + fi +]) + + + +# AX_PYTHON_PATH( ) +# ----------------- +# Look for Python and set the output variable 'PYTHON' +# to 'python' if found, empty otherwise. + +AC_DEFUN([AX_PYTHON_PATH], +[ + AC_ARG_VAR( [PYTHON], [Python Executable Path] ) + AC_PATH_PROG( PYTHON, python, [], $1 ) + if test -z "$PYTHON" + then + AC_MSG_ERROR([Python Executable not found]) + else + ax_python_use=true + fi + AM_CONDITIONAL(PYTHON_USE, test "$ax_python_use" = "true") +]) + + + +# AX_PYTHON_PREFIX( ) +# ------------------- +# Use the values of $prefix and $exec_prefix for the corresponding +# values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. + +AC_DEFUN([AX_PYTHON_PREFIX], +[ + if test -z "$PYTHON" + then + AC_MSG_ERROR([Python Executable Path is not known]) + fi + ax_python_prefix=`${PYTHON} -c "import sys; print(sys.prefix)"` + ax_python_execprefix=`${PYTHON} -c "import sys; print(sys.exec_prefix)"` + AC_SUBST([PYTHON_PREFIX], ["${ax_python_prefix}"]) + AC_SUBST([PYTHON_EXECPREFIX], ["${ax_python_execprefix}"]) +]) + + + +# AX_PYTHON_RUN( PYTHON_PROGRAM ) +# ----------------- +# Run a Python Test Program saving its output +# in ax_python_output and its condition code +# in ax_python_cc. + +AC_DEFUN([AX_PYTHON_RUN], +[ + AC_ARG_VAR( [PYTHON], [Python Executable Path] ) + if test -z "$PYTHON" + then + AC_MSG_ERROR([Python Executable not found]) + else + cat >conftest.py <<_ACEOF +$1 +_ACEOF + ax_python_output=`$PYTHON conftest.py` + ax_python_cc=$? + rm conftest.py + if test -f "conftest.pyc" + then + rm conftest.pyc + fi + fi +]) + + + +# AX_PYTHON_VERSION_CHECK( VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE] ) +# ----------------------------------------------------------------------------- +# Run ACTION-IF-TRUE if the Python interpreter has version >= VERSION. +# Run ACTION-IF-FALSE otherwise. +# This test uses sys.hexversion instead of the string equivalent (first +# word of sys.version), in order to cope with versions such as 2.2c1. +# hexversion has been introduced in Python 1.5.2; it's probably not +# worth to support older versions (1.5.1 was released on October 31, 1998). + +AC_DEFUN([AX_PYTHON_VERSION_CHECK], + [ + AC_ARG_VAR( [PYTHON], [Python Executable Path] ) + if test -n "$PYTHON" + then + AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AX_PYTHON_RUN([ +import sys +# split strings by '.' and convert to numeric. Append some zeros +# because we need at least 4 digits for the hex conversion. +# It accepts a string like "X[.Y[.Z]]" with X,Y,Z=digits +# and [] means optional. +minver = list(map(int, '$1'.split('.'))) + [[0, 0, 0]] +minver[3] = 255 +minverhex = 0 +for i in range(0, 4): minverhex = (minverhex << 8) + minver[[i]] +if sys.hexversion >= minverhex: + sys.exit( 0 ) +else: + sys.exit( 1 ) + ]) + if test $ax_python_cc -eq 0 + then + $2 + m4_ifvaln( + [$3], + [else $3] + ) + fi + fi +]) + + + +# AX_PYTHON_VERSION_ENSURE( VERSION ) +# ----------------- +# Insure that the Python Interpreter Version +# is greater than or equal to the VERSION +# parameter. + +AC_DEFUN([AX_PYTHON_VERSION_ENSURE], +[ + AX_PYTHON_VERSION_CHECK( + [$1], + [AC_MSG_RESULT(yes)], + [AC_MSG_ERROR(too old)] + ) +]) + + + +# AX_PYTHON_WITH( [path] ) +# ----------------------------------------------------------------- +# Handles the various --with-python commands. +# Input: +# $1 is the optional search path for the python executable if needed +# Output: +# PYTHON_USE (AM_CONDITIONAL) is true if python executable found +# and --with-python was requested; otherwise false. +# $PYTHON contains the full executable path to python if PYTHON_USE +# is true. +# +# Example: +# AX_PYTHON_WITH( ) +# or +# AX_PYTHON_WITH("/usr/bin") + +AC_DEFUN([AX_PYTHON_WITH], +[ + AC_ARG_VAR([PYTHON],[Python Executable Path]) + + # unless PYTHON was supplied to us (as a precious variable), + # see if --with-python[=PythonExecutablePath], --with-python, + # --without-python or --with-python=no was given. + if test -z "$PYTHON" + then + AC_MSG_CHECKING(for --with-python) + AC_ARG_WITH( + python, + AS_HELP_STRING([--with-python@<:@=PYTHON@:>@], + [absolute path name of Python executable] + ), + [ + if test "$withval" = "yes" + then + # "yes" was specified, but we don't have a path + # for the executable. + # So, let's search the PATH Environment Variable. + AC_MSG_RESULT(yes) + AC_PATH_PROG( + [PYTHON], + python, + [], + $1 + ) + if test -z "$PYTHON" + then + AC_MSG_ERROR(no path to python found) + fi + ax_python_use=true + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + AX_PYTHON_PREFIX( ) + elif test "$withval" = "no" + then + AC_MSG_RESULT(no) + ax_python_use=false + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + else + # $withval must be the executable path then. + AC_SUBST([PYTHON], ["${withval}"]) + AC_MSG_RESULT($withval) + ax_python_use=true + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + AX_PYTHON_PREFIX( ) + fi + ], + [ + # --with-python was not specified. + AC_MSG_RESULT(no) + ax_python_use=false + AM_CONDITIONAL(PYTHON_USE, test x"$ax_python_use" = x"true") + ] + ) + fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python.m4 projectm-3.1.0/m4/autoconf-archive/ax_python.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_python.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,97 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON +# +# DESCRIPTION +# +# This macro does a complete Python development environment check. +# +# It checks for all known versions. When it finds an executable, it looks +# to find the header files and library. +# +# It sets PYTHON_BIN to the name of the python executable, +# PYTHON_INCLUDE_DIR to the directory holding the header files, and +# PYTHON_LIB to the name of the Python library. +# +# This macro calls AC_SUBST on PYTHON_BIN (via AC_CHECK_PROG), +# PYTHON_INCLUDE_DIR and PYTHON_LIB. +# +# LICENSE +# +# Copyright (c) 2008 Michael Tindal +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 18 + +AC_DEFUN([AX_PYTHON], +[AC_MSG_CHECKING(for python build information) +AC_MSG_RESULT([]) +for python in python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do +AC_CHECK_PROGS(PYTHON_BIN, [$python]) +ax_python_bin=$PYTHON_BIN +if test x$ax_python_bin != x; then + AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) + if test x$ax_python_lib == xno; then + AC_CHECK_LIB(${ax_python_bin}m, main, ax_python_lib=${ax_python_bin}m, ax_python_lib=no) + fi + if test x$ax_python_lib != xno; then + ax_python_header=`$ax_python_bin -c "from distutils.sysconfig import *; print(get_config_var('CONFINCLUDEPY'))"` + if test x$ax_python_header != x; then + break; + fi + fi +fi +done +if test x$ax_python_bin = x; then + ax_python_bin=no +fi +if test x$ax_python_header = x; then + ax_python_header=no +fi +if test x$ax_python_lib = x; then + ax_python_lib=no +fi + +AC_MSG_RESULT([ results of the Python check:]) +AC_MSG_RESULT([ Binary: $ax_python_bin]) +AC_MSG_RESULT([ Library: $ax_python_lib]) +AC_MSG_RESULT([ Include Dir: $ax_python_header]) + +if test x$ax_python_header != xno; then + PYTHON_INCLUDE_DIR=$ax_python_header + AC_SUBST(PYTHON_INCLUDE_DIR) +fi +if test x$ax_python_lib != xno; then + PYTHON_LIB=$ax_python_lib + AC_SUBST(PYTHON_LIB) +fi +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_module.m4 projectm-3.1.0/m4/autoconf-archive/ax_python_module.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_module.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_python_module.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_python_module.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PYTHON_MODULE(modname[, fatal, python]) +# +# DESCRIPTION +# +# Checks for Python module. +# +# If fatal is non-empty then absence of a module will trigger an error. +# The third parameter can either be "python" for Python 2 or "python3" for +# Python 3; defaults to Python 3. +# +# LICENSE +# +# Copyright (c) 2008 Andrew Collier +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_PYTHON_MODULE], [AX_PYTHON_MODULE]) +AC_DEFUN([AX_PYTHON_MODULE],[ + if test -z $PYTHON; + then + if test -z "$3"; + then + PYTHON="python3" + else + PYTHON="$3" + fi + fi + PYTHON_NAME=`basename $PYTHON` + AC_MSG_CHECKING($PYTHON_NAME module: $1) + $PYTHON -c "import $1" 2>/dev/null + if test $? -eq 0; + then + AC_MSG_RESULT(yes) + eval AS_TR_CPP(HAVE_PYMOD_$1)=yes + else + AC_MSG_RESULT(no) + eval AS_TR_CPP(HAVE_PYMOD_$1)=no + # + if test -n "$2" + then + AC_MSG_ERROR(failed to find required module $1) + exit 1 + fi + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_module_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_python_module_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_python_module_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_python_module_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,37 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_python_module_version.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_PYTHON_MODULE_VERSION(modname, min_version[, python]) +# +# DESCRIPTION +# +# Checks for Python module with at least the given version. +# +# Triggers an error if module is absent or present but at a lower version. +# The third parameter can either be "python" for Python 2 or "python3" for +# Python 3; defaults to Python 3. +# +# LICENSE +# +# Copyright (c) 2015 Endless Mobile, Inc.; contributed by Philip Chimento and Kurt von Laven +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_PYTHON_MODULE_VERSION], [ + AX_PYTHON_MODULE([$1], [required], [$3]) + AC_MSG_CHECKING([for version $2 or higher of $1]) + $PYTHON -c "import sys, $1; from distutils.version import StrictVersion; sys.exit(StrictVersion($1.__version__) < StrictVersion('$2'))" 2> /dev/null + AS_IF([test $? -eq 0], [], [ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need at least version $2 of the $1 Python module.]) + ]) + AC_MSG_RESULT([yes]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_recursive_eval.m4 projectm-3.1.0/m4/autoconf-archive/ax_recursive_eval.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_recursive_eval.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_recursive_eval.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_recursive_eval.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RECURSIVE_EVAL(VALUE, RESULT) +# +# DESCRIPTION +# +# Interpolate the VALUE in loop until it doesn't change, and set the +# result to $RESULT. WARNING: It's easy to get an infinite loop with some +# unsane input. +# +# LICENSE +# +# Copyright (c) 2008 Alexandre Duret-Lutz +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 1 + +AC_DEFUN([AX_RECURSIVE_EVAL], +[_lcl_receval="$1" +$2=`(test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + _lcl_receval_old='' + while test "[$]_lcl_receval_old" != "[$]_lcl_receval"; do + _lcl_receval_old="[$]_lcl_receval" + eval _lcl_receval="\"[$]_lcl_receval\"" + done + echo "[$]_lcl_receval")`]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_require_defined.m4 projectm-3.1.0/m4/autoconf-archive/ax_require_defined.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_require_defined.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_require_defined.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,37 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_require_defined.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_DEFINED(MACRO) +# +# DESCRIPTION +# +# AX_REQUIRE_DEFINED is a simple helper for making sure other macros have +# been defined and thus are available for use. This avoids random issues +# where a macro isn't expanded. Instead the configure script emits a +# non-fatal: +# +# ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found +# +# It's like AC_REQUIRE except it doesn't expand the required macro. +# +# Here's an example: +# +# AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG]) +# +# LICENSE +# +# Copyright (c) 2014 Mike Frysinger +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_REQUIRE_DEFINED], [dnl + m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) +])dnl AX_REQUIRE_DEFINED diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_require_one_func.m4 projectm-3.1.0/m4/autoconf-archive/ax_require_one_func.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_require_one_func.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_require_one_func.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_require_one_func.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_REQUIRE_ONE_FUNC (FUNCTION..., [ACTION-IF-ANY-FOUND], [ACTION-IF-NONE-FOUND]) +# +# DESCRIPTION +# +# AX_REQUIRE_ONE_FUNC is a simple wrapper for AC_CHECK_FUNCS. It calls +# AC_CHECK_FUNCS on the list of functions named in the first argument, +# then invokes ACTION-IF-ANY-FOUND if at least one of the functions exists +# or ACTION-IF-NONE-FOUND if none of the functions exist. +# +# Here's an example: +# +# AX_REQUIRE_ONE_FUNC([posix_memalign memalign valloc], , +# [AC_MSG_ERROR([unable to allocate page-aligned memory])]) +# +# LICENSE +# +# Copyright (c) 2008 Scott Pakin +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_REQUIRE_ONE_FUNC], +[m4_define([ax_1func_cv], [AS_TR_SH(ax_cv_func_any_$1)]) +AC_CACHE_VAL([ax_1func_cv], + [ax_1func_cv=no + AC_CHECK_FUNCS([$1], [ax_1func_cv="$ax_1func_cv $ac_func"])]) +AS_IF([test "$ax_1func_cv" = "no"], + [$3], + [ax_1func_cv=`echo $ax_1func_cv | sed 's/^no //'` + $2]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_restore_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_restore_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_restore_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_restore_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_restore_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RESTORE_FLAGS([namespace]) +# +# DESCRIPTION +# +# Restore common compilation flags from temporary variables. +# +# Compilation flags includes: CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS, LIBS, +# OBJCFLAGS. +# +# By default these flags are restored to a global (empty) namespace, but +# user could restore from specific NAMESPACE by using +# AX_RESTORE_FLAGS(NAMESPACE) macro. +# +# Typical usage is like: +# +# AX_SAVE_FLAGS(mypackage) +# CPPFLAGS="-Imypackagespath ${CPPFLAGS}" +# dnl ... do some detection ... +# AX_RESTORE_FLAGS(mypackage) +# +# LICENSE +# +# Copyright (c) 2009 Filippo Giunchedi +# Copyright (c) 2011 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2011 Russ Allbery +# Copyright (c) 2013 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +# save one flag in name space +AC_DEFUN([_AX_RESTORE_ONE_FLAG],[dnl + AS_VAR_PUSHDEF([_ax_restore_flag_var], [$2[]_$1[]_ax_save_flags]) + AS_VAR_COPY($2[],_ax_restore_flag_var) + AS_VAR_POPDEF([_ax_restore_flag_var]) +]) + +AC_DEFUN([AX_RESTORE_FLAGS], [dnl + m4_foreach([FLAG], dnl + [_AX_SAVE_FLAGS_LIST()], dnl + [_AX_RESTORE_ONE_FLAG([$1],FLAG)]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_restore_flags_with_prefix.m4 projectm-3.1.0/m4/autoconf-archive/ax_restore_flags_with_prefix.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_restore_flags_with_prefix.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_restore_flags_with_prefix.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,66 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_restore_flags_with_prefix.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_RESTORE_FLAGS_WITH_PREFIX(PREFIX, LIST-OF-FLAGS) +# +# DESCRIPTION +# +# Restore the flags saved by AX_SAVE_FLAGS_WITH_PREFIX. +# +# Expansion example: AX_RESTORE_FLAGS_WITH_PREFIX([GL], [[CFLAGS],[LIBS]]) +# expands to +# +# CFLAGS="$gl_saved_flag_cflags" +# LIBS="$gl_saved_flag_libs" +# +# One common use case is to define a package specific wrapper macro around +# this one, and also restore other variables if needed. For example: +# +# AC_DEFUN([_AX_CHECK_GL_RESTORE_FLAGS], [ +# AX_RESTORE_FLAGS_WITH_PREFIX([GL],[$1]) +# AC_LANG_POP([C]) +# ]) +# +# # Restores CFLAGS, LIBS and language state +# _AX_CHECK_GL_RESTORE_FLAGS([[CFLAGS],[LIBS]]) +# +# LICENSE +# +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_RESTORE_FLAGS_WITH_PREFIX],[ +m4_ifval([$2], [ +m4_car($2)="$_ax_[]m4_tolower($1)_saved_flag_[]m4_tolower(m4_car($2))" +$0($1, m4_cdr($2))]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_rpm_init.m4 projectm-3.1.0/m4/autoconf-archive/ax_rpm_init.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_rpm_init.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_rpm_init.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,263 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_rpm_init.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RPM_INIT +# +# DESCRIPTION +# +# Setup variables for creation of rpms. It will define several variables +# useful for creating rpms on a system where rpms are supported. +# Currently, I requires changes to Makefile.am to function properly (see +# the example below). +# +# Also note that I do not use any non-UNIX OSs (and for the most part, I +# only use RedHat), so this is probably generally not useful for other +# systems. +# +# Required setup: +# +# In configure.in: +# +# dnl For my rpm.m4 macros +# RPM_RELEASE=1 +# AC_SUBST(RPM_RELEASE) +# +# AX_RPM_INIT +# dnl Enable or disable the rpm making rules in Makefile.am +# AM_CONDITIONAL(MAKE_RPMS, test x$make_rpms = xtrue) +# +# Furthermore, the %GNUconfigure rpm macro has a problem in that it does +# not define CXXFLAGS for the target system correctly, so for compiling +# C++ code, add the following line _before_ calling AC_PROG_CXX: +# +# dnl This is a little hack to make this work with rpm better (see mysql++.spec.in) +# test -z "$CXXFLAGS" && CXXFLAGS="${CFLAGS}" +# +# Changes to Makefile.am (I am trying to get rid of this step; suggestions +# invited): +# +# if MAKE_RPMS +# rpm: @RPM_TARGET@ +# +# .PHONY: rpm +# +# $(RPM_TARGET): $(DISTFILES) +# ${MAKE} dist +# -mkdir -p $(RPM_DIR)/SRPMS +# -mkdir -p `dirname $(RPM_TARGET)` +# $(RPM_PROG) $(RPM_ARGS) $(RPM_TARBALL) +# @echo Congratulations, $(RPM_TARGET) "(and friends)" should now exist. +# else +# endif +# +# Also, it works best with a XXXX.spec.in file like the following (this is +# way down on the wishlist, but a program to generate the skeleton spec.in +# much like autoscan would just kick butt!): +# +# ---------- 8< ---------- +# # -*- Mode:rpm-spec -*- +# # mysql++.spec.in +# Summary: Your package description goes here +# %define rel @RPM_RELEASE@ +# +# %define version @VERSION@ +# %define pkgname @PACKAGE@ +# %define prefix /usr +# +# %define lt_release @LT_RELEASE@ +# %define lt_version @LT_CURRENT@.@LT_REVISION@.@LT_AGE@ +# +# # This is a hack until I can figure out how to better handle replacing +# # autoconf macros... (gotta love autoconf...) +# %define __aclocal aclocal || aclocal -I ./macros +# %define configure_args @RPM_CONFIGURE_ARGS@ +# +# Name: %{pkgname} +# Version: %{version} +# Release: %{rel} +# +# Copyright: LGPL +# Group: # your group name goes here +# Source: %{pkgname}-%{version}.tar.gz +# Requires: # additional requirements +# Buildroot: /tmp/%{pkgname}-root +# URL: http://yoururl.go.here +# Prefix: %{prefix} +# BuildArchitectures: # Target platforms, i.e., i586 +# Packager: Your Name +# +# %description +# Your package description +# +# %changelog +# +# %prep +# %setup +# #%patch +# +# %build +# %GNUconfigure %{configure_args} +# # This is why we copy the CFLAGS to the CXXFLAGS in configure.in +# # CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" ./configure %{_target_platform} --prefix=%{prefix} +# make +# +# %install +# # To make things work with BUILDROOT +# if [ "$RPM_BUILD_ROOT" != "/tmp/%{pkgname}-root" ] +# then +# echo +# echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +# echo @ @ +# echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @ +# echo @ @ +# echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +# echo +# else +# echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT" +# rm -rf "$RPM_BUILD_ROOT" +# fi +# make DESTDIR="$RPM_BUILD_ROOT" install +# +# %clean +# # Call me paranoid, but I do not want to be responsible for nuking +# # someone's harddrive! +# if [ "$RPM_BUILD_ROOT" != "/tmp/%{pkgname}-root" ] +# then +# echo +# echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +# echo @ @ +# echo @ RPM_BUILD_ROOT is not what I expected. Please clean it yourself. @ +# echo @ @ +# echo @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +# echo +# else +# echo Cleaning RPM_BUILD_ROOT: "$RPM_BUILD_ROOT" +# rm -rf "$RPM_BUILD_ROOT" +# fi +# +# %files +# %defattr(-, root, root) +# # Your application file list goes here +# # %{prefix}/lib/lib*.so* +# %doc COPYRIGHT ChangeLog README AUTHORS NEWS +# %doc doc/* +# +# # If you install a library +# %post -p /sbin/ldconfig +# +# # If you install a library +# %postun -p /sbin/ldconfig +# +# %package devel +# Summary: Development files for %{pkgname} +# Group: Applications/Databases +# %description devel +# Development files for %{pkgname}. +# +# %files devel +# %defattr(-, root, root) +# # Your development files go here +# # Programmers documentation goes here +# %doc doc +# +# # end of file +# ---------- >8 ---------- +# +# LICENSE +# +# Copyright (c) 2008 Dale K. Hawkins +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +dnl AX_RPM_INIT +dnl Figure out how to create rpms for this system and setup for an +dnl automake target + +AU_ALIAS([AM_RPM_INIT], [AX_RPM_INIT]) +AC_DEFUN([AX_RPM_INIT], +[dnl +AC_REQUIRE([AC_CANONICAL_HOST]) +dnl Find the RPM program +AC_ARG_WITH(rpm-prog,[ --with-rpm-prog=PROG Which rpm to use (optional)], + rpm_prog="$withval", rpm_prog="") + +AC_ARG_ENABLE(rpm-rules, [ --enable-rpm-rules Try to create rpm make rules (defaults to yes for Linux)], + enable_rpm_rules="$withval",enable_rpm_rules=no) + +AC_ARG_WITH(rpm-extra-args, [ --with-rpm-extra-args=ARGS Run rpm with extra arguments (defaults to none)], + rpm_extra_args="$withval", rpm_extra_args="") + +dnl AC_ARG_ENABLE(rpm-topdir, [ --enable-rpm Try to create rpm make rules (defaults to yes for Linux)], +dnl enable_rpm_rules="$withval",no) + +dnl echo enable_rpm_rules is $enable_rpm_rules +dnl echo rpm_prog is $rpm_prog + + RPM_TARGET="" + + if test x$enable_rpm_rules = xno ; then + echo "Not trying to build rpms for your system (use --enable-rpm-rules to override) " + no_rpm=yes + else + if test x$rpm_prog != x ; then + if test x${RPM_PROG+set} != xset ; then + RPM_PROG=$rpm_prog + fi + fi + + AC_PATH_PROG(RPM_PROG, rpm, no) + no_rpm=no + if test "$RPM_PROG" = "no" ; then +echo *** RPM Configuration Failed +echo *** Failed to find the rpm program. If you want to build rpm packages +echo *** indicate the path to the rpm program using --with-rpm-prog=PROG + no_rpm=yes + RPM_MAKE_RULES="" + else + AC_MSG_CHECKING(how rpm sets %{_rpmdir}) + rpmdir=`rpm --eval %{_rpmdir}` + if test x$rpmdir = x"%{_rpmdir}" ; then + AC_MSG_RESULT([not set (cannot build rpms?)]) + echo *** Could not determine the value of %{_rpmdir} + echo *** This could be because it is not set, or your version of rpm does not set it + echo *** It must be set in order to generate the correct rpm generation commands + echo *** + echo *** You might still be able to create rpms, but I could not automate it for you + echo *** BTW, if you know this is wrong, please help to improve the rpm.m4 module + echo *** Send corrections, updates and fixes to dhawkins@cdrgts.com. Thanks. + else + AC_MSG_RESULT([$rpmdir]) + fi + AC_MSG_CHECKING(how rpm sets %{_rpmfilename}) + rpmfilename=$rpmdir/`rpm --eval %{_rpmfilename} | sed "s/%{ARCH}/${host_cpu}/g" | sed "s/%{NAME}/$PACKAGE/g" | sed "s/%{VERSION}/${VERSION}/g" | sed "s/%{RELEASE}/${RPM_RELEASE}/g"` + AC_MSG_RESULT([$rpmfilename]) + + RPM_DIR=${rpmdir} + RPM_TARGET=$rpmfilename + RPM_ARGS="-ta $rpm_extra_args" + RPM_TARBALL=${PACKAGE}-${VERSION}.tar.gz + fi + fi + + case "${no_rpm}" in + yes) make_rpms=false;; + no) make_rpms=true;; + *) AC_MSG_WARN([bad value ${no_rpm} for no_rpm (not making rpms)]) + make_rpms=false;; + esac + AC_SUBST(RPM_DIR) + AC_SUBST(RPM_TARGET) + AC_SUBST(RPM_ARGS) + AC_SUBST(RPM_TARBALL) + + RPM_CONFIGURE_ARGS=${ac_configure_args} + AC_SUBST(RPM_CONFIGURE_ARGS) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ruby_devel.m4 projectm-3.1.0/m4/autoconf-archive/ax_ruby_devel.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ruby_devel.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ruby_devel.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,180 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ruby_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RUBY_DEVEL([version]) +# +# DESCRIPTION +# +# This macro checks for Ruby and tries to get the include path to +# 'ruby.h'. It provides the $(RUBY_CPPFLAGS) and $(RUBY_LDFLAGS) output +# variables. It also exports $(RUBY_EXTRA_LIBS) for embedding Ruby in your +# code. +# +# You can search for some particular version of Ruby by passing a +# parameter to this macro, for example "2.2.1". +# +# LICENSE +# +# Copyright (c) 2008 Rafal Rzepecki +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# Copyright (c) 2008 Matteo Settenvini +# Copyright (c) 2008 Horst Knorr +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_RUBY_DEVEL],[ + AX_WITH_PROG(RUBY,ruby) + AS_IF([test -n "$1"], [ + AX_PROG_RUBY_VERSION([$1],[],[ + AC_MSG_ERROR([this package requires Ruby $1]) + ]) + ]) + + # + # Check if you have rbconfig, else fail + # + AC_MSG_CHECKING([for the rbconfig Ruby package]) + ac_rbconfig_result=`$RUBY -rrbconfig -e ";" 2>&1` + if test -z "$ac_rbconfig_result"; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_ERROR([cannot import Ruby module "rbconfig". +Please check your Ruby installation. The error was: +$ac_rbconfig_result]) + fi + + # + # Check for Ruby include path + # + AC_MSG_CHECKING([for Ruby include path]) + if test -z "$RUBY_CPPFLAGS"; then + ruby_path=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyhdrdir"]]'` + ruby_arch_path=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["rubyarchhdrdir"]]'` + if test -n "${ruby_path}"; then + ruby_path="-I$ruby_path" + fi + if test -n "${ruby_arch_path}"; then + ruby_arch_path="-I$ruby_arch_path" + fi + RUBY_CPPFLAGS="$ruby_path $ruby_arch_path" + fi + AC_MSG_RESULT([$RUBY_CPPFLAGS]) + AC_SUBST([RUBY_CPPFLAGS]) + + # + # Check for Ruby library path + # + AC_MSG_CHECKING([for Ruby library path]) + if test -z "$RUBY_LDFLAGS"; then + RUBY_LDFLAGS=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["LIBRUBYARG_SHARED"]]'` + fi + AC_MSG_RESULT([$RUBY_LDFLAGS]) + AC_SUBST([RUBY_LDFLAGS]) + + # + # Check for site packages + # + AC_MSG_CHECKING([for Ruby site-packages path]) + if test -z "$RUBY_SITE_PKG"; then + RUBY_SITE_PKG=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["sitearchdir"]]'` + fi + AC_MSG_RESULT([$RUBY_SITE_PKG]) + AC_SUBST([RUBY_SITE_PKG]) + + # + # libraries which must be linked in when embedding + # + AC_MSG_CHECKING(ruby extra libraries) + if test -z "$RUBY_EXTRA_LIBS"; then + RUBY_EXTRA_LIBS=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["SOLIBS"]]'` + fi + AC_MSG_RESULT([$RUBY_EXTRA_LIBS]) + AC_SUBST(RUBY_EXTRA_LIBS) + + # + # linking flags needed when embedding + # (is it even needed for Ruby?) + # + # AC_MSG_CHECKING(ruby extra linking flags) + # if test -z "$RUBY_EXTRA_LDFLAGS"; then + # RUBY_EXTRA_LDFLAGS=`$RUBY -rrbconfig -e 'print RbConfig::CONFIG[["LINKFORSHARED"]]'` + # fi + # AC_MSG_RESULT([$RUBY_EXTRA_LDFLAGS]) + # AC_SUBST(RUBY_EXTRA_LDFLAGS) + + # this flags breaks ruby.h, and is sometimes defined by KDE m4 macros + CFLAGS="`echo "$CFLAGS" | sed -e 's/-std=iso9899:1990//g;'`" + # + # final check to see if everything compiles alright + # + AC_MSG_CHECKING([consistency of all components of ruby development environment]) + AC_LANG_PUSH([C]) + # save current global flags + ac_save_LIBS="$LIBS" + LIBS="$ac_save_LIBS $RUBY_LDFLAGS" + ac_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$ac_save_CPPFLAGS $RUBY_CPPFLAGS" + AC_TRY_LINK([ + #include + ],[ + ruby_init(); + ],[rubyexists=yes],[rubyexists=no]) + + AC_MSG_RESULT([$rubyexists]) + + if test ! "$rubyexists" = "yes"; then + AC_MSG_ERROR([ + Could not link test program to Ruby. Maybe the main Ruby library has been + installed in some non-standard library path. If so, pass it to configure, + via the LDFLAGS environment variable. + Example: ./configure LDFLAGS="-L/usr/non-standard-path/ruby/lib" + ============================================================================ + ERROR! + You probably have to install the development version of the Ruby package + for your distribution. The exact name of this package varies among them. + ============================================================================ + ]) + RUBY_VERSION="" + fi + AC_LANG_POP + # turn back to default flags + CPPFLAGS="$ac_save_CPPFLAGS" + LIBS="$ac_save_LIBS" + + # + # all done! + # +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ruby_ext.m4 projectm-3.1.0/m4/autoconf-archive/ax_ruby_ext.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_ruby_ext.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_ruby_ext.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,144 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_ruby_ext.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_RUBY_EXT +# +# DESCRIPTION +# +# Fetches the linker flags and C compiler flags for compiling and linking +# Ruby binary extensions. The macro substitutes RUBY_VERSION, +# RUBY_EXT_INC, RUBY_EXT_LIB, RUBY_EXT_CPPFLAGS, RUBY_EXT_LDFLAGS and +# RUBY_EXT_DLEXT variables if Ruby executable has been found. It also +# checks the same variables before trying to retrieve them from the Ruby +# configuration. +# +# RUBY_VERSION: version of the Ruby interpreter +# RUBY_EXT_INC: Ruby include directory +# RUBY_EXT_LIB: Ruby extensions destination directory +# RUBY_EXT_CPPFLAGS: C preprocessor flags to compile extensions +# RUBY_EXT_LDFLAGS: linker flags to build extensions +# RUBY_EXT_DLEXT: extensions suffix for ruby modules (e.g. "so") +# +# Examples: +# +# AX_RUBY_EXT +# if test x"$RUBY" = x; then +# AC_ERROR(["cannot find Ruby"]) +# fi +# +# LICENSE +# +# Copyright (c) 2011 Stanislav Sedov +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +# THE POSSIBILITY OF SUCH DAMAGE. + +#serial 4 + +AC_DEFUN([AX_RUBY_EXT],[ + + # + # Check if ruby executable exists. + # + AC_PATH_PROGS(RUBY, ["${RUBY-ruby}"], []) + + if test -n "$RUBY" ; then + + AC_MSG_NOTICE([Ruby executable: '$RUBY']) + + # + # Check Ruby version. + # + AC_MSG_CHECKING([for Ruby version]) + [RUBY_VERSION=`$RUBY -e 'puts RUBY_VERSION'`]; + AC_MSG_RESULT([$RUBY_VERSION]) + AC_SUBST(RUBY_VERSION) + + # + # Check for Ruby extensions include path. + # + AC_ARG_VAR(RUBY_EXT_INC, [Directory to include ruby headers from]) + AC_MSG_CHECKING([for Ruby headers include path]) + if test -z "$RUBY_EXT_INC" ; then + [RUBY_EXT_INC=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]'`]; + fi + AC_MSG_RESULT([$RUBY_EXT_INC]) + AC_SUBST(RUBY_EXT_INC) + + # + # Check for the extensions target directory. + # + AC_ARG_VAR(RUBY_EXT_LIB, [Directory to install ruby extensions into]) + AC_MSG_CHECKING([for Ruby extensions target directory]) + if test -z "$RUBY_EXT_LIB" ; then + [RUBY_EXT_LIB=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]'`]; + fi + AC_MSG_RESULT([$RUBY_EXT_LIB]) + AC_SUBST(RUBY_EXT_LIB) + + # + # Check for Ruby CPP flags. + # + AC_ARG_VAR(RUBY_EXT_CPPFLAGS, [CPPFLAGS to compile Ruby extensions]) + AC_MSG_CHECKING([for Ruby extensions C preprocessor flags]) + if test -z "$RUBY_EXT_CPPFLAGS" ; then + [RUBY_EXT_CPPFLAGS=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["CPPFLAGS"]'`]; + fi + AC_MSG_RESULT([$RUBY_EXT_CPPFLAGS]) + AC_SUBST(RUBY_EXT_CPPFLAGS) + + # + # Check for Ruby extensions link flags. + # + AC_ARG_VAR(RUBY_EXT_LDFLAGS, [LDFLAGS to build Ruby extensions]) + AC_MSG_CHECKING([for Ruby extensions linker flags]) + if test -z "$RUBY_EXT_LDFLAGS" ; then + [RUBY_EXT_LDFLAGS=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["LDFLAGS"]'`]; + fi + # Fix LDFLAGS for OS X. We don't want any -arch flags here, otherwise + # linking might fail. We also including the proper flags to create a bundle. + case "$host" in + *darwin*) + RUBY_EXT_LDFLAGS=`echo ${RUBY_EXT_LDFLAGS} | sed -e "s,-arch [[^ ]]*,,g"` + RUBY_EXT_LDFLAGS="${RUBY_EXT_LDFLAGS} -bundle -undefined dynamic_lookup" + ;; + esac + AC_MSG_RESULT([$RUBY_EXT_LDFLAGS]) + AC_SUBST(RUBY_EXT_LDFLAGS) + + # + # Check for Ruby dynamic library extension. + # + AC_ARG_VAR(RUBY_EXT_DLEXT, [Ruby dynamic library extension]) + AC_MSG_CHECKING([for Ruby dynamic library extension]) + if test -z "$RUBY_EXT_DLEXT" ; then + [RUBY_EXT_DLEXT=`$RUBY -rrbconfig -e 'puts RbConfig::CONFIG["DLEXT"]'`]; + RUBY_EXT_DLEXT=".${RUBY_EXT_DLEXT}" + fi + AC_MSG_RESULT([$RUBY_EXT_DLEXT]) + AC_SUBST(RUBY_EXT_DLEXT) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_save_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_save_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_save_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_save_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_save_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SAVE_FLAGS([NAMESPACE]) +# +# DESCRIPTION +# +# Save common compilation flags into temporary variables. +# +# Compilation flags includes: CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS, LIBS, +# OBJCFLAGS. +# +# By default these flags are saved to a global (empty) namespace, but user +# could specify a specific NAMESPACE to AX_SAVE_FLAGS macro and latter +# restore it by using AX_RESTORE_FLAGS(NAMESPACE). +# +# AX_SAVE_FLAGS(mypackage) +# CPPFLAGS="-Imypackagespath ${CPPFLAGS}" +# dnl .. do some detection ... +# AX_RESTORE_FLAGS(mypackage) +# +# LICENSE +# +# Copyright (c) 2009 Filippo Giunchedi +# Copyright (c) 2011 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2011 Russ Allbery +# Copyright (c) 2013 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +# list of flag to save +AC_DEFUN([_AX_SAVE_FLAGS_LIST],[dnl +[CCASFLAGS],dnl +[CFLAGS],dnl +[CPPFLAGS],dnl +[CXXFLAGS],dnl +[ERLCFLAGS],dnl +[FCFLAGS],dnl +[FCLIBS],dnl +[FFLAGS],dnl +[FLIBS],dnl +[GCJFLAGS],dnl +[JAVACFLAGS],dnl +[LDFLAGS],dnl +[LIBS],dnl +[OBJCFLAGS],dnl +[OBJCXXFLAGS],dnl +[UPCFLAGS],dnl +[VALAFLAGS]dnl +]) + +# save one flag in name space +AC_DEFUN([_AX_SAVE_ONE_FLAG],[ + AS_VAR_PUSHDEF([_ax_save_flag_var], [$2[]_$1[]_ax_save_flags]) + AS_VAR_COPY(_ax_save_flag_var, $2[]) + AS_VAR_POPDEF([_ax_save_flag_var]) +]) + +AC_DEFUN([AX_SAVE_FLAGS],[dnl + m4_foreach([FLAG], dnl + [_AX_SAVE_FLAGS_LIST()], dnl + [_AX_SAVE_ONE_FLAG([$1],FLAG)]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_save_flags_with_prefix.m4 projectm-3.1.0/m4/autoconf-archive/ax_save_flags_with_prefix.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_save_flags_with_prefix.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_save_flags_with_prefix.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,72 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_save_flags_with_prefix.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_SAVE_FLAGS_WITH_PREFIX(PREFIX, LIST-OF-FLAGS) +# +# DESCRIPTION +# +# For each flag in LIST-OF-FLAGS, it expands to lower-cased shell variable +# with the prefix holding the flag original value. The saved variables +# can be restored by AX_RESTORE_FLAGS_WITH_PREFIX +# +# As an example: AX_SAVE_FLAGS_WITH_PREFIX([GL], [[CFLAGS],[LIBS]]) +# expands to +# +# gl_saved_flag_cflags="$CFLAGS" +# gl_saved_flag_libs="$LIBS" +# CFLAGS="$GL_CFLAGS $CFLAGS" +# LIBS="$GL_LIBS $LIBS" +# +# One common use case is to define a package specific wrapper macro around +# this one, and also setup other variables if needed. For example: +# +# AC_DEFUN([_AX_CHECK_GL_SAVE_FLAGS], [ +# AX_SAVE_FLAGS_WITH_PREFIX([GL],[$1]) +# AC_LANG_PUSH([C]) +# ]) +# +# # pushes GL_CFLAGS and GL_LIBS to CFLAGS and LIBS +# # also set the current language to test to C +# _AX_CHECK_GL_SAVE_FLAGS([[CFLAGS],[LIBS]]) +# +# LICENSE +# +# Copyright (c) 2016 Felix Chern +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_SAVE_FLAGS_WITH_PREFIX],[ +m4_ifval([$2], [ +_ax_[]m4_tolower($1)_saved_flag_[]m4_tolower(m4_car($2))="$m4_car($2)" +m4_car($2)="$$1_[]m4_car($2) $m4_car($2)" +$0($1, m4_cdr($2)) +])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_set_default_paths_system.m4 projectm-3.1.0/m4/autoconf-archive/ax_set_default_paths_system.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_set_default_paths_system.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_set_default_paths_system.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,139 @@ +# ================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_set_default_paths_system.html +# ================================================================================ +# +# SYNOPSIS +# +# AX_SET_DEFAULT_PATHS_SYSTEM +# +# DESCRIPTION +# +# the most interesting changes go about windows-targets - where the +# default_prefix is set to /programs, and quite some directories are +# aliased: sbindir := libdir := bindir and the docprefix-defaults are also +# a bit different, even on FHS2-compliant systems where the mandir is +# going to $prefix/man only if prefix=/usr, otherwise they shall go to +# $datadir/man. We use an extra docprefix to express it which is either +# defined as being prefix or datadir. not SUBSTed here. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AU_ALIAS([AC_SET_DEFAULT_PATHS_SYSTEM], [AX_SET_DEFAULT_PATHS_SYSTEM]) +AC_DEFUN([AX_SET_DEFAULT_PATHS_SYSTEM], +[AC_REQUIRE([AC_CANONICAL_HOST]) # -------------------------------------------- +case "$prefix:$ac_default_prefix" in + NONE:/usr/local) + result="" + AC_MSG_CHECKING(default prefix path) + case "${target_os}" in + *cygwin* | *mingw* | *uwin* | *djgpp | *emx* ) + if test "${host_os}" = "${target_os}" ; then + ac_default_prefix="/programs" + result="(win/dos target)" + else + case "$PATH" in + *:/usr/local/cross-tools/$target_alias/bin:*) + ac_default_prefix="/usr/local/cross-tools/$target_alias" ;; + *:/usr/local/$target_alias/bin:*) + ac_default_prefix="/usr/local/$target_alias" ;; + *:/usr/local/$target_cpu-$target_os/bin:*) + ac_default_prefix="/usr/local/$target_cpu-$target_os" ;; + *) + ac_default_prefix="/programs" ;; + esac + result="(win/dos cross-compiler)" + fi + ;; + esac + AC_MSG_RESULT($ac_default_prefix $result) + ;; +esac +AC_MSG_CHECKING(default prefix system) +result="$prefix" ; test "$result" = "NONE" && result="$ac_default_prefix" +case ${result} in + /programs | /programs/*) result="is win-/programs" + # on win/dos, .exe .dll and .cfg live in the same directory + libdir=`echo $libdir |sed -e 's:^..exec_prefix./lib$:${bindir}:'` + sbindir=`echo $sbindir |sed -e 's:^..exec_prefix./sbin$:${libdir}:'` + sysconfdir=`echo $sysconfdir |sed -e 's:^..prefix./etc$:${sbindir}:'` + libexecdir=`echo $libexecdir |sed -e 's:/libexec$:/system:'` + # help-files shall be set with --infodir, docprefix is datadir + docprefix="${datadir}" + mandir=`echo $mandir \ + |sed -e 's:^..prefix./man$:${datadir}/info:'` + includedir=`echo $includedir \ + |sed -e 's:^..prefix./include$:${datadir}/include:'` + # other state files (but /etc) are moved to datadir + sharedstatedir=`echo $sharedstatedir \ + |sed -e 's:^..prefix./com$:${datadir}/default:'` + localstatedir=`echo $localstatedir \ + |sed -e 's:^..prefix./var$:${datadir}/current:'` + ;; + /usr) result="is /usr-shipped" + # doc files are left at prefix + docprefix="${prefix}" + # state files go under /top + sysconfdir=`echo $sysconfdir |sed -e 's:^..prefix./etc$:/etc:'` + sharedstatedir=`echo $sharedstatedir \ + |sed -e 's:^..prefix./com$:/etc/default:'` + # $prefix/var is going to end up in /var/lib + localstatedir=`echo $localstatedir \ + |sed -e 's:^..prefix./var$:/var/lib:'` + ;; + /opt | /opt/*) result="is /opt-package" + # state files go under /top/prefix + sysconfdir=`echo $sysconfdir \ + |sed -e 's:^..prefix./etc$:/etc${prefix}:'` + sharedstatedir=`echo $sharedstatedir \ + |sed -e 's:^..prefix./com$:/etc/default${prefix}:'` + # $prefix/var is going to be /var$prefix... once again + localstatedir=`echo $localstatedir \ + |sed -e 's:^..prefix./var$:/var${prefix}:'` + # doc files are left at prefix + docprefix="${prefix}" + ;; + *) result="is /local-package" + # doc files are moved from prefix down to datadir + docprefix="${datadir}" + mandir=`echo $mandir \ + |sed -e 's:^..prefix./man$:${datadir}/man:'` + infodir=`echo $infodir \ + |sed -e 's:^..prefix./infodir$:${datadir}/info:'` + # never use $prefix/com - that is no good idea + sharedstatedir=`echo $sharedstatedir \ + |sed -e 's:^..prefix./com$:${sysconfdir}/default:'` + ;; +esac +AC_MSG_RESULT($result) +# -------------------------------------------------------- +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_short_sleep.m4 projectm-3.1.0/m4/autoconf-archive/ax_short_sleep.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_short_sleep.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_short_sleep.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,92 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_short_sleep.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SHORT_SLEEP +# +# DESCRIPTION +# +# This macro searches for a "sleep" function that has 1/1000 of a second +# accuracy. On some systems, this is known as nap() and on others usleep() +# / 1000. There are probably other functions like this defined in other +# system libraries, but we don't know how to search for them yet. +# Contributions joyously accepted. :) +# +# LICENSE +# +# Copyright (c) 2008 Warren Young +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([ETR_SHORT_SLEEP], [AX_SHORT_SLEEP]) +AC_DEFUN([AX_SHORT_SLEEP], +[ + AC_MSG_CHECKING([for nap() in libc]) + AC_TRY_LINK([ extern "C" long nap(long ms); ], [ nap(42); ], + [ + ax_ss_found=yes + ax_ss_factor=1 + AC_DEFINE(HAVE_NAP,1, + [Define to use the nap() system call for short sleeps]) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + ax_ss_found=no + ]) + + if test x"$ax_ss_found" = "xno" + then + AC_MSG_CHECKING([for usleep()]) + AC_TRY_LINK([ #include ], [ usleep(42); ], + [ + ax_ss_found=yes + ax_ss_factor=1000 + AC_DEFINE(HAVE_USLEEP,1, + [Define to use the usleep() system call for short sleeps]) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + ax_ss_found=no + ]) + fi + + if test x"$ax_ss_found" = "xno" + then + save_LIBS=$LIBS + LIBS="$LIBS -lx" + AC_MSG_CHECKING([for nap() in libx]) + AC_TRY_LINK([ extern "C" long nap(long ms); ], [ nap(42); ], + [ + ax_ss_found=yes + ax_ss_factor=1 + AC_DEFINE(HAVE_NAP,1, + [Define to use the nap() system call for short sleeps]) + AC_MSG_RESULT(yes) + ], + [ + AC_MSG_RESULT(no) + ax_ss_found=no + ]) + + LIBS=$save_LIBS + AX_SS_LIB=-lx + AC_SUBST(AX_SS_LIB) + fi + + if test x"$ax_ss_found" = "xyes" + then + AC_DEFINE_UNQUOTED(SHORT_SLEEP_FACTOR, $ax_ss_factor, + [Multiply milliseconds by this to get the argument for the short sleep system call]) + else + AC_MSG_ERROR([Could not find a "short sleep" system call.]) + fi +])dnl AX_SHORT_SLEEP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_silent_mode.m4 projectm-3.1.0/m4/autoconf-archive/ax_silent_mode.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_silent_mode.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_silent_mode.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_silent_mode.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SILENT_MODE(on|off) +# +# DESCRIPTION +# +# Temporarily disable console output when running Autoconf macros. For +# example: +# +# AX_SILENT_MODE(on) dnl disable console output +# AC_PROG_CXX +# AX_SILENT_MODE(off) dnl enable console output +# AC_PROG_RANLIB +# +# LICENSE +# +# Copyright (c) 2008 Peter Simons +# Copyright (c) 2008 Paolo Bonzini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_SILENT_MODE], + [ + case "$1" in + on) + exec 6>/dev/null + ;; + off) + exec 6>&1 + ;; + *) + AC_MSG_ERROR([Silent mode can only be switched "on" or "off".]) + ;; + esac + ])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sip_devel.m4 projectm-3.1.0/m4/autoconf-archive/ax_sip_devel.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sip_devel.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_sip_devel.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,108 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_sip_devel.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SIP_DEVEL([]) +# +# DESCRIPTION +# +# Searches for the sip executable and the sip include path. The sip +# include path consists of two components, one which contains the file +# qt/qtmod.sip and the other one the path to sip.h, which should be found +# in the include/pythonX.Y directory. +# +# The macro bails out if the executable or the file cannot be located. +# Otherwise it defines: +# +# SIP the path to the sip executable +# SIP_CPPFLAGS include path: -I -I +# +# Example: +# +# AX_SIP_DEVEL +# AX_SIP_DEVEL([4.1]) +# +# Requires: perl (for version string comparison) +# +# FIXME: Use AX_COMPARE_VERSION instead. +# +# LICENSE +# +# Copyright (c) 2008 Uwe Mayer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([MERK_SIP_DEVEL], [AX_SIP_DEVEL]) +AC_DEFUN([AX_SIP_DEVEL],[ +#-- provide --with-sip=PATH command line argument +AC_ARG_WITH([sip], + AS_HELP_STRING([--with-sip=PATH], [specify the location of the qt/qtmod.sip file]), + [sip_search_dir="$withval"], + [sip_search_dir=""]) + +#-- check for sip executable +AC_PATH_PROG([SIP], [sip], [no]) +if test x"$SIP" == x"no"; then + AC_MSG_ERROR([failed to find required command sip]) +fi +AC_SUBST([SIP]) + +#-- check for minimum sip version +if test x"$1" != x""; then + AC_CHECK_PROG([PERL], [perl], [$(which perl)]) + if test x"$PERL" == x""; then + AC_MSG_ERROR([perl required for checking sip version]) + fi + AC_MSG_CHECKING([sip version >= $1]) + sip_version=$($SIP -V |cut -f 1 -d " ") + ax_sip_devel_result=$(echo "$sip_version" |perl -e '("$1" lt ) && print "ok"') + if test x"$ax_sip_devel_result" == x""; then + AC_MSG_RESULT([$sip_version]) + AC_MSG_ERROR([a newer version of sip is required]) + else + AC_MSG_RESULT([ok]) + fi +fi + +#-- Check for SIP include path +AC_MSG_CHECKING([for sip include path]) + +# check for qt/qtmod.sip +for i in "$sip_search_dir" "/usr/share/sip"; do + sip_path1=`find $i -type f -name qtmod.sip -print | sed "1q"` + if test -n "$sip_path1"; then + break + fi +done + +sip_path1=`echo "$sip_path1" | sed 's,/qt/qtmod.sip,,'` +if test -z "$sip_path1" ; then + AC_MSG_ERROR([cannot find qt/qtmod.sip; try --with-sip=PATH]) +fi + +# check for sip.h +dnl this part of the code to detect python version and include path +dnl was taken from AX_PYTHON_DEVEL macro, (rev. 2008-04-12) +python_path=`echo $PYTHON | sed "s,/bin.*$,,"` +for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do + python_path=`find $i -type f -name Python.h -print | sed "1q"` + if test -n "$python_path" ; then + break + fi +done +sip_path2=`echo $python_path | sed "s,/Python.h$,,"` +if ! test -f "$sip_path2/sip.h"; then + AC_MSG_ERROR([cannot find include path to sip.h]) +fi + +AC_MSG_RESULT([$sip_path1,$sip_path2]) + +AC_SUBST([SIP_CPPFLAGS],["-I$sip_path1 -I$sip_path2"]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_spec_file.m4 projectm-3.1.0/m4/autoconf-archive/ax_spec_file.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_spec_file.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_spec_file.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,133 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_spec_file.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SPEC_FILE [(rpmspecfile [,subdirpath])] +# +# DESCRIPTION +# +# set the specfile - if no argument has been given then check whether the +# ac_unique_file looks like a .spec file and use it. This macro is +# ac_REQUIRED by many AX_SPEC_ routines. +# +# the AX_SPEC_EXTRACT macro is a helper used by many AX_SPEC_ routines and +# therefore placed here to be automatically included in the macro set of +# (older) aclocal/acinclude. +# +# AX_SPEC_EXTRACT(shellvar [,specvar [,defaultvalue]]) +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AC_DEFUN([AX_SPEC_FILE], +[ AC_MSG_CHECKING([rpm spec file]) + if test ".$1" != "." ; then + ax_spec_file_="$1" + ax_spec_file=`basename $1` + else + case ".$ac_unique_file" in + *.spec) ax_spec_file="$ac_unique_file" + ax_spec_file_="$ac_unique_file" ;; + *) ax_spec_file="TODO" + if test ".$PACKAGE" != "." + then ax_spec_file_="$PACKAGE.spec" + else ax_spec_file_="README" + fi + cat m4_ifset([AS_MESSAGE_LOG_FD],[>&AS_MESSAGE_LOG_FD],[>>config.log]) < +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 12 + +AC_DEFUN([AX_SPEC_PACKAGE_LICENSE],[AC_REQUIRE([AX_SPEC_FILE])dnl + AS_VAR_PUSHDEF([VAR],[PACKAGE_LICENSE])dnl + AC_MSG_CHECKING([for spec license type]) + if test ".$VAR" = "." ; then if test ! -f $ax_spec_file + then k="(w/o spec)" + else k="" + AX_SPEC_EXTRACT(VAR,[license],m4_ifval($1,$1)) + VAR=`echo $VAR | sed -e 's/ *License//g'` + fi fi + test ".$VAR" = "." && k="(fallback)" + ifelse($2,,[dnl here the defaults for LICENSE / COPYRIGHT + if test ".$VAR" = "." ; then + for ac_file in "$srcdir/COPYING" "$srcdir/COPYING" "$srcdir/LICENSE" ; do + test -f "$ac_file" || continue +dnl http://www.ibiblio.org/osrt/omf/omf_elements "16. Rights" + if grep "GNU LESSER GENERAL PUBLIC LICENSE" "$ac_file" >/dev/null + then VAR="GNU LGPL" ; break + elif grep "GNU GENERAL PUBLIC LICENSE" "$ac_file" >/dev/null + then VAR="GNU GPL" ; break + elif grep "MOZILLA PUBLIC LICENSE" "$ac_file" >/dev/null + then VAR="MPL" ; break + elif grep "Mozilla Public License" "$ac_file" >/dev/null + then VAR="MPL" ; break + elif grep -i "artistic license" "$ac_file" >/dev/null + then VAR="Artistic" ; break + elif grep -i "artistic control" "$ac_file" >/dev/null + then VAR="Artistic" ; break + elif grep -i "semblance of artistic" "$ac_file" >/dev/null + then VAR="Artistic" ; break + elif grep -i "above copyright notice" "$ac_file" >/dev/null + then VAR="BSD" ; break + fi + done + if test ".$VAR" = "." ; then + if test "$srcdir/COPYING.LIB" ; then VAR="GNU LGPL" + elif test ".$ltmain" != "." ; then VAR="GNU LGPL" + else VAR="GNU GPL" + fi + fi + fi + ],[test ".$VAR" = "." && VAR="$2"]) + test "$VAR" = "GPL" && VAR="GNU GPL" + test "$VAR" = "LGPL" && VAR="GNU LGPL" + AC_MSG_RESULT([m4_ifval([$1],[$1 = ])$VAR $k]) + AS_VAR_POPDEF([VAR])dnl +]) + +AC_DEFUN([AX_SPEC_PACKAGE_SUMMARY],[AC_REQUIRE([AX_SPEC_FILE])dnl + AS_VAR_PUSHDEF([VAR],[PACKAGE_SUMMARY])dnl + AC_MSG_CHECKING([for spec summary]) + if test ".$VAR" = "." ; then if test ! -f $ax_spec_file + then k="(w/o spec)" + else k="" + AX_SPEC_EXTRACT(VAR,[summary],m4_ifval($1,$1)) + fi fi + test ".$VAR" = "." && k="(fallback)" + ifelse($2,,[dnl here the defaults for SUMMARY + if test ".$VAR" = "." ; then VAR="$PACKAGE" + test ".$VAR" = "." && VAR="foo" + test ".$ltmain" != "." && VAR="$VAR library" + fi + ],[test ".$VAR" = "." && VAR="$2"]) + AC_MSG_RESULT([m4_ifval([$1],[$1 = ])$VAR $k]) + AS_VAR_POPDEF([VAR])dnl +]) + +AC_DEFUN([AX_SPEC_PACKAGE_ICON],[AC_REQUIRE([AX_SPEC_FILE])dnl + AS_VAR_PUSHDEF([VAR],[PACKAGE_ICON])dnl + AC_MSG_CHECKING([for spec icon]) + if test ".$VAR" = "." ; then if test ! -f $ax_spec_file + then k="(w/o spec)" + else k="" + AX_SPEC_EXTRACT(VAR,[icon],m4_ifval($1,$1)) + fi fi + test ".$VAR" = "." && k="(fallback)" + ifelse($2,,[dnl here the defaults for ICON + if test ".$VAR" = "." ; then VAR="$PACKAGE-icon.png" ; fi + ],[test ".$VAR" = "." && VAR="$2"]) + AC_MSG_RESULT([m4_ifval([$1],[$1 = ])$VAR $k]) + AS_VAR_POPDEF([VAR])dnl +]) + +AC_DEFUN([AX_SPEC_PACKAGE_CATEGORY],[AC_REQUIRE([AX_SPEC_FILE])dnl + AS_VAR_PUSHDEF([VAR],[PACKAGE_CATEGORY])dnl + AC_MSG_CHECKING([for spec category]) + if test ".$VAR" = "." ; then if test ! -f $ax_spec_file + then k="(w/o spec)" + else k="" + AX_SPEC_EXTRACT(VAR,[group],m4_ifval($1,$1)) + VAR=`echo $VAR | sed -e 's/ /-/g'` + fi fi + test ".$VAR" = "." && k="(fallback)" + ifelse($2,,[dnl here the defaults for CATEGORY + if test ".$VAR" = "." ; then if test ".$ltmain" != "." + then VAR="Development/Library" + else VAR="Development/Other" + fi fi + ],[test ".$VAR" = "." && VAR="$2"]) + AC_MSG_RESULT([m4_ifval([$1],[$1 = ])$VAR $k]) + AS_VAR_POPDEF([VAR])dnl +]) + +AC_DEFUN([AX_SPEC_PACKAGE_NAME],[AC_REQUIRE([AX_SPEC_FILE])dnl + AS_VAR_PUSHDEF([VAR],[PACKAGE_NAME])dnl + AC_MSG_CHECKING([for spec package]) + if test ".$VAR" = "." ; then if test ! -f $ax_spec_file + then k="(w/o spec)" + else k="" + AX_SPEC_EXTRACT(VAR,[name],m4_ifval($1,$1)) + VAR=`echo $VAR | sed -e 's/ /-/g'` + fi fi + test ".$VAR" = "." && k="(fallback)" + ifelse($2,,[dnl here the defaults for PACKAGE + test ".$VAR" = "." && VAR=`basename $ax_spec_file .spec` + test ".$VAR" = ".README" && VAR="TODO" + test ".$VAR" = ".TODO" && VAR="foo" + ],[test ".$VAR" = "." && VAR="$2"]) + test "VAR" = "PACKAGE_NAME" && test ".$PACKAGE" = "." && PACKAGE="$VAR" + AC_MSG_RESULT([m4_ifval([$1],[$1 = ])$VAR $k]) + AS_VAR_POPDEF([VAR])dnl +]) + +AC_DEFUN([AX_SPEC_PACKAGE_VERSION_],[AC_REQUIRE([AX_SPEC_FILE])dnl + AS_VAR_PUSHDEF([VAR],[PACKAGE_VERSION])dnl + AC_MSG_CHECKING([for spec version]) + if test ".$VAR" = "." ; then if test ! -f $ax_spec_file + then k="(w/o spec)" + else k="" + AX_SPEC_EXTRACT(VAR,[version],m4_ifval($1,$1)) + VAR=`echo $VAR | sed -e 's/ /-/g'` + fi fi + test ".$VAR" = "." && k="(fallback)" + ifelse($2,,[dnl here the defaults for VERSION + test ".$VAR" = "." && VAR=`date +0.%y.%W%w` + ],[test ".$VAR" = "." && VAR="$2"]) + test "VAR" = "PACKAGE_VERSION" && test ".$VERSION" = "." && VERSION="$VAR" + case "$VAR" in # note we set traditional VERSION before cleaning things up + *.*.) VAR="$VAR"`date +%W%w` ;; + *.*.*) ;; + *.) VAR="$VAR"`date +%y.%W%w` ;; + *.*) VAR="$VAR.0" ;; + *) VAR=AS_TR_SH([$VAR]) ; VAR="$VAR.`date +%y.%W%w`" ;; + esac + VAR=`echo $VAR | sed -e "s/[[.]][0]\\([0-9]\\)/.\\1/g"` + AC_MSG_RESULT([m4_ifval([$1],[$1 = ])$VAR $k]) + AS_VAR_POPDEF([VAR])dnl +]) + +dnl for compatibility, we define ax_spec_package_version +dnl to do all of ax_spec_package_name as well. +AC_DEFUN([AX_SPEC_PACKAGE_VERSION],[AC_REQUIRE([AX_SPEC_FILE])dnl + ifelse($1,, + AC_MSG_WARN([please use ax_spec_package_AND_version now!]), + AC_MSG_ERROR([please use ax_spec_package_AND_version now!])) + AX_SPEC_PACKAGE_NAME + AX_SPEC_PACKAGE_VERSION_ + +]) + +AC_DEFUN([AX_SPEC_PACKAGE_AND_VERSION],[ + m4_ifset([m4_ax_spec_file],,[AX_SPEC_FILE($1)]) + AX_SPEC_PACKAGE_NAME + AX_SPEC_PACKAGE_VERSION_ +]) + +AC_DEFUN([AX_SPEC_DEFAULTS],[ + m4_ifset([m4_ax_spec_file],,[AX_SPEC_FILE($1)]) + AX_SPEC_PACKAGE_NAME + AX_SPEC_PACKAGE_VERSION_ + AX_SPEC_PACKAGE_LICENSE + AX_SPEC_PACKAGE_SUMMARY + AX_SPEC_PACKAGE_CATEGORY + AX_SPEC_PACKAGE_ICON +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_split_version.m4 projectm-3.1.0/m4/autoconf-archive/ax_split_version.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_split_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_split_version.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,38 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_split_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SPLIT_VERSION +# +# DESCRIPTION +# +# Splits a version number in the format MAJOR.MINOR.POINT into its +# separate components. +# +# Sets the variables. +# +# LICENSE +# +# Copyright (c) 2008 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_SPLIT_VERSION],[ + AC_REQUIRE([AC_PROG_SED]) + AX_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'` + AX_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'` + AX_POINT_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'` + AC_MSG_CHECKING([Major version]) + AC_MSG_RESULT([$AX_MAJOR_VERSION]) + AC_MSG_CHECKING([Minor version]) + AC_MSG_RESULT([$AX_MINOR_VERSION]) + AC_MSG_CHECKING([Point version]) + AC_MSG_RESULT([$AX_POINT_VERSION]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_strings_strcasecmp.m4 projectm-3.1.0/m4/autoconf-archive/ax_strings_strcasecmp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_strings_strcasecmp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_strings_strcasecmp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_strings_strcasecmp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_STRINGS_STRCASECMP +# +# DESCRIPTION +# +# This macro tries to find strcasecmp() in strings.h. See the +# AX_STRING_STRCASECMP macro's commentary for usage details. +# +# LICENSE +# +# Copyright (c) 2008 Warren Young +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([ETR_STRINGS_STRCASECMP], [AX_STRINGS_STRCASECMP]) +AC_DEFUN([AX_STRINGS_STRCASECMP], +[ AC_CACHE_CHECK([for strcasecmp() in strings.h], ac_cv_strings_strcasecmp, [ + + AC_TRY_LINK( + [ #include ], + [ strcasecmp("foo", "bar"); ], + ac_cv_strings_strcasecmp=yes, + ac_cv_strings_strcasecmp=no) +]) + + if test x"$ac_cv_strings_strcasecmp" = "xyes" + then + AC_DEFINE(HAVE_STRINGS_STRCASECMP, 1, + [ Define if your system has strcasecmp() in strings.h ]) + fi +]) dnl AX_STRINGS_STRCASECMP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_string_strcasecmp.m4 projectm-3.1.0/m4/autoconf-archive/ax_string_strcasecmp.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_string_strcasecmp.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_string_strcasecmp.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,52 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_string_strcasecmp.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_STRING_STRCASECMP +# +# DESCRIPTION +# +# This macro tries to find strcasecmp() in string.h. +# +# Use this macro in conjunction with AX_STRINGS_STRCASECMP in your +# configure.in like so: +# +# AX_STRING_STRCASECMP +# if test x"$ac_cv_string_strcasecmp" = "xno" ; then +# AX_STRINGS_STRCASECMP +# fi +# +# This will cause either HAVE_STRING_STRCASECMP or HAVE_STRINGS_STRCASECMP +# to be defined in config.h, which will tell your code what header to +# include to get strcasecmp()'s prototype. +# +# LICENSE +# +# Copyright (c) 2008 Warren Young +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([ETR_STRING_STRCASECMP], [AX_STRING_STRCASECMP]) +AC_DEFUN([AX_STRING_STRCASECMP], +[ +AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [ + AC_TRY_LINK( + [ #include ], + [ strcasecmp("foo", "bar"); ], + ac_cv_string_strcasecmp=yes, + ac_cv_string_strcasecmp=no) +]) + + if test x"$ac_cv_string_strcasecmp" = "xyes" + then + AC_DEFINE(HAVE_STRING_STRCASECMP, 1, + [ Define if your system has strcasecmp() in string.h ]) + fi +]) dnl AX_STRING_STRCASECMP diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_struct_semun.m4 projectm-3.1.0/m4/autoconf-archive/ax_struct_semun.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_struct_semun.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_struct_semun.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_struct_semun.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_STRUCT_SEMUN +# +# DESCRIPTION +# +# This macro checks to see if sys/sem.h defines struct semun. Some systems +# do, some systems don't. Your code must be able to deal with this +# possibility; if HAVE_STRUCT_SEMUM isn't defined for a given system, you +# have to define this structure before you can call functions like +# semctl(). +# +# You should call AX_SYSV_IPC before this macro, to separate the check for +# System V IPC headers from the check for struct semun. +# +# LICENSE +# +# Copyright (c) 2008 Warren Young +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([ETR_STRUCT_SEMUN], [AX_STRUCT_SEMUN]) +AC_DEFUN([AX_STRUCT_SEMUN], +[ +AC_CACHE_CHECK([for struct semun], ac_cv_struct_semun, [ + AC_TRY_COMPILE( + [ + #include + #include + #include + ], + [ struct semun s; ], + ac_cv_struct_semun=yes, + ac_cv_struct_semun=no) +]) + + if test x"$ac_cv_struct_semun" = "xyes" + then + AC_DEFINE(HAVE_STRUCT_SEMUN, 1, + [ Define if your system's sys/sem.h file defines struct semun ]) + fi +]) dnl AX_STRUCT_SEMUN diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_subdir_files.m4 projectm-3.1.0/m4/autoconf-archive/ax_subdir_files.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_subdir_files.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_subdir_files.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_subdir_files.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SUBDIR_FILES [(SUBDIRS [, CASEPATTERN])] +# +# DESCRIPTION +# +# Look into subdirs and copy the (real) files that match pattern into the +# local directory. Preferably we use a symbolic link of course. existing +# local files are not overwritten. +# +# The default casepattern is "*.?|*.cc|*.cpp", the default subdir-list +# contains all subdirs available. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_SUBDIR_FILES], [AX_SUBDIR_FILES]) +AC_DEFUN([AX_SUBDIR_FILES], +[AC_BEFORE($0,[AX_PROG_CP_S]) + for ac_subdir in ifelse([$1], , *, $1) ; do + if test -d $ac_subdir ; then + AC_MSG_CHECKING(subdir $ac_subdir) + for ac_file in $ac_subdir/* ; do + if test -f $ac_file ; then + if test ! -e `basename $ac_file` ; then + case `basename $ac_file` in + ifelse([$2], , *.?|*.cc|*.cpp,[$1])) + echo ${ECHO_N} "$ac_file," ; + $CP_S $ac_file . ;; + esac + fi + fi + done + AC_MSG_RESULT(;) + fi + done +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_subdirs_configure.m4 projectm-3.1.0/m4/autoconf-archive/ax_subdirs_configure.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_subdirs_configure.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_subdirs_configure.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,337 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_subdirs_configure.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SUBDIRS_CONFIGURE( [subdirs], [mandatory arguments], [possibly merged arguments], [replacement arguments], [forbidden arguments]) +# +# DESCRIPTION +# +# AX_SUBDIRS_CONFIGURE attempts to be the equivalent of AC_CONFIG_SUBDIRS +# with customizable options for configure scripts. +# +# Run the configure script for each directory from the comma-separated m4 +# list 'subdirs'. This macro can be used multiple times. All arguments of +# this macro must be comma-separated lists. +# +# All command line arguments from the parent configure script will be +# given to the subdirectory configure script after the following +# modifications (in that order): +# +# 1. The arguments from the 'mandatory arguments' list shall always be +# appended to the argument list. +# +# 2. The arguments from the 'possibly merged arguments' list shall be +# added if not present in the arguments of the parent configure script or +# merged with the existing argument otherwise. +# +# 3. The arguments from the 'replacement arguments' list shall be added if +# not present in the arguments of the parent configure script or replace +# the existing argument otherwise. +# +# 4. The arguments from the 'forbidden arguments' list shall always be +# removed from the argument list. +# +# The lists 'mandatory arguments' and 'forbidden arguments' can hold any +# kind of argument. The 'possibly merged arguments' and 'replacement +# arguments' expect their arguments to be of the form --option-name=value. +# +# This macro aims to remain as close as possible to the AC_CONFIG_SUBDIRS +# macro. It corrects the paths for '--cache-file' and '--srcdir' and adds +# '--disable-option-checking' and '--silent' if necessary. +# +# This macro also sets the output variable subdirs_extra to the list of +# directories recorded with AX_SUBDIRS_CONFIGURE. This variable can be +# used in Makefile rules or substituted in configured files. +# +# This macro shall do nothing more than managing the arguments of the +# configure script. Just like when using AC_CONFIG_SUBDIRS, it is up to +# the user to check any requirements or define and substitute any required +# variable for the remainder of the project. +# +# Configure scripts recorded with AX_SUBDIRS_CONFIGURE may be executed +# before configure scripts recorded with AC_CONFIG_SUBDIRS. +# +# Without additional arguments, the behaviour of AX_SUBDIRS_CONFIGURE +# should be identical to the behaviour of AC_CONFIG_SUBDIRS, apart from +# the contents of the variables subdirs and subdirs_extra (except that +# AX_SUBDIRS_CONFIGURE expects a comma-separated m4 list): +# +# AC_CONFIG_SUBDIRS([something]) +# AX_SUBDIRS_CONFIGURE([something]) +# +# This macro may be called multiple times. +# +# Usage example: +# +# Let us assume our project has 4 dependencies, namely A, B, C and D. Here +# are some characteristics of our project and its dependencies: +# +# - A does not require any special option. +# +# - we want to build B with an optional feature which can be enabled with +# its configure script's option '--enable-special-feature'. +# +# - B's configure script is strange and has an option '--with-B=build'. +# After close inspection of its documentation, we don't want B to receive +# this option. +# +# - C and D both need B. +# +# - Just like our project, C and D can build B themselves with the option +# '--with-B=build'. +# +# - We want C and D to use the B we build instead of building it +# themselves. +# +# Our top-level configure script will be called as follows: +# +# $ --with-A=build --with-B=build --with-C=build \ +# --with-D=build --some-option +# +# Thus we have to make sure that: +# +# - neither B, C or D receive the option '--with-B=build' +# +# - C and D know where to find the headers and libraries of B. +# +# Under those conditions, we can use the AC_CONFIG_SUBDIRS macro for A, +# but need to use AX_SUBDIRS_CONFIGURE for B, C and D: +# +# - B must receive '--enable-special-feature' but cannot receive +# '--with-B=build' +# +# - C and D cannot receive '--with-B=build' (or else it would be built +# thrice) and need to be told where to find B (since we are building it, +# it would probably not be available in standard paths). +# +# Here is a configure.ac snippet that solves our problem: +# +# AC_CONFIG_SUBDIRS([dependencies/A]) +# AX_SUBDIRS_CONFIGURE( +# [dependencies/B], [--enable-special-feature], [], [], +# [--with-B=build]) +# AX_SUBDIRS_CONFIGURE( +# [[dependencies/C],[dependencies/D]], +# [], +# [[CPPFLAGS=-I${ac_top_srcdir}/dependencies/B -I${ac_top_builddir}/dependencies/B], +# [LDFLAGS=-L${ac_abs_top_builddir}/dependencies/B/.libs]], +# [--with-B=system], +# []) +# +# If using automake, the following can be added to the Makefile.am (we use +# both $(subdirs) and $(subdirs_extra) since our example above used both +# AC_CONFIG_SUBDIRS and AX_SUBDIRS_CONFIGURE): +# +# SUBDIRS = $(subdirs) $(subdirs_extra) +# +# LICENSE +# +# Copyright (c) 2017 Harenome Ranaivoarivony-Razanajato +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# Under Section 7 of GPL version 3, you are granted additional permissions +# described in the Autoconf Configure Script Exception, version 3.0, as +# published by the Free Software Foundation. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . + +#serial 4 + +AC_DEFUN([AX_SUBDIRS_CONFIGURE], +[ + dnl Calls to AC_CONFIG_SUBDIRS perform preliminary steps and build a list + dnl '$subdirs' which is used later by _AC_OUTPUT_SUBDIRS (used by AC_OUTPUT) + dnl to actually run the configure scripts. + dnl This macro performs similiar preliminary steps but uses + dnl AC_CONFIG_COMMANDS_PRE to delay the final tasks instead of building an + dnl intermediary list and relying on another macro. + dnl + dnl Since each configure script can get different options, a special variable + dnl named 'ax_sub_configure_args_' is constructed for each + dnl subdirectory. + + # Various preliminary checks. + AC_REQUIRE([AC_DISABLE_OPTION_CHECKING]) + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) + AS_LITERAL_IF([$1], [], + [AC_DIAGNOSE([syntax], [$0: you should use literals])]) + + m4_foreach(subdir_path, [$1], + [ + ax_dir="subdir_path" + + dnl Build the argument list in a similiar fashion to AC_CONFIG_SUBDIRS. + dnl A few arguments found in the final call to the configure script are not + dnl added here because they rely on variables that may not yet be available + dnl (see below the part that is similiar to _AC_OUTPUT_SUBDIRS). + # Do not complain, so a configure script can configure whichever parts of a + # large source tree are present. + if test -d "$srcdir/$ax_dir"; then + _AC_SRCDIRS(["$ax_dir"]) + # Remove --cache-file, --srcdir, and --disable-option-checking arguments + # so they do not pile up. + ax_args= + ax_prev= + eval "set x $ac_configure_args" + shift + for ax_arg; do + if test -n "$ax_prev"; then + ax_prev= + continue + fi + case $ax_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi | --cache-f \ + | --cache- | --cache | --cach | --cac | --ca | --c) + ax_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ax_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ax_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* \ + | --p=*) + ;; + --disable-option-checking) + ;; + *) case $ax_arg in + *\'*) ax_arg=$(AS_ECHO(["$ax_arg"]) | sed "s/'/'\\\\\\\\''/g");; + esac + AS_VAR_APPEND([ax_args], [" '$ax_arg'"]) ;; + esac + done + # Always prepend --disable-option-checking to silence warnings, since + # different subdirs can have different --enable and --with options. + ax_args="--disable-option-checking $ax_args" + # Options that must be added as they are provided. + m4_ifnblank([$2], [m4_foreach(opt, [$2], [AS_VAR_APPEND(ax_args, " 'opt'") + ])]) + # New options that may need to be merged with existing options. + m4_ifnblank([$3], [m4_foreach(opt, [$3], + [ax_candidate="opt" + ax_candidate_flag="${ax_candidate%%=*}" + ax_candidate_content="${ax_candidate#*=}" + if test "x$ax_candidate" != "x" -a "x$ax_candidate_flag" != "x"; then + if echo "$ax_args" | grep -- "${ax_candidate_flag}=" >/dev/null 2>&1; then + [ax_args=$(echo $ax_args | sed "s,\(${ax_candidate_flag}=[^']*\),\1 ${ax_candidate_content},")] + else + AS_VAR_APPEND(ax_args, " 'opt'") + fi + fi + ])]) + # New options that must replace existing options. + m4_ifnblank([$4], [m4_foreach(opt, [$4], + [ax_candidate="opt" + ax_candidate_flag="${ax_candidate%%=*}" + ax_candidate_content="${ax_candidate#*=}" + if test "x$ax_candidate" != "x" -a "x$ax_candidate_flag" != "x"; then + if echo "$ax_args" | grep -- "${ax_candidate_flag}=" >/dev/null 2>&1; then + [ax_args=$(echo $ax_args | sed "s,${ax_candidate_flag}=[^']*,${ax_candidate},")] + else + AS_VAR_APPEND(ax_args, " 'opt'") + fi + fi + ])]) + # Options that must be removed. + m4_ifnblank([$5], [m4_foreach(opt, [$5], [ax_args=$(echo $ax_args | sed "s,'opt',,") + ])]) + AS_VAR_APPEND([ax_args], [" '--srcdir=$ac_srcdir'"]) + + # Add the subdirectory to the list of target subdirectories. + ax_subconfigures="$ax_subconfigures $ax_dir" + # Save the argument list for this subdirectory. + dnl $1 is a path to some subdirectory: m4_bpatsubsts() is used to convert + dnl $1 into a valid shell variable name. + dnl For instance, "ax_sub_configure_args_path/to/subdir" becomes + dnl "ax_sub_configure_args_path_to_subdir". + ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_") + eval "ax_sub_configure_args_$ax_var=\"$ax_args\"" + eval "ax_sub_configure_$ax_var=\"yes\"" + else + AC_MSG_WARN([could not find source tree for $ax_dir]) + fi + + dnl Add some more arguments to the argument list and then actually run the + dnl configure script. This is mostly what happens in _AC_OUTPUT_SUBDIRS + dnl except it does not iterate over an intermediary list. + AC_CONFIG_COMMANDS_PRE( + dnl This very line cannot be quoted! m4_foreach has some work here. + ax_dir="subdir_path" + [ + # Convert the path to the subdirectory into a shell variable name. + ax_var=$(printf "$ax_dir" | tr -c "0-9a-zA-Z_" "_") + ax_configure_ax_var=$(eval "echo \"\$ax_sub_configure_$ax_var\"") + if test "$no_recursion" != "yes" -a "x$ax_configure_ax_var" = "xyes"; then + AC_SUBST([subdirs_extra], ["$subdirs_extra $ax_dir"]) + ax_msg="=== configuring in $ax_dir ($(pwd)/$ax_dir)" + _AS_ECHO_LOG([$ax_msg]) + _AS_ECHO([$ax_msg]) + AS_MKDIR_P(["$ax_dir"]) + _AC_SRCDIRS(["$ax_dir"]) + + ax_popdir=$(pwd) + cd "$ax_dir" + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f "$ac_srcdir/configure.gnu"; then + ax_sub_configure=$ac_srcdir/configure.gnu + elif test -f "$ac_srcdir/configure"; then + ax_sub_configure=$ac_srcdir/configure + elif test -f "$ac_srcdir/configure.in"; then + # This should be Cygnus configure. + ax_sub_configure=$ac_aux_dir/configure + else + AC_MSG_WARN([no configuration information is in $ax_dir]) + ax_sub_configure= + fi + + if test -n "$ax_sub_configure"; then + # Get the configure arguments for the current configure. + eval "ax_sub_configure_args=\"\$ax_sub_configure_args_${ax_var}\"" + + # Always prepend --prefix to ensure using the same prefix + # in subdir configurations. + ax_arg="--prefix=$prefix" + case $ax_arg in + *\'*) ax_arg=$(AS_ECHO(["$ax_arg"]) | sed "s/'/'\\\\\\\\''/g");; + esac + ax_sub_configure_args="'$ax_arg' $ax_sub_configure_args" + if test "$silent" = yes; then + ax_sub_configure_args="--silent $ax_sub_configure_args" + fi + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [[\\/]]* | ?:[[\\/]]* ) + ax_sub_cache_file=$cache_file ;; + *) # Relative name. + ax_sub_cache_file=$ac_top_build_prefix$cache_file ;; + esac + + AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file]) + eval "\$SHELL \"$ax_sub_configure\" $ax_sub_configure_args --cache-file=\"$ax_sub_cache_file\"" \ + || AC_MSG_ERROR([$ax_sub_configure failed for $ax_dir]) + fi + + cd "$ax_popdir" + fi + ]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_subst_with.m4 projectm-3.1.0/m4/autoconf-archive/ax_subst_with.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_subst_with.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_subst_with.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,153 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_subst_with.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SUBST_WITH([varname]) +# +# DESCRIPTION +# +# a very simple macro but also very helpful - the varname is usually the +# one from an AC_ARG_ENABLE or AC_ARG_WITH option. it is transliterated +# into uppercase and a prefix WITH_ and WITHOUT_ that are both _SUBSTed. +# +# Only one of these is set to "#" while the other is empty. In other words +# a call like AC_WITHNONE(enable-call) will create two SUBST-symbols as +# WITH_ENABLE_CALL and WITHOUT_ENABLE_CALL. When the varname had been set +# to something not "no" or "0" or ":" or "false" then it results in +# +# WITH_ENABLE_CALL="" ; WITHOUT_ENABLE_CALL="#" +# +# which you can use in your Makefile quite easily as if using an +# AM_CONDITIONAL but which can be also parsed by normal make +# +# USE = @WITH_ENABLE_CALL@ -Denabled USE = @WITHOUT_ENABLE_CALL@ +# -Dnot_enabled +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +dnl AX_SUBST_WITH_IF(flag,cond) - not unlike AM_CONDITIONAL +AC_DEFUN([AX_SUBST_WITH_IF],[dnl +pushdef([VAR_WITH], patsubst(translit([with_$1], [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHOUT], patsubst(translit([without_$1], [a-z], [A-Z]), -, _))dnl +AC_SUBST(VAR_WITH) +AC_SUBST(VAR_WITHOUT) +if $2; then + VAR_WITH="" + VAR_WITHOUT="#" +else + VAR_WITH="#" + VAR_WITHOUT="" +fi +popdef([VAR_WITHOUT])dnl +popdef([VAR_WITH])dnl +]) + +dnl AX_SUBST_WITH(varname [,default]) - not unlike AM_CONDITIONAL +AC_DEFUN([AX_SUBST_WITH],[dnl +pushdef([VAR], patsubst(translit([with_$1], [A-Z], [a-z]), -, _))dnl +pushdef([VAR_WITH], patsubst(translit([with_$1], [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHOUT], patsubst(translit([without_$1], [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHVAL], patsubst(translit([withval_$1], [a-z], [A-Z]), -, _))dnl +AC_SUBST(VAR_WITH) +AC_SUBST(VAR_WITHOUT) +VAR_WITHVAL=`echo "$VAR"` +test ".$VAR_WITHVAL" = "." && VAR_WITHVAL="m4_ifval([$2],[$2],no)" +test ".$VAR_WITHVAL" = ".:" && VAR_WITHVAL="no" +test ".$VAR_WITHVAL" = ".0" && VAR_WITHVAL="no" +test ".$VAR_WITHVAL" = ".no" && VAR_WITHVAL="no" +test ".$VAR_WITHVAL" = ".false" && VAR_WITHVAL="no" +if test ".$VAR_WITHVAL" != ".no" ; then + VAR_WITH="" + VAR_WITHOUT="#" +else + VAR_WITH="#" + VAR_WITHOUT="" +fi +popdef([VAR_WITHVAL])dnl +popdef([VAR_WITHOUT])dnl +popdef([VAR_WITH])dnl +popdef([VAR])dnl +]) + +dnl AX_SUBST_WITH_DEFINE(varname [,default]) - not unlike AM_CONDITIONAL +AC_DEFUN([AX_SUBST_WITH_DEFINE],[dnl +pushdef([VAR], patsubst(translit([with_$1], [A-Z], [a-z]), -, _))dnl +pushdef([VAR_WITH], patsubst(translit([with_$1], [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHOUT], patsubst(translit([without_$1], [a-z], [A-Z]), -, _))dnl +pushdef([VAR_WITHVAL], patsubst(translit([withval_$1], [a-z], [A-Z]), -, _))dnl +AC_SUBST(VAR_WITH) +AC_SUBST(VAR_WITHOUT) +VAR_WITHVAL=`echo "$VAR"` +test ".$VAR_WITHVAL" = "." && VAR_WITHVAL="m4_ifval([$2],[$2],no)" +test ".$VAR_WITHVAL" = ".:" && VAR_WITHVAL="no" +test ".$VAR_WITHVAL" = ".0" && VAR_WITHVAL="no" +test ".$VAR_WITHVAL" = ".no" && VAR_WITHVAL="no" +test ".$VAR_WITHVAL" = ".false" && VAR_WITHVAL="no" +if test ".$VAR_WITHVAL" != ".no" ; then + VAR_WITH="" + VAR_WITHOUT="#" + case "$VAR_WITHVAL" in + [[0123456789]]*) ;; + [yes)] VAR_WITHVAL="1" ;; + [*)] VAR_WITHVAL=`echo "\"$VAR_WITHVAL\"" | sed -e 's,"",",g'` ;; + esac +else + VAR_WITH="#" + VAR_WITHOUT="" +fi +if test ".$VAR_WITHVAL" != ".no" ; then + AC_DEFINE_UNQUOTED(VAR_WITH, $VAR_WITHVAL, + [whether $1 feature is enabled]) +fi dnl +popdef([VAR_WITHVAL])dnl +popdef([VAR_WITHOUT])dnl +popdef([VAR_WITH])dnl +popdef([VAR])dnl +]) + +dnl backward compatibility helpers +AC_DEFUN([AX_SUBST_WITH_ARG],[dnl +pushdef([VAR], patsubst(translit([with_$1], [A-Z], [a-z]), -, _))dnl +m4_ifvaln([$2],[test ".$VAR" = "." && VAR="$2"])dnl +AX_SUBST_WITH([$1],[$2]) +popdef([VAR])dnl +]) + +AC_DEFUN([AX_SUBST_WITH_DEFINE_ARG],[dnl +pushdef([VAR], patsubst(translit([with_$1], [A-Z], [a-z]), -, _))dnl +m4_ifvaln([$2],[test ".$VAR" = "." && VAR="$2"])dnl +AX_SUBST_WITH_DEFINE([$1],[$2]) +popdef([VAR])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_swig_enable_cxx.m4 projectm-3.1.0/m4/autoconf-archive/ax_swig_enable_cxx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_swig_enable_cxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_swig_enable_cxx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,53 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_swig_enable_cxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SWIG_ENABLE_CXX +# +# DESCRIPTION +# +# Enable SWIG C++ support. This affects all invocations of $(SWIG). +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([SWIG_ENABLE_CXX], [AX_SWIG_ENABLE_CXX]) +AC_DEFUN([AX_SWIG_ENABLE_CXX],[ + AC_REQUIRE([AX_PKG_SWIG]) + AC_REQUIRE([AC_PROG_CXX]) + SWIG="$SWIG -c++" +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_swig_multi_module_support.m4 projectm-3.1.0/m4/autoconf-archive/ax_swig_multi_module_support.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_swig_multi_module_support.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_swig_multi_module_support.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_swig_multi_module_support.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_SWIG_MULTI_MODULE_SUPPORT +# +# DESCRIPTION +# +# Enable support for multiple modules. This effects all invocations of +# $(SWIG). You have to link all generated modules against the appropriate +# SWIG runtime library. If you want to build Python modules for example, +# use the AX_SWIG_PYTHON macro and link the modules against +# $(AX_SWIG_PYTHON_LIBS). +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([SWIG_MULTI_MODULE_SUPPORT], [AX_SWIG_MULTI_MODULE_SUPPORT]) +AC_DEFUN([AX_SWIG_MULTI_MODULE_SUPPORT],[ + AC_REQUIRE([AX_PKG_SWIG]) + SWIG="$SWIG -noruntime" +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_swig_python.m4 projectm-3.1.0/m4/autoconf-archive/ax_swig_python.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_swig_python.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_swig_python.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,64 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_swig_python.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SWIG_PYTHON([use-shadow-classes = {no, yes}]) +# +# DESCRIPTION +# +# Checks for Python and provides the $(AX_SWIG_PYTHON_CPPFLAGS), and +# $(AX_SWIG_PYTHON_OPT) output variables. +# +# $(AX_SWIG_PYTHON_OPT) contains all necessary SWIG options to generate +# code for Python. Shadow classes are enabled unless the value of the +# optional first argument is exactly 'no'. If you need multi module +# support (provided by the AX_SWIG_MULTI_MODULE_SUPPORT macro) use +# $(AX_SWIG_PYTHON_LIBS) to link against the appropriate library. It +# contains the SWIG Python runtime library that is needed by the type +# check system for example. +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([SWIG_PYTHON], [AX_SWIG_PYTHON]) +AC_DEFUN([AX_SWIG_PYTHON],[ + AC_REQUIRE([AX_PKG_SWIG]) + AC_REQUIRE([AX_PYTHON_DEVEL]) + test "x$1" != "xno" || swig_shadow=" -noproxy" + AC_SUBST([AX_SWIG_PYTHON_OPT],[-python$swig_shadow]) + AC_SUBST([AX_SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_switch_flags.m4 projectm-3.1.0/m4/autoconf-archive/ax_switch_flags.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_switch_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_switch_flags.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,47 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_switch_flags.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SWITCH_FLAGS(newnamespace,[oldnamespace]) +# +# DESCRIPTION +# +# Switch common compilation flags from temporary variables between two +# compilation namespace. +# +# Compilation flags includes: CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS, LIBS, +# OBJCFLAGS. +# +# By default these flags are restored to a global (empty) namespace, but +# user could restore from specific NAMESPACE by using +# AX_RESTORE_FLAGS(NAMESPACE) macro. +# +# Typical usage is like: +# +# AX_SAVE_FLAGS(beginprogram) +# CPPFLAGS="-Imypackagespath ${CPPFLAGS}" +# AX_SWITCH_FLAGS(mypackage,beginprogram) +# +# LICENSE +# +# Copyright (c) 2009 Filippo Giunchedi +# Copyright (c) 2011 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2011 Russ Allbery +# Copyright (c) 2013 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_SWITCH_FLAGS], [ + AC_REQUIRE(AX_SAVE_FLAGS) + AC_REQUIRE(AX_RESTORE_FLAGS) + AS_IF([test "X$1" = "X"], AC_MSG_ERROR(newnamespace is empty)] + AX_SAVE_FLAGS($1[]) + AX_RESTORE_FLAGS($2[]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_dev_poll.m4 projectm-3.1.0/m4/autoconf-archive/ax_sys_dev_poll.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_dev_poll.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_sys_dev_poll.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,50 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_sys_dev_poll.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SYS_DEV_POLL([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# This macro tests for the presence of /dev/poll support in the build +# environment. It checks that the needed structure (dvpoll) is available, +# with the standard fields. /dev/poll is most often seen under Solaris. +# +# Note that it does not attempt to actually open /dev/poll -- you should +# test for errors when you open it and then fall back to poll() if it is +# unavailable. +# +# LICENSE +# +# Copyright (c) 2008 Dave Benson +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AC_SYS_DEV_POLL], [AX_SYS_DEV_POLL]) +AC_DEFUN([AX_SYS_DEV_POLL], [AC_CACHE_CHECK(for /dev/poll support, ac_cv_dev_poll, + AC_TRY_COMPILE([#include +#include +#include +#include +#include ], +[ + struct dvpoll p; + p.dp_timeout = 0; + p.dp_nfds = 0; + p.dp_fds = (struct pollfd *) 0; + return 0; +], + ac_cv_dev_poll=yes + [$1], + ac_cv_dev_poll=no + [$2] + ) + ) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_largefile_sensitive.m4 projectm-3.1.0/m4/autoconf-archive/ax_sys_largefile_sensitive.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_largefile_sensitive.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_sys_largefile_sensitive.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_sys_largefile_sensitive.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_SYS_LARGEFILE_SENSITIVE +# +# DESCRIPTION +# +# Check whether the current system is sensitive to -Ddefines making off_t +# having different types/sizes. Automatically define a config.h symbol +# LARGEFILE_SENSITIVE if that is the case, otherwise leave everything as +# is. +# +# This macro builds on top of AC_SYS_LARGEFILE to detect whether special +# options are needed to make the code use 64bit off_t - in many setups +# this will also make the code use 64bit off_t immediately. +# +# The common use of a LARGEFILE_SENSITIVE config.h-define is to rename +# exported functions, usually adding a 64 to the original function name. +# Such renamings are only needed on systems being both (a) 32bit off_t by +# default and (b) implementing large.file extensions (as for unix98). +# +# a renaming section could look like this: +# +# #if defined LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 == 64 +# #define zzip_open zzip_open64 +# #define zzip_seek zzip_seek64 +# #endif +# +# for libraries, it is best to take advantage of the prefix-config.h +# macro, otherwise you want to export a renamed LARGEFILE_SENSITIVE in an +# installed header file. -> see AX_PREFIX_CONFIG_H +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 10 + +AU_ALIAS([AC_SYS_LARGEFILE_SENSITIVE], [AX_SYS_LARGEFILE_SENSITIVE]) +AC_DEFUN([AX_SYS_LARGEFILE_SENSITIVE],[dnl +AC_REQUIRE([AC_SYS_LARGEFILE])dnl +# we know about some internals of ac_sys_largefile here... +AC_MSG_CHECKING(whether system differentiates 64bit off_t by defines) +ac_cv_sys_largefile_sensitive="no" +if test ".${ac_cv_sys_file_offset_bits-no}${ac_cv_sys_large_files-no}" != ".nono" +then ac_cv_sys_largefile_sensitive="yes" + AC_DEFINE(LARGEFILE_SENSITIVE, 1, + [whether the system defaults to 32bit off_t but can do 64bit when requested]) +fi +AC_MSG_RESULT([$ac_cv_sys_largefile_sensitive]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_perlsharpbang.m4 projectm-3.1.0/m4/autoconf-archive/ax_sys_perlsharpbang.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_perlsharpbang.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_sys_perlsharpbang.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,138 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_sys_perlsharpbang.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SYS_PERLSHARPBANG +# +# DESCRIPTION +# +# Determine how the perl interpreter is located by the OS kernel and make +# substitution variable PERL_SHEBANG available. Does AC_PATH_PROG to find +# the path to perl. As a side-effect, that sets PERLINTERP and makes it +# available as a substitution variable. +# +# Note: The macro allows for the possibility (expected to be seldom used) +# of an explicit user override (the "user" being the operator executing +# the final 'configure' script, in this context) by making the option +# argument like: +# +# --with-perl-shebang='#! /my/funky/perlpath' # OR +# --with-perl-shebang='/my/funky/perlpath' # we just throw away the #! anyway +# # bec it must be absent in Makefile +# +# Rationale: The are various ways of starting an interpreter on different +# *nix-like systems. Many use the simple +# +# #!/usr/bin/perl +# +# but it could be instead +# +# #!/usr/local/bin/perl +# +# and there is even the possibility that the user wants +# +# #!/usr/bin/env perl +# +# to find whichever perl comes first in the current $PATH. This is +# preferred by some of us because we run multiple perl installations on +# the same box. Adjusting our $PATH then allows us to set precedence over +# other perls, even whatever the "house" version is. +# +# Users on very non-unix systems like MS Windows do not have a kernel that +# does this kind of thing from the first line of script files, but instead +# the perl on their machine is started and merely notices whatever comes +# after the interpreter path on this first line of the script (options +# like "-w"). +# +# Acknowledgement: this macro was in part inspired by Dean Povey's +# AC_PROG_PERL_VERSION. +# +# LICENSE +# +# Copyright (c) 2009 Soren Andersen +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 14 + +AC_DEFUN([AX_SYS_PERLSHARPBANG],[dnl + + AC_PATH_PROG(PERLINTERP,perl,perl) + ac_cv_path_perlinterp="$PERLINTERP" + _sHpB='#!' + + AC_ARG_WITH(perl-shebang, + AS_HELP_STRING([--with-perl-shebang], + [override what perl thinks is the way for the kernel to start it (seldom needed)]dnl + ), + [opt_perl_shebang="$withval"]dnl + ,dnl + [opt_perl_shebang="not_set"]dnl + )dnl + + AC_CACHE_CHECK([whether explicit instead of detected sharpbang is to be used], + ax_cv_opt_perl_shebang, + [ case "$opt_perl_shebang" in + not_set ) ax_cv_opt_perl_shebang='' + ;; + * ) + ax_cv_opt_perl_shebang=`echo "$opt_perl_shebang" | sed -e's|^#!\s*\(.*\)$|\1|'` + esac + ]dnl + )dnl + + if test "A$ax_cv_opt_perl_shebang" != "A" + then + ac_cv_sys_kernshrpbang_perl="$ax_cv_opt_perl_shebang" + PERL_SHEBANG="$ac_cv_sys_kernshrpbang_perl" + AC_SUBST(PERL_SHEBANG)dnl + AC_MSG_NOTICE([OK - PERL_SHEBANG is $_sHpB$PERL_SHEBANG.]) + +# Automatic detection of sharpbang formula starts here + else dnl + + _somian_shbangperl=`$PERLINTERP -V:startperl` + negclass="[[^']]"; dnl +# must leave this comment: m4 will remove the outer brackets for us, heheh + AC_CACHE_CHECK([for kernel sharpbang invocation to start perl], + ac_cv_sys_kernshrpbang_perl, + [_somian_kspb_perl=`echo "$_somian_shbangperl" | sed -ne"s|.*='\($negclass*\)';$|\1|p"` + if test "x$_somian_kspb_perl" == x + then _somian_ksbp_warn_empty='durnit' + else + case "A$_somian_kspb_perl" in + A#!*perl* ) + ac_cv_sys_kernshrpbang_perl=`echo "$_somian_kspb_perl" | sed -e's|#!\(.*\)$|\1|'` + ;; + A* ) _somian_ksbp_warn_defau='trouble' + ac_cv_sys_kernshrpbang_perl="$PERLINTERP" + esac + fi +])dnl Done with testing sharpbang + +# The above prints Checking ... result message to user. + PERL_SHEBANG="$ac_cv_sys_kernshrpbang_perl" + AC_SUBST(PERL_SHEBANG) + if test A${_somian_ksbp_warn_empty+set} == Aset + then AC_MSG_WARN([dnl +In last check, doing $PERLINTERP -V:startperl yielded empty result! That should not happen.]) + fi +# Inform user after printing result value + if test A${_somian_ksbp_warn_defau+set} == Aset + then AC_MSG_NOTICE([Maybe Not good -]) + AC_MSG_WARN([dnl +In last check perl's Config query did not work so we bunted: $_sHpB$PERLINTERP]) + else AC_MSG_NOTICE([OK Good result - ]) + AC_MSG_NOTICE([dnl +In last check we got a proper-looking answer from perl's Config: $_somian_shbangperl]) +dnl Done with user info messages + fi +dnl Outer loop checked for user override term here + fi dnl + +])dnl EOMACRO DEF diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sysv_ipc.m4 projectm-3.1.0/m4/autoconf-archive/ax_sysv_ipc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sysv_ipc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_sysv_ipc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_sysv_ipc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SYSV_IPC +# +# DESCRIPTION +# +# This macro checks for the SysV IPC header files. It only checks that you +# can compile a program with them, not whether the system actually +# implements working SysV IPC. +# +# LICENSE +# +# Copyright (c) 2008 Warren Young +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AU_ALIAS([ETR_SYSV_IPC], [AX_SYSV_IPC]) +AC_DEFUN([AX_SYSV_IPC], +[ +AC_CACHE_CHECK([for System V IPC headers], ac_cv_sysv_ipc, [ + AC_TRY_COMPILE( + [ + #include + #include + #include + #include + #include + ],, ac_cv_sysv_ipc=yes, ac_cv_sysv_ipc=no) +]) + + if test x"$ac_cv_sysv_ipc" = "xyes" + then + AC_DEFINE(HAVE_SYSV_IPC, 1, [ Define if you have System V IPC ]) + fi +]) dnl AX_SYSV_IPC diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_weak_alias.m4 projectm-3.1.0/m4/autoconf-archive/ax_sys_weak_alias.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_sys_weak_alias.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_sys_weak_alias.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,337 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_sys_weak_alias.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_SYS_WEAK_ALIAS +# +# DESCRIPTION +# +# Determines whether weak aliases are supported on the system, and if so, +# what scheme is used to declare them. Also checks to see if aliases can +# cross object file boundaries, as some systems don't permit them to. +# +# Most systems permit something called a "weak alias" or "weak symbol." +# These aliases permit a library to provide a stub form of a routine +# defined in another library, thus allowing the first library to operate +# even if the other library is not linked. This macro will check for +# support of weak aliases, figure out what schemes are available, and +# determine some characteristics of the weak alias support -- primarily, +# whether a weak alias declared in one object file may be referenced from +# another object file. +# +# There are four known schemes of declaring weak symbols; each scheme is +# checked in turn, and the first one found is prefered. Note that only one +# of the mentioned preprocessor macros will be defined! +# +# 1. Function attributes +# +# This scheme was first introduced by the GNU C compiler, and attaches +# attributes to particular functions. It is among the easiest to use, and +# so is the first one checked. If this scheme is detected, the +# preprocessor macro HAVE_SYS_WEAK_ALIAS_ATTRIBUTE will be defined to 1. +# This scheme is used as in the following code fragment: +# +# void __weakf(int c) +# { +# /* Function definition... */ +# } +# +# void weakf(int c) __attribute__((weak, alias("__weakf"))); +# +# 2. #pragma weak +# +# This scheme is in use by many compilers other than the GNU C compiler. +# It is also particularly easy to use, and fairly portable -- well, as +# portable as these things get. If this scheme is detected first, the +# preprocessor macro HAVE_SYS_WEAK_ALIAS_PRAGMA will be defined to 1. This +# scheme is used as in the following code fragment: +# +# extern void weakf(int c); +# #pragma weak weakf = __weakf +# void __weakf(int c) +# { +# /* Function definition... */ +# } +# +# 3. #pragma _HP_SECONDARY_DEF +# +# This scheme appears to be in use by the HP compiler. As it is rather +# specialized, this is one of the last schemes checked. If it is the first +# one detected, the preprocessor macro HAVE_SYS_WEAK_ALIAS_HPSECONDARY +# will be defined to 1. This scheme is used as in the following code +# fragment: +# +# extern void weakf(int c); +# #pragma _HP_SECONDARY_DEF __weakf weakf +# void __weakf(int c) +# { +# /* Function definition... */ +# } +# +# 4. #pragma _CRI duplicate +# +# This scheme appears to be in use by the Cray compiler. As it is rather +# specialized, it too is one of the last schemes checked. If it is the +# first one detected, the preprocessor macro +# HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE will be defined to 1. This scheme is +# used as in the following code fragment: +# +# extern void weakf(int c); +# #pragma _CRI duplicate weakf as __weakf +# void __weakf(int c) +# { +# /* Function definition... */ +# } +# +# In addition to the preprocessor macros listed above, if any scheme is +# found, the preprocessor macro HAVE_SYS_WEAK_ALIAS will also be defined +# to 1. +# +# Once a weak aliasing scheme has been found, a check will be performed to +# see if weak aliases are honored across object file boundaries. If they +# are, the HAVE_SYS_WEAK_ALIAS_CROSSFILE preprocessor macro is defined to +# 1. +# +# This Autoconf macro also makes two substitutions. The first, WEAK_ALIAS, +# contains the name of the scheme found (one of "attribute", "pragma", +# "hpsecondary", or "criduplicate"), or "no" if no weak aliasing scheme +# was found. The second, WEAK_ALIAS_CROSSFILE, is set to "yes" or "no" +# depending on whether or not weak aliases may cross object file +# boundaries. +# +# LICENSE +# +# Copyright (c) 2008 Kevin L. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 7 + +AU_ALIAS([KLM_SYS_WEAK_ALIAS], [AX_SYS_WEAK_ALIAS]) +AC_DEFUN([AX_SYS_WEAK_ALIAS], [ + # starting point: no aliasing scheme yet... + ax_sys_weak_alias=no + + # Figure out what kind of aliasing may be supported... + _AX_SYS_WEAK_ALIAS_ATTRIBUTE + _AX_SYS_WEAK_ALIAS_PRAGMA + _AX_SYS_WEAK_ALIAS_HPSECONDARY + _AX_SYS_WEAK_ALIAS_CRIDUPLICATE + + # Do we actually support aliasing? + AC_CACHE_CHECK([how to create weak aliases with $CC], + [ax_cv_sys_weak_alias], + [ax_cv_sys_weak_alias=$ax_sys_weak_alias]) + + # OK, set a #define + AS_IF([test $ax_cv_sys_weak_alias != no], [ + AC_DEFINE([HAVE_SYS_WEAK_ALIAS], 1, + [Define this if your system can create weak aliases]) + ]) + + # Can aliases cross object file boundaries? + _AX_SYS_WEAK_ALIAS_CROSSFILE + + # OK, remember the results + AC_SUBST([WEAK_ALIAS], [$ax_cv_sys_weak_alias]) + AC_SUBST([WEAK_ALIAS_CROSSFILE], [$ax_cv_sys_weak_alias_crossfile]) +]) + +AC_DEFUN([_AX_SYS_WEAK_ALIAS_ATTRIBUTE], +[ # Test whether compiler accepts __attribute__ form of weak aliasing + AC_CACHE_CHECK([whether $CC accepts function __attribute__((weak,alias()))], + [ax_cv_sys_weak_alias_attribute], [ + # We add -Werror if it's gcc to force an error exit if the weak attribute + # isn't understood + AS_IF([test $GCC = yes], [ + save_CFLAGS=$CFLAGS + CFLAGS=-Werror]) + + # Try linking with a weak alias... + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ +void __weakf(int c) {} +void weakf(int c) __attribute__((weak, alias("__weakf")));], + [weakf(0)])], + [ax_cv_sys_weak_alias_attribute=yes], + [ax_cv_sys_weak_alias_attribute=no]) + + # Restore original CFLAGS + AS_IF([test $GCC = yes], [ + CFLAGS=$save_CFLAGS]) + ]) + + # What was the result of the test? + AS_IF([test $ax_sys_weak_alias = no && + test $ax_cv_sys_weak_alias_attribute = yes], [ + ax_sys_weak_alias=attribute + AC_DEFINE([HAVE_SYS_WEAK_ALIAS_ATTRIBUTE], 1, + [Define this if weak aliases may be created with __attribute__]) + ]) +]) + +AC_DEFUN([_AX_SYS_WEAK_ALIAS_PRAGMA], +[ # Test whether compiler accepts #pragma form of weak aliasing + AC_CACHE_CHECK([whether $CC supports @%:@pragma weak], + [ax_cv_sys_weak_alias_pragma], [ + + # Try linking with a weak alias... + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ +extern void weakf(int c); +@%:@pragma weak weakf = __weakf +void __weakf(int c) {}], + [weakf(0)])], + [ax_cv_sys_weak_alias_pragma=yes], + [ax_cv_sys_weak_alias_pragma=no]) + ]) + + # What was the result of the test? + AS_IF([test $ax_sys_weak_alias = no && + test $ax_cv_sys_weak_alias_pragma = yes], [ + ax_sys_weak_alias=pragma + AC_DEFINE([HAVE_SYS_WEAK_ALIAS_PRAGMA], 1, + [Define this if weak aliases may be created with @%:@pragma weak]) + ]) +]) + +AC_DEFUN([_AX_SYS_WEAK_ALIAS_HPSECONDARY], +[ # Test whether compiler accepts _HP_SECONDARY_DEF pragma from HP... + AC_CACHE_CHECK([whether $CC supports @%:@pragma _HP_SECONDARY_DEF], + [ax_cv_sys_weak_alias_hpsecondary], [ + + # Try linking with a weak alias... + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ +extern void weakf(int c); +@%:@pragma _HP_SECONDARY_DEF __weakf weakf +void __weakf(int c) {}], + [weakf(0)])], + [ax_cv_sys_weak_alias_hpsecondary=yes], + [ax_cv_sys_weak_alias_hpsecondary=no]) + ]) + + # What was the result of the test? + AS_IF([test $ax_sys_weak_alias = no && + test $ax_cv_sys_weak_alias_hpsecondary = yes], [ + ax_sys_weak_alias=hpsecondary + AC_DEFINE([HAVE_SYS_WEAK_ALIAS_HPSECONDARY], 1, + [Define this if weak aliases may be created with @%:@pragma _HP_SECONDARY_DEF]) + ]) +]) + +AC_DEFUN([_AX_SYS_WEAK_ALIAS_CRIDUPLICATE], +[ # Test whether compiler accepts "_CRI duplicate" pragma from Cray + AC_CACHE_CHECK([whether $CC supports @%:@pragma _CRI duplicate], + [ax_cv_sys_weak_alias_criduplicate], [ + + # Try linking with a weak alias... + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ +extern void weakf(int c); +@%:@pragma _CRI duplicate weakf as __weakf +void __weakf(int c) {}], + [weakf(0)])], + [ax_cv_sys_weak_alias_criduplicate=yes], + [ax_cv_sys_weak_alias_criduplicate=no]) + ]) + + # What was the result of the test? + AS_IF([test $ax_sys_weak_alias = no && + test $ax_cv_sys_weak_alias_criduplicate = yes], [ + ax_sys_weak_alias=criduplicate + AC_DEFINE([HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE], 1, + [Define this if weak aliases may be created with @%:@pragma _CRI duplicate]) + ]) +]) + +dnl Note: This macro is modeled closely on AC_LINK_IFELSE, and in fact +dnl depends on some implementation details of that macro, particularly +dnl its use of _AC_MSG_LOG_CONFTEST to log the failed test program and +dnl its use of ac_link for running the linker. +AC_DEFUN([_AX_SYS_WEAK_ALIAS_CROSSFILE], +[ # Check to see if weak aliases can cross object file boundaries + AC_CACHE_CHECK([whether $CC supports weak aliases across object file boundaries], + [ax_cv_sys_weak_alias_crossfile], [ + AS_IF([test $ax_cv_sys_weak_alias = no], + [ax_cv_sys_weak_alias_crossfile=no], [ +dnl Must build our own test files... + # conftest1 contains our weak alias definition... + cat >conftest1.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF + cat confdefs.h >>conftest1.$ac_ext + cat >>conftest1.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +@%:@ifndef HAVE_SYS_WEAK_ALIAS_ATTRIBUTE +extern void weakf(int c); +@%:@endif +@%:@if defined(HAVE_SYS_WEAK_ALIAS_PRAGMA) +@%:@pragma weak weakf = __weakf +@%:@elif defined(HAVE_SYS_WEAK_ALIAS_HPSECONDARY) +@%:@pragma _HP_SECONDARY_DEF __weakf weakf +@%:@elif defined(HAVE_SYS_WEAK_ALIAS_CRIDUPLICATE) +@%:@pragma _CRI duplicate weakf as __weakf +@%:@endif +void __weakf(int c) {} +@%:@ifdef HAVE_SYS_WEAK_ALIAS_ATTRIBUTE +void weakf(int c) __attribute((weak, alias("__weakf"))); +@%:@endif +_ACEOF + # And conftest2 contains our main routine that calls it + cat >conftest2.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF + cat confdefs.h >> conftest2.$ac_ext + cat >>conftest2.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +extern void weakf(int c); +int +main () +{ + weakf(0); + return 0; +} +_ACEOF + # We must remove the object files (if any) ourselves... + rm -f conftest2.$ac_objext conftest$ac_exeext + + # Change ac_link to compile *2* files together + save_aclink=$ac_link + ac_link=`echo "$ac_link" | \ + sed -e 's/conftest\(\.\$ac_ext\)/conftest1\1 conftest2\1/'` +dnl Substitute our own routine for logging the conftest +m4_pushdef([_AC_MSG_LOG_CONFTEST], +[echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD +echo ">>> conftest1.$ac_ext" >&AS_MESSAGE_LOG_FD +sed "s/^/| /" conftest1.$ac_ext >&AS_MESSAGE_LOG_FD +echo ">>> conftest2.$ac_ext" >&AS_MESSAGE_LOG_FD +sed "s/^/| /" conftest2.$ac_ext >&AS_MESSAGE_LOG_FD +])dnl + # Since we created the files ourselves, don't use SOURCE argument + AC_LINK_IFELSE(, [ax_cv_sys_weak_alias_crossfile=yes], + [ax_cv_sys_weak_alias_crossfile=no]) +dnl Restore _AC_MSG_LOG_CONFTEST +m4_popdef([_AC_MSG_LOG_CONFTEST])dnl + # Restore ac_link + ac_link=$save_aclink + + # We must remove the object files (if any) and C files ourselves... + rm -f conftest1.$ac_ext conftest2.$ac_ext \ + conftest1.$ac_objext conftest2.$ac_objext + ]) + ]) + + # What were the results of the test? + AS_IF([test $ax_cv_sys_weak_alias_crossfile = yes], [ + AC_DEFINE([HAVE_SYS_WEAK_ALIAS_CROSSFILE], 1, + [Define this if weak aliases in other files are honored]) + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_tls.m4 projectm-3.1.0/m4/autoconf-archive/ax_tls.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_tls.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_tls.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,74 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_tls.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TLS([action-if-found], [action-if-not-found]) +# +# DESCRIPTION +# +# Provides a test for the compiler support of thread local storage (TLS) +# extensions. Defines TLS if it is found. Currently knows about C++11, +# GCC/ICC, and MSVC. I think SunPro uses the same as GCC, and Borland +# apparently supports either. +# +# LICENSE +# +# Copyright (c) 2008 Alan Woodland +# Copyright (c) 2010 Diego Elio Petteno` +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 14 + +AC_DEFUN([AX_TLS], [ + AC_MSG_CHECKING([for thread local storage (TLS) class]) + AC_CACHE_VAL([ac_cv_tls], + [for ax_tls_keyword in thread_local _Thread_local __thread '__declspec(thread)' none; do + AS_CASE([$ax_tls_keyword], + [none], [ac_cv_tls=none ; break], + [AC_TRY_COMPILE( + [#include + static void + foo(void) { + static ] $ax_tls_keyword [ int bar; + exit(1); + }], + [], + [ac_cv_tls=$ax_tls_keyword ; break], + ac_cv_tls=none + )]) + done + ]) + AC_MSG_RESULT([$ac_cv_tls]) + + AS_IF([test "$ac_cv_tls" != "none"], + [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here]) + m4_ifnblank([$1],[$1])], + [m4_ifnblank([$2],[$2])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_amesos.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_amesos.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_amesos.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_amesos.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_amesos.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_AMESOS([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.amesos" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_TRILINOS_AMESOS],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_amesos=yes + AC_HAVE_LIBRARY([amesos],[:],[ax_trilinos_amesos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([amesos.macros],[ax_trilinos_amesos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([amesos],[ax_trilinos_amesos=no]) + if test "$ax_trilinos_amesos" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Amesos not found.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_base.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_base.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_base.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_base.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,148 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_base.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_BASE([, MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +# +# DESCRIPTION +# +# Test for the Trilinos (http://trilinos.sandia.gov/) libraries. +# +# Provides a --with-trilinos=DIR option. Searches --with-trilinos, +# $TRILINOS_HOME, and the usual places for Trilinos installation headers. +# +# Requires that a development branch or released version greater than +# MINIMUM-VERSION be found. If not specified, the default minimum version +# is 8.0.0. +# +# Supports separately specifying --with-trilinos-include or +# --with-trilinos-libdir to override default locations underneath either +# --with-trilinos or $TRILINOS_HOME. +# +# On success, adds -Ipath to CPPFLAGS, -Lpath to LDFLAGS, sets the +# variable TRILINOS_INCLUDE based on the discovered location of +# Trilinos_version.h, and #defines HAVE_TRILINOS. When ACTION-IF-NOT-FOUND +# is not specified, the default behavior is for configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# Copyright (c) 2009 Thomas Porschberg +# Copyright (c) 2009 Caolan McNamara +# Copyright (c) 2009 Alexandre Duret-Lutz +# Copyright (c) 2009 Matthew Mueller +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AC_DEFUN([AX_TRILINOS_BASE], +[ +AC_REQUIRE([AX_TRILINOS_ABSOLUTE_HEADER]) +AC_ARG_VAR(TRILINOS_HOME,[root directory of Trilinos installation]) + +AC_ARG_WITH(trilinos, [AS_HELP_STRING([--with-trilinos[=DIR]],[root directory of Trilinos installation])],[ +with_trilinos=$withval +if test "${with_trilinos}" != yes; then + TRILINOS_HOME=$withval + trilinos_include="$withval/include" + trilinos_libdir="$withval/lib" +fi +],[ +with_trilinos=$withval +if test "x${TRILINOS_HOME}" != "x"; then + trilinos_include="${TRILINOS_HOME}/include" + trilinos_libdir="${TRILINOS_HOME}/lib" +fi +]) + +AC_ARG_WITH(trilinos-include, +[AS_HELP_STRING([--with-trilinos-include=DIR],[specify exact directory for Trilinos headers])],[ +if test -d "$withval"; then + trilinos_include="$withval" +else + AC_MSG_ERROR([--with-trilinos-include expected directory name]) +fi +]) + +AC_ARG_WITH(trilinos-libdir, [AS_HELP_STRING([--with-trilinos-libdir=DIR],[specify exact directory for Trilinos libraries])],[ +if test -d "$withval"; then + trilinos_libdir="$withval" +else + AC_MSG_ERROR([--with-trilinos-libdir expected directory name]) +fi +]) + +if test "${with_trilinos}" != no ; then + + OLD_LIBS=$LIBS + OLD_LDFLAGS=$LDFLAGS + OLD_CPPFLAGS=$CPPFLAGS + + if test -d "${trilinos_libdir}" ; then + LDFLAGS="-L${trilinos_libdir} $LDFLAGS" + fi + if test -d "${trilinos_include}" ; then + CPPFLAGS="-I${trilinos_include} $CPPFLAGS" + fi + + succeeded=no + AC_CHECK_HEADER([Trilinos_version.h],[found_header=yes],[found_header=no]) + if test "$found_header" = yes; then + dnl Patterned after AX_BOOST_BASE + trilinos_lib_version_req=ifelse([$1],,8.0.0,$1) + trilinos_lib_version_req_shorten=`expr $trilinos_lib_version_req : '\([[0-9]]*\.[[0-9]]*\)'` + trilinos_lib_version_req_major=`expr $trilinos_lib_version_req : '\([[0-9]]*\)'` + trilinos_lib_version_req_minor=`expr $trilinos_lib_version_req : '[[0-9]]*\.\([[0-9]]*\)'` + trilinos_lib_version_req_sub_minor=`expr $trilinos_lib_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'` + if test "x$trilinos_lib_version_req_sub_minor" = "x" ; then + trilinos_lib_version_req_sub_minor="0" + fi + WANT_TRILINOS_VERSION=`expr $trilinos_lib_version_req_major \* 10000 \+ $trilinos_lib_version_req_minor \* 100 \+ $trilinos_lib_version_req_sub_minor` + AC_LANG_PUSH([C++]) + AC_MSG_CHECKING(for Trilinos release >= $trilinos_lib_version_req) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #if (TRILINOS_MAJOR_VERSION == 0) + /* Development branch has zero major version. A-OK. */ + #elif (TRILINOS_MAJOR_MINOR_VERSION >= $WANT_TRILINOS_VERSION) + /* Stable release of appropriate version. A-OK. */ + #else + # error Trilinos version is too old + #endif + ]])],[ + AC_MSG_RESULT(yes) + succeeded=yes + ],[ + AC_MSG_RESULT(no) + ]) + AC_LANG_POP([C++]) + fi + + if test "$succeeded" = no; then + LIBS=$OLD_LIBS + LDFLAGS=$OLD_LDFLAGS + CPPFLAGS=$OLD_CPPFLAGS + + ifelse([$3],,AC_MSG_ERROR([Trilinos not found. Try either --with-trilinos or setting TRILINOS_HOME.]), + [$3]) + else + dnl Find the absolute path to Trilinos_version.h + dnl We need it to back out the discovered TRILINOS_INCLUDE directory. + AX_TRILINOS_ABSOLUTE_HEADER([Trilinos_version.h]) + TRILINOS_INCLUDE=`AS_DIRNAME([$ax_cv_absolute_Trilinos_version_h])` + + AC_DEFINE(HAVE_TRILINOS,1,[Define if Trilinos is available]) + AC_SUBST(TRILINOS_INCLUDE) + ifelse([$2],,,[$2]) + fi + +fi + +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_epetraext_hdf5.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_epetraext_hdf5.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_epetraext_hdf5.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_epetraext_hdf5.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,55 @@ +# =============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_epetraext_hdf5.html +# =============================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_EPETRAEXT_HDF5([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Checks if EpetraExt was compiled with HDF5 support +# (--enable-epetraext-hdf5) enabled. When ACTION-IF-NOT-FOUND is not +# specified, the default behavior is for configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_EPETRAEXT_HDF5],[ + AC_REQUIRE([AC_LIB_HDF5]) + AC_REQUIRE([AX_TRILINOS_EPETRAEXT]) + ax_trilinos_epetraext_hdf5=yes + AC_CHECK_HEADER([EpetraExt_ConfigDefs.h],,[ax_trilinos_epetraext_hdf5=no]) + AC_MSG_CHECKING([for HDF5 support in EpetraExt release]) + AC_LANG_PUSH(C++) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + #ifndef HAVE_EPETRAEXT_HDF5 + # error HAVE_EPETRAEXT_HDF5 was not defined in EpetraExt_ConfigDefs.h + #endif + ]])],[ + AC_MSG_RESULT(yes) + ],[ + AC_MSG_RESULT(no) + ax_trilinos_epetraext_hdf5=no + ]) + AC_LANG_POP([C++]) + if test "$ax_trilinos_epetraext_hdf5" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos EpetraExt HDF5 not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_epetraext.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_epetraext.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_epetraext.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_epetraext.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_epetraext.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_EPETRAEXT([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.epetraext" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_EPETRAEXT],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_epetraext=yes + AC_HAVE_LIBRARY([epetraext],[:],[ax_trilinos_epetraext=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([epetraext.macros],[ax_trilinos_epetraext=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([epetraext],[ax_trilinos_epetraext=no]) + if test "$ax_trilinos_epetraext" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos EpetraExt not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_epetra.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_epetra.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_epetra.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_epetra.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_epetra.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_EPETRA([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.epetra" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_TRILINOS_EPETRA],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_epetra=yes + AC_HAVE_LIBRARY([epetra],[:],[ax_trilinos_epetra=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([epetra.macros],[ax_trilinos_epetra=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([epetra],[ax_trilinos_epetra=no]) + if test "$ax_trilinos_epetra" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Epetra not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_rtop.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_rtop.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_rtop.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_rtop.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_rtop.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_RTOP([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.rtop" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_RTOP],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_rtop=yes + AC_HAVE_LIBRARY([rtop],[:],[ax_trilinos_rtop=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([rtop.macros],[ax_trilinos_rtop=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([rtop],[ax_trilinos_rtop=no]) + if test "$ax_trilinos_rtop" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos RTOp not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_rythmos.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_rythmos.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_rythmos.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_rythmos.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_rythmos.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_RYTHMOS([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.rythmos" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_RYTHMOS],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_rythmos=yes + AC_HAVE_LIBRARY([rythmos],[:],[ax_trilinos_rythmos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([rythmos.macros],[ax_trilinos_rythmos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([rythmos],[ax_trilinos_rythmos=no]) + if test "$ax_trilinos_rythmos" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Rythmos not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_teuchos.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_teuchos.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_teuchos.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_teuchos.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_teuchos.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_TEUCHOS([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.teuchos" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. +# +# When ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_TRILINOS_TEUCHOS],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_teuchos=yes + AC_HAVE_LIBRARY([teuchos],[:],[ax_trilinos_teuchos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([teuchos.macros],[ax_trilinos_teuchos=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([teuchos],[ax_trilinos_teuchos=no]) + if test "$ax_trilinos_teuchos" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Teuchos not usable]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_thyra_epetraext.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_thyra_epetraext.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_thyra_epetraext.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_thyra_epetraext.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# ================================================================================ +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_thyra_epetraext.html +# ================================================================================ +# +# SYNOPSIS +# +# AX_TRILINOS_THYRA_EPETRAEXT([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Checks if the Thyra/EpetraExt adapters were compiled with Trilinos. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_THYRA_EPETRAEXT],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + AC_REQUIRE([AX_TRILINOS_EPETRAEXT]) + AC_REQUIRE([AX_TRILINOS_THYRA_EPETRA]) + ax_trilinos_thyra_epetraext=yes + AC_HAVE_LIBRARY([thyraepetraext],[:],[ax_trilinos_thyra_epetraext=no]) + if test "$ax_trilinos_thyra_epetraext" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Thyra/EpetraExt adapters not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_thyra_epetra.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_thyra_epetra.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_thyra_epetra.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_thyra_epetra.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,41 @@ +# ============================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_thyra_epetra.html +# ============================================================================= +# +# SYNOPSIS +# +# AX_TRILINOS_THYRA_EPETRA([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# Checks if the Thyra/Epetra adapters were compiled with Trilinos. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_THYRA_EPETRA],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + AC_REQUIRE([AX_TRILINOS_EPETRA]) + AC_REQUIRE([AX_TRILINOS_THYRA]) + ax_trilinos_thyra_epetra=yes + AC_HAVE_LIBRARY([thyraepetra],[:],[ax_trilinos_thyra_epetra=no]) + if test "$ax_trilinos_thyra_epetra" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Thyra/Epetra support not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_thyra.m4 projectm-3.1.0/m4/autoconf-archive/ax_trilinos_thyra.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_trilinos_thyra.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_trilinos_thyra.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,43 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_trilinos_thyra.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRILINOS_THYRA([, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +# +# DESCRIPTION +# +# On success, adds "include Makefile.export.thyra" statements to every +# Automake file containing @INC_AMINCLUDE@. Requires that Trilinos was +# configured with the --enable-export-makefiles option. When +# ACTION-IF-NOT-FOUND is not specified, the default behavior is for +# configure to fail. +# +# LICENSE +# +# Copyright (c) 2009 Rhys Ulerich +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_TRILINOS_THYRA],[ + AC_REQUIRE([AX_TRILINOS_BASE]) + ax_trilinos_thyra=yes + AC_HAVE_LIBRARY([thyra],[:],[ax_trilinos_thyra=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([thyra.macros],[ax_trilinos_thyra=no]) + AX_ADD_AM_TRILINOS_MAKEFILE_EXPORT([thyra],[ax_trilinos_thyra=no]) + if test "$ax_trilinos_thyra" = yes; then + : # NOP + ifelse([$1],,, + [$1]) + else + : # NOP + ifelse([$2],,AC_MSG_ERROR([Trilinos Thyra not usable.]), + [$2]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_awk_anyout.m4 projectm-3.1.0/m4/autoconf-archive/ax_try_awk_anyout.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_awk_anyout.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_try_awk_anyout.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,53 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_try_awk_anyout.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRY_AWK_ANYOUT(NAME,TEST-INPUT,TEST-BODY,[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Run a test using the awk program found on AWK variable. The test being +# run has TEST-BODY as body and is feeded with TEST-INPUT. If successful +# execute ACTION-IF-SUCCESS otherwise ACTION-IF-FAILURE +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_TRY_AWK_ANYOUT], [ + AC_REQUIRE([AX_NEED_AWK]) + + AC_MSG_CHECKING([if $AWK supports $1]) + + cat < conftest.out +$2 +EOF + + ax_try_awk_output=`$AWK '{ [$3] ; }' conftest.out 2> /dev/null` + ax_try_awk_result=$? + + rm -f conftest.out + + AS_IF([test $ax_try_awk_result -eq 0],[ + AC_MSG_RESULT([yes]) + $4 + ],[ + AC_MSG_RESULT([no]) + $5 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_awk_expout.m4 projectm-3.1.0/m4/autoconf-archive/ax_try_awk_expout.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_awk_expout.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_try_awk_expout.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,59 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_try_awk_expout.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRY_AWK_EXPOUT(NAME,TEST-INPUT,TEST-BODY,EXPECTED-OUTPUT,[ACTION-IF-SUCCESS],[ACTION-IF-FAILURE]) +# +# DESCRIPTION +# +# Run a test using the awk program found on AWK variable. The test being +# run has TEST-BODY as body and is feeded with TEST-INPUT. Check if the +# test gives the expected output. If successful execute ACTION-IF-SUCCESS +# otherwise ACTION-IF-FAILURE. +# +# This work is heavily based upon testawk.sh script by Heiner Steven. You +# should find his script (and related works) at +# . Thanks to +# Alessandro Massignan for his suggestions and extensive nawk tests on +# FreeBSD. +# +# LICENSE +# +# Copyright (c) 2009 Francesco Salvestrini +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AC_DEFUN([AX_TRY_AWK_EXPOUT], [ + AC_REQUIRE([AX_NEED_AWK]) + + AC_MSG_CHECKING([if $AWK supports $1]) + + cat < conftest.out +$2 +EOF + + ax_try_awk_output=`$AWK '{ [$3] ; }' conftest.out 2> /dev/null` + ax_try_awk_result=$? + + rm -f conftest.out + + AS_IF([test $ax_try_awk_result -eq 0],[ + AS_IF([test "X$ax_try_awk_output" = "X[$4]"],[ + AC_MSG_RESULT([yes]) + $5 + ],[ + AC_MSG_RESULT([no]) + $6 + ]) + ],[ + AC_MSG_RESULT([no]) + $6 + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_compile_java.m4 projectm-3.1.0/m4/autoconf-archive/ax_try_compile_java.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_compile_java.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_try_compile_java.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,55 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_try_compile_java.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRY_COMPILE_JAVA +# +# DESCRIPTION +# +# AX_TRY_COMPILE_JAVA attempt to compile user given source. +# +# *Warning*: its success or failure can depend on a proper setting of the +# CLASSPATH env. variable. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Devin Weaver +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +AU_ALIAS([AC_TRY_COMPILE_JAVA], [AX_TRY_COMPILE_JAVA]) +AC_DEFUN([AX_TRY_COMPILE_JAVA],[ +AC_REQUIRE([AX_PROG_JAVAC])dnl +cat << \EOF > Test.java +/* [#]line __oline__ "configure" */ +ifelse([$1], , , [import $1;]) +public class Test { +[$2] +} +EOF +if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class +then +dnl Don't remove the temporary files here, so they can be examined. + ifelse([$3], , :, [$3]) +else + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat Test.java >&AS_MESSAGE_LOG_FD +ifelse([$4], , , [ rm -f Test.java Test.class + $4 +])dnl +fi +rm -f Test.java Test.class]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_run_java.m4 projectm-3.1.0/m4/autoconf-archive/ax_try_run_java.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_try_run_java.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_try_run_java.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,56 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_try_run_java.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TRY_RUN_JAVA +# +# DESCRIPTION +# +# AX_TRY_RUN_JAVA attempt to compile and run user given source. +# +# *Warning*: its success or failure can depend on a proper setting of the +# CLASSPATH env. variable. +# +# Note: This is part of the set of autoconf M4 macros for Java programs. +# It is VERY IMPORTANT that you download the whole set, some macros depend +# on other. Unfortunately, the autoconf archive does not support the +# concept of set of macros, so I had to break it for submission. The +# general documentation, as well as the sample configure.in, is included +# in the AX_PROG_JAVA macro. +# +# LICENSE +# +# Copyright (c) 2008 Devin Weaver +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AU_ALIAS([AC_TRY_RUN_JAVA], [AX_TRY_RUN_JAVA]) +AC_DEFUN([AX_TRY_RUN_JAVA],[ +AC_REQUIRE([AX_PROG_JAVAC])dnl +AC_REQUIRE([AX_PROG_JAVA])dnl +cat << \EOF > Test.java +/* [#]line __oline__ "configure" */ +ifelse([$1], , , [include $1;]) +public class Test { +[$2] +} +EOF +if AC_TRY_COMMAND($JAVAC $JAVACFLAGS Test.java) && test -s Test.class && ($JAVA $JAVAFLAGS Test; exit) 2>/dev/null +then +dnl Don't remove the temporary files here, so they can be examined. + ifelse([$3], , :, [$3]) +else + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat Test.java >&AS_MESSAGE_LOG_FD +ifelse([$4], , , [ rm -fr Test.java Test.class + $4 +])dnl +fi +rm -fr Test.java Test.class]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_type_socklen_t.m4 projectm-3.1.0/m4/autoconf-archive/ax_type_socklen_t.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_type_socklen_t.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_type_socklen_t.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_type_socklen_t.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_TYPE_SOCKLEN_T +# +# DESCRIPTION +# +# Check whether sys/socket.h defines type socklen_t. Please note that some +# systems require sys/types.h to be included before sys/socket.h can be +# compiled. +# +# LICENSE +# +# Copyright (c) 2008 Lars Brinkhoff +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([TYPE_SOCKLEN_T], [AX_TYPE_SOCKLEN_T]) +AC_DEFUN([AX_TYPE_SOCKLEN_T], +[AC_CACHE_CHECK([for socklen_t], ac_cv_ax_type_socklen_t, +[ + AC_TRY_COMPILE( + [#include + #include ], + [socklen_t len = (socklen_t) 42; return (!len);], + ac_cv_ax_type_socklen_t=yes, + ac_cv_ax_type_socklen_t=no) +]) + if test $ac_cv_ax_type_socklen_t != yes; then + AC_DEFINE(socklen_t, int, [Substitute for socklen_t]) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_upload.m4 projectm-3.1.0/m4/autoconf-archive/ax_upload.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_upload.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_upload.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,82 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_upload.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_UPLOAD([command]) +# +# DESCRIPTION +# +# Adds support for uploading dist files. %%s in the command will be +# substituted with the name of the file. e.g: +# +# AX_UPLOAD([ncftpput -v upload.sourceforge.net /incoming %%s]) +# +# To add upload support for other custom dists add upload- to +# UPLOAD_BIN or UPLOAD_SRC, where is the type of dist that is being +# uploaded and add a mapping from to the dist file name in the +# format '{=>}' to UPLOAD_TARGETS. For example: +# +# UPLOAD_BIN += upload-foobar +# UPLOAD_TARGETS += {foobar=>@PACKAGE@-@VERSION@.fb} +# +# You can then upload of the src distribution files by running: +# +# make upload-src +# +# all the binary distribution files by running: +# +# make upload-bin +# +# or both by running: +# +# make upload +# +# LICENSE +# +# Copyright (c) 2009 Tom Howard +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +AC_DEFUN([AX_UPLOAD], +[ +AC_MSG_NOTICE([adding upload support]) +AM_CONDITIONAL(USING_AX_UPLOAD, [true]) +AC_MSG_NOTICE([setting upload command... \`$1\`]) +AX_ADD_AM_MACRO_STATIC([ +UPLOAD_BIN = +UPLOAD_SRC = upload-gzip upload-bzip2 upload-zip +UPLOAD_TARGETS = \\ +{gzip=>$PACKAGE-$VERSION.tar.gz} \\ +{bzip2=>$PACKAGE-$VERSION.tar.bz2} \\ +{zip=>$PACKAGE-$VERSION.zip} + +\$(UPLOAD_BIN) \$(UPLOAD_SRC): + @TYPE=\`echo ${AX_DOLLAR}@ | \$(SED) -e \'s/upload-//\'\`; \\ + DIST=\"dist-\$\${TYPE}\"; \\ + \$(MAKE) \$(AM_MAKEFLAGS) \$\${DIST}; \\ + list=\'\$(UPLOAD_TARGETS)\'; \\ + pattern=\`echo \"^{\$\${TYPE}=>\"\`; \\ + for dist in \$\$list; do \\ + echo \$\$dist | \$(EGREP) \"^{\$\${TYPE}=>\" > /dev/null 2>&1; \\ + if test \"\$\$?\" -eq \"0\"; then \\ + TARGET=\`echo \"\$\$dist\" | \$(AWK) -v pattern=\$\$pattern \'{ sub( pattern, \"\"); sub( /}\$\$/, \"\" ); print; }\'\`; \\ + UPLOAD_COMMAND=\`printf \"$1\" \$\$TARGET \`; \\ + echo \"Uploading \$\$TARGET ...\"; \\ + \$\$UPLOAD_COMMAND; \\ + fi \\ + done + +upload-src: \$(UPLOAD_SRC) + +upload-bin: \$(UPLOAD_BIN) + +upload upload-all all-upload: upload-src upload-bin +]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_valgrind_check.m4 projectm-3.1.0/m4/autoconf-archive/ax_valgrind_check.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_valgrind_check.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_valgrind_check.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,239 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_VALGRIND_DFLT(memcheck|helgrind|drd|sgcheck, on|off) +# AX_VALGRIND_CHECK() +# +# DESCRIPTION +# +# AX_VALGRIND_CHECK checks whether Valgrind is present and, if so, allows +# running `make check` under a variety of Valgrind tools to check for +# memory and threading errors. +# +# Defines VALGRIND_CHECK_RULES which should be substituted in your +# Makefile; and $enable_valgrind which can be used in subsequent configure +# output. VALGRIND_ENABLED is defined and substituted, and corresponds to +# the value of the --enable-valgrind option, which defaults to being +# enabled if Valgrind is installed and disabled otherwise. Individual +# Valgrind tools can be disabled via --disable-valgrind-, the +# default is configurable via the AX_VALGRIND_DFLT command or is to use +# all commands not disabled via AX_VALGRIND_DFLT. All AX_VALGRIND_DFLT +# calls must be made before the call to AX_VALGRIND_CHECK. +# +# If unit tests are written using a shell script and automake's +# LOG_COMPILER system, the $(VALGRIND) variable can be used within the +# shell scripts to enable Valgrind, as described here: +# +# https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html +# +# Usage example: +# +# configure.ac: +# +# AX_VALGRIND_DFLT([sgcheck], [off]) +# AX_VALGRIND_CHECK +# +# in each Makefile.am with tests: +# +# @VALGRIND_CHECK_RULES@ +# VALGRIND_SUPPRESSIONS_FILES = my-project.supp +# EXTRA_DIST = my-project.supp +# +# This results in a "check-valgrind" rule being added. Running `make +# check-valgrind` in that directory will recursively run the module's test +# suite (`make check`) once for each of the available Valgrind tools (out +# of memcheck, helgrind and drd) while the sgcheck will be skipped unless +# enabled again on the commandline with --enable-valgrind-sgcheck. The +# results for each check will be output to test-suite-$toolname.log. The +# target will succeed if there are zero errors and fail otherwise. +# +# Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in +# memcheck, helgrind, drd and sgcheck. These are useful because often only +# some of those tools can be ran cleanly on a codebase. +# +# The macro supports running with and without libtool. +# +# LICENSE +# +# Copyright (c) 2014, 2015, 2016 Philip Withnall +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 17 + +dnl Configured tools +m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]]) +m4_set_add_all([valgrind_exp_tool_set], [sgcheck]) +m4_foreach([vgtool], [valgrind_tool_list], + [m4_define([en_dflt_valgrind_]vgtool, [on])]) + +AC_DEFUN([AX_VALGRIND_DFLT],[ + m4_define([en_dflt_valgrind_$1], [$2]) +])dnl + +AM_EXTRA_RECURSIVE_TARGETS([check-valgrind]) +m4_foreach([vgtool], [valgrind_tool_list], + [AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)]) + +AC_DEFUN([AX_VALGRIND_CHECK],[ + dnl Check for --enable-valgrind + AC_ARG_ENABLE([valgrind], + [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])], + [enable_valgrind=$enableval],[enable_valgrind=]) + + AS_IF([test "$enable_valgrind" != "no"],[ + # Check for Valgrind. + AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind]) + AS_IF([test "$VALGRIND" = ""],[ + AS_IF([test "$enable_valgrind" = "yes"],[ + AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind]) + ],[ + enable_valgrind=no + ]) + ],[ + enable_valgrind=yes + ]) + ]) + + AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"]) + AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind]) + + # Check for Valgrind tools we care about. + [valgrind_enabled_tools=] + m4_foreach([vgtool],[valgrind_tool_list],[ + AC_ARG_ENABLE([valgrind-]vgtool, + m4_if(m4_defn([en_dflt_valgrind_]vgtool),[off],dnl +[AS_HELP_STRING([--enable-valgrind-]vgtool, [Whether to use ]vgtool[ during the Valgrind tests])],dnl +[AS_HELP_STRING([--disable-valgrind-]vgtool, [Whether to skip ]vgtool[ during the Valgrind tests])]), + [enable_valgrind_]vgtool[=$enableval], + [enable_valgrind_]vgtool[=]) + AS_IF([test "$enable_valgrind" = "no"],[ + enable_valgrind_]vgtool[=no], + [test "$enable_valgrind_]vgtool[" ]dnl +m4_if(m4_defn([en_dflt_valgrind_]vgtool), [off], [= "yes"], [!= "no"]),[ + AC_CACHE_CHECK([for Valgrind tool ]vgtool, + [ax_cv_valgrind_tool_]vgtool,[ + ax_cv_valgrind_tool_]vgtool[=no + m4_set_contains([valgrind_exp_tool_set],vgtool, + [m4_define([vgtoolx],[exp-]vgtool)], + [m4_define([vgtoolx],vgtool)]) + AS_IF([`$VALGRIND --tool=]vgtoolx[ --help >/dev/null 2>&1`],[ + ax_cv_valgrind_tool_]vgtool[=yes + ]) + ]) + AS_IF([test "$ax_cv_valgrind_tool_]vgtool[" = "no"],[ + AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[ + AC_MSG_ERROR([Valgrind does not support ]vgtool[; reconfigure with --disable-valgrind-]vgtool) + ],[ + enable_valgrind_]vgtool[=no + ]) + ],[ + enable_valgrind_]vgtool[=yes + ]) + ]) + AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[ + valgrind_enabled_tools="$valgrind_enabled_tools ]m4_bpatsubst(vgtool,[^exp-])[" + ]) + AC_SUBST([ENABLE_VALGRIND_]vgtool,[$enable_valgrind_]vgtool) + ]) + AC_SUBST([valgrind_tools],["]m4_join([ ], valgrind_tool_list)["]) + AC_SUBST([valgrind_enabled_tools],[$valgrind_enabled_tools]) + +[VALGRIND_CHECK_RULES=' +# Valgrind check +# +# Optional: +# - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions +# files to load. (Default: empty) +# - VALGRIND_FLAGS: General flags to pass to all Valgrind tools. +# (Default: --num-callers=30) +# - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of: +# memcheck, helgrind, drd, sgcheck). (Default: various) + +# Optional variables +VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES)) +VALGRIND_FLAGS ?= --num-callers=30 +VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no +VALGRIND_helgrind_FLAGS ?= --history-level=approx +VALGRIND_drd_FLAGS ?= +VALGRIND_sgcheck_FLAGS ?= + +# Internal use +valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools))) + +valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS) +valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS) +valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS) +valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS) + +valgrind_quiet = $(valgrind_quiet_$(V)) +valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY)) +valgrind_quiet_0 = --quiet +valgrind_v_use = $(valgrind_v_use_$(V)) +valgrind_v_use_ = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY)) +valgrind_v_use_0 = @echo " USE " $(patsubst check-valgrind-%-am,%,$''@):; + +# Support running with and without libtool. +ifneq ($(LIBTOOL),) +valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute +else +valgrind_lt = +endif + +# Use recursive makes in order to ignore errors during check +check-valgrind-am: +ifeq ($(VALGRIND_ENABLED),yes) + $(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \ + $(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool)) +else + @echo "Need to reconfigure with --enable-valgrind" +endif + +# Valgrind running +VALGRIND_TESTS_ENVIRONMENT = \ + $(TESTS_ENVIRONMENT) \ + env VALGRIND=$(VALGRIND) \ + G_SLICE=always-malloc,debug-blocks \ + G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly + +VALGRIND_LOG_COMPILER = \ + $(valgrind_lt) \ + $(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS) + +define valgrind_tool_rule +check-valgrind-$(1)-am: +ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes) +ifneq ($$(TESTS),) + $$(valgrind_v_use)$$(MAKE) check-TESTS \ + TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \ + LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \ + LOG_FLAGS="$$(valgrind_$(1)_flags)" \ + TEST_SUITE_LOG=test-suite-$(1).log +endif +else ifeq ($$(VALGRIND_ENABLED),yes) + @echo "Need to reconfigure with --enable-valgrind-$(1)" +else + @echo "Need to reconfigure with --enable-valgrind" +endif +endef + +$(foreach tool,$(valgrind_tools),$(eval $(call valgrind_tool_rule,$(tool)))) + +A''M_DISTCHECK_CONFIGURE_FLAGS ?= +A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind + +MOSTLYCLEANFILES ?= +MOSTLYCLEANFILES += $(valgrind_log_files) + +.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools)) +'] + + AC_SUBST([VALGRIND_CHECK_RULES]) + m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_var_pop.m4 projectm-3.1.0/m4/autoconf-archive/ax_var_pop.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_var_pop.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_var_pop.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,99 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_var_pop.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_VAR_POPVALUE(VARIABLE) +# +# DESCRIPTION +# +# Restores a variable's previous value. Compile, link and running tests +# usually require the programmer to provide additional flags. However, it +# is strongly recommended not to override flags defined by the user +# through the configure command. AX_VAR_PUSHVALUE and AX_VAR_POPVALUE are +# clean way to temporarily store a variable's value and restore it later, +# using a stack-like behaviour. This macro supports nesting. +# +# Example: +# +# AX_VAR_PUSHVALUE([CXXFLAGS],["my test flags"]) +# perform some checks with CXXFLAGS... +# CXXFLAGS value will be "my test flags" +# AX_VAR_POPVALUE([CXXFLAGS]) +# CXXFLAGS is restored to its original value +# +# LICENSE +# +# Copyright (c) 2015 Jorge Bellon +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +# Main macros +AC_DEFUN([AX_VAR_PUSHVALUE],[ + increment([$1_counter]) + + AS_VAR_PUSHDEF([variable],[$1]) dnl + AS_VAR_PUSHDEF([backup],[save_$1_]$1_counter) dnl + + AS_VAR_SET(backup,$variable) dnl + AS_VAR_SET(variable,["]m4_default($2,$variable)["]) dnl + + AS_VAR_POPDEF([variable]) dnl + AS_VAR_POPDEF([backup]) dnl +])dnl AX_PUSH_VAR + +AC_DEFUN([AX_VAR_POPVALUE],[ + AS_VAR_PUSHDEF([variable],[$1]) dnl + AS_VAR_PUSHDEF([backup],[save_$1_]$1_counter) dnl + + AS_VAR_SET(variable,$backup) dnl + + decrement([$1_counter]) + AS_VAR_POPDEF([variable]) dnl + AS_VAR_POPDEF([backup]) dnl +])dnl AX_POP_VAR + +# ------------------------- +# Auxiliary macro +# ------------------------- +# decrement(counter_name) +# +# Decrement the value of a named counter. +# Throws an error if counter not defined +# or value reaches zero. +# ------------------------- +m4_define([decrement],[dnl + m4_ifdef([$1],dnl + [m4_if(m4_eval($1 > 0), + [1],m4_define([$1],m4_decr($1)),dnl + [m4_fatal([Missing call to AX_VAR_PUSHVALUE with var $1])]dnl + )],dnl + [m4_fatal([Missing call to AX_VAR_PUSHVALUE with var $1])])dnl +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_var_push.m4 projectm-3.1.0/m4/autoconf-archive/ax_var_push.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_var_push.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_var_push.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,96 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_var_push.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_VAR_PUSHVALUE(VARIABLE, [VALUE]) +# +# DESCRIPTION +# +# Stores a copy of variable_name's value and assigns it to 'value' If no +# value is given, its original value is kept. Compile, link and running +# tests usually require the programmer to provide additional flags. +# However, it is strongly recommended not to override flags defined by the +# user through the configure command. AX_VAR_PUSHVALUE and AX_VAR_POPVALUE +# are clean way to temporarily store a variable's value and restore it +# later, using a stack-like behaviour. This macro supports nesting. +# +# Example: +# +# AX_VAR_PUSHVALUE([CXXFLAGS],["my test flags"]) +# perform some checks with CXXFLAGS... +# CXXFLAGS value will be "my test flags" +# AX_VAR_POPVALUE([CXXFLAGS]) +# CXXFLAGS is restored to its original value +# +# LICENSE +# +# Copyright (c) 2015 Jorge Bellon +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 2 + +AC_DEFUN([AX_VAR_PUSHVALUE],[ + increment([$1_counter]) + + AS_VAR_PUSHDEF([variable],[$1]) dnl + AS_VAR_PUSHDEF([backup],[save_$1_]$1_counter) dnl + + AS_VAR_SET(backup,$variable) dnl + AS_VAR_SET(variable,["]m4_default($2,$variable)["]) dnl + + AS_VAR_POPDEF([variable]) dnl + AS_VAR_POPDEF([backup]) dnl +])dnl AX_PUSH_VAR + +AC_DEFUN([AX_VAR_POPVALUE],[ + AS_VAR_PUSHDEF([variable],[$1]) dnl + AS_VAR_PUSHDEF([backup],[save_$1_]$1_counter) dnl + + AS_VAR_SET(variable,$backup) dnl + + decrement([$1_counter]) + AS_VAR_POPDEF([variable]) dnl + AS_VAR_POPDEF([backup]) dnl +])dnl AX_POP_VAR + +# ------------------------- +# Auxiliary macro +# ------------------------- +# increment(counter_name) +# +# Increment the value of a named counter. +# Initialize to 1 if not defined +# ------------------------- +m4_define([increment],[dnl + m4_ifdef([$1],dnl + [m4_define([$1],m4_incr($1))],dnl + [m4_define([$1],[1])]dnl + )dnl +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_var_timezone_externals.m4 projectm-3.1.0/m4/autoconf-archive/ax_var_timezone_externals.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_var_timezone_externals.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_var_timezone_externals.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,95 @@ +# ============================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_var_timezone_externals.html +# ============================================================================== +# +# SYNOPSIS +# +# AX_VAR_TIMEZONE_EXTERNALS +# +# DESCRIPTION +# +# Use instead of `AC_STRUCT_TIMEZONE' to determine whether the external +# timezone variables `timezone', `altzone' and `daylight' exist, defining +# `HAVE_TIMEZONE', `HAVE_ALTZONE' and `HAVE_DAYLIGHT' respectively (as +# well as gaining the macros defined by `AC_STRUCT_TIMEZONE'). +# +# Rewritten for Autoconf 2.68, and made robust against BSD's timezone() +# function, by Daniel Richard G. +# +# LICENSE +# +# Copyright (c) 2008 Mark R. Bannister +# Copyright (c) 2011 Daniel Richard G. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 7 + +AU_ALIAS([AC_VAR_TIMEZONE_EXTERNALS], [AX_VAR_TIMEZONE_EXTERNALS]) +AC_DEFUN([AX_VAR_TIMEZONE_EXTERNALS], +[ AC_REQUIRE([AC_STRUCT_TIMEZONE])dnl + + AC_LANG_PUSH([C]) + + AC_CACHE_CHECK([for `timezone' variable in time.h], [mb_cv_var_timezone], + [ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int *foo = (int *)0xdeadbeef; return foo@<:@timezone@:>@ /* ; */])], + [mb_cv_var_timezone=yes], + [mb_cv_var_timezone=no]) + ]) + + AC_CACHE_CHECK([for `altzone' variable in time.h], [mb_cv_var_altzone], + [ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int *foo = (int *)0xdeadbeef; return foo@<:@altzone@:>@ /* ; */])], + [mb_cv_var_altzone=yes], + [mb_cv_var_altzone=no]) + ]) + + AC_CACHE_CHECK([for `daylight' variable in time.h], [mb_cv_var_daylight], + [ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], + [int *foo = (int *)0xdeadbeef; return foo@<:@daylight@:>@ /* ; */])], + [mb_cv_var_daylight=yes], + [mb_cv_var_daylight=no]) + ]) + + if test "$mb_cv_var_timezone" = "yes"; then + AC_DEFINE([HAVE_TIMEZONE], [1], + [Define to 1 if you have the external `timezone' variable.]) + fi + + if test "$mb_cv_var_altzone" = "yes"; then + AC_DEFINE([HAVE_ALTZONE], [1], + [Define to 1 if you have the external `altzone' variable.]) + fi + + if test "$mb_cv_var_daylight" = "yes"; then + AC_DEFINE([HAVE_DAYLIGHT], [1], + [Define to 1 if you have the external `daylight' variable.]) + fi + + AC_LANG_POP +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_very_nice.m4 projectm-3.1.0/m4/autoconf-archive/ax_very_nice.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_very_nice.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_very_nice.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,80 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_very_nice.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_VERY_NICE +# +# DESCRIPTION +# +# A macro to check the options of nice, in order to have a VERY_NICE +# variable which runs a program at the lowest priority VERY_NICE is +# undefined if we don't find the proper options, so you can safely use: +# +# @VERY_NICE@ mycommand +# +# in a shell script. +# +# The VERY_NICE variable includes the placeholder NICE_VALUE that you have +# to instantiate at run-time. If you give a argument to AX_VERY_NICE, it +# will be used as an argument of nice for testing and included in +# VERY_NICE instead of the above placeholder. +# +# LICENSE +# +# Copyright (c) 2008 Stephane Bortzmeyer +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AU_ALIAS([AC_VERY_NICE], [AX_VERY_NICE]) +AC_DEFUN([AX_VERY_NICE],[ +if test "x$1" != "x"; then + NICE_VALUE=$1 +else + NICE_VALUE=20 +fi +AC_CHECK_PROGS(TEST_NICE, date) +AC_CHECK_PROGS(NICE, nice, ) +AC_MSG_CHECKING(syntax of nice) +if test "x$NICE" != "x"; then + if ( $NICE -n $NICE_VALUE $TEST_NICE > /dev/null 2>&1 ) ; then + VERY_NICE="$NICE -n $NICE_VALUE" + else + if ( $NICE -$NICE_VALUE $TEST_NICE > /dev/null 2>&1 ) ; then + VERY_NICE="$NICE -$NICE_VALUE" + fi + fi +fi +if test "x$1" = "x"; then + VERY_NICE=`echo $VERY_NICE | sed "s/$NICE_VALUE/NICE_VALUE/"` +fi +AC_MSG_RESULT($VERY_NICE) +AC_SUBST(VERY_NICE) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_warning_default_aclocaldir.m4 projectm-3.1.0/m4/autoconf-archive/ax_warning_default_aclocaldir.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_warning_default_aclocaldir.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_warning_default_aclocaldir.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,146 @@ +# ================================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_warning_default_aclocaldir.html +# ================================================================================== +# +# SYNOPSIS +# +# AX_WARNING_DEFAULT_ACLOCALDIR [(dirvariable [,[defsetting][,[A][,[N/A]]]])] +# AX_ENABLE_DEFAULT_ACLOCALDIR [(dirvariable [,defsetting])] +# +# DESCRIPTION +# +# print a warning message if the $(datadir)/aclocal directory is not in +# the dirlist searched by the aclocal tool. This macro is useful if some +# `make install` would target $(datadir)/aclocal to install an autoconf m4 +# file of your project to be picked up by other projects. +# +# default $1 dirvariable = aclocaldir +# default $2 defsetting = ${datadir}/aclocal +# default $3 action = nothing to do +# default $4 action = warn the user about mismatch +# +# In the _WARNING_ variant, the defsetting is not placed in dirvariable +# nor is it ac_subst'ed in any way. The default fail-action $4 is to send +# a warning message to the user, and the default accept-action $3 is +# nothing. It is expected that a Makefile is generated with +# aclocaldir=${datadir}/aclocal +# +# The _ENABLE_ variant however will set not only the $aclocaldir shell var +# of the script, but it is also AC-SUBST'ed on default - and furthermore a +# configure option "--enable-default-aclocaldir" is provided. Only if that +# option is set then $2 default is not set to the canonic default in the a +# $prefix subpath but instead $2 default is set to the primary path where +# `aclocal` looks for macros. The user may also override the default on +# the command line. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 9 + +AC_DEFUN([AX_WARNING_DEFAULT_ACLOCALDIR],[dnl +AC_REQUIRE([AX_EXPAND_PREFIX])dnl +AS_VAR_PUSHDEF([DIR],[ax_warning_default_aclocal_dir])dnl +AS_VAR_PUSHDEF([BIN],[ax_warning_default_aclocal_bin])dnl +AS_VAR_PUSHDEF([LOC],[ax_warning_default_aclocal_loc])dnl +LOC='m4_if([$2],,[${datadir}/aclocal],[$2])' +m4_ifval([$1],[test ".$[]$1" != "." && LOC="$[]$1"]) + if test ".$ACLOCAL" = "." ; then + AC_PATH_PROG([ACLOCAL],[aclocal],[:]) + fi + BIN="$ACLOCAL" + test ".$BIN" = "." && BIN="aclocal" + DIR=`test ".$SHELL" = "." && SHELL="'sh'" ; eval "$BIN --print-ac-dir"` + test ".$DIR" = "." && test -d "/usr/share/aclocal" && DIR="/usr/share/aclocal" + test ".$DIR" = "." && DIR="/tmp" +DIR=`eval "echo $DIR"` # we need to expand +DIR=`eval "echo $DIR"` +LOC=`eval "echo $LOC"` +LOC=`eval "echo $LOC"` +LOC=`eval "echo $LOC"` +LOC=`eval "echo $LOC"` +AC_RUN_LOG([: test "$LOC" = "$DIR"]) +if test "$LOC" != "$DIR" ; then + if test -f "$DIR/dirlist" ; then + for DIR in `cat $DIR/dirlist` $DIR ; do + AC_RUN_LOG([: test "$LOC" = "$DIR"]) + test "$LOC" = "$DIR" && break + done + fi + if test "$LOC" != "$DIR" ; then + m4_ifval([$4],[$4],[dnl + AC_MSG_NOTICE([warning: m4_if([$1],,[aclocaldir],[$1])=$LOC dnl +(see config.log)]) + AC_MSG_NOTICE([perhaps: make install m4_if([$1],,[aclocaldir],[$1])=$DIR]) + cat m4_ifset([AS_MESSAGE_LOG_FD],[>&AS_MESSAGE_LOG_FD],[>>config.log]) <@], [override the datadir/aclocal default])]) +test ".$enable_default_aclocaldir" = "." && enable_default_aclocaldir="no" +case ".$enable_default_aclocaldir" in + .no) DIR='m4_if([$2],,[${datadir}/aclocal],[$2])' ;; + .yes) # autodetect + if test ".$ACLOCAL" = "." ; then + AC_PATH_PROG([ACLOCAL],[aclocal],[:]) + fi + BIN="$ACLOCAL" + test ".$BIN" = "." && BIN="aclocal" + DIR=`test ".$SHELL" = "." && SHELL="'sh'" ; eval "$BIN --print-ac-dir"` + test ".$DIR" = "." && test -d "/usr/share/aclocal" && DIR="/usr/share/aclocal" + test ".$DIR" = "." && DIR="/tmp" ;; + *) DIR="$enable_default_aclocaldir" ;; +esac +AX_WARNING_DEFAULT_ACLOCALDIR([$1],[$DEF],[$3],[$4],[$5]) +m4_if([$1],,[aclocaldir],[$1])="$ax_warning_default_aclocal_dir" +AC_SUBST(m4_if([$1],,[aclocaldir],[$1])) +AS_VAR_POPDEF([DEF])dnl +AS_VAR_POPDEF([DIR])dnl +AS_VAR_POPDEF([BIN])dnl +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_warning_default_pkgconfig.m4 projectm-3.1.0/m4/autoconf-archive/ax_warning_default_pkgconfig.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_warning_default_pkgconfig.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_warning_default_pkgconfig.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,161 @@ +# ================================================================================= +# https://www.gnu.org/software/autoconf-archive/ax_warning_default_pkgconfig.html +# ================================================================================= +# +# SYNOPSIS +# +# AX_WARNING_DEFAULT_PKGCONFIGDIR [(dirvariable [,[defsetting][,[A][,[N/A]]]])] +# AX_ENABLE_DEFAULT_PKGCONFIGDIR [(dirvariable [,defsetting])] +# +# DESCRIPTION +# +# print a warning message if the $(datadir)/aclocal directory is not in +# the dirlist searched by the aclocal tool. This macro is useful if some +# `make install` would target $(datadir)/aclocal to install an autoconf m4 +# file of your project to be picked up by other projects. +# +# default $1 dirvariable = pkgconfigdir +# default $2 defsetting = ${libdir}/pkgconfig +# default $3 action = nothing to do +# default $4 action = warn the user about mismatch +# +# In the _WARNING_ variant, the defsetting is not placed in dirvariable +# nor is it ac_subst'ed in any way. The default fail-action $4 is to send +# a warning message to the user, and the default accept-action $3 is +# nothing. It is expected that a Makefile is generated with +# pkgconfigdir=${libdir}/pkgconfig +# +# The _ENABLE_ variant however will set not only the $pkgconfigdir shell +# var of the script, but it is also AC-SUBST'ed on default - and +# furthermore a configure option "--enable-default-pkgconfigdir" is +# provided. Only if that option is set then $2 default is not set to the +# canonic default in the a $prefix subpath but instead $2 default is set +# to the primary path where `pkg-config` looks for .pc files. The user may +# also override the default on the command line. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AC_DEFUN([AX_WARNING_DEFAULT_PKGCONFIGDIR],[dnl +AC_REQUIRE([AX_EXPAND_PREFIX])dnl +AS_VAR_PUSHDEF([DIR],[ax_warning_default_pkgconfig_dir])dnl +AS_VAR_PUSHDEF([BIN],[ax_warning_default_pkgconfig_bin])dnl +AS_VAR_PUSHDEF([LOC],[ax_warning_default_pkgconfig_loc])dnl +LOC='m4_if([$2],,[${libdir}/pkgconfig],[$2])' +m4_ifval([$1],[test ".$[]$1" != "." && LOC="$[]$1"]) + if test ".$PKG_CONFIG" = "." ; then # we use the same default as in pkg.m4 + AC_PATH_PROG([PKG_CONFIG],[pkg-config],[no]) + fi + if test "$PKG_CONFIG" = "no" + then DIR="/" ; test -d "/usr/lib/pkgconfig" && DIR="/usr/lib/pkgconfig" + else BIN=`AS_DIRNAME(["$DIR"])` ; + if test -d "$BIN/lib/pkgconfig" ; then + DIR="$BIN/lib/pkgconfig" + else BIN=`AS_DIRNAME(["$DIR"])` + if test -d "$BIN/lib/pkgconfig" ; then + DIR="$BIN/lib/pkgconfig" + else + if test -d "/usr/lib/pkgconfig" ; then + DIR="/usr/lib/pkgconfig" + else + DIR="/" + fi fi fi + fi +AC_RUN_LOG([: last pkgconfig dir is assumed as "$DIR"]) +DIR=`eval "echo $DIR"` +DIR=`eval "echo $DIR"` +LOC=`eval "echo $LOC"` +LOC=`eval "echo $LOC"` +LOC=`eval "echo $LOC"` +LOC=`eval "echo $LOC"` +for DIR in `echo "$PKG_CONFIG_PATH:$DIR" | sed -e 's,:, ,g'` ; do + AC_RUN_LOG([: test ".$LOC" = ".$DIR"]) + test ".$LOC" = ".$DIR" && break +done +if test "$LOC" != "$DIR" ; then + m4_ifval([$4],[$4],[dnl + AC_MSG_NOTICE([warning: m4_if([$1],,[pkgconfigdir],[$1])=$LOC dnl +(see config.log)]) + AC_MSG_NOTICE([perhaps: make install m4_if([$1],,[pkgconfigdir],[$1])=$DIR]) + cat m4_ifset([AS_MESSAGE_LOG_FD],[>&AS_MESSAGE_LOG_FD],[>>config.log]) < in addition to +# . Consequently, the "do I have a system wint_t?" probe fails +# and an alternate gets used. Unfortunately, by the time the program gets +# built, one way or another that funny header winds up getting included +# and the "#define wint_t unsigned int" patch-up-hack mutilates the +# typedef. This macro will get it right. +# +# LICENSE +# +# Copyright (c) 2008 Bruce Korb +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_WINT_T],[ + AC_CHECK_HEADERS([runetype.h wchar.h]) + AC_CHECK_TYPE(wint_t, [], [ + AC_DEFINE_UNQUOTED([wint_t], [unsigned int], + [Define to `unsigned int' if not found])], [ + AC_INCLUDES_DEFAULT + #if HAVE_RUNETYPE_H + # include + #endif + #if HAVE_WCHAR_H + # include + #endif + ])]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_apxs.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_apxs.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_apxs.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_apxs.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,60 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_apxs.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_APXS([value-if-not-found], [path]) +# +# DESCRIPTION +# +# Locates an installed apxs binary, placing the result in the precious +# variable $APXS. Accepts a preset $APXS, then --with-apxs, and failing +# that searches for apxs in the given path (which defaults to the system +# path). If apxs is found, $APXS is set to the full path of the binary; +# otherwise it is set to VALUE-IF-NOT-FOUND, which defaults to apxs. +# +# Example: +# +# AX_WITH_APXS(missing) +# +# LICENSE +# +# Copyright (c) 2008 Dustin J. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 11 + +AC_DEFUN([AX_WITH_APXS], +[ + AC_ARG_VAR([APXS]) + + dnl unless APXS was supplied to us (as a precious variable) + if test -z "$APXS" + then + AC_MSG_CHECKING(for --with-apxs) + AC_ARG_WITH(apxs, + AS_HELP_STRING([--with-apxs=APXS], + [absolute path name of apxs executable]), + [ if test "$withval" != "yes" + then + APXS="$withval" + AC_MSG_RESULT($withval) + else + AC_MSG_RESULT(no) + fi + ], + [ AC_MSG_RESULT(no) + ]) + fi + + dnl if it's still not found, check the paths, or use the fallback + if test -z "$APXS" + then + AC_PATH_PROG([APXS], apxs, m4_ifval([$1],[$1],[apxs]), $2) + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_build_path.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_build_path.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_build_path.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_build_path.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,44 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_build_path.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_BUILD_PATH +# +# DESCRIPTION +# +# This macro adds a "--with-build-path" option to the configure script. +# This configure option provides a convenient way to add "-I" options to +# CPPFLAGS and "-L" options to LDFLAGS, at configure time. +# +# Invoking "./configure --with-build-path=DIR" results in "-I DIR/include" +# being added to CPPFLAGS if DIR/include exists, and "-L DIR/lib" being +# added to LDFLAGS if DIR/lib exists. +# +# Separate multiple directories using colons; e.g. +# "--with-build-path=DIR1:DIR2:DIR3". +# +# LICENSE +# +# Copyright (c) 2008 Steve M. Robbins +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([SMR_WITH_BUILD_PATH], [AX_WITH_BUILD_PATH]) +AC_DEFUN([AX_WITH_BUILD_PATH], +[ + AC_ARG_WITH([build-path], + [ --with-build-path=DIR build using DIR/include and DIR/lib], + [ + for d in `echo $withval | tr : ' '`; do + test -d $d/include && CPPFLAGS="$CPPFLAGS -I$d/include" + test -d $d/lib && LDFLAGS="$LDFLAGS -L$d/lib" + done + ]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_curses_extra.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_curses_extra.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_curses_extra.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_curses_extra.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,245 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_curses_extra.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_CURSES_PANEL +# AX_WITH_CURSES_MENU +# AX_WITH_CURSES_FORM +# +# DESCRIPTION +# +# These macros try to find additional libraries that often come with +# SysV-compatible Curses. In particular, the Panel, Menu and Form +# libraries are searched, along with their header files. These macros +# depend on AX_WITH_CURSES. +# +# The following preprocessor symbols may be defined by these macros: +# +# By AX_WITH_CURSES_PANEL: +# +# HAVE_PANEL - if the Panel library is present +# HAVE_PANEL_H - if is present and should be used +# HAVE_NCURSES_PANEL_H - if should be used +# HAVE_NCURSESW_PANEL_H - if should be used +# +# By AX_WITH_CURSES_MENU: +# +# HAVE_MENU - if the Menu library is present +# HAVE_MENU_H - if is present and should be used +# HAVE_NCURSES_MENU_H - if should be used +# HAVE_NCURSESW_MENU_H - if should be used +# +# By AX_WITH_CURSES_FORM: +# +# HAVE_FORM - if the Form library is present +# HAVE_FORM_H - if is present and should be used +# HAVE_NCURSES_FORM_H - if should be used +# HAVE_NCURSESW_FORM_H - if should be used +# +# The following output variables may be defined by these macros; these are +# precious and may be overridden on the ./configure command line: +# +# PANEL_LIBS - library to add to xxx_LDADD before CURSES_LIBS +# MENU_LIBS - library to add to xxx_LDADD before CURSES_LIBS +# FORM_LIBS - library to add to xxx_LDADD before CURSES_LIBS +# +# In previous versions of this macro, the flags PANEL_LIB, MENU_LIB and +# FORM_LIB were defined. These have been renamed, in keeping with the +# variable scheme of PKG_CHECK_MODULES, which should eventually supersede +# the use of AX_WITH_CURSES and AX_WITH_CURSES_* macros. These libraries +# are NOT added to LIBS by default. You need to add them to the +# appropriate xxx_LDADD line in your Makefile.am in front of the +# equivalent CURSES_LIBS incantation. For example: +# +# prog_LDADD = @PANEL_LIBS@ @CURSES_LIBS@ +# +# If one of the xxx_LIBS variables is set on the configure command line +# (such as by running "./configure PANEL_LIBS=-lmypanel"), then the header +# file searched must NOT contain a subpath. In this case, in other words, +# only would be searched for. The user may use the CPPFLAGS +# precious variable to override the standard #include search path. +# +# The following shell variables may be defined by these macros: +# +# ax_cv_panel - set to "yes" if Panels library is present +# ax_cv_menu - set to "yes" if Menu library is present +# ax_cv_form - set to "yes" if Form library is present +# +# These variables can be used in your configure.ac to determine whether a +# library you require is actually present. For example: +# +# AX_WITH_CURSES +# if test "x$ax_cv_curses" != xyes; then +# AC_MSG_ERROR([requires a SysV or X/Open-compatible Curses library]) +# fi +# AX_WITH_CURSES_PANEL +# if test "x$ax_cv_panel" != xyes; then +# AC_MSG_ERROR([requires the Curses Panel library]) +# fi +# +# To use the HAVE_xxx_H preprocessor symbols, insert the following into +# your system.h (or equivalent) header file: +# +# For AX_WITH_CURSES_PANEL: +# +# #if defined HAVE_NCURSESW_PANEL_H +# # include +# #elif defined HAVE_NCURSES_PANEL_H +# # include +# #elif defined HAVE_PANEL_H +# # include +# #else +# # error "SysV-compatible Curses Panel header file required" +# #endif +# +# For AX_WITH_CURSES_MENU: +# +# #if defined HAVE_NCURSESW_MENU_H +# # include +# #elif defined HAVE_NCURSES_MENU_H +# # include +# #elif defined HAVE_MENU_H +# # include +# #else +# # error "SysV-compatible Curses Menu header file required" +# #endif +# +# For AX_WITH_CURSES_FORM: +# +# #if defined HAVE_NCURSESW_FORM_H +# # include +# #elif defined HAVE_NCURSES_FORM_H +# # include +# #elif defined HAVE_FORM_H +# # include +# #else +# # error "SysV-compatible Curses Form header file required" +# #endif +# +# LICENSE +# +# Copyright (c) 2011 John Zaitseff +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 5 + +AC_DEFUN([_AX_WITH_CURSES_CHECKEXTRA], [ + dnl Parameter 1 is the variable name component, using uppercase letters only + dnl Parameter 2 is the printable library name + dnl Parameter 3 is the C code to try compiling and linking + dnl Parameter 4 is the header filename + dnl Parameter 5 is the library command line + + AS_VAR_PUSHDEF([_AX_WITH_CURSES_CHECKEXTRA_have_var], [HAVE_$1])dnl + AS_VAR_PUSHDEF([_AX_WITH_CURSES_CHECKEXTRA_cv_var], [ax_cv_[]m4_tolower($1)])dnl + AS_VAR_PUSHDEF([_AX_WITH_CURSES_CHECKEXTRA_header_var], [ax_cv_header_$4])dnl + AS_VAR_PUSHDEF([_AX_WITH_CURSES_CHECKEXTRA_have_header_var], [HAVE_[]m4_toupper($4)])dnl + + ax_saved_LIBS=$LIBS + ax_saved_CPPFLAGS=$CPPFLAGS + + AC_CACHE_CHECK([for Curses $2 library with $4], [_AX_WITH_CURSES_CHECKEXTRA_header_var], [ + LIBS="$ax_saved_LIBS $5 $CURSES_LIBS" + CPPFLAGS="$ax_saved_CPPFLAGS $CURSES_CFLAGS" + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include <$4> + ]], [$3])], + [_AX_WITH_CURSES_CHECKEXTRA_header_var=yes], + [_AX_WITH_CURSES_CHECKEXTRA_header_var=no]) + ]) + AS_IF([test "x$[]_AX_WITH_CURSES_CHECKEXTRA_header_var" = xyes], [ + _AX_WITH_CURSES_CHECKEXTRA_cv_var=yes + AS_LITERAL_IF([$5], [$1_LIBS="$5"]) + AC_DEFINE([_AX_WITH_CURSES_CHECKEXTRA_have_var], [1], [Define to 1 if the Curses $2 library is present]) + AC_DEFINE([_AX_WITH_CURSES_CHECKEXTRA_have_header_var], [1], [Define to 1 if <$4> is present]) + ], [ + AS_IF([test "x$[]_AX_WITH_CURSES_CHECKEXTRA_cv_var" = xyes], [], + [_AX_WITH_CURSES_CHECKEXTRA_cv_var=no]) + ]) + + LIBS=$ax_saved_LIBS + CPPFLAGS=$ax_saved_CPPFLAGS + unset ax_saved_LIBS + unset ax_saved_CPPFLAGS + + AS_VAR_POPDEF([_AX_WITH_CURSES_CHECKEXTRA_have_header_var])dnl + AS_VAR_POPDEF([_AX_WITH_CURSES_CHECKEXTRA_header_var])dnl + AS_VAR_POPDEF([_AX_WITH_CURSES_CHECKEXTRA_cv_var])dnl + AS_VAR_POPDEF([_AX_WITH_CURSES_CHECKEXTRA_have_var])dnl +])dnl + +AC_DEFUN([_AX_WITH_CURSES_EXTRA], [ + dnl Parameter 1 is the variable name component, using uppercase letters only + dnl Parameter 2 is the printable library name + dnl Parameter 3 is the C code to try compiling and linking + dnl Parameter 4 is the header filename component + dnl Parameter 5 is the NCursesW library command line + dnl Parameter 6 is the NCurses library command line + dnl Parameter 7 is the plain Curses library command line + + AC_REQUIRE([AX_WITH_CURSES]) + AC_ARG_VAR([$1_LIBS], [linker library for Curses $2, e.g. $7]) + + AS_IF([test "x$[]$1_LIBS" != x], [ + _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$[]$1_LIBS]) + ], [ + AS_IF([test "x$ax_cv_curses_which" = xncursesw], [ + _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncursesw/$4], [$5]) + ], [test "x$ax_cv_curses_which" = xncurses], [ + _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$6]) + AS_IF([test x$[]ax_cv_[]m4_tolower($1) != "xyes"], [ + _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [ncurses/$4], [$6]) + ]) + ], [test "x$ax_cv_curses_which" = xplaincurses], [ + _AX_WITH_CURSES_CHECKEXTRA([$1], [$2], [$3], [$4], [$7]) + ]) + ]) +])dnl + +AC_DEFUN([AX_WITH_CURSES_PANEL], [ + _AX_WITH_CURSES_EXTRA([PANEL], [Panel], [[ + WINDOW *win = newwin(0, 0, 0, 0); + PANEL *pan = new_panel(win); + ]], [panel.h], [-lpanelw], [-lpanel], [-lpanel]) +])dnl + +AC_DEFUN([AX_WITH_CURSES_MENU], [ + _AX_WITH_CURSES_EXTRA([MENU], [Menu], [[ + ITEM **mi; + MENU *m = new_menu(mi); + ]], [menu.h], [-lmenuw], [-lmenu], [-lmenu]) +])dnl + +AC_DEFUN([AX_WITH_CURSES_FORM], [ + _AX_WITH_CURSES_EXTRA([FORM], [Form], [[ + FIELD **ff; + FORM *f = new_form(ff); + ]], [form.h], [-lformw], [-lform], [-lform]) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_curses.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_curses.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_curses.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_curses.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,582 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_curses.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_CURSES +# +# DESCRIPTION +# +# This macro checks whether a SysV or X/Open-compatible Curses library is +# present, along with the associated header file. The NcursesW +# (wide-character) library is searched for first, followed by Ncurses, +# then the system-default plain Curses. The first library found is the +# one returned. Finding libraries will first be attempted by using +# pkg-config, and should the pkg-config files not be available, will +# fallback to combinations of known flags itself. +# +# The following options are understood: --with-ncursesw, --with-ncurses, +# --without-ncursesw, --without-ncurses. The "--with" options force the +# macro to use that particular library, terminating with an error if not +# found. The "--without" options simply skip the check for that library. +# The effect on the search pattern is: +# +# (no options) - NcursesW, Ncurses, Curses +# --with-ncurses --with-ncursesw - NcursesW only [*] +# --without-ncurses --with-ncursesw - NcursesW only [*] +# --with-ncursesw - NcursesW only [*] +# --with-ncurses --without-ncursesw - Ncurses only [*] +# --with-ncurses - NcursesW, Ncurses [**] +# --without-ncurses --without-ncursesw - Curses only +# --without-ncursesw - Ncurses, Curses +# --without-ncurses - NcursesW, Curses +# +# [*] If the library is not found, abort the configure script. +# +# [**] If the second library (Ncurses) is not found, abort configure. +# +# The following preprocessor symbols may be defined by this macro if the +# appropriate conditions are met: +# +# HAVE_CURSES - if any SysV or X/Open Curses library found +# HAVE_CURSES_ENHANCED - if library supports X/Open Enhanced functions +# HAVE_CURSES_COLOR - if library supports color (enhanced functions) +# HAVE_CURSES_OBSOLETE - if library supports certain obsolete features +# HAVE_NCURSESW - if NcursesW (wide char) library is to be used +# HAVE_NCURSES - if the Ncurses library is to be used +# +# HAVE_CURSES_H - if is present and should be used +# HAVE_NCURSESW_H - if should be used +# HAVE_NCURSES_H - if should be used +# HAVE_NCURSESW_CURSES_H - if should be used +# HAVE_NCURSES_CURSES_H - if should be used +# +# (These preprocessor symbols are discussed later in this document.) +# +# The following output variables are defined by this macro; they are +# precious and may be overridden on the ./configure command line: +# +# CURSES_LIBS - library to add to xxx_LDADD +# CURSES_CFLAGS - include paths to add to xxx_CPPFLAGS +# +# In previous versions of this macro, the flags CURSES_LIB and +# CURSES_CPPFLAGS were defined. These have been renamed, in keeping with +# AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should +# eventually supersede the use of AX_WITH_CURSES. Neither the library +# listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS, +# respectively CPPFLAGS, by default. You need to add both to the +# appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For +# example: +# +# prog_LDADD = @CURSES_LIBS@ +# prog_CPPFLAGS = @CURSES_CFLAGS@ +# +# If CURSES_LIBS is set on the configure command line (such as by running +# "./configure CURSES_LIBS=-lmycurses"), then the only header searched for +# is . If the user needs to specify an alternative path for a +# library (such as for a non-standard NcurseW), the user should use the +# LDFLAGS variable. +# +# The following shell variables may be defined by this macro: +# +# ax_cv_curses - set to "yes" if any Curses library found +# ax_cv_curses_enhanced - set to "yes" if Enhanced functions present +# ax_cv_curses_color - set to "yes" if color functions present +# ax_cv_curses_obsolete - set to "yes" if obsolete features present +# +# ax_cv_ncursesw - set to "yes" if NcursesW library found +# ax_cv_ncurses - set to "yes" if Ncurses library found +# ax_cv_plaincurses - set to "yes" if plain Curses library found +# ax_cv_curses_which - set to "ncursesw", "ncurses", "plaincurses" or "no" +# +# These variables can be used in your configure.ac to determine the level +# of support you need from the Curses library. For example, if you must +# have either Ncurses or NcursesW, you could include: +# +# AX_WITH_CURSES +# if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then +# AC_MSG_ERROR([requires either NcursesW or Ncurses library]) +# fi +# +# If any Curses library will do (but one must be present and must support +# color), you could use: +# +# AX_WITH_CURSES +# if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then +# AC_MSG_ERROR([requires an X/Open-compatible Curses library with color]) +# fi +# +# Certain preprocessor symbols and shell variables defined by this macro +# can be used to determine various features of the Curses library. In +# particular, HAVE_CURSES and ax_cv_curses are defined if the Curses +# library found conforms to the traditional SysV and/or X/Open Base Curses +# definition. Any working Curses library conforms to this level. +# +# HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the +# library supports the X/Open Enhanced Curses definition. In particular, +# the wide-character types attr_t, cchar_t and wint_t, the functions +# wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES +# are checked. The Ncurses library does NOT conform to this definition, +# although NcursesW does. +# +# HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library +# supports color functions and macros such as COLOR_PAIR, A_COLOR, +# COLOR_WHITE, COLOR_RED and init_pair(). These are NOT part of the +# X/Open Base Curses definition, but are part of the Enhanced set of +# functions. The Ncurses library DOES support these functions, as does +# NcursesW. +# +# HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the +# library supports certain features present in SysV and BSD Curses but not +# defined in the X/Open definition. In particular, the functions +# getattrs(), getcurx() and getmaxx() are checked. +# +# To use the HAVE_xxx_H preprocessor symbols, insert the following into +# your system.h (or equivalent) header file: +# +# #if defined HAVE_NCURSESW_CURSES_H +# # include +# #elif defined HAVE_NCURSESW_H +# # include +# #elif defined HAVE_NCURSES_CURSES_H +# # include +# #elif defined HAVE_NCURSES_H +# # include +# #elif defined HAVE_CURSES_H +# # include +# #else +# # error "SysV or X/Open-compatible Curses header file required" +# #endif +# +# For previous users of this macro: you should not need to change anything +# in your configure.ac or Makefile.am, as the previous (serial 10) +# semantics are still valid. However, you should update your system.h (or +# equivalent) header file to the fragment shown above. You are encouraged +# also to make use of the extended functionality provided by this version +# of AX_WITH_CURSES, as well as in the additional macros +# AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM. +# +# LICENSE +# +# Copyright (c) 2009 Mark Pulford +# Copyright (c) 2009 Damian Pietras +# Copyright (c) 2012 Reuben Thomas +# Copyright (c) 2011 John Zaitseff +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 18 + +# internal function to factorize common code that is used by both ncurses +# and ncursesw +AC_DEFUN([_FIND_CURSES_FLAGS], [ + AC_MSG_CHECKING([for $1 via pkg-config]) + + AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS]) + _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1]) + _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1]) + + AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[ + AC_MSG_RESULT([no]) + # No suitable .pc file found, have to find flags via fallback + AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [ + AS_ECHO() + pkg_cv__ax_cv_$1_libs="-l$1" + pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS" + LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" + CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags" + + AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs]) + AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], + [ + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs]) + AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[ + ax_cv_$1=yes + ],[ + AC_MSG_RESULT([no]) + m4_if( + [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"], + [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"] + ) + LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" + + AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs]) + AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[ + ax_cv_$1=yes + ],[ + ax_cv_$1=no + ]) + ]) + ],[ + ax_cv_$1=no + ]) + ]) + ],[ + AC_MSG_RESULT([yes]) + # Found .pc file, using its information + LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" + CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags" + ax_cv_$1=yes + ]) +]) + +AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) +AC_DEFUN([AX_WITH_CURSES], [ + AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses]) + AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw]) + AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses], + [force the use of Ncurses or NcursesW])], + [], [with_ncurses=check]) + AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw], + [do not use NcursesW (wide character support)])], + [], [with_ncursesw=check]) + + ax_saved_LIBS=$LIBS + ax_saved_CPPFLAGS=$CPPFLAGS + + AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes], + [ax_with_plaincurses=no], [ax_with_plaincurses=check]) + + ax_cv_curses_which=no + + # Test for NcursesW + AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [ + _FIND_CURSES_FLAGS([ncursesw]) + + AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [ + AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library]) + ]) + + AS_IF([test "x$ax_cv_ncursesw" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=ncursesw + CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs" + CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags" + AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + + AC_CACHE_CHECK([for working ncursesw/curses.h], [ax_cv_header_ncursesw_curses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_header_ncursesw_curses_h=yes], + [ax_cv_header_ncursesw_curses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSESW_CURSES_H], [1], [Define to 1 if is present]) + ]) + + AC_CACHE_CHECK([for working ncursesw.h], [ax_cv_header_ncursesw_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_header_ncursesw_h=yes], + [ax_cv_header_ncursesw_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncursesw_h" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSESW_H], [1], [Define to 1 if is present]) + ]) + + AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h_with_ncursesw], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_header_ncurses_h_with_ncursesw=yes], + [ax_cv_header_ncurses_h_with_ncursesw=no]) + ]) + AS_IF([test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if is present]) + ]) + + AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno], [ + AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h]) + ]) + ]) + ]) + unset pkg_cv__ax_cv_ncursesw_libs + unset pkg_cv__ax_cv_ncursesw_cppflags + + # Test for Ncurses + AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ + _FIND_CURSES_FLAGS([ncurses]) + + AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [ + AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library]) + ]) + + AS_IF([test "x$ax_cv_ncurses" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=ncurses + CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs" + CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags" + AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + + AC_CACHE_CHECK([for working ncurses/curses.h], [ax_cv_header_ncurses_curses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ]])], + [ax_cv_header_ncurses_curses_h=yes], + [ax_cv_header_ncurses_curses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xyes], [ + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSES_CURSES_H], [1], [Define to 1 if is present]) + ]) + + AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ]])], + [ax_cv_header_ncurses_h=yes], + [ax_cv_header_ncurses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_ncurses_h" = xyes], [ + ax_cv_curses_color=yes + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if is present]) + ]) + + AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno], [ + AC_MSG_WARN([could not find a working ncurses/curses.h or ncurses.h]) + ]) + ]) + ]) + unset pkg_cv__ax_cv_ncurses_libs + unset pkg_cv__ax_cv_ncurses_cppflags + + # Test for plain Curses (or if CURSES_LIBS was set by user) + AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [ + AS_IF([test "x$CURSES_LIBS" != x], [ + LIBS="$ax_saved_LIBS $CURSES_LIBS" + ], [ + LIBS="$ax_saved_LIBS -lcurses" + ]) + + AC_CACHE_CHECK([for Curses library], [ax_cv_plaincurses], [ + AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], + [ax_cv_plaincurses=yes], [ax_cv_plaincurses=no]) + ]) + + AS_IF([test "x$ax_cv_plaincurses" = xyes], [ + ax_cv_curses=yes + ax_cv_curses_which=plaincurses + AS_IF([test "x$CURSES_LIBS" = x], [ + CURSES_LIBS="-lcurses" + ]) + AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) + + # Check for base conformance (and header file) + + AC_CACHE_CHECK([for working curses.h], [ax_cv_header_curses_h], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + initscr(); + ]])], + [ax_cv_header_curses_h=yes], + [ax_cv_header_curses_h=no]) + ]) + AS_IF([test "x$ax_cv_header_curses_h" = xyes], [ + AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if is present]) + + # Check for X/Open Enhanced conformance + + AC_CACHE_CHECK([for X/Open Enhanced Curses conformance], [ax_cv_plaincurses_enhanced], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + @%:@ifndef _XOPEN_CURSES + @%:@error "this Curses library is not enhanced" + "this Curses library is not enhanced" + @%:@endif + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + attr_t d = WA_NORMAL; + cchar_t e; + wint_t f; + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + wattr_set(stdscr, d, 0, NULL); + wget_wch(stdscr, &f); + ]])], + [ax_cv_plaincurses_enhanced=yes], + [ax_cv_plaincurses_enhanced=no]) + ]) + AS_IF([test "x$ax_cv_plaincurses_enhanced" = xyes], [ + ax_cv_curses_enhanced=yes + ax_cv_curses_color=yes + AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions]) + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + ]) + + # Check for color functions + + AC_CACHE_CHECK([for Curses color functions], [ax_cv_plaincurses_color], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@define _XOPEN_SOURCE_EXTENDED 1 + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + chtype c = COLOR_PAIR(1) & A_COLOR; + initscr(); + init_pair(1, COLOR_WHITE, COLOR_RED); + ]])], + [ax_cv_plaincurses_color=yes], + [ax_cv_plaincurses_color=no]) + ]) + AS_IF([test "x$ax_cv_plaincurses_color" = xyes], [ + ax_cv_curses_color=yes + AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)]) + ]) + + # Check for obsolete functions + + AC_CACHE_CHECK([for obsolete Curses functions], [ax_cv_plaincurses_obsolete], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + @%:@include + ]], [[ + chtype a = A_BOLD; + int b = KEY_LEFT; + int g = getattrs(stdscr); + int h = getcurx(stdscr) + getmaxx(stdscr); + initscr(); + ]])], + [ax_cv_plaincurses_obsolete=yes], + [ax_cv_plaincurses_obsolete=no]) + ]) + AS_IF([test "x$ax_cv_plaincurses_obsolete" = xyes], [ + ax_cv_curses_obsolete=yes + AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features]) + ]) + ]) + + AS_IF([test "x$ax_cv_header_curses_h" = xno], [ + AC_MSG_WARN([could not find a working curses.h]) + ]) + ]) + ]) + + AS_IF([test "x$ax_cv_curses" != xyes], [ax_cv_curses=no]) + AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [ax_cv_curses_enhanced=no]) + AS_IF([test "x$ax_cv_curses_color" != xyes], [ax_cv_curses_color=no]) + AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no]) + + LIBS=$ax_saved_LIBS + CPPFLAGS=$ax_saved_CPPFLAGS + + unset ax_saved_LIBS + unset ax_saved_CPPFLAGS +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_dmalloc.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_dmalloc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_dmalloc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_dmalloc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,51 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_dmalloc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_DMALLOC +# +# DESCRIPTION +# +# Let the user enable/disable support for the dmalloc library available +# from . +# +# The macro adds the command-line flag "--with-dmalloc". Furthermore, +# "-IPREFIX/include" will be added to "$CPPFLAGS", "-LPREFIX/lib" to +# "$LDFLAGS", and "-DDEBUG_DMALLOC" and "-DDMALLOC_FUNC_CHECK" to +# "$CPPFLAGS". +# +# To enable dmalloc support in your code, add the following snippet to +# your header files: +# +# #ifdef DEBUG_DMALLOC +# # include +# #endif +# +# LICENSE +# +# Copyright (c) 2008 Peter Simons +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 8 + +AC_DEFUN([AX_WITH_DMALLOC], [ +AC_MSG_CHECKING(whether to use the dmalloc library) +AC_ARG_WITH(dmalloc, +[ --with-dmalloc[=PREFIX] Compile with dmalloc library], +if test "$withval" = "" -o "$withval" = "yes"; then + ac_cv_dmalloc="/usr/local" +else + ac_cv_dmalloc="$withval" +fi +AC_MSG_RESULT(yes) +CPPFLAGS="$CPPFLAGS -DDEBUG_DMALLOC -DDMALLOC_FUNC_CHECK -I$ac_cv_dmalloc/include" +LDFLAGS="$LDFLAGS -L$ac_cv_dmalloc/lib" +LIBS="$LIBS -ldmalloc" +,AC_MSG_RESULT(no)) +])dnl diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_mpatrol.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_mpatrol.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_mpatrol.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_mpatrol.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,181 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_mpatrol.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_MPATROL(DEFAULT) +# +# DESCRIPTION +# +# Integrates the mpatrol malloc debugging library into a new or existing +# project and also attempts to determine the support libraries that need +# to be linked in when libmpatrol is used. +# +# It takes one optional parameter specifying whether mpatrol should be +# included in the project (`yes') or not (`no'). This can also be +# specified as `threads' if you wish to use the threadsafe version of the +# mpatrol library. You can override the value of the optional parameter +# with the `--with-mpatrol' option to the resulting `configure' shell +# script. +# +# LICENSE +# +# Copyright (c) 2008 Graeme S. Roy +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 6 + +AU_ALIAS([AM_WITH_MPATROL], [AX_WITH_MPATROL]) +AC_DEFUN([AX_WITH_MPATROL], [ + # Firstly, determine if the mpatrol library should be used. + + AC_MSG_CHECKING(if mpatrol should be used) + AC_ARG_WITH(mpatrol, + [ --with-mpatrol build with the mpatrol library], + [case "$withval" in + threads) + ax_with_mpatrol=1 + ax_with_mpatrol_threads=1;; + yes) + ax_with_mpatrol=1 + ax_with_mpatrol_threads=0;; + no) + ax_with_mpatrol=0 + ax_with_mpatrol_threads=0;; + *) + AC_MSG_RESULT(no) + AC_MSG_ERROR(invalid value $withval for --with-mpatrol);; + esac + ], + [if test "x[$1]" = x + then + ax_with_mpatrol=0 + ax_with_mpatrol_threads=0 + elif test "[$1]" = no + then + ax_with_mpatrol=0 + ax_with_mpatrol_threads=0 + elif test "[$1]" = yes + then + ax_with_mpatrol=1 + ax_with_mpatrol_threads=0 + elif test "[$1]" = threads + then + ax_with_mpatrol=1 + ax_with_mpatrol_threads=1 + else + AC_MSG_RESULT(no) + AC_MSG_ERROR(invalid argument [$1]) + fi + ] + ) + + if test "$ax_with_mpatrol" = 1 + then + AC_MSG_RESULT(yes) + + # Next, determine which support libraries are available on this + # system. If we don't do this here then we can't link later with + # the mpatrol library to perform any further tests. + + ax_with_mpatrol_libs="" + AC_CHECK_LIB(ld, ldopen, + ax_with_mpatrol_libs="$ax_with_mpatrol_libs -lld") + AC_CHECK_LIB(elf, elf_begin, + ax_with_mpatrol_libs="$ax_with_mpatrol_libs -lelf") + AC_CHECK_LIB(bfd, bfd_init, + ax_with_mpatrol_libs="$ax_with_mpatrol_libs -lbfd -liberty", , + -liberty) + AC_CHECK_LIB(imagehlp, SymInitialize, + ax_with_mpatrol_libs="$ax_with_mpatrol_libs -limagehlp") + AC_CHECK_LIB(cl, U_get_previous_frame, + ax_with_mpatrol_libs="$ax_with_mpatrol_libs -lcl") + AC_CHECK_LIB(exc, unwind, + ax_with_mpatrol_libs="$ax_with_mpatrol_libs -lexc") + + # Now determine which libraries really need to be linked in with + # the version of libmpatrol that is on this system. For example, + # if the system has libelf and libbfd, we need to determine which + # of these, if any, libmpatrol was built with support for. + + ax_with_mpatrol_libs2="" + AC_CHECK_LIB(mpatrol, __mp_libld, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lld", , + $ax_with_mpatrol_libs) + AC_CHECK_LIB(mpatrol, __mp_libelf, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lelf", , + $ax_with_mpatrol_libs) + AC_CHECK_LIB(mpatrol, __mp_libbfd, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lbfd -liberty", , + $ax_with_mpatrol_libs) + AC_CHECK_LIB(mpatrol, __mp_libimagehlp, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -limagehlp", , + $ax_with_mpatrol_libs) + AC_CHECK_LIB(mpatrol, __mp_libcl, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lcl", , + $ax_with_mpatrol_libs) + AC_CHECK_LIB(mpatrol, __mp_libexc, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lexc", , + $ax_with_mpatrol_libs) + + # If we are using the threadsafe mpatrol library then we may also need + # to link in the threads library. We check blindly for pthreads here + # even if we don't need them (in which case it doesn't matter) since + # the threads libraries are linked in by default on AmigaOS, Windows + # and Netware and it is only UNIX systems that we need to worry about. + + if test "$ax_with_mpatrol_threads" = 1 + then + AC_CHECK_LIB(pthread, pthread_mutex_init, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lpthread", [ + AC_CHECK_LIB(pthreads, pthread_mutex_init, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lpthreads", [ + AC_CHECK_LIB(thread, pthread_mutex_init, + ax_with_mpatrol_libs2="$ax_with_mpatrol_libs2 -lthread") + ] + ) + ] + ) + fi + + # We now know what libraries to use in order to link with libmpatrol. + + AC_DEFINE(HAVE_MPATROL, 1, [Define if using mpatrol]) + if test "$ax_with_mpatrol_threads" = 1 + then + LIBS="-lmpatrolmt $ax_with_mpatrol_libs2 $LIBS" + else + LIBS="-lmpatrol $ax_with_mpatrol_libs2 $LIBS" + fi + + # Finally, verify that mpatrol is correctly installed and that we can + # link a simple program with it. + + AC_CACHE_CHECK(for working mpatrol, am_cv_with_mpatrol, [ + AC_TRY_LINK([#include ], [ +int main(void) +{ + malloc(4); + return EXIT_SUCCESS; +} +], + [am_cv_with_mpatrol=yes], + [am_cv_with_mpatrol=no] + ) + ] + ) + + if test "$am_cv_with_mpatrol" = no + then + AC_MSG_ERROR(mpatrol not installed correctly) + fi + else + AC_MSG_RESULT(no) + fi + ] +) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_prog.m4 projectm-3.1.0/m4/autoconf-archive/ax_with_prog.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_with_prog.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_with_prog.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,70 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_with_prog.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_WITH_PROG([VARIABLE],[program],[VALUE-IF-NOT-FOUND],[PATH]) +# +# DESCRIPTION +# +# Locates an installed program binary, placing the result in the precious +# variable VARIABLE. Accepts a present VARIABLE, then --with-program, and +# failing that searches for program in the given path (which defaults to +# the system path). If program is found, VARIABLE is set to the full path +# of the binary; if it is not found VARIABLE is set to VALUE-IF-NOT-FOUND +# if provided, unchanged otherwise. +# +# A typical example could be the following one: +# +# AX_WITH_PROG(PERL,perl) +# +# NOTE: This macro is based upon the original AX_WITH_PYTHON macro from +# Dustin J. Mitchell . +# +# LICENSE +# +# Copyright (c) 2008 Francesco Salvestrini +# Copyright (c) 2008 Dustin J. Mitchell +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 17 + +AC_DEFUN([AX_WITH_PROG],[ + AC_PREREQ([2.61]) + + pushdef([VARIABLE],$1) + pushdef([EXECUTABLE],$2) + pushdef([VALUE_IF_NOT_FOUND],$3) + pushdef([PATH_PROG],$4) + + AC_ARG_VAR(VARIABLE,Absolute path to EXECUTABLE executable) + + AS_IF(test -z "$VARIABLE",[ + AC_MSG_CHECKING(whether EXECUTABLE executable path has been provided) + AC_ARG_WITH(EXECUTABLE,AS_HELP_STRING([--with-EXECUTABLE=[[[PATH]]]],absolute path to EXECUTABLE executable), [ + AS_IF([test "$withval" != yes && test "$withval" != no],[ + VARIABLE="$withval" + AC_MSG_RESULT($VARIABLE) + ],[ + VARIABLE="" + AC_MSG_RESULT([no]) + AS_IF([test "$withval" != no], [ + AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) + ]) + ]) + ],[ + AC_MSG_RESULT([no]) + AC_PATH_PROG([]VARIABLE[],[]EXECUTABLE[],[]VALUE_IF_NOT_FOUND[],[]PATH_PROG[]) + ]) + ]) + + popdef([PATH_PROG]) + popdef([VALUE_IF_NOT_FOUND]) + popdef([EXECUTABLE]) + popdef([VARIABLE]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_xercesc.m4 projectm-3.1.0/m4/autoconf-archive/ax_xercesc.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_xercesc.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_xercesc.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,499 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_xercesc.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_XERCESC +# +# DESCRIPTION +# +# Define $HAVE_LIBXERCES_C, $LIBXERCES_C, and $LTLIBXERCES_C to signify +# whether Xerces is available. +# +# LICENSE +# +# Copyright (c) 2008 Ronald Landheer-Cieslak +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 8 + +AU_ALIAS([RLC_XERCESC], [AX_XERCESC]) +AC_DEFUN([AX_XERCESC], +[ + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + AC_LANG_PUSH(C++) + AX_XERCESC_BODY() + + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCXERCES_C]) + + AC_CACHE_CHECK([for libxerces-c], [ac_cv_libxerces_c], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIBXERCES_C $LIBICONV" + AC_TRY_LINK([ +#include +#ifdef XERCES_CPP_NAMESPACE_USE +XERCES_CPP_NAMESPACE_USE +#endif + ], [ +try +{ + XMLPlatformUtils::Initialize(); +} +catch (...) +{ + // ... +} +XMLPlatformUtils::Terminate(); + ], [ac_cv_libxerces_c=yes], [ac_cv_libxerces_c=no]) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_libxerces_c" = yes; then + HAVE_LIBXERCES_C=yes + AC_DEFINE(HAVE_LIBXERCES_C, 1, [Define if you have the xerces-c library.]) + AC_MSG_CHECKING([how to link with libxerces-c]) + AC_MSG_RESULT([$LIBXERCES_C]) + else + HAVE_LIBXERCES_C=no + CPPFLAGS="$ac_save_CPPFLAGS" + LIBXERCES_C= + LTLIBXERCES_C= + fi + + AC_LANG_POP(C++) + + AC_SUBST(HAVE_LIBXERCES_C) + AC_SUBST(LIBXERCES_C) + AC_SUBST(LTLIBXERCES_C) +]) + +AC_DEFUN([AX_XERCESC_BODY], +[ + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH([libxerces-c-prefix], +[ --with-libxerces-c-prefix[=DIR] search for libxerces-c in DIR/include and DIR/lib + --without-libxerces-c-prefix don't search for libxerces-c in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-search. + LIBXERCES_C= + LTLIBXERCES_C= + INCXERCES_C= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='xerces-c' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIBXERCES_C="${LTLIBXERCES_C}${LTLIBXERCES_C:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + found_so="$additional_libdir/lib$name.$shlibext*" + for i in $found_so; do + if test -f $i && test -x $i; then + found_so="$i" + break + fi + done + if test -n "$shlibext" && test -f $found_so; then + found_dir="$additional_libdir" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIBXERCES_C; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext*" + for i in $found_so; do + if test -f $i && test -x $i; then + found_so="$i" + break + fi + done + + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIBXERCES_C="${LTLIBXERCES_C}${LTLIBXERCES_C:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then + dnl No hardcoding is needed. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + if test "$hardcode_direct" = yes; then + dnl resulting binary. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + haveit= + for x in $LDFLAGS $LIBXERCES_C; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$found_so" + else + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INCXERCES_C; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + INCXERCES_C="${INCXERCES_C}${INCXERCES_C:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIBXERCES_C; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIBXERCES_C; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + LTLIBXERCES_C="${LTLIBXERCES_C}${LTLIBXERCES_C:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -R*) + dir=`echo "X$dep" | sed -e 's/^X-R//'` + if test "$enable_rpath" != no; then + dnl Potentially add DIR to rpathdirs. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $dir" + fi + dnl Potentially add DIR to ltrpathdirs. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $dir" + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$dep" + LTLIBXERCES_C="${LTLIBXERCES_C}${LTLIBXERCES_C:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }-l$name" + LTLIBXERCES_C="${LTLIBXERCES_C}${LTLIBXERCES_C:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIBXERCES_C="${LIBXERCES_C}${LIBXERCES_C:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIBXERCES_C="${LTLIBXERCES_C}${LTLIBXERCES_C:+ }-R$found_dir" + done + fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_xsdcxx.m4 projectm-3.1.0/m4/autoconf-archive/ax_xsdcxx.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_xsdcxx.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_xsdcxx.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,71 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_xsdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_XSDCXX +# +# DESCRIPTION +# +# This macro tries to find the CodeSynthesis XSD executable and the +# corresponding headers. +# +# Supported options: +# +# --with-xsdcxx +# use CodeSynthesis XSD from given prefix (ARG=path); +# check PATH (ARG=yes); disable (ARG=no) +# +# --with-xsdcxx-inc +# path to CodeSynthesis XSD headers (ARG=path); use standard prefix +# (ARG=yes); disable (ARG=no) +# +# Output variables: +# +# XSDCXX +# XSDCXX_CPPFLAGS +# +# LICENSE +# +# Copyright (c) 2013 Laszlo Kajan +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 3 + +AC_DEFUN([AX_XSDCXX], +[ + AC_ARG_WITH([xsdcxx], + [AS_HELP_STRING([--with-xsdcxx=@<:@ARG@:>@], + [use CodeSynthesis XSD from given prefix (ARG=path); check PATH (ARG=yes); disable (ARG=no)])], + [], + [with_xsdcxx=yes]) + + AS_IF([test "x$with_xsdcxx" != xno], + [if test "$with_xsdcxx" = "yes"; then with_xsdcxx=xsdcxx; fi + AC_CHECK_PROG([XSDCXX], [$with_xsdcxx], [$with_xsdcxx]) + if test "x$XSDCXX" = x; then + AC_CHECK_PROG([XSDCXX], [xsdcxx], [xsdcxx]) + if test "x$XSDCXX" = x; then + AC_CHECK_PROG([XSDCXX], [xsd], [xsd]) + fi + fi]) + + AC_ARG_WITH([xsdcxx-inc], + AS_HELP_STRING([--with-xsdcxx-inc=@<:@DIR@:>@], + [path to CodeSynthesis XSD headers (ARG=path); use standard prefix (ARG=); disable (ARG=no)] + ), + [xsdcxx_include_dir="$withval"], + [xsdcxx_include_dir=] + ) + + XSDCXX_CPPFLAGS="" + if test "x$xsdcxx_include_dir" != "xno" -a "x$xsdcxx_include_dir" != "x"; then + AC_SUBST([XSDCXX_CPPFLAGS],[-I$xsdcxx_include_dir]) + fi +]) +# vim:et: diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_xtra_classpath.m4 projectm-3.1.0/m4/autoconf-archive/ax_xtra_classpath.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_xtra_classpath.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_xtra_classpath.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,75 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_xtra_classpath.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_XTRA_CLASSPATH(,,,,) +# +# DESCRIPTION +# +# Set $1 to extra classpath components required for class $2 found in a +# jar file in $3. If the class is found do $4 and otherwise do $5. Uses +# AX_JAVA_CHECK_CLASS for testing whether a class is available +# +# LICENSE +# +# Copyright (c) 2008 Duncan Simpson +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AU_ALIAS([DPS_XTRA_CLASSPATH], [AX_XTRA_CLASSPATH]) +AC_DEFUN([AX_XTRA_CLASSPATH],[ +AC_PROG_SED + +POTENTIAL_LOCATIONS="/usr/share/java" +for jhome in `ls -dr /usr/java/* /usr/local/java/* 2> /dev/null`; do +for jdir in lib jre/lib; do +POTENTIAL_LOCATIONS="$POTENTIAL_LOCATIONS $jhome/$jdir" +done; done + +AX_JAVA_CHECK_CLASS([$2],[got="yes"],[got="no"]) +cpxtra=""; saved_cp="${CLASSPATH}"; +for location in $POTENTIAL_LOCATIONS; do +for jfile in $3; do +if test "x$got" != "xyes" && test -f "$location/$jfile"; then +CLASSPATH="${saved_cp}:$location/$jfile" +AX_JAVA_CHECK_CLASS([$2],[got="yes"; cpxtra="$location/$jfile:"],[got="no"]) +fi; done; done; + +if test "x${saved_cp}" != "x"; then +CLASSPATH="${saved_cp}" +else unset CLASSPATH; fi +if test "x$got" = "xyes"; then +$1="$cpxtra" +$4 +true; else +$5 +false; fi +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_zmq.m4 projectm-3.1.0/m4/autoconf-archive/ax_zmq.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_zmq.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_zmq.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,86 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_zmq.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ZMQ([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# DESCRIPTION +# +# Test for the ZMQ libraries of a particular version (or newer). The +# default version tested for is 4.0.0. +# +# The macro tests for ZMQ libraries in the library/include path, and, when +# provided, also in the path given by --with-zmq. +# +# This macro calls: +# +# AC_SUBST(ZMQ_CPPFLAGS) / AC_SUBST(ZMQ_LDFLAGS) / AC_SUBST(ZMQ_LIBS) +# +# And sets: +# +# HAVE_ZMQ +# +# LICENSE +# +# Copyright (c) 2016 Jeroen Meijer +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 2 + +AC_DEFUN([AX_ZMQ], [ + AC_ARG_WITH([zmq], [AS_HELP_STRING([--with-zmq=],[ZMQ prefix directory])], [ + ZMQ_LDFLAGS="-L${with_zmq}/lib" + ZMQ_CPPFLAGS="-I${with_zmq}/include" + ]) + + HAVE_ZMQ=0 + if test "$with_zmq" != "no"; then + + LD_FLAGS="$LDFLAGS $ZMQ_LDFLAGS" + CPPFLAGS="$CPPFLAGS $ZMQ_CPPFLAGS" + + AC_LANG_SAVE + AC_LANG_C + AC_CHECK_HEADER(zmq.h, [zmq_h=yes], [zmq_h=no]) + AC_LANG_RESTORE + + if test "$zmq_h" = "yes"; then + version=ifelse([$1], ,4.0.0,$1) + AC_MSG_CHECKING([for ZMQ version >= $version]) + version=$(echo $version | tr '.' ',') + AC_EGREP_CPP([version_ok], [ +#include +#if defined(ZMQ_VERSION) && ZMQ_VERSION >= ZMQ_MAKE_VERSION($version) + version_ok +#endif + ],[ + AC_MSG_RESULT(yes) + HAVE_ZMQ=1 + ZMQ_LIBS="-lzmq" + AC_SUBST(ZMQ_LDFLAGS) + AC_SUBST(ZMQ_CPPFLAGS) + AC_SUBST(ZMQ_LIBS) + ], AC_MSG_RESULT([no valid ZMQ version was found])) + else + AC_MSG_WARN([no valid ZMQ installation was found]) + fi + + if test $HAVE_ZMQ = 1; then + # execute ACTION-IF-FOUND (if present): + ifelse([$2], , :, [$2]) + else + # execute ACTION-IF-NOT-FOUND (if present): + ifelse([$3], , :, [$3]) + fi + else + AC_MSG_NOTICE([not checking for ZMQ]) + fi + + AC_DEFINE(HAVE_ZMQ,,[define if the ZMQ library is available]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_zoneinfo.m4 projectm-3.1.0/m4/autoconf-archive/ax_zoneinfo.m4 --- projectm-2.2.0~git28bb9/m4/autoconf-archive/ax_zoneinfo.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/autoconf-archive/ax_zoneinfo.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,274 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_zoneinfo.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_ZONEINFO([options...]) +# +# DESCRIPTION +# +# This macro finds compiled zoneinfo files. If successful it will define +# HAVE_ZONEINFO per: +# +# AC_DEFINE([HAVE_ZONEINFO], [1], [...]) +# +# and have the variable TZDIR point to the zoneinfo directory as per +# +# AC_SUBST([TZDIR]) +# AC_DEFINE_UNQUOTED([TZDIR], [/path/to/zic/files], [...]) +# +# Optionally, OPTIONS can be `right' to trigger further tests that will +# determine if leap second fix-ups are available. If so the variables +# HAVE_ZONEINFO_RIGHT, ZONEINFO_UTC_RIGHT and TZDIR_RIGHT will be +# populated: +# +# AC_DEFINE([HAVE_ZONEINFO_RIGHT], [1], [...]) +# AC_SUBST([TZDIR_RIGHT]) +# AC_DEFINE_UNQUOTED([TZDIR_RIGHT], [/path/to/right/zic/files], [...]) +# AC_SUBST([ZONEINFO_UTC_RIGHT]) +# AC_DEFINE_UNQUOTED([ZONEINFO_UTC_RIGHT], [$ZONEINFO_UTC_RIGHT], [...]) +# +# LICENSE +# +# Copyright (c) 2012 Sebastian Freundt +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 4 + +AC_DEFUN([AX_ZONEINFO_TZFILE_H], [dnl + dnl not totally necessary (yet), as we can simply inspect the tzfiles + dnl ourselves, but it certainly helps + AC_CHECK_HEADER([tzfile.h]) +])dnl AX_ZONEINFO_TZFILE_H + +AC_DEFUN([AX_ZONEINFO_CHECK_TZFILE], [dnl + dnl AX_ZONEINFO_CHECK_TZFILE([FILE], [ACTION-IF-VALID], [ACTION-IF-NOT]) + dnl secret switch is the 4th argument, which determines the ret code + dnl of the leapcnt check + pushdef([probe], [$1]) + pushdef([if_found], [$2]) + pushdef([if_not_found], [$3]) + + AC_REQUIRE([AX_ZONEINFO_TZFILE_H]) + + if test -z "${ax_tmp_zoneinfo_nested}"; then + AC_MSG_CHECKING([zoneinfo file ]probe[]) + fi + + AC_LANG_PUSH([C]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include +#include +#include +#include + +]]ifelse([$4], [], [], [[ +#define CHECK_LEAPCNT ]]$4[[ +]])[[ + +/* simplified struct */ +struct tzhead { + char tzh_magic[4]; /* TZ_MAGIC */ + char tzh_version[1]; /* '\0' or '2' as of 2005 */ + char tzh_reserved[15]; /* reserved--must be zero */ + char tzh_ttisgmtcnt[4]; /* coded number of trans. time flags */ + char tzh_ttisstdcnt[4]; /* coded number of trans. time flags */ + char tzh_leapcnt[4]; /* coded number of leap seconds */ + char tzh_timecnt[4]; /* coded number of transition times */ + char tzh_typecnt[4]; /* coded number of local time types */ + char tzh_charcnt[4]; /* coded number of abbr. chars */ +}; + +int +main(int argc, char *argv[]) +{ + struct tzhead foo; + int f; + + if (argc <= 1) { + return 0; + } else if ((f = open(argv[1], O_RDONLY, 0644)) < 0) { + return 1; + } else if (read(f, &foo, sizeof(foo)) != sizeof(foo)) { + return 1; + } else if (close(f) < 0) { + return 1; + } + + /* inspect the header */ + if (memcmp(foo.tzh_magic, "TZif", sizeof(foo.tzh_magic))) { + return 1; + } else if (*foo.tzh_version && *foo.tzh_version != '2') { + return 1; +#if defined CHECK_LEAPCNT + } else if (!foo.tzh_leapcnt[0] && !foo.tzh_leapcnt[1] && + !foo.tzh_leapcnt[2] && !foo.tzh_leapcnt[3]) { + return CHECK_LEAPCNT; +#endif /* CHECK_LEAPCNT */ + } + + /* otherwise everything's in order */ + return 0; +} +]])], [## call the whole shebang again with the tzfile + if ./conftest$EXEEXT probe; then + if test -z "${ax_tmp_zoneinfo_nested}"; then + AC_MSG_RESULT([looking good]) + fi + []if_found[] + else + if test -z "${ax_tmp_zoneinfo_nested}"; then + AC_MSG_RESULT([looking bad ${ax_tmp_rc}]) + fi + []if_not_found[] + fi +], [ + if test -z "${ax_tmp_zoneinfo_nested}"; then + AC_MSG_RESULT([impossible]) + fi + []if_not_found[]]) + AC_LANG_POP([C]) + + popdef([probe]) + popdef([if_found]) + popdef([if_not_found]) +])dnl AX_ZONEINFO_CHECK_TZFILE + +AC_DEFUN([AX_ZONEINFO_TZDIR], [dnl + dnl we consider a zoneinfo directory properly populated when it + dnl provides UTC or UCT or Universal or Zulu + + pushdef([check_tzdir], [dnl + pushdef([dir], $]1[)dnl + test -n []dir[] && test -d []dir[] dnl + popdef([dir])dnl + ])dnl check_tzdir + + dnl try /etc/localtime first, sometimes it's a link into TZDIR + if test -L "/etc/localtime"; then + TZDIR_cand="`readlink /etc/localtime` ${TZDIR_cand}" + fi + + dnl oh, how about we try and check if there is a TZDIR already + if check_tzdir(["${TZDIR}"]); then + ## bingo + TZDIR_cand="${TZDIR} ${TZDIR_cand}" + fi + + dnl often there's a tzselect util which contains the TZDIR path + AC_PATH_PROG([TZSELECT], [tzselect]) + if test -n "${ac_cv_path_TZSELECT}"; then + dnl snarf the value + valtmp="`mktemp`" + strings "${ac_cv_path_TZSELECT}" | \ + grep -F 'TZDIR=' > "${valtmp}" + . "${valtmp}" + TZDIR_cand="${TZDIR} ${TZDIR_cand}" + rm -f -- "${valtmp}" + fi + + dnl lastly, append the usual suspects + TZDIR_cand="${TZDIR_cand} \ +/usr/share/zoneinfo \ +/usr/lib/zoneinfo \ +/usr/local/etc/zoneinfo \ +/usr/share/lib/zoneinfo \ +" + + dnl go through our candidates + AC_CACHE_CHECK([for TZDIR], [ax_cv_zoneinfo_tzdir], [dnl + ax_tmp_zoneinfo_nested="yes" + for c in ${TZDIR_cand}; do + ax_cv_zoneinfo_utc="" + for f in "UTC" "UCT" "Universal" "Zulu"; do + AX_ZONEINFO_CHECK_TZFILE(["${c}/${f}"], [ + dnl ACTION-IF-FOUND + ax_cv_zoneinfo_utc="${c}/${f}" + break + ]) + done + if test -n "${ax_cv_zoneinfo_utc}"; then + ax_cv_zoneinfo_tzdir="${c}" + break + fi + done + ax_tmp_zoneinfo_nested="" + ])dnl ax_cv_tzdir + + TZDIR="${ax_cv_zoneinfo_tzdir}" + AC_SUBST([TZDIR]) + + if check_tzdir(["${ax_cv_zoneinfo_tzdir}"]); then + AC_DEFINE([HAVE_ZONEINFO], [1], [dnl +Define when zoneinfo directory has been present during configuration.]) + AC_DEFINE_UNQUOTED([TZDIR], ["${ax_cv_zoneinfo_tzdir}"], [ +Configuration time zoneinfo directory.]) + fi + + popdef([check_tzdir]) +])dnl AX_ZONEINFO_TZDIR + +AC_DEFUN([AX_ZONEINFO_RIGHT], [dnl + AC_REQUIRE([AX_ZONEINFO_TZDIR]) + + TZDIR_cand="${TZDIR} \ +${TZDIR}/leapseconds \ +${TZDIR}-leaps \ +${TZDIR}/right \ +${TZDIR}-posix \ +${TZDIR}/posix \ +" + + dnl go through our candidates + AC_CACHE_CHECK([for leap second file], [ax_cv_zoneinfo_utc_right], [dnl + ax_tmp_zoneinfo_nested="yes" + if test -n "${ax_cv_zoneinfo_utc}"; then + __utc_file="`basename "${ax_cv_zoneinfo_utc}"`" + for c in ${TZDIR_cand}; do + if test -d "${c}"; then + c="${c}/${__utc_file}" + fi + AX_ZONEINFO_CHECK_TZFILE(["${c}"], [ + dnl ACTION-IF-FOUND + ax_cv_zoneinfo_utc_right="${c}" + break + ], [:], [2]) + done + fi + ax_tmp_zoneinfo_nested="" + ])dnl ax_cv_tzdir + + ZONEINFO_UTC_RIGHT="${ax_cv_zoneinfo_utc_right}" + AC_SUBST([ZONEINFO_UTC_RIGHT]) + AC_SUBST([TZDIR_RIGHT]) + + if test -n "${ax_cv_zoneinfo_utc_right}"; then + TZDIR_RIGHT="`dirname ${ax_cv_zoneinfo_utc_right}`" + + AC_DEFINE([HAVE_ZONEINFO_RIGHT], [1], [dnl +Define when zoneinfo directory has been present during configuration.]) + AC_DEFINE_UNQUOTED([TZDIR_RIGHT], + ["${TZDIR_RIGHT}"], [ +Configuration time zoneinfo directory.]) + AC_DEFINE_UNQUOTED([ZONEINFO_UTC_RIGHT], + ["${ax_cv_zoneinfo_utc_right}"], [ +Leap-second aware UTC zoneinfo file.]) + fi +])dnl AX_ZONEINFO_RIGHT + +AC_DEFUN([AX_ZONEINFO], [ + AC_REQUIRE([AX_ZONEINFO_TZDIR]) + + ifelse([$1], [right], [ + AC_REQUIRE([AX_ZONEINFO_RIGHT]) + ]) + + AC_ARG_VAR([TZDIR], [Directory with compiled zoneinfo files.]) +])dnl AX_ZONEINFO + +dnl ax_zoneinfo.m4 ends here diff -Nru projectm-2.2.0~git28bb9/m4/disable-rpath.m4 projectm-3.1.0/m4/disable-rpath.m4 --- projectm-2.2.0~git28bb9/m4/disable-rpath.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/disable-rpath.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,27 @@ +dnl file : m4/disable-rpath.m4 +dnl author : Boris Kolpackov +dnl copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +dnl license : GNU GPL v2; see accompanying LICENSE file +dnl +AC_DEFUN([DISABLE_RPATH],[ + +AC_MSG_CHECKING([whether to use rpath]) +AC_ARG_ENABLE( + [rpath], + [AC_HELP_STRING([--disable-rpath], [patch libtool to not use rpath])], + [libtool_rpath="$enable_rpath"], + [libtool_rpath="yes"]) +AC_MSG_RESULT($libtool_rpath) + +# Patch libtool to not use rpath if requested. +# +AC_CONFIG_COMMANDS( + [libtool-rpath-patch], + [if test "$libtool_use_rpath" = "no"; then + sed < libtool > libtool-2 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_NO_RPATH__ "/' + mv libtool-2 libtool + chmod 755 libtool + fi], + [libtool_use_rpath=$libtool_rpath]) +])dnl + diff -Nru projectm-2.2.0~git28bb9/m4/emscripten.m4 projectm-3.1.0/m4/emscripten.m4 --- projectm-2.2.0~git28bb9/m4/emscripten.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/emscripten.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,17 @@ +AC_DEFUN([AM_EMSCRIPTEN], +[ + AC_MSG_CHECKING(for emscripten compiler) + emscripten_compiler=no + AC_TRY_COMPILE([ + #ifndef EMSCRIPTEN + #error "not an emscripten compiler" + #endif + ],[ + ],[ + host=javascript-web-emscripten + emscripten_compiler=yes + cross_compiling=yes + ]) + AC_MSG_RESULT($emscripten_compiler) + AM_CONDITIONAL(EMSCRIPTEN, [test "x$emscripten_compiler" = "xyes"]) +]) diff -Nru projectm-2.2.0~git28bb9/m4/sdl2.m4 projectm-3.1.0/m4/sdl2.m4 --- projectm-2.2.0~git28bb9/m4/sdl2.m4 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/m4/sdl2.m4 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,234 @@ +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor +# +# Changelog: +# * also look for SDL2.framework under Mac OS X + +# serial 1 + +dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN([AM_PATH_SDL2], +[dnl +dnl Get the cflags and libraries from the sdl2-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) +AC_ARG_ENABLE(sdlframework, [ --disable-sdlframework Do not search for SDL2.framework], + , search_sdl_framework=yes) + +AC_ARG_VAR(SDL2_FRAMEWORK, [Path to SDL2.framework]) + + min_sdl_version=ifelse([$1], ,2.0.0,$1) + + if test "x$sdl_prefix$sdl_exec_prefix" = x ; then + PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version], + [sdl_pc=yes], + [sdl_pc=no]) + else + sdl_pc=no + if test x$sdl_exec_prefix != x ; then + sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL2_CONFIG+set} != xset ; then + SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" + if test x${SDL2_CONFIG+set} != xset ; then + SDL2_CONFIG=$sdl_prefix/bin/sdl2-config + fi + fi + fi + + if test "x$sdl_pc" = xyes ; then + no_sdl="" + SDL2_CONFIG="pkg-config sdl2" + else + as_save_PATH="$PATH" + if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then + PATH="$prefix/bin:$prefix/usr/bin:$PATH" + fi + AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH]) + PATH="$as_save_PATH" + no_sdl="" + + if test "$SDL2_CONFIG" = "no" -a "x$search_sdl_framework" = "xyes"; then + AC_MSG_CHECKING(for SDL2.framework) + if test "x$SDL2_FRAMEWORK" != x; then + sdl_framework=$SDL2_FRAMEWORK + else + for d in / ~/ /System/; do + if test -d "${d}Library/Frameworks/SDL2.framework"; then + sdl_framework="${d}Library/Frameworks/SDL2.framework" + fi + done + fi + + if test -d $sdl_framework; then + AC_MSG_RESULT($sdl_framework) + sdl_framework_dir=`dirname $sdl_framework` + SDL_CFLAGS="-F$sdl_framework_dir -Wl,-framework,SDL2 -I$sdl_framework/include" + SDL_LIBS="-F$sdl_framework_dir -Wl,-framework,SDL2" + else + no_sdl=yes + fi + fi + + if test "$SDL2_CONFIG" != "no"; then + if test "x$sdl_pc" = "xno"; then + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags` + SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs` + fi + + sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_CXXFLAGS="$CXXFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl2-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include +#include +#include +#include "SDL.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.sdltest"); + */ + { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_sdl_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n"); + printf("*** to point to the correct copy of sdl2-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + + fi + if test "x$sdl_pc" = "xno"; then + if test "x$no_sdl" = "xyes"; then + AC_MSG_RESULT(no) + else + AC_MSG_RESULT(yes) + fi + fi + fi + fi + if test "x$no_sdl" = x ; then + ifelse([$2], , :, [$2]) + else + if test "$SDL2_CONFIG" = "no" ; then + echo "*** The sdl2-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL2_CONFIG environment variable to the" + echo "*** full path to sdl2-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ +#include +#include "SDL.h" + +int main(int argc, char *argv[]) +{ return 0; } +#undef main +#define main K_and_R_C_main +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, 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 SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) diff -Nru projectm-2.2.0~git28bb9/Makefile.am projectm-3.1.0/Makefile.am --- projectm-2.2.0~git28bb9/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/Makefile.am 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,31 @@ +ACLOCAL_AMFLAGS = -I m4 +AM_CPPFLAGS=-DDATADIR_PATH='"${pkgdatadir}"' +SUBDIRS=src +PRESETSDIR = presets +EXTRA_DIST=README.md AUTHORS.txt presets fonts $(PRESETSDIR) +CLEANFILES= + +# aka /usr/local/share/projectM +pm_data_dir = $(pkgdatadir) +pm_font_dir = $(pm_data_dir)/fonts +pm_presets_dir = $(pm_data_dir)/presets + +# files to install +pm_data__DATA = src/libprojectM/config.inp +pm_font__DATA = fonts/Vera.ttf fonts/VeraMono.ttf + +# find and install all preset files +install-data-local: + test -z $(DESTDIR)$(pkgdatadir) || $(MKDIR_P) $(DESTDIR)$(pm_presets_dir) + find "$(PRESETSDIR)" -type f -exec $(INSTALL_DATA) {} $(DESTDIR)$(pm_presets_dir) \; + +# from https://stackoverflow.com/questions/30897170/ac-subst-does-not-expand-variable answer: https://stackoverflow.com/a/30960268 +# ptomato https://stackoverflow.com/users/172999/ptomato + +src/libprojectM/config.inp: src/libprojectM/config.inp.in Makefile + $(AM_V_GEN)rm -f $@ $@.tmp && \ + $(SED) -e "s,%datadir%,$(datadir),"g $< >$@.tmp && \ + chmod a-w $@.tmp && \ + mv $@.tmp $@ + +CLEANFILES += src/libprojectM/config.inp diff -Nru projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/CMakeLists.txt projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/CMakeLists.txt --- projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/CMakeLists.txt 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -PROJECT(projectM) -cmake_minimum_required(VERSION 2.8.0) - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The projectM core library.") -INCLUDE(cmake/CPack-projectM.cmake) -INCLUDE(CMakeDependentOption) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - -# projectM version block -set(PROJECTM_VERSION 2.2.0) -set(PROJECTM_ABI_LEVEL 2) -# - -SET(USE_THREADS_DEF ON) -SET(USE_FTGL_DEF ON) -SET(USE_FBO_DEF ON) - -if (EMSCRIPTEN) - SET(USE_THREADS-DEF OFF) - SET(USE_FTGL_DEF ON) - SET(USE_FBO_DEF OFF) - - SET(USE_GLES1 ON) - SET(BUILD_PROJECTM_STATIC ON) - SET(DISABLE_NATIVE_PRESETS ON) - - SET(APPLE ) - SET(LINUX ) - - SET(OPENGL_gl_LIBRARY "fake_gl_lib.a") - SET(GLEW_LIBRARY "gl.symbols") - ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS) -endif (EMSCRIPTEN) - -OPTION (USE_GLES1 "Use OpenGL ES" OFF) -CMAKE_DEPENDENT_OPTION (USE_FBO "Use Framebuffer Objects for increased rendering quality. Disable this if you are experiencing problems on older or poorly supported hardware." ON "${USE_GLES1}" OFF) # disabled by default for GLES -OPTION(USE_FTGL "Use FTGL for on-screen fonts" ${USE_FTGL_DEF}) -OPTION (USE_THREADS "Use threads for parallelization" ${USE_THREADS_DEF}) -OPTION (USE_OPENMP "Use OpenMP and OMPTL for multi-core parallelization" OFF) -OPTION (USE_INCLUDED_GLEW "Use projectM's included implemention of GLEW" OFF) -OPTION (USE_CG "Use Cg for Pixel Shader support" OFF) -OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF) -OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." ON) -OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" ${DISABLE_NATIVE_PRESETS}) -OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets" ${DISABLE_MILKDROP_PRESETS}) - - -ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") - -SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" - CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" - FORCE) - -if (USE_INCLUDED_GLEW) -ADD_DEFINITIONS(-DUSE_NATIVE_GLEW) - SET(GLEW_SOURCES glew.h glew.c) - SET(GLEW_LIBRARY "") -else(USE_INCLUDED_GLEW) - set (GLEW_SOURCES "") - find_package (GLEW) -endif(USE_INCLUDED_GLEW) - -SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp -timer.cpp wipemalloc.cpp PresetLoader.cpp PresetChooser.cpp PipelineMerger.cpp ConfigFile.cpp TimeKeeper.cpp PresetFactory.cpp PresetFactoryManager.cpp ${GLEW_SOURCES}) - -if (MSVC) -SET(projectM_SOURCES ${projectM_SOURCES} dlfcn.c win32-dirent.cpp) -endif(MSVC) - -if (NOT DISABLE_NATIVE_PRESETS) - add_subdirectory(NativePresetFactory) - SET(PRESET_FACTORY_SOURCES ${PRESET_FACTORY_SOURCES} ${NativePresetFactory_SOURCE_DIR}) - SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${NativePresetFactory_BINARY_DIR}) - SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} NativePresetFactory) -endif(NOT DISABLE_NATIVE_PRESETS) - -if (NOT DISABLE_MILKDROP_PRESETS) - add_subdirectory(MilkdropPresetFactory) - SET(PRESET_FACTORY_SOURCES ${PRESET_FACTORY_SOURCES} ${MilkdropPresetFactory_SOURCE_DIR}) - SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${MilkdropPresetFactory_BINARY_DIR}) - SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} MilkdropPresetFactory) -endif(NOT DISABLE_MILKDROP_PRESETS) - -if (USE_DEVIL) - SET (projectM_SOURCES ${projectM_SOURCES}) - ADD_DEFINITIONS(-DUSE_DEVIL) - SET (IMAGE_LINK_TARGETS IL ILU ILUT) -else (USE_DEVIL) - SET (projectM_SOURCES ${projectM_SOURCES}) - SET (IMAGE_LINK_TARGETS ) -endif (USE_DEVIL) - -if (USE_CG) - ADD_DEFINITIONS(-DUSE_CG) - - if (APPLE) - FIND_LIBRARY(CG_LINK_TARGETS Cg) - else (APPLE) - SET (CG_LINK_TARGETS Cg CgGL) - endif (APPLE) -else (USE_CG) - SET (CG_LINK_TARGETS) -endif(USE_CG) - -include(CheckCXXCompilerFlag) - -if(USE_GLES1) - ADD_DEFINITIONS(-DUSE_GLES1) -endif(USE_GLES1) - -if(USE_FBO) - ADD_DEFINITIONS(-DUSE_FBO) -endif(USE_FBO) - -if(USE_FTGL) - ADD_DEFINITIONS(-DUSE_FTGL) - - find_package( Freetype REQUIRED) - include_directories( ${FREETYPE_INCLUDE_DIRS} ) - -endif(USE_FTGL) - -if (BUILD_PROJECTM_STATIC) - ADD_LIBRARY(projectM STATIC ${projectM_SOURCES}) -else(BUILD_PROJECTM_STATIC) - ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) -endif(BUILD_PROJECTM_STATIC) - -SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION ${PROJECTM_VERSION} SOVERSION ${PROJECTM_ABI_LEVEL}) - -if (USE_THREADS) -ADD_DEFINITIONS(-DUSE_THREADS) -endif(USE_THREADS) - -if (APPLE) - ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS) - set(RESOURCE_PREFIX "Resources") - FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include") -else (APPLE) - if (WIN32) - set (RESOURCE_PREFIX "Resources") - ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS) - else(WIN32) - set (RESOURCE_PREFIX "share/projectM") - IF (NOT EMSCRIPTEN) - ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS) - ENDIF (NOT EMSCRIPTEN) - endif(WIN32) - set(COREFOUNDATION_LIBRARY ) - set(OPENGL_LIBRARIES ) -endif(APPLE) - -add_subdirectory(Renderer) - -if (USE_GLES1) - INCLUDE(cmake/FindOpenGLES.cmake) - FIND_PACKAGE(OpenGLES) -else (USE_GLES1) - FIND_PACKAGE(OpenGL) -endif (USE_GLES1) - -INCLUDE(FindPkgConfig.cmake) - -pkg_search_module (FTGL ftgl) - -#set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH};/opt/local/include;/Developer/SDKs/MACOSX10.5.sdk/usr/X11/include) -#set(CMAKE_LIBRARY_PATH /opt/local/lib;/Developer/SDKs/MACOSX10.5.sdk;/Developer/SDKs/MacOSX10.5.sdk/usr/X11/lib/) - -IF(USE_FTGL) - if (FTGL_FOUND) - MESSAGE(STATUS "[projectM] FTGL font support was detected and enabled.") - else (FTGL_FOUND) - MESSAGE(STATUS - "[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.") - endif (FTGL_FOUND) - - ADD_DEFINITIONS(-DUSE_FTGL) - - set (FTGL_INCUDE_DIRS ${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR}) - set (FTGL_LINK_DIRS ${FTGL_LIBRARY_DIRS} ) - set (FTGL_LINK_TARGETS ftgl freetype) - -ELSE (USE_FTGL) - IF (FTGL_FOUND) - MESSAGE(STATUS "[projectM] Warning: FTGL font support was detected but NOT enabled. You can enable it by setting USE_FTGL=true") - ELSE (FTGL_FOUND) - MESSAGE(STATUS "[projectM] Warning: FTGL font support was not detected. Visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.") - ENDIF(FTGL_FOUND) - - # todo: change this because its obscure and probably not being used - set (FTGL_INCLUDE_DIRS "/opt/local/include") - set (FTGL_LINK_DIRS ) - set (FTGL_LINK_TARGETS ) -ENDIF(USE_FTGL) - -CHECK_CXX_COMPILER_FLAG("-fopenmp" SUPPORTS_OPENMP) - -IF(USE_OPENMP AND SUPPORTS_OPENMP) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ") -ENDIF(USE_OPENMP AND SUPPORTS_OPENMP) - -INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} - ${FTGL_INCLUDE_DIRS} - ${Renderer_SOURCE_DIR} - ${PRESET_FACTORY_SOURCES} -) -LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} - ${Renderer_BINARY_DIR} - ${PRESET_FACTORY_BINARY_DIR} -) - -if(MSVC) - SET (MATH_LIBRARIES ) -else(MSVC) - SET (MATH_LIBRARIES m) -endif(MSVC) - -# compiling on arm? relocation is gonna fail unless position-independent -IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR NOT ${DISABLE_NATIVE_PRESETS}) - SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC") -ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR NOT ${DISABLE_NATIVE_PRESETS}) - -SET(projectM_LIBRARIES_TO_LINK - Renderer - ${IMAGE_LINK_TARGETS} - ${CG_LINK_TARGETS} - ${PRESET_FACTORY_LINK_TARGETS} - ${GLEW_LIBRARY} - ${FTGL_LINK_TARGETS} - ${MATH_LIBRARIES} - ${COREFOUNDATION_LIBRARIES} - ${OPENGL_LIBRARIES} - ${OPENGLES_LIBRARIES} - dl -) -TARGET_LINK_LIBRARIES(projectM ${projectM_LIBRARIES_TO_LINK}) - -SET(projectM_FONT_MENU "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" CACHE FILEPATH "Path to the default menu TrueType font") -SET(projectM_FONT_TITLE "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" CACHE FILEPATH "Path to the default title TrueType font") -ADD_DEFINITIONS(-DprojectM_FONT_MENU="\\\"${projectM_FONT_MENU}\\\"") -ADD_DEFINITIONS(-DprojectM_FONT_TITLE="\\\"${projectM_FONT_TITLE}\\\"") - -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc" @ONLY) -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY) - -IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf") - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts) -ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf") - -IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf") - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts) -ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf") - -FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") -INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) -INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) -INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM) -INSTALL(TARGETS projectM DESTINATION lib) diff -Nru projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/CMakeLists.txt projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/CMakeLists.txt --- projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/CMakeLists.txt 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -project(Renderer) - -SET(SOIL_SOURCES - SOIL2/image_DXT.c - SOIL2/image_helper.c - SOIL2/SOIL2.c - SOIL2/etc1_utils.c -) - -SET(Renderer_SOURCES - FBO.cpp - MilkdropWaveform.cpp - PerPixelMesh.cpp - Pipeline.cpp - Renderer.cpp - ShaderEngine.cpp - UserTexture.cpp - Waveform.cpp - Filters.cpp - PerlinNoise.cpp - PipelineContext.cpp - Renderable.cpp - BeatDetect.cpp - Shader.cpp - TextureManager.cpp - VideoEcho.cpp - RenderItemDistanceMetric.cpp - RenderItemMatcher.cpp - ../KeyHandler.cpp - ${SOIL_SOURCES} -) - -IF(NOT MSVC) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") -ENDIF(NOT MSVC) - -if(MSVC) - SET (MATH_LIBRARIES ) -else(MSVC) - SET (MATH_LIBRARIES m) -endif(MSVC) - -if (APPLE) - FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) - INCLUDE_DIRECTORIES( /usr/include ) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include") -else (APPLE) - set(COREFOUNDATION_LIBRARY ) -endif(APPLE) - -INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${projectM_SOURCE_DIR}/Renderer) - -ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) -TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES} - ${GLEW_LINK_TARGETS} - ${FTGL_LINK_TARGETS} - ${OPENGL_LIBRARIES} - ${IMAGE_LINK_TARGETS} - ${CG_LINK_TARGETS} - ${FREETYPE2_LIBRARIES} - ${COREFOUNDATION_LIBRARY} -) -set_target_properties(Renderer PROPERTIES COMPILE_FLAGS "-Wno-parentheses") diff -Nru projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.cpp projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.cpp --- projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.cpp 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,296 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: FBO.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Render this methods - */ - -#include -#include -#include "Common.hpp" -#include "FBO.hpp" - -RenderTarget::~RenderTarget() { - - - glDeleteTextures( 1, &this->textureID[0]); - -#ifdef USE_FBO - if (useFBO) - { - glDeleteTextures( 1, &this->textureID[1] ); - glDeleteRenderbuffersEXT(1, &this->depthb[0]); - glDeleteFramebuffersEXT(1, &this->fbuffer[0]); - if(renderToTexture) - { - glDeleteTextures( 1, &this->textureID[2] ); - glDeleteRenderbuffersEXT(1, &this->depthb[1]); - glDeleteFramebuffersEXT(1, &this->fbuffer[1]); - } - } -#endif - -} - -GLuint RenderTarget::initRenderToTexture() -{ -#ifdef USE_FBO - - if (this->useFBO==1) - { - this->renderToTexture=1; - - GLuint fb2, depth_rb2; - glGenFramebuffersEXT(1, &fb2); - glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fb2 ); - glGenRenderbuffersEXT(1, &depth_rb2); - glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, depth_rb2 ); - - glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, this->texsize,this->texsize ); - glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_rb2 ); - this->fbuffer[1] = fb2; - this->depthb[1]= depth_rb2; - glGenTextures(1, &this->textureID[2]); - glBindTexture(GL_TEXTURE_2D, this->textureID[2]); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, this->textureID[2], 0 ); - return this->textureID[2]; - } -#endif -return -1; - -} - -/** Creates new pbuffers */ -RenderTarget::RenderTarget(int texsize, int width, int height) : useFBO(false) { - - int mindim = 0; - int origtexsize = 0; - - this->renderToTexture = 0; - this->texsize = texsize; - -#ifdef USE_FBO - glewInit(); - // Forceably disable FBO if user requested it but the video card / driver lacks - // the appropraite frame buffer extension. - if (useFBO = glewIsSupported("GL_EXT_framebuffer_object")) - { - - GLuint fb, depth_rb, rgba_tex, other_tex; - glGenFramebuffersEXT(1, &fb); - glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fb ); - - glGenRenderbuffersEXT(1, &depth_rb); - glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, depth_rb ); - glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, this->texsize,this->texsize ); - glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_rb ); - this->fbuffer[0] = fb; - this->depthb[0]= depth_rb; - - glGenTextures(1, &other_tex); - glBindTexture(GL_TEXTURE_2D,other_tex); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //glGenerateMipmapEXT(GL_TEXTURE_2D); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - - - glGenTextures(1, &rgba_tex); - glBindTexture(GL_TEXTURE_2D, rgba_tex); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //glGenerateMipmapEXT(GL_TEXTURE_2D); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - - - glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, rgba_tex, 0 ); - this->textureID[0] = rgba_tex; - this->textureID[1] = other_tex; - - GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); - - glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0); - - if (status == GL_FRAMEBUFFER_COMPLETE_EXT) { - return; - } - std::cerr << "[projecM] warning: FBO support not detected. Using fallback." << std::endl; - } - -#endif - -// Can reach here via two code paths: -// (1) useFBO was set to false externally by cmake / system setting / etc. -// (2) useFBO was true but forced to false as it failed to pass all the GLU extension checks. - - /** Fallback pbuffer creation via teximage hack */ - /** Check the texture size against the viewport size */ - /** If the viewport is smaller, then we'll need to scale the texture size down */ - /** If the viewport is larger, scale it up */ - mindim = width < height ? width : height; - origtexsize = this->texsize; - this->texsize = nearestPower2( mindim, SCALE_MINIFY ); - glGenTextures(1, &this->textureID[0] ); - - glBindTexture(GL_TEXTURE_2D, this->textureID[0] ); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage2D(GL_TEXTURE_2D, - 0, - GL_RGB, - this->texsize, this->texsize, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - NULL); - - - - return; - } - - void RenderTarget::fallbackRescale(int width, int height) - { - int mindim = width < height ? width : height; - int origtexsize = this->texsize; - this->texsize = nearestPower2( mindim, SCALE_MINIFY ); - - if (origtexsize == texsize) - return; - - /* Create the texture that will be bound to the render this */ - /* - - if ( this->texsize != origtexsize ) { - - glDeleteTextures( 1, &this->textureID[0] ); - } - */ - - glGenTextures(1, &this->textureID[0] ); - - glBindTexture(GL_TEXTURE_2D, this->textureID[0] ); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage2D(GL_TEXTURE_2D, - 0, - GL_RGB, - this->texsize, this->texsize, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - NULL); - - - } - -/** Destroys the pbuffer */ - -/** Locks the pbuffer */ -void RenderTarget::lock() { - -#ifdef USE_FBO - if(this->useFBO) - { - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->fbuffer[0]); - } -#endif - } - -/** Unlocks the pbuffer */ -void RenderTarget::unlock() { - -#ifdef USE_FBO - if(this->useFBO) - { - glBindTexture( GL_TEXTURE_2D, this->textureID[1] ); - glCopyTexSubImage2D( GL_TEXTURE_2D, - 0, 0, 0, 0, 0, - this->texsize, this->texsize ); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - return; - } -#endif - /** Fallback texture path */ - - glBindTexture( GL_TEXTURE_2D, this->textureID[0] ); - - glCopyTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 0, 0, this->texsize, this->texsize ); - } - -/** - * Calculates the nearest power of two to the given number using the - * appropriate rule - */ -int RenderTarget::nearestPower2( int value, TextureScale scaleRule ) { - - int x = value; - int power = 0; - - while ( ( x & 0x01 ) != 1 ) { - x >>= 1; - } - - if ( x == 1 ) { - return value; - } else { - x = value; - while ( x != 0 ) { - x >>= 1; - power++; - } - switch ( scaleRule ) { - case SCALE_NEAREST: - if ( ( ( 1 << power ) - value ) <= ( value - ( 1 << ( power - 1 ) ) ) ) { - return 1 << power; - } else { - return 1 << ( power - 1 ); - } - case SCALE_MAGNIFY: - return 1 << power; - case SCALE_MINIFY: - return 1 << ( power - 1 ); - default: - break; - } - } - return 0; - } diff -Nru projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.hpp projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.hpp --- projectm-2.2.0~git28bb9/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.hpp 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/0001-hacky-removal-of-glew-pm-git.patch/src/libprojectM/Renderer/FBO.hpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: FBO.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Opaque render target - * - */ - -#ifndef _RENDERTARGET_H -#define _RENDERTARGET_H - - -#ifdef EMSCRIPTEN -#include -#endif - -#ifdef USE_FBO -#ifdef USE_INCLUDED_GLEW -#include "glew.h" -#else -#include -#endif -#endif - -#ifdef __APPLE__ -#include -#endif /** MACOS */ - -#ifdef WIN32 -#include -#endif /** WIN32 */ - -#ifdef LINUX -#ifdef USE_GLES1 -#include -#else -#include -#include -#endif -#endif - -typedef enum { SCALE_NEAREST, SCALE_MAGNIFY, SCALE_MINIFY } TextureScale; - -class RenderTarget { - - -public: - /** Texture size */ - int texsize; - - int useFBO; - int renderToTexture; - - ~RenderTarget(); - - RenderTarget( int texsize, int width, int height ); - void lock(); - void unlock(); - GLuint initRenderToTexture(); - int nearestPower2( int value, TextureScale scaleRule ); - void fallbackRescale(int width, int height); - - /** Opaque pbuffer context and pbuffer */ -/* -#ifdef MACOS - void *origContext; - void *pbufferContext; - void *pbuffer; -#endif -*/ - /** Render target texture ID for non-pbuffer systems */ - GLuint textureID[3]; -#ifdef USE_FBO - GLuint fbuffer[2]; - GLuint depthb[2]; -#endif - }; - - - -#endif /** !_RENDERTARGET_H */ diff -Nru projectm-2.2.0~git28bb9/.pc/applied-patches projectm-3.1.0/.pc/applied-patches --- projectm-2.2.0~git28bb9/.pc/applied-patches 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -0001-hacky-removal-of-glew-pm-git.patch -fix_pulse_link.patch diff -Nru projectm-2.2.0~git28bb9/.pc/fix_pulse_link.patch/src/projectM-pulseaudio/CMakeLists.txt projectm-3.1.0/.pc/fix_pulse_link.patch/src/projectM-pulseaudio/CMakeLists.txt --- projectm-2.2.0~git28bb9/.pc/fix_pulse_link.patch/src/projectM-pulseaudio/CMakeLists.txt 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/fix_pulse_link.patch/src/projectM-pulseaudio/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -PROJECT(projectM-pulseaudio) - -cmake_minimum_required(VERSION 2.4.0) - -Include(cmake/CPack-projectM.cmake) - -# Include the current dir as a source for find_package macro -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) - -set(QT_USE_OPENGL TRUE) - -cmake_policy(SET CMP0005 OLD) - -include(${QT_USE_FILE} FindPkgConfig.cmake) - -# only search for these modules when not building monolithically - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') -else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) - set(LIBPROJECTM-QT_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(Qt5Widgets REQUIRED) -FIND_PACKAGE(Qt5OpenGL REQUIRED) -FIND_PACKAGE(Qt5Core REQUIRED) - - -pkg_search_module(LIBPULSE REQUIRED libpulse>=0.9.8) - -if (LIBPROJECTM_FOUND) -MESSAGE (STATUS "[projectM-pulseaudio] projectM detected.") -else(LIBPROJECTM_FOUND) -MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - -if (LIBPROJECTM-QT_FOUND) -MESSAGE (STATUS "[projectM-pulseaudio] projectM-qt detected.") -else(LIBPROJECTM-QT_FOUND) -MESSAGE (FATAL_ERROR "projectM-qt NOT detected. Please install the projectM-qt module or build from the top level projectM source directory.") -endif(LIBPROJECTM-QT_FOUND) - -if (LIBPULSE_FOUND) -MESSAGE(STATUS "[projectM-pulseaudio] pulse audio detected.") -else (LIBPULSE_FOUND) -MESSAGE(FATAL_ERROR "ERROR: Pulse Audio is NOT found. Please install pulse audio 0.9.8 or greater from www.pulseaudio.org.") -endif(LIBPULSE_FOUND) - -# ftgl - OpenGL library to use arbitrary fonts -pkg_search_module(FTGL REQUIRED ftgl) -if (FTGL_FOUND) - message(STATUS "[projectm-pulseaudio] ftgl library detected.") - message(STATUS "FTGL_LIBRARIES = ${FTGL_LIBRARIES}") - message(STATUS "FTGL_LIBRARY_DIRS = ${FTGL_LIBRARY_DIRS}") - include_directories(${FTGL_INCLUDE_DIRS}) - link_directories(${FTGL_LIBRARY_DIRS}) -else (FTGL_FOUND USE) -## message(FATAL_ERROR "ERROR: ftgl library not detected. Please install it from ftgl.wiki.sourceforge.net") -endif (FTGL_FOUND) - -set(projectM_pulseaudio_SRCS - qprojectM-pulseaudio.cpp ConfigFile.h ConfigFile.cpp QPulseAudioThread.cpp QPulseAudioDeviceChooser.cpp QPulseAudioDeviceModel.cpp -) - -set(projectM_pulseaudio_MOC_HDRS - QPulseAudioThread.hpp QPulseAudioDeviceChooser.hpp QPulseAudioDeviceModel.hpp -) - -set(projectM_pulseaudio_UIS - PulseDeviceChooserDialog.ui -) - - -qt5_wrap_ui(projectM_pulseaudio_UIS_H ${projectM_pulseaudio_UIS}) - -# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx. -qt5_wrap_cpp(projectM_pulseaudio_MOC_SRCS ${projectM_pulseaudio_MOC_HDRS}) - -ADD_DEFINITIONS(-DLINUX) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_NO_DEBUG) - - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM-qt) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) - # projectM-qt places itself in same location as (lib)projectM - # whether it should is a whole other issue -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} - ${Qt5Widgets_INCLUDE_DIR} - ${Qt5OpenGL_INCLUDE_DIR} - ${Qt5Core_INCLUDE_DIR} - ${LIBPULSE_INCLUDEDIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/projectM-pulseaudio -) - -LINK_DIRECTORIES(${PROJECTM_LINK}) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -ADD_EXECUTABLE(projectM-pulseaudio ${projectM_pulseaudio_SRCS} ${projectM_pulseaudio_MOC_SRCS} ${projectM_pulseaudio_UIS_H}) - -TARGET_LINK_LIBRARIES(projectM-pulseaudio projectM-qt projectM pulse ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5Core_LIBRARIES} ${GLEW_LIBRARY} ${FTGL_LIBRARIES}) - -INSTALL(TARGETS projectM-pulseaudio DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) -install(FILES "projectM-pulseaudio.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) diff -Nru projectm-2.2.0~git28bb9/.pc/.quilt_patches projectm-3.1.0/.pc/.quilt_patches --- projectm-2.2.0~git28bb9/.pc/.quilt_patches 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/patches diff -Nru projectm-2.2.0~git28bb9/.pc/.quilt_series projectm-3.1.0/.pc/.quilt_series --- projectm-2.2.0~git28bb9/.pc/.quilt_series 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/.quilt_series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -series diff -Nru projectm-2.2.0~git28bb9/.pc/.version projectm-3.1.0/.pc/.version --- projectm-2.2.0~git28bb9/.pc/.version 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/.pc/.version 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2 diff -Nru projectm-2.2.0~git28bb9/presets/presets_milkdrop/CMakeLists.txt projectm-3.1.0/presets/presets_milkdrop/CMakeLists.txt --- projectm-2.2.0~git28bb9/presets/presets_milkdrop/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/presets/presets_milkdrop/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -PROJECT(presets_milkdrop) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/presets/presets_milkdrop_104/CMakeLists.txt projectm-3.1.0/presets/presets_milkdrop_104/CMakeLists.txt --- projectm-2.2.0~git28bb9/presets/presets_milkdrop_104/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/presets/presets_milkdrop_104/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -PROJECT(presets_milkdrop_104) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/presets/presets_milkdrop_200/CMakeLists.txt projectm-3.1.0/presets/presets_milkdrop_200/CMakeLists.txt --- projectm-2.2.0~git28bb9/presets/presets_milkdrop_200/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/presets/presets_milkdrop_200/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -PROJECT(presets_milkdrop_200) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/presets/presets_projectM/CMakeLists.txt projectm-3.1.0/presets/presets_projectM/CMakeLists.txt --- projectm-2.2.0~git28bb9/presets/presets_projectM/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/presets/presets_projectM/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -PROJECT(presets-projectm) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/presets/presets_stock/CMakeLists.txt projectm-3.1.0/presets/presets_stock/CMakeLists.txt --- projectm-2.2.0~git28bb9/presets/presets_stock/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/presets/presets_stock/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(presets) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru projectm-2.2.0~git28bb9/presets/presets_tryptonaut/CMakeLists.txt projectm-3.1.0/presets/presets_tryptonaut/CMakeLists.txt --- projectm-2.2.0~git28bb9/presets/presets_tryptonaut/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/presets/presets_tryptonaut/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(presets) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" 2018-10-16 14:16:32.000000000 +0000 @@ -537,7 +537,7 @@ warp_65=`pln.yz=op.yz+surfp.yz*(pln.w+0.5).xx; warp_66=`bpr.xy=op.yz+surfp.yz*(pln.w-5).xx; warp_67=`cnt.xyz=pln.x>0?((abs(bpr.x)<5)&&(abs(bpr.y)<5)?bpr.xyz:cnt):cnt; -warp_68=`tuv.xyz=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzx:tuv):tuv; +warp_68=`tuv.xyzw=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzxw:tuv):tuv; warp_69=`sp=tuv.x; warp_70=`float3 t1,t2,a1,a2; warp_71=`b2=tex2D(base02,cnt.xy*0.1+0.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" 2018-10-16 14:16:32.000000000 +0000 @@ -537,7 +537,7 @@ warp_65=`pln.yz=op.yz+surfp.yz*(pln.w+0.5).xx; warp_66=`bpr.xy=op.yz+surfp.yz*(pln.w-5).xx; warp_67=`cnt.xyz=pln.x>0?((abs(bpr.x)<5)&&(abs(bpr.y)<5)?bpr.xyz:cnt):cnt; -warp_68=`tuv.xyz=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzx:tuv):tuv; +warp_68=`tuv.xyzw=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzxw:tuv):tuv; warp_69=`sp=tuv.x; warp_70=`float3 t1,t2,a1,a2; warp_71=`b2=tex2D(base02,cnt.xy*0.1+0.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" 2018-10-16 14:16:32.000000000 +0000 @@ -743,8 +743,8 @@ warp_147=`//ret = hormask; warp_148=`} warp_149=` -warp_150=`written by martin -warp_151=`END +warp_150=`//written by martin +warp_151=`//END comp_1=`shader_body comp_2=`{ comp_3=` diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" 2018-10-16 14:16:32.000000000 +0000 @@ -663,5 +663,5 @@ comp_56=`ret = 1-exp(.1-ret1) ; comp_57=`} comp_58=` -comp_59=`written by martin -comp_60=`END \ No newline at end of file +comp_59=`//written by martin +comp_60=`//END diff -Nru projectm-2.2.0~git28bb9/projectMTrunk.kdevelop projectm-3.1.0/projectMTrunk.kdevelop --- projectm-2.2.0~git28bb9/projectMTrunk.kdevelop 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/projectMTrunk.kdevelop 1970-01-01 00:00:00.000000000 +0000 @@ -1,228 +0,0 @@ - - - - Carmelo Piccione - carmelo.piccione@gmail.com - 1 - KDevCustomProject - C++ - - projectMTrunk - . - false - - - - - - - executable - /home/struktured/workspace/projectm_trunk/src - - - /home/struktured/workspace/projectm_trunk/src - false - false - true - true - false - - - - *.java - *.h - *.H - *.hh - *.hxx - *.hpp - *.c - *.C - *.cc - *.cpp - *.c++ - *.cxx - Makefile - CMakeLists.txt - - - - make - /home/struktured/workspace/projectm_trunk/src/ - - - 0 - - - - default - - - - - - true - 2 - 0 - false - - - - default - - - - - - - - - - - - - true - false - false - false - - - false - true - 10 - - - - - ada - ada_bugs_gcc - bash - bash_bugs - clanlib - fortran_bugs_gcc - gnome1 - gnustep - gtk - gtk_bugs - haskell - haskell_bugs_ghc - java_bugs_gcc - java_bugs_sun - kde2book - opengl - pascal_bugs_fp - php - php_bugs - perl - perl_bugs - python - python_bugs - qt-kdev3 - ruby - ruby_bugs - sdl - sw - w3c-dom-level2-html - w3c-svg - w3c-uaag10 - wxwidgets_bugs - - - Guide to the Qt Translation Tools - Qt Assistant Manual - Qt Designer Manual - Qt Reference Documentation - qmake User Guide - - - KDE Libraries (Doxygen) - - - - - - - - - - - - - true - 4 - 4 - /usr/qt/3 - ExternalDesigner - /usr/bin/qmake-qt4 - /usr/bin/designer-qt4 - - - - false - true - true - 300 - 400 - 250 - false - 0 - true - true - true - std=_GLIBCXX_STD;__gnu_cxx=std - true - true - true - true - true - true - true - true - .; - - - - set - m_,_ - theValue - true - true - - - false - true - Vertical - - - automatic_%2Fhome%2Fstruktured%2Fworkspace%2Fprojectm_trunk - - - - - .hpp - .cpp - - - - - - - - - - - - /home/carm/projects/projectM/trunk/tags - - - - - false - false - - - *.o,*.lo,CVS - false - false - - - Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/projectMTrunk.kdevelop.pcs and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/projectMTrunk.kdevelop.pcs differ diff -Nru projectm-2.2.0~git28bb9/projectMTrunk.kdevses projectm-3.1.0/projectMTrunk.kdevses --- projectm-2.2.0~git28bb9/projectMTrunk.kdevses 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/projectMTrunk.kdevses 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru projectm-2.2.0~git28bb9/README.md projectm-3.1.0/README.md --- projectm-2.2.0~git28bb9/README.md 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/README.md 2018-10-16 14:16:30.000000000 +0000 @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/projectM-visualizer/projectm.svg?branch=master)](https://travis-ci.org/projectM-visualizer/projectm) + ![Logo](https://github.com/projectM-visualizer/projectm/raw/master/web/logo.png) ## projectM - The most advanced open-source music visualizer @@ -6,21 +8,33 @@ Its purpose in life is to read in audio input and produce mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations. ### Available For -* [Mac OS X iTunes (plugin)](https://github.com/projectM-visualizer/projectm/releases) +* [macOS, Linux (binary)](https://github.com/projectM-visualizer/projectm/releases/tag/v0.9.2-beta) * [Android](https://play.google.com/store/apps/details?id=com.psperl.projectM) * [iOS](https://itunes.apple.com/us/app/projectm-music-visualizer/id530922227?mt=8&ign-mpt=uo%3D4) -* [ALSA, Qt, xmms, winamp, jack, pulseaudio](https://sourceforge.net/projects/projectm/files/) +* Qt5 + Pulseaudio +* [ALSA, xmms, winamp, jack](https://sourceforge.net/projects/projectm/files/) (source, unmaintained) +* [iTunes plugin (macOS)](https://github.com/projectM-visualizer/projectm/releases/tag/v0.9.1-beta) +* Windows (in progress) + +### Download +Get it from the [Releases](https://github.com/projectM-visualizer/projectm/releases) tab + +### Project Status +You can read more about how it works and the current state of development [here](https://lwn.net/Articles/750152/). ### Presets -The preset files define the visualizations via pixel shaders and Milkdrop-style equations and parameters. Included with projectM are the bltc201, Milkdrop 1 and 2, projectM, tryptonaut and yin collections. You can grab all of the presets [here](http://spiegelmc.com.s3.amazonaws.com/pub/projectm_presets.zip). +The preset files define the visualizations via pixel shaders and Milkdrop-style equations and parameters. Included with projectM are the bltc201, Milkdrop 1 and 2, projectM, tryptonaut and yin collections. You can grab all of the presets [here](http://spiegelmc.com/pub/projectm_presets.zip). ### Also Featured In -[![Kodi](https://github.com/projectM-visualizer/projectm/raw/master/web/kodi.png)](https://kodi.tv/) -Kodi (formerly XBMC) +[![Kodi](https://github.com/projectM-visualizer/projectm/raw/master/web/kodi.png)](https://kodi.tv/) +Kodi (formerly XBMC) -[![Helix](https://github.com/projectM-visualizer/projectm/raw/master/web/helix.jpg)](http://ghostfiregames.com/helixhome.html) +[![Helix](https://github.com/projectM-visualizer/projectm/raw/master/web/helix.jpg)](http://ghostfiregames.com/helixhome.html) Helix +[![Silverjuke](https://github.com/projectM-visualizer/projectm/raw/master/web/silverjuke.png)](https://www.silverjuke.net) +Silverjuke (FOSS Jukebox) + *** ## Screenshots @@ -44,35 +58,63 @@ # Building From Source +## Building From Source Clone +``` +./autogen.sh +./configure && make && sudo make install +``` + +## Linux (debian/ubuntu) +* `sudo apt-get install autoconf libtool libsdl2-dev libglm-dev` + +## FreeBSD +* `pkg install gcc autoconf automake libtool mesa-libs libGLU sdl2 glm` + ## Mac OS X -* [Prebuilt iTunes plugin installer](https://github.com/projectM-visualizer/projectm/releases) -* [OSX Build instructions](https://github.com/projectM-visualizer/projectm/raw/master/BUILDING_OSX.txt) +* `brew install glm sdl2` +* `./configure --enable-sdl` -## Linux -* `sudo apt-get install cmake-curses-gui libsdl2-dev libglew-dev libftgl-dev libsdl2-dev` -## Building From Source -Requires [cmake](https://cmake.org/download/). -``` -cmake . -make -make install -``` +### OpenGL ES +projectM supports OpenGL ES 2 and 3 for embedded systems. Be sure to configure with the `--enable--gles` flag. + + +# Using the library +At its core projectM is a library, [libprojectM](src/libprojectM). This library is responsible for parsing presets, analyzing audio PCM data with beat detection and FFT, applying the preset to the audio feature data and rendering the resulting output with openGL. It can render to an openGL context or a texture. -## Configure With cmake -If you wish to configure build options run: -`ccmake .` -This will present you with a simple console-based interface of options for projectM. -Review the options and change what you think is necessary. Press 'g' to generate the make files and exit. +For an example of a simple example use of the library see the [libSDL2 sample code](src/projectM-sdl/projectM_SDL_main.cpp). + +There are many other applications that make use of libprojectM that can be found in the [src](src/) directory. + +*** + +# Todo +* Make it build on windows again. There is support, it just needs updating. +* Support for the missing Milkdrop waveforms to get full compatibility with Milkdrop presets. +* Steal cool stuff from the recently-released Milkdrop source. +* Finish emscripten support for building to wasm/webGL for the web. +* Update the [various implementations using libprojectM](src). +* Update downstream projects with new versions. *** ## Help Report issues on [GitHub](https://github.com/projectM-visualizer/projectm/issues/new) +We're on IRC at irc.freenode.net #projectM + +If you would like to help improve this project, either with documentation, code, porting, hardware or anything else please let us know! We gladly accept pull requests and issues. + +## Maintainers +If you maintain packages of libprojectM, we are happy to work with you! Please note well: +* The main focus of this project is libprojectM. It's a library that only really depends on OpenGL. The other applications are more like examples and demos. +* This project was converted to use GNU autotools instead of CMake in 2018. This was due to inflexibility of CMake, issues with OSX and SDL2, an unintuitive configuration interface, standardizing on the most common and well-understood build system, a desire to make it easier for others to get up and running and contribute, and other factors too lengthy to expound on here. +* Most of the applications (e.g. `src/projectM-*`) are likely outdated and of less utility than the core library. If you desire to use them or depend on them, please file an issue so we can help update them. +* The "canonical" application for actually viewing the visualizations is now projectM-sdl, based on libSDL2 because it supports audio input and is completely cross-platform. +* This is an open source project! If you don't like something, feel free to contribute improvements! +* Yes, you are looking at the official version. This is not a fork. ## Authors -[Authors](https://github.com/projectM-visualizer/projectm/raw/master/AUTHORS.txt) -If you would like to help improve this project, either with documentation, code, porting, hardware or anything else please let us know! We gladly accept pull requests and issues. +[Authors](https://github.com/projectM-visualizer/projectm/raw/master/AUTHORS.txt) ## License [LGPL](https://github.com/projectM-visualizer/projectm/raw/master/LICENSE.txt) diff -Nru projectm-2.2.0~git28bb9/src/cmake/CPack-projectM.cmake projectm-3.1.0/src/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -# CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -IF(CPACK_PROJECTM_INCLUDED) - INCLUDE(CPack) -ELSE(CPACK_PROJECTM_INCLUDED) - SET(CACHE CPACK_PROJECTM_INCLUDED 1) -ENDIF(CPACK_PROJECTM_INCLUDED) diff -Nru projectm-2.2.0~git28bb9/src/cmake/FindSDL2.cmake projectm-3.1.0/src/cmake/FindSDL2.cmake --- projectm-2.2.0~git28bb9/src/cmake/FindSDL2.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/cmake/FindSDL2.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -# Locate SDL2 library -# This module defines -# SDL2_LIBRARY, the name of the library to link against -# SDL2_FOUND, if false, do not try to link to SDL2 -# SDL2_INCLUDE_DIR, where to find SDL.h -# -# This module responds to the the flag: -# SDL2_BUILDING_LIBRARY -# If this is defined, then no SDL2main will be linked in because -# only applications need main(). -# Otherwise, it is assumed you are building an application and this -# module will attempt to locate and set the the proper link flags -# as part of the returned SDL2_LIBRARY variable. -# -# Don't forget to include SDLmain.h and SDLmain.m your project for the -# OS X framework based version. (Other versions link to -lSDL2main which -# this module will try to find on your behalf.) Also for OS X, this -# module will automatically add the -framework Cocoa on your behalf. -# -# -# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration -# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library -# (SDL2.dll, libsdl2.so, SDL2.framework, etc). -# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. -# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value -# as appropriate. These values are used to generate the final SDL2_LIBRARY -# variable, but when these values are unset, SDL2_LIBRARY does not get created. -# -# -# $SDL2DIR is an environment variable that would -# correspond to the ./configure --prefix=$SDL2DIR -# used in building SDL2. -# l.e.galup 9-20-02 -# -# Modified by Eric Wing. -# Added code to assist with automated building by using environmental variables -# and providing a more controlled/consistent search behavior. -# Added new modifications to recognize OS X frameworks and -# additional Unix paths (FreeBSD, etc). -# Also corrected the header search path to follow "proper" SDL guidelines. -# Added a search for SDL2main which is needed by some platforms. -# Added a search for threads which is needed by some platforms. -# Added needed compile switches for MinGW. -# -# On OSX, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of -# SDL2_LIBRARY to override this selection or set the CMake environment -# CMAKE_INCLUDE_PATH to modify the search paths. -# -# Note that the header path has changed from SDL2/SDL.h to just SDL.h -# This needed to change because "proper" SDL convention -# is #include "SDL.h", not . This is done for portability -# reasons because not all systems place things in SDL2/ (see FreeBSD). - -#============================================================================= -# Copyright 2003-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -SET(SDL2_SEARCH_PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts - /opt/csw # Blastwave - /opt -) - -FIND_PATH(SDL2_INCLUDE_DIR SDL.h - HINTS - $ENV{SDL2DIR} - PATH_SUFFIXES include/SDL2 include - PATHS ${SDL2_SEARCH_PATHS} -) - -FIND_LIBRARY(SDL2_LIBRARY_TEMP - NAMES SDL2 - HINTS - $ENV{SDL2DIR} - PATH_SUFFIXES lib64 lib - PATHS ${SDL2_SEARCH_PATHS} -) - -IF(NOT SDL2_BUILDING_LIBRARY) - IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") - # Non-OS X framework versions expect you to also dynamically link to - # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms - # seem to provide SDL2main for compatibility even though they don't - # necessarily need it. - FIND_LIBRARY(SDL2MAIN_LIBRARY - NAMES SDL2main - HINTS - $ENV{SDL2DIR} - PATH_SUFFIXES lib64 lib - PATHS ${SDL2_SEARCH_PATHS} - ) - ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") -ENDIF(NOT SDL2_BUILDING_LIBRARY) - -# SDL2 may require threads on your system. -# The Apple build may not need an explicit flag because one of the -# frameworks may already provide it. -# But for non-OSX systems, I will use the CMake Threads package. -IF(NOT APPLE) - FIND_PACKAGE(Threads) -ENDIF(NOT APPLE) - -# MinGW needs an additional library, mwindows -# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows -# (Actually on second look, I think it only needs one of the m* libraries.) -IF(MINGW) - SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") -ENDIF(MINGW) - -IF(SDL2_LIBRARY_TEMP) - # For SDL2main - IF(NOT SDL2_BUILDING_LIBRARY) - IF(SDL2MAIN_LIBRARY) - SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP}) - ENDIF(SDL2MAIN_LIBRARY) - ENDIF(NOT SDL2_BUILDING_LIBRARY) - - # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. - # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. - # I think it has something to do with the CACHE STRING. - # So I use a temporary variable until the end so I can set the - # "real" variable in one-shot. - IF(APPLE) - SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") - ENDIF(APPLE) - - # For threads, as mentioned Apple doesn't need this. - # In fact, there seems to be a problem if I used the Threads package - # and try using this line, so I'm just skipping it entirely for OS X. - IF(NOT APPLE) - SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(NOT APPLE) - - # For MinGW library - IF(MINGW) - SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) - ENDIF(MINGW) - - # Set the final string here so the GUI reflects the final state. - SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found") - # Set the temp variable to INTERNAL so it is not seen in the CMake GUI - SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "") -ENDIF(SDL2_LIBRARY_TEMP) - -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) diff -Nru projectm-2.2.0~git28bb9/src/CMakeLists.txt projectm-3.1.0/src/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/CMakeLists.txt 2017-02-21 08:09:53.000000000 +0000 +++ projectm-3.1.0/src/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -project (projectM-complete) - -cmake_minimum_required(VERSION 3.0) - -set(PROJECTM_ROOT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - -if(EMSCRIPTEN) - SET(EMSCRIPTEN-DEFAULT ON) -elseif(EMSCRIPTEN) - SET(EMSCRIPTEN-DEFAULT OFF) -endif(EMSCRIPTEN) - -OPTION(INCLUDE-PROJECTM-QT "Build the projectM Qt4 user interface extension library (recommended)" OFF) -OPTION(INCLUDE-PROJECTM-PULSEAUDIO "Build the projectM pulse audio client (recommended for fedora users)" OFF) -OPTION(INCLUDE-PROJECTM-LIBVISUAL "Build the projectM libvisual client" OFF) -OPTION(INCLUDE-PROJECTM-LIBVISUAL-ALSA "Build experimental libvisual / alsa input standalone client" OFF) -OPTION(INCLUDE-PROJECTM-JACK "Build the projectM JACK client" OFF) -OPTION(INCLUDE-PROJECTM-TEST "Build the projectM test suite" OFF) -OPTION(INCLUDE-PROJECTM-EMSCRIPTEN "Build projectM for the web (emscripten)" ${EMSCRIPTEN-DEFAULT}) -OPTION(INCLUDE-PROJECTM-XMMS "Build the projectM xmms module (deprecated, use audacious instead)" OFF) -OPTION(INCLUDE-PROJECTM-SDL "Build the projectM SDL application" ON) -OPTION(INCLUDE-NATIVE-SAMPLES "Build the projectM native preset sample collection " ON) - -add_subdirectory (libprojectM) - -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) - -if(INCLUDE-PROJECTM-EMSCRIPTEN) - add_subdirectory (projectM-emscripten) -endif(INCLUDE-PROJECTM-EMSCRIPTEN) - -if(INCLUDE-PROJECTM-TEST) - add_subdirectory (projectM-test) -endif(INCLUDE-PROJECTM-TEST) - -if (INCLUDE-PROJECTM-QT) - add_subdirectory (projectM-qt) -endif(INCLUDE-PROJECTM-QT) - -if (INCLUDE-PROJECTM-JACK) - add_subdirectory (projectM-jack) -endif (INCLUDE-PROJECTM-JACK) - -if (INCLUDE-PROJECTM-PULSEAUDIO) - add_subdirectory (projectM-pulseaudio) -endif (INCLUDE-PROJECTM-PULSEAUDIO) - -if (INCLUDE-PROJECTM-XMMS) - add_subdirectory (projectM-xmms) -endif (INCLUDE-PROJECTM-XMMS) - -if (INCLUDE-PROJECTM-LIBVISUAL) - add_subdirectory (projectM-libvisual) -endif (INCLUDE-PROJECTM-LIBVISUAL) - -if (INCLUDE-PROJECTM-LIBVISUAL-ALSA) - add_subdirectory (projectM-libvisual-alsa) -endif (INCLUDE-PROJECTM-LIBVISUAL-ALSA) - -if (INCLUDE-PROJECTM-SDL) - add_subdirectory (projectM-sdl) -endif (INCLUDE-PROJECTM-SDL) - -if (INCLUDE-NATIVE-SAMPLES) - add_subdirectory(NativePresets) -endif (INCLUDE-NATIVE-SAMPLES) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/cmake/CPack-projectM.cmake projectm-3.1.0/src/libprojectM/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/libprojectM/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -IF(CPACK_PROJECTM_INCLUDED) - INCLUDE(CPack) -ELSE(CPACK_PROJECTM_INCLUDED) - SET(CACHE CPACK_PROJECTM_INCLUDED 1) -ENDIF(CPACK_PROJECTM_INCLUDED) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/cmake/FindGLEW.cmake projectm-3.1.0/src/libprojectM/cmake/FindGLEW.cmake --- projectm-2.2.0~git28bb9/src/libprojectM/cmake/FindGLEW.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/cmake/FindGLEW.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -# - Try to find GLEW -# Once done this will define -# -# GLEW_FOUND - system has GLEW -# GLEW_INCLUDE_DIR - the GLEW include directory -# GLEW_LIBRARY - Link these to use GLEW -# - - FIND_PATH( GLEW_INCLUDE_DIR glew.h wglew.h - PATHS /usr/local /usr c:/glew "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK" "C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK" - PATH_SUFFIXES include include/gl include/GL Include Include/gl Include/GL ) - FIND_LIBRARY( GLEW_LIBRARY - NAMES glew32 glew GLEW - PATHS /usr /usr/local c:/glew "C:/Program Files/Microsoft Visual Studio .NET 2003/Vc7/PlatformSDK" "C:/Program Files/Microsoft Visual Studio 8/VC/PlatformSDK" - PATH_SUFFIXES lib Lib - ) - -IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) - SET(GLEW_FOUND TRUE) - SET( GLEW_LIBRARY_DIR ${GLEW_LIBRARY} ) -ELSE (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) - SET( GLEW_FOUND FALSE ) -ENDIF (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/cmake/FindOpenGLES.cmake projectm-3.1.0/src/libprojectM/cmake/FindOpenGLES.cmake --- projectm-2.2.0~git28bb9/src/libprojectM/cmake/FindOpenGLES.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/cmake/FindOpenGLES.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -#snapped from: https://bitbucket.org/sinbad/ogre/src/0bba4f7cdb95/CMake/Packages/FindOpenGLES.cmake?at=default -#------------------------------------------------------------------- -# This file is part of the CMake build system for OGRE -# (Object-oriented Graphics Rendering Engine) -# For the latest info, see http://www.ogre3d.org/ -# -# The contents of this file are placed in the public domain. Feel -# free to make use of it in any way you like. -#------------------------------------------------------------------- - -# - Try to find OpenGLES -# Once done this will define -# -# OPENGLES_FOUND - system has OpenGLES -# OPENGLES_INCLUDE_DIR - the GL include directory -# OPENGLES_LIBRARIES - Link these to use OpenGLES - -IF (WIN32) - IF (CYGWIN) - - FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h ) - - FIND_LIBRARY(OPENGLES_gl_LIBRARY libgles_cm ) - - ELSE (CYGWIN) - - IF(MSVC) - #The user hast to provide this atm. GLES can be emulated via Desktop OpenGL - #using the ANGLE project found at: http://code.google.com/p/angleproject/ - SET (OPENGLES_gl_LIBRARY import32 CACHE STRING "OpenGL ES 1.x library for win32") - ENDIF(MSVC) - - ENDIF (CYGWIN) - -ELSE (WIN32) - - IF (APPLE) - - create_search_paths(/Developer/Platforms) - findpkg_framework(OpenGLES) - set(OPENGLES_gl_LIBRARY "-framework OpenGLES") - - ELSE(APPLE) - - FIND_PATH(OPENGLES_INCLUDE_DIR GLES/gl.h - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include - /usr/include - /opt/vc/include - ) - - FIND_LIBRARY(OPENGLES_gl_LIBRARY - NAMES GLES_CM GLESv1_CM - PATHS /opt/graphics/OpenGL/lib - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - /usr/lib - /opt/vc/lib - ) - - # On Unix OpenGL most certainly always requires X11. - # Feel free to tighten up these conditions if you don't - # think this is always true. - - IF (OPENGLES_gl_LIBRARY) - IF(NOT X11_FOUND) - INCLUDE(FindX11) - ENDIF(NOT X11_FOUND) - IF (X11_FOUND) - SET (OPENGLES_LIBRARIES ${X11_LIBRARIES}) - ENDIF (X11_FOUND) - ENDIF (OPENGLES_gl_LIBRARY) - - ENDIF(APPLE) -ENDIF (WIN32) - -SET( OPENGLES_FOUND "NO" ) -IF(OPENGLES_gl_LIBRARY) - - SET( OPENGLES_LIBRARIES ${OPENGLES_gl_LIBRARY} ${OPENGLES_LIBRARIES}) - - SET( OPENGLES_FOUND "YES" ) - -ENDIF(OPENGLES_gl_LIBRARY) - -MARK_AS_ADVANCED( - OPENGLES_INCLUDE_DIR - OPENGLES_gl_LIBRARY -) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/CMakeLists.txt projectm-3.1.0/src/libprojectM/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/libprojectM/CMakeLists.txt 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -PROJECT(projectM) -cmake_minimum_required(VERSION 2.8.0) - -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The projectM core library.") -INCLUDE(cmake/CPack-projectM.cmake) -INCLUDE(CMakeDependentOption) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - -# projectM version block -set(PROJECTM_VERSION 2.2.0) -set(PROJECTM_ABI_LEVEL 2) -# - -SET(USE_THREADS_DEF ON) -SET(USE_FTGL_DEF ON) -SET(USE_FBO_DEF ON) - -if (EMSCRIPTEN) - SET(USE_THREADS-DEF OFF) - SET(USE_FTGL_DEF ON) - SET(USE_FBO_DEF OFF) - - SET(USE_GLES1 ON) - SET(BUILD_PROJECTM_STATIC ON) - SET(DISABLE_NATIVE_PRESETS ON) - - SET(APPLE ) - SET(LINUX ) - - SET(OPENGL_gl_LIBRARY "fake_gl_lib.a") - SET(GLEW_LIBRARY "gl.symbols") - ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS) -endif (EMSCRIPTEN) - -OPTION (USE_GLES1 "Use OpenGL ES" OFF) -CMAKE_DEPENDENT_OPTION (USE_FBO "Use Framebuffer Objects for increased rendering quality. Disable this if you are experiencing problems on older or poorly supported hardware." ON "${USE_GLES1}" OFF) # disabled by default for GLES -OPTION(USE_FTGL "Use FTGL for on-screen fonts" ${USE_FTGL_DEF}) -OPTION (USE_THREADS "Use threads for parallelization" ${USE_THREADS_DEF}) -OPTION (USE_OPENMP "Use OpenMP and OMPTL for multi-core parallelization" OFF) -OPTION (USE_INCLUDED_GLEW "Use projectM's included implemention of GLEW" OFF) -OPTION (USE_CG "Use Cg for Pixel Shader support" OFF) -OPTION (USE_DEVIL "Use devIL for image loading rather than the builtin SOIL library" OFF) -OPTION (BUILD_PROJECTM_STATIC "Build the projectM target library in the platform's native static (NOT shared) format." ON) -OPTION (DISABLE_NATIVE_PRESETS "Turn off support for native (C++ style) presets" ${DISABLE_NATIVE_PRESETS}) -OPTION (DISABLE_MILKDROP_PRESETS "Turn off support for Milkdrop (.milk / .prjm) presets" ${DISABLE_MILKDROP_PRESETS}) - - -ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\") - -SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" - CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" - FORCE) - -if (USE_INCLUDED_GLEW) -ADD_DEFINITIONS(-DUSE_NATIVE_GLEW) - SET(GLEW_SOURCES glew.h glew.c) - SET(GLEW_LIBRARY "") -else(USE_INCLUDED_GLEW) - #set (GLEW_SOURCES "") - #find_package (GLEW) -endif(USE_INCLUDED_GLEW) - -SET(projectM_SOURCES projectM.cpp PCM.cpp Preset.cpp fftsg.cpp KeyHandler.cpp -timer.cpp wipemalloc.cpp PresetLoader.cpp PresetChooser.cpp PipelineMerger.cpp ConfigFile.cpp TimeKeeper.cpp PresetFactory.cpp PresetFactoryManager.cpp ${GLEW_SOURCES}) - -if (MSVC) -SET(projectM_SOURCES ${projectM_SOURCES} dlfcn.c win32-dirent.cpp) -endif(MSVC) - -if (NOT DISABLE_NATIVE_PRESETS) - add_subdirectory(NativePresetFactory) - SET(PRESET_FACTORY_SOURCES ${PRESET_FACTORY_SOURCES} ${NativePresetFactory_SOURCE_DIR}) - SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${NativePresetFactory_BINARY_DIR}) - SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} NativePresetFactory) -endif(NOT DISABLE_NATIVE_PRESETS) - -if (NOT DISABLE_MILKDROP_PRESETS) - add_subdirectory(MilkdropPresetFactory) - SET(PRESET_FACTORY_SOURCES ${PRESET_FACTORY_SOURCES} ${MilkdropPresetFactory_SOURCE_DIR}) - SET(PRESET_FACTORY_BINARY_DIR ${PRESET_FACTORY_BINARY_DIR} ${MilkdropPresetFactory_BINARY_DIR}) - SET(PRESET_FACTORY_LINK_TARGETS ${PRESET_FACTORY_LINK_TARGETS} MilkdropPresetFactory) -endif(NOT DISABLE_MILKDROP_PRESETS) - -if (USE_DEVIL) - SET (projectM_SOURCES ${projectM_SOURCES}) - ADD_DEFINITIONS(-DUSE_DEVIL) - SET (IMAGE_LINK_TARGETS IL ILU ILUT) -else (USE_DEVIL) - SET (projectM_SOURCES ${projectM_SOURCES}) - SET (IMAGE_LINK_TARGETS ) -endif (USE_DEVIL) - -if (USE_CG) - ADD_DEFINITIONS(-DUSE_CG) - - if (APPLE) - FIND_LIBRARY(CG_LINK_TARGETS Cg) - else (APPLE) - SET (CG_LINK_TARGETS Cg CgGL) - endif (APPLE) -else (USE_CG) - SET (CG_LINK_TARGETS) -endif(USE_CG) - -include(CheckCXXCompilerFlag) - -if(USE_GLES1) - ADD_DEFINITIONS(-DUSE_GLES1) -endif(USE_GLES1) - -if(USE_FBO) - ADD_DEFINITIONS(-DUSE_FBO) -endif(USE_FBO) - -if(USE_FTGL) - ADD_DEFINITIONS(-DUSE_FTGL) - - find_package( Freetype REQUIRED) - include_directories( ${FREETYPE_INCLUDE_DIRS} ) - -endif(USE_FTGL) - -if (BUILD_PROJECTM_STATIC) - ADD_LIBRARY(projectM STATIC ${projectM_SOURCES}) -else(BUILD_PROJECTM_STATIC) - ADD_LIBRARY(projectM SHARED ${projectM_SOURCES}) -endif(BUILD_PROJECTM_STATIC) - -SET_TARGET_PROPERTIES(projectM PROPERTIES VERSION ${PROJECTM_VERSION} SOVERSION ${PROJECTM_ABI_LEVEL}) - -if (USE_THREADS) -ADD_DEFINITIONS(-DUSE_THREADS) -endif(USE_THREADS) - -if (APPLE) - ADD_DEFINITIONS(-DMACOS -DSTBI_NO_DDS) - set(RESOURCE_PREFIX "Resources") - FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/local/include") -else (APPLE) - if (WIN32) - set (RESOURCE_PREFIX "Resources") - ADD_DEFINITIONS(-DWIN32 -DSTBI_NO_DDS) - else(WIN32) - set (RESOURCE_PREFIX "share/projectM") - IF (NOT EMSCRIPTEN) - ADD_DEFINITIONS(-DLINUX -DSTBI_NO_DDS) - ENDIF (NOT EMSCRIPTEN) - endif(WIN32) - set(COREFOUNDATION_LIBRARY ) - set(OPENGL_LIBRARIES ) -endif(APPLE) - -add_subdirectory(Renderer) - -if (USE_GLES1) - INCLUDE(cmake/FindOpenGLES.cmake) - FIND_PACKAGE(OpenGLES) -else (USE_GLES1) - FIND_PACKAGE(OpenGL) -endif (USE_GLES1) - -INCLUDE(FindPkgConfig.cmake) - -pkg_search_module (FTGL ftgl) - -#set(CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH};/opt/local/include;/Developer/SDKs/MACOSX10.5.sdk/usr/X11/include) -#set(CMAKE_LIBRARY_PATH /opt/local/lib;/Developer/SDKs/MACOSX10.5.sdk;/Developer/SDKs/MacOSX10.5.sdk/usr/X11/lib/) - -IF(USE_FTGL) - if (FTGL_FOUND) - MESSAGE(STATUS "[projectM] FTGL font support was detected and enabled.") - else (FTGL_FOUND) - MESSAGE(STATUS - "[projectM] Warning! FTGL has been enabled but not detected. Your compilation will probably break. Turn off FTGL support by setting USE_FTGL to false, or visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.") - endif (FTGL_FOUND) - - ADD_DEFINITIONS(-DUSE_FTGL) - - set (FTGL_INCUDE_DIRS ${FTGL_INCLUDE_DIRS} ${CMAKE_INCLUDE_PATH} ${OPENGL_INCLUDE_DIR}) - set (FTGL_LINK_DIRS ${FTGL_LIBRARY_DIRS} ) - set (FTGL_LINK_TARGETS ftgl freetype) - -ELSE (USE_FTGL) - IF (FTGL_FOUND) - MESSAGE(STATUS "[projectM] Warning: FTGL font support was detected but NOT enabled. You can enable it by setting USE_FTGL=true") - ELSE (FTGL_FOUND) - MESSAGE(STATUS "[projectM] Warning: FTGL font support was not detected. Visit http://ftgl.wiki.sourceforge.net/ for help on installing FTGL.") - ENDIF(FTGL_FOUND) - - # todo: change this because its obscure and probably not being used - set (FTGL_INCLUDE_DIRS "/opt/local/include") - set (FTGL_LINK_DIRS ) - set (FTGL_LINK_TARGETS ) -ENDIF(USE_FTGL) - -CHECK_CXX_COMPILER_FLAG("-fopenmp" SUPPORTS_OPENMP) - -IF(USE_OPENMP AND SUPPORTS_OPENMP) - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ") -ENDIF(USE_OPENMP AND SUPPORTS_OPENMP) - -INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} - ${FTGL_INCLUDE_DIRS} - ${Renderer_SOURCE_DIR} - ${PRESET_FACTORY_SOURCES} -) -LINK_DIRECTORIES(${FTGL_LIBRARY_DIRS} - ${Renderer_BINARY_DIR} - ${PRESET_FACTORY_BINARY_DIR} -) - -if(MSVC) - SET (MATH_LIBRARIES ) -else(MSVC) - SET (MATH_LIBRARIES m) -endif(MSVC) - -# compiling on arm? relocation is gonna fail unless position-independent -IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR NOT ${DISABLE_NATIVE_PRESETS}) - SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "-fPIC") -ENDIF( CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l" OR NOT ${DISABLE_NATIVE_PRESETS}) - -SET(projectM_LIBRARIES_TO_LINK - Renderer - ${IMAGE_LINK_TARGETS} - ${CG_LINK_TARGETS} - ${PRESET_FACTORY_LINK_TARGETS} - #${GLEW_LIBRARY} - ${FTGL_LINK_TARGETS} - ${MATH_LIBRARIES} - ${COREFOUNDATION_LIBRARIES} - ${OPENGL_LIBRARIES} - ${OPENGLES_LIBRARIES} - dl -) -TARGET_LINK_LIBRARIES(projectM ${projectM_LIBRARIES_TO_LINK}) - -SET(projectM_FONT_MENU "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" CACHE FILEPATH "Path to the default menu TrueType font") -SET(projectM_FONT_TITLE "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" CACHE FILEPATH "Path to the default title TrueType font") -ADD_DEFINITIONS(-DprojectM_FONT_MENU="\\\"${projectM_FONT_MENU}\\\"") -ADD_DEFINITIONS(-DprojectM_FONT_TITLE="\\\"${projectM_FONT_TITLE}\\\"") - -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc" @ONLY) -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/config.inp.in" "${CMAKE_CURRENT_BINARY_DIR}/config.inp" @ONLY) - -IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf") - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts) -ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/Vera.ttf") - -IF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf") - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/fonts/VeraMono.ttf DESTINATION ${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts) -ENDIF(projectM_FONT_MENU MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf" OR projectM_FONT_TITLE MATCHES "${CMAKE_INSTALL_PREFIX}/${RESOURCE_PREFIX}/fonts/VeraMono.ttf") - -FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") -INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) -INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) -INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM) -INSTALL(TARGETS projectM DESTINATION lib) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Common.hpp projectm-3.1.0/src/libprojectM/Common.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Common.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Common.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -30,6 +30,7 @@ #include #include #include + #ifdef _MSC_sVER #define strcasecmp(s, t) _strcmpi(s, t) #endif @@ -46,7 +47,7 @@ //extern FILE *debugFile; #endif -#ifdef MACOS +#ifdef __APPLE__ #include extern FILE *fmemopen(void *buf, size_t len, const char *pMode); #endif /** MACOS */ @@ -61,7 +62,7 @@ #define STRING_LINE_SIZE 1024 -#ifdef LINUX +#ifdef __unix__ #include #define projectM_isnan std::isnan #endif @@ -75,11 +76,11 @@ #define projectM_isnan(x) ((x) != (x)) #endif -#ifdef MACOS +#ifdef __APPLE__ #define projectM_isnan(x) ((x) != (x)) #endif -#ifdef LINUX +#ifdef __unix__ #define projectM_fmax fmax #endif @@ -87,11 +88,11 @@ #define projectM_fmax(x,y) ((x) >= (y) ? (x): (y)) #endif -#ifdef MACOS +#ifdef __APPLE__ #define projectM_fmax(x,y) ((x) >= (y) ? (x): (y)) #endif -#ifdef LINUX +#ifdef __unix__ #define projectM_fmin fmin #endif @@ -99,7 +100,7 @@ #define projectM_fmin(x,y) ((x) <= (y) ? (x): (y)) #endif -#ifdef MACOS +#ifdef __APPLE__ #define projectM_fmin(x,y) ((x) <= (y) ? (x): (y)) #endif @@ -245,5 +246,3 @@ typedef std::vector RatingList; #endif - - diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/config.inp.in projectm-3.1.0/src/libprojectM/config.inp.in --- projectm-2.2.0~git28bb9/src/libprojectM/config.inp.in 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/config.inp.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -# config.inp -# Configuration File for projectM - -Texture Size = 1024 # Size of internal rendering texture -Mesh X = 32 # Width of PerPixel Equation mesh -Mesh Y = 24 # Height of PerPixel Equation mesh -FPS = 35 # Frames Per Second -Fullscreen = false -Window Width = 512 # startup window width -Window Height = 512 # startup window height - -Smooth Transition Duration = 5 # in seconds -Preset Duration = 30 # in seconds -Easter Egg Parameter = 1 - -Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent -Aspect Correction = true # Custom Shape Aspect Correction - -Preset Path = @CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@/presets # preset location -Title Font = @projectM_FONT_TITLE@ -Menu Font = @projectM_FONT_MENU@ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/config.inp.in.in projectm-3.1.0/src/libprojectM/config.inp.in.in --- projectm-2.2.0~git28bb9/src/libprojectM/config.inp.in.in 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/config.inp.in.in 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,22 @@ +# config.inp +# Configuration File for projectM + +#Texture Size = 1024 # Size of internal rendering texture + +Mesh X = 220 # Width of PerPixel Equation mesh +Mesh Y = 125 # Height of PerPixel Equation mesh +FPS = 35 # Frames Per Second +Fullscreen = false +Window Width = 512 # startup window width +Window Height = 512 # startup window height + +Smooth Transition Duration = 5 # in seconds +Preset Duration = 30 # in seconds +Easter Egg Parameter = 1 + +Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent +Aspect Correction = true # Custom Shape Aspect Correction + +Preset Path = %datadir%/@PACKAGE@/presets # preset location +Title Font = Vera.ttf +Menu Font = VeraMono.ttf diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/FindPkgConfig.cmake projectm-3.1.0/src/libprojectM/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/libprojectM/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/fonts/CMakeLists.txt projectm-3.1.0/src/libprojectM/fonts/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/libprojectM/fonts/CMakeLists.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/fonts/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(fonts) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/HungarianMethod.hpp projectm-3.1.0/src/libprojectM/HungarianMethod.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/HungarianMethod.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/HungarianMethod.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -11,10 +11,10 @@ template class HungarianMethod { public : -static const int MAX_SIZE = N; +static const size_t MAX_SIZE = N; private: -int n, max_match; //n workers and n jobs +size_t n, max_match; //n workers and n jobs double lx[N], ly[N]; //labels of X and Y parts int xy[N]; //xy[x] - vertex that is matched with x, int yx[N]; //yx[y] - vertex that is matched with y @@ -36,7 +36,7 @@ void augment(const double cost[N][N]) //main function of the algorithm { if (max_match == n) return; //check wether matching is already perfect - int x, y, root; //just counters and root vertex + int x, y, root = 0; //just counters and root vertex int q[N], wr = 0, rd = 0; //q - queue for bfs, wr,rd - write and read //pos in queue memset(S, false, sizeof(S)); //init set S @@ -154,7 +154,7 @@ /// \param cost a matrix of two sets I,J where cost[i][j] is the weight of edge i->j /// \param logicalSize the number of elements in both I and J /// \returns the total cost of the best matching -inline double operator()(const double cost[N][N], int logicalSize) +inline double operator()(const double cost[N][N], size_t logicalSize) { n = logicalSize; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/libprojectM.pc.in projectm-3.1.0/src/libprojectM/libprojectM.pc.in --- projectm-2.2.0~git28bb9/src/libprojectM/libprojectM.pc.in 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/libprojectM.pc.in 2018-10-16 14:16:32.000000000 +0000 @@ -1,12 +1,12 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include -pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ -sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +pkgdatadir=@datadir@/@PACKAGE_NAME@ +sysconfdir=@datadir@/@PACKAGE_NAME@ Name: libprojectM -Version: @PROJECTM_VERSION@ +Version: @PACKAGE_VERSION@ Description: projectM - OpenGL Milkdrop Requires: Libs: -L${libdir} -lprojectM diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/libprojectM.xcodeproj/project.pbxproj projectm-3.1.0/src/libprojectM/libprojectM.xcodeproj/project.pbxproj --- projectm-2.2.0~git28bb9/src/libprojectM/libprojectM.xcodeproj/project.pbxproj 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/libprojectM.xcodeproj/project.pbxproj 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,1116 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 48; + objects = { + +/* Begin PBXBuildFile section */ + 1612C9C2207A859800862A3A /* Func.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B1207A859700862A3A /* Func.cpp */; }; + 1612C9C3207A859800862A3A /* MilkdropPresetFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B2207A859700862A3A /* MilkdropPresetFactory.cpp */; }; + 1612C9C4207A859800862A3A /* BuiltinParams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B3207A859700862A3A /* BuiltinParams.cpp */; }; + 1612C9C5207A859800862A3A /* Eval.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B4207A859700862A3A /* Eval.cpp */; }; + 1612C9C6207A859800862A3A /* Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B5207A859700862A3A /* Parser.cpp */; }; + 1612C9C7207A859800862A3A /* IdlePreset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B6207A859700862A3A /* IdlePreset.cpp */; }; + 1612C9C8207A859800862A3A /* CustomWave.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B7207A859700862A3A /* CustomWave.cpp */; }; + 1612C9C9207A859800862A3A /* CustomShape.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B8207A859700862A3A /* CustomShape.cpp */; }; + 1612C9CA207A859800862A3A /* PresetFrameIO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9B9207A859700862A3A /* PresetFrameIO.cpp */; }; + 1612C9CB207A859800862A3A /* PerPixelEqn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9BA207A859700862A3A /* PerPixelEqn.cpp */; }; + 1612C9CC207A859800862A3A /* InitCond.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9BB207A859700862A3A /* InitCond.cpp */; }; + 1612C9CD207A859800862A3A /* MilkdropPreset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9BC207A859700862A3A /* MilkdropPreset.cpp */; }; + 1612C9CE207A859800862A3A /* PerFrameEqn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9BD207A859700862A3A /* PerFrameEqn.cpp */; }; + 1612C9CF207A859800862A3A /* BuiltinFuncs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9BE207A859700862A3A /* BuiltinFuncs.cpp */; }; + 1612C9D0207A859800862A3A /* Param.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9BF207A859700862A3A /* Param.cpp */; }; + 1612C9D1207A859800862A3A /* PerPointEqn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9C0207A859700862A3A /* PerPointEqn.cpp */; }; + 1612C9D2207A859800862A3A /* Expr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9C1207A859700862A3A /* Expr.cpp */; }; + 1612C9D5207A85B300862A3A /* NativePresetFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9D4207A85B300862A3A /* NativePresetFactory.cpp */; }; + 1612C9EC207A860000862A3A /* KeyHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AC5207A68A600D3B0C8 /* KeyHandler.cpp */; }; + 1612C9FF207A878900862A3A /* event.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9EE207A878800862A3A /* event.h */; }; + 1612CA00207A878900862A3A /* cocoatoprojectM.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9EF207A878800862A3A /* cocoatoprojectM.h */; }; + 1612CA01207A878900862A3A /* fatal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F0207A878800862A3A /* fatal.h */; }; + 1612CA02207A878900862A3A /* glError.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F1207A878800862A3A /* glError.h */; }; + 1612CA03207A878900862A3A /* glew.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F2207A878800862A3A /* glew.h */; }; + 1612CA04207A878900862A3A /* lvtoprojectM.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F3207A878800862A3A /* lvtoprojectM.h */; }; + 1612CA05207A878900862A3A /* ConfigFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F4207A878800862A3A /* ConfigFile.h */; }; + 1612CA06207A878900862A3A /* sdltoprojectM.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F5207A878800862A3A /* sdltoprojectM.h */; }; + 1612CA07207A878900862A3A /* wipemalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F6207A878800862A3A /* wipemalloc.h */; }; + 1612CA08207A878900862A3A /* timer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F7207A878800862A3A /* timer.h */; }; + 1612CA09207A878900862A3A /* fftsg.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F8207A878800862A3A /* fftsg.h */; }; + 1612CA0A207A878900862A3A /* dlldefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9F9207A878800862A3A /* dlldefs.h */; }; + 1612CA0B207A878900862A3A /* glxew.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9FA207A878800862A3A /* glxew.h */; }; + 1612CA0C207A878900862A3A /* win32-dirent.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9FB207A878800862A3A /* win32-dirent.h */; }; + 1612CA0D207A878900862A3A /* carbontoprojectM.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9FC207A878800862A3A /* carbontoprojectM.h */; }; + 1612CA0E207A878900862A3A /* projectM-opengl.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9FD207A878900862A3A /* projectM-opengl.h */; }; + 1612CA0F207A878900862A3A /* resource.h in Headers */ = {isa = PBXBuildFile; fileRef = 1612C9FE207A878900862A3A /* resource.h */; }; + 1612CA29207B9ED500862A3A /* PerPointEqn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA15207B9ED400862A3A /* PerPointEqn.hpp */; }; + 1612CA2A207B9ED500862A3A /* BuiltinFuncs.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA16207B9ED400862A3A /* BuiltinFuncs.hpp */; }; + 1612CA2B207B9ED500862A3A /* Expr.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA17207B9ED400862A3A /* Expr.hpp */; }; + 1612CA2C207B9ED500862A3A /* MilkdropPresetFactory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA18207B9ED400862A3A /* MilkdropPresetFactory.hpp */; }; + 1612CA2D207B9ED500862A3A /* CustomWave.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA19207B9ED400862A3A /* CustomWave.hpp */; }; + 1612CA2E207B9ED500862A3A /* CustomShape.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA1A207B9ED400862A3A /* CustomShape.hpp */; }; + 1612CA2F207B9ED500862A3A /* BuiltinParams.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA1B207B9ED400862A3A /* BuiltinParams.hpp */; }; + 1612CA30207B9ED500862A3A /* CValue.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA1C207B9ED400862A3A /* CValue.hpp */; }; + 1612CA31207B9ED500862A3A /* Func.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA1D207B9ED400862A3A /* Func.hpp */; }; + 1612CA32207B9ED500862A3A /* Eval.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA1E207B9ED400862A3A /* Eval.hpp */; }; + 1612CA33207B9ED500862A3A /* InitCondUtils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA1F207B9ED400862A3A /* InitCondUtils.hpp */; }; + 1612CA34207B9ED500862A3A /* PerPixelEqn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA20207B9ED400862A3A /* PerPixelEqn.hpp */; }; + 1612CA35207B9ED500862A3A /* IdlePreset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA21207B9ED400862A3A /* IdlePreset.hpp */; }; + 1612CA36207B9ED500862A3A /* PerFrameEqn.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA22207B9ED400862A3A /* PerFrameEqn.hpp */; }; + 1612CA37207B9ED500862A3A /* Parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA23207B9ED500862A3A /* Parser.hpp */; }; + 1612CA38207B9ED500862A3A /* PresetFrameIO.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA24207B9ED500862A3A /* PresetFrameIO.hpp */; }; + 1612CA39207B9ED500862A3A /* MilkdropPreset.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA25207B9ED500862A3A /* MilkdropPreset.hpp */; }; + 1612CA3A207B9ED500862A3A /* InitCond.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA26207B9ED500862A3A /* InitCond.hpp */; }; + 1612CA3B207B9ED500862A3A /* Param.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA27207B9ED500862A3A /* Param.hpp */; }; + 1612CA3C207B9ED500862A3A /* ParamUtils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1612CA28207B9ED500862A3A /* ParamUtils.hpp */; }; + 166854422105E4EC0042793A /* etc1_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E4207A85DC00862A3A /* etc1_utils.c */; }; + 166854432105E4EF0042793A /* image_DXT.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E6207A85DC00862A3A /* image_DXT.c */; }; + 166854442105E4FC0042793A /* image_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E7207A85DC00862A3A /* image_helper.c */; }; + 166854452105E4FC0042793A /* SOIL2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E5207A85DC00862A3A /* SOIL2.c */; }; + 166854462105E4FC0042793A /* BeatDetect.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172820C33DF300947E7E /* BeatDetect.hpp */; }; + 166854482105E4FC0042793A /* Filters.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172920C33DF300947E7E /* Filters.hpp */; }; + 1668544B2105E4FC0042793A /* PerlinNoise.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172E20C33DF300947E7E /* PerlinNoise.hpp */; }; + 1668544C2105E4FC0042793A /* PerPixelMesh.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173420C33DF400947E7E /* PerPixelMesh.hpp */; }; + 1668544D2105E4FC0042793A /* Pipeline.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173520C33DF400947E7E /* Pipeline.hpp */; }; + 1668544E2105E4FC0042793A /* PipelineContext.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172620C33DF300947E7E /* PipelineContext.hpp */; }; + 1668544F2105E4FC0042793A /* Renderable.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172420C33DF300947E7E /* Renderable.hpp */; }; + 166854502105E4FC0042793A /* RenderContext.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687174D20C33E1000947E7E /* RenderContext.hpp */; }; + 166854512105E4FC0042793A /* Renderer.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172C20C33DF300947E7E /* Renderer.hpp */; }; + 166854522105E4FC0042793A /* RenderItemDistanceMetric.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172A20C33DF300947E7E /* RenderItemDistanceMetric.hpp */; }; + 166854532105E4FC0042793A /* RenderItemMatcher.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172720C33DF300947E7E /* RenderItemMatcher.hpp */; }; + 166854542105E4FC0042793A /* RenderItemMergeFunction.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173320C33DF300947E7E /* RenderItemMergeFunction.hpp */; }; + 166854552105E4FC0042793A /* Shader.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172B20C33DF300947E7E /* Shader.hpp */; }; + 166854572105E4FC0042793A /* ShaderEngine.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173620C33DF400947E7E /* ShaderEngine.hpp */; }; + 166854582105E4FC0042793A /* TextureManager.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172320C33DF300947E7E /* TextureManager.hpp */; }; + 166854592105E4FD0042793A /* Transformation.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173220C33DF300947E7E /* Transformation.hpp */; }; + 1668545B2105E4FD0042793A /* VideoEcho.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172F20C33DF300947E7E /* VideoEcho.hpp */; }; + 1668545C2105E4FD0042793A /* Waveform.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173020C33DF300947E7E /* Waveform.hpp */; }; + 1668545D2105E4FD0042793A /* CodeWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689520BB1FE0000AFC1B /* CodeWriter.cpp */; }; + 1668545E2105E4FD0042793A /* Engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C688F20BB1FDF000AFC1B /* Engine.cpp */; }; + 1668545F2105E4FD0042793A /* GLSLGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689120BB1FDF000AFC1B /* GLSLGenerator.cpp */; }; + 166854612105E4FD0042793A /* HLSLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689220BB1FDF000AFC1B /* HLSLParser.cpp */; }; + 166854622105E4FD0042793A /* HLSLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689420BB1FE0000AFC1B /* HLSLTokenizer.cpp */; }; + 166854632105E4FD0042793A /* HLSLTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689320BB1FE0000AFC1B /* HLSLTree.cpp */; }; + 166854652105E4FD0042793A /* BeatDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854202105E4BC0042793A /* BeatDetect.cpp */; }; + 166854662105E4FD0042793A /* Filters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854222105E4BD0042793A /* Filters.cpp */; }; + 166854682105E4FD0042793A /* MilkdropWaveform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668542D2105E4BD0042793A /* MilkdropWaveform.cpp */; }; + 166854692105E4FD0042793A /* PerlinNoise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668541B2105E4BC0042793A /* PerlinNoise.cpp */; }; + 1668546A2105E4FD0042793A /* PerPixelMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854232105E4BD0042793A /* PerPixelMesh.cpp */; }; + 1668546B2105E4FD0042793A /* Pipeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854252105E4BD0042793A /* Pipeline.cpp */; }; + 1668546C2105E4FD0042793A /* PipelineContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668542C2105E4BD0042793A /* PipelineContext.cpp */; }; + 1668546D2105E4FD0042793A /* Renderable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668542B2105E4BD0042793A /* Renderable.cpp */; }; + 1668546E2105E4FD0042793A /* RenderContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668541E2105E4BC0042793A /* RenderContext.cpp */; }; + 1668546F2105E4FD0042793A /* Renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854282105E4BD0042793A /* Renderer.cpp */; }; + 166854702105E4FD0042793A /* RenderItemDistanceMetric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854212105E4BC0042793A /* RenderItemDistanceMetric.cpp */; }; + 166854712105E4FD0042793A /* RenderItemMatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668541C2105E4BC0042793A /* RenderItemMatcher.cpp */; }; + 166854722105E4FD0042793A /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668541F2105E4BC0042793A /* Shader.cpp */; }; + 166854732105E4FD0042793A /* ShaderEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854292105E4BD0042793A /* ShaderEngine.cpp */; }; + 166854742105E4FD0042793A /* Texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668542A2105E4BD0042793A /* Texture.cpp */; }; + 166854752105E4FD0042793A /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854242105E4BD0042793A /* TextureManager.cpp */; }; + 166854762105E4FD0042793A /* VideoEcho.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668541D2105E4BC0042793A /* VideoEcho.cpp */; }; + 166854772105E4FD0042793A /* Waveform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854262105E4BD0042793A /* Waveform.cpp */; }; + 1687173820C33DF400947E7E /* TextureManager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172320C33DF300947E7E /* TextureManager.hpp */; }; + 1687173920C33DF400947E7E /* Renderable.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172420C33DF300947E7E /* Renderable.hpp */; }; + 1687173B20C33DF400947E7E /* PipelineContext.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172620C33DF300947E7E /* PipelineContext.hpp */; }; + 1687173C20C33DF400947E7E /* RenderItemMatcher.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172720C33DF300947E7E /* RenderItemMatcher.hpp */; }; + 1687173D20C33DF400947E7E /* BeatDetect.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172820C33DF300947E7E /* BeatDetect.hpp */; }; + 1687173E20C33DF400947E7E /* Filters.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172920C33DF300947E7E /* Filters.hpp */; }; + 1687173F20C33DF400947E7E /* RenderItemDistanceMetric.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172A20C33DF300947E7E /* RenderItemDistanceMetric.hpp */; }; + 1687174020C33DF400947E7E /* Shader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172B20C33DF300947E7E /* Shader.hpp */; }; + 1687174120C33DF400947E7E /* Renderer.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172C20C33DF300947E7E /* Renderer.hpp */; }; + 1687174220C33DF400947E7E /* MilkdropWaveform.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172D20C33DF300947E7E /* MilkdropWaveform.hpp */; }; + 1687174320C33DF400947E7E /* PerlinNoise.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172E20C33DF300947E7E /* PerlinNoise.hpp */; }; + 1687174420C33DF400947E7E /* VideoEcho.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687172F20C33DF300947E7E /* VideoEcho.hpp */; }; + 1687174520C33DF400947E7E /* Waveform.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687173020C33DF300947E7E /* Waveform.hpp */; }; + 1687174720C33DF400947E7E /* Transformation.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687173220C33DF300947E7E /* Transformation.hpp */; }; + 1687174820C33DF400947E7E /* RenderItemMergeFunction.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687173320C33DF300947E7E /* RenderItemMergeFunction.hpp */; }; + 1687174920C33DF400947E7E /* PerPixelMesh.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687173420C33DF400947E7E /* PerPixelMesh.hpp */; }; + 1687174A20C33DF400947E7E /* Pipeline.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687173520C33DF400947E7E /* Pipeline.hpp */; }; + 1687174B20C33DF400947E7E /* ShaderEngine.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687173620C33DF400947E7E /* ShaderEngine.hpp */; }; + 1687174E20C33E1000947E7E /* RenderContext.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 1687174D20C33E1000947E7E /* RenderContext.hpp */; }; + 16A49E5E207A7CAE00E508EA /* ConfigFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178ABD207A68A500D3B0C8 /* ConfigFile.cpp */; }; + 16A49E62207A7CAE00E508EA /* fftsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AB5207A68A400D3B0C8 /* fftsg.cpp */; }; + 16A49E69207A7CAE00E508EA /* PCM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AC1207A68A600D3B0C8 /* PCM.cpp */; }; + 16A49E6B207A7CAE00E508EA /* PipelineMerger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AA1207A68A300D3B0C8 /* PipelineMerger.cpp */; }; + 16A49E6D207A7CAE00E508EA /* Preset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178A98207A68A300D3B0C8 /* Preset.cpp */; }; + 16A49E6F207A7CAE00E508EA /* PresetChooser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AAE207A68A400D3B0C8 /* PresetChooser.cpp */; }; + 16A49E71207A7CAE00E508EA /* PresetFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AA5207A68A300D3B0C8 /* PresetFactory.cpp */; }; + 16A49E73207A7CAE00E508EA /* PresetFactoryManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178ABA207A68A500D3B0C8 /* PresetFactoryManager.cpp */; }; + 16A49E75207A7CAE00E508EA /* PresetLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178A9B207A68A300D3B0C8 /* PresetLoader.cpp */; }; + 16A49E78207A7CAE00E508EA /* projectM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AA0207A68A300D3B0C8 /* projectM.cpp */; }; + 16A49E7D207A7CAE00E508EA /* TimeKeeper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AB8207A68A500D3B0C8 /* TimeKeeper.cpp */; }; + 16A49E7F207A7CAE00E508EA /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178AB6207A68A400D3B0C8 /* timer.cpp */; }; + 16A49E81207A7CAE00E508EA /* wipemalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16178ABC207A68A500D3B0C8 /* wipemalloc.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 1612C9A4207A855D00862A3A /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMilkdropPresetFactory.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1612C9AC207A856A00862A3A /* libNativePresetFactory.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libNativePresetFactory.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1612C9B1207A859700862A3A /* Func.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Func.cpp; path = MilkdropPresetFactory/Func.cpp; sourceTree = ""; }; + 1612C9B2207A859700862A3A /* MilkdropPresetFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MilkdropPresetFactory.cpp; path = MilkdropPresetFactory/MilkdropPresetFactory.cpp; sourceTree = ""; }; + 1612C9B3207A859700862A3A /* BuiltinParams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BuiltinParams.cpp; path = MilkdropPresetFactory/BuiltinParams.cpp; sourceTree = ""; }; + 1612C9B4207A859700862A3A /* Eval.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Eval.cpp; path = MilkdropPresetFactory/Eval.cpp; sourceTree = ""; }; + 1612C9B5207A859700862A3A /* Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Parser.cpp; path = MilkdropPresetFactory/Parser.cpp; sourceTree = ""; }; + 1612C9B6207A859700862A3A /* IdlePreset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IdlePreset.cpp; path = MilkdropPresetFactory/IdlePreset.cpp; sourceTree = ""; }; + 1612C9B7207A859700862A3A /* CustomWave.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CustomWave.cpp; path = MilkdropPresetFactory/CustomWave.cpp; sourceTree = ""; }; + 1612C9B8207A859700862A3A /* CustomShape.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CustomShape.cpp; path = MilkdropPresetFactory/CustomShape.cpp; sourceTree = ""; }; + 1612C9B9207A859700862A3A /* PresetFrameIO.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PresetFrameIO.cpp; path = MilkdropPresetFactory/PresetFrameIO.cpp; sourceTree = ""; }; + 1612C9BA207A859700862A3A /* PerPixelEqn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerPixelEqn.cpp; path = MilkdropPresetFactory/PerPixelEqn.cpp; sourceTree = ""; }; + 1612C9BB207A859700862A3A /* InitCond.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InitCond.cpp; path = MilkdropPresetFactory/InitCond.cpp; sourceTree = ""; }; + 1612C9BC207A859700862A3A /* MilkdropPreset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MilkdropPreset.cpp; path = MilkdropPresetFactory/MilkdropPreset.cpp; sourceTree = ""; }; + 1612C9BD207A859700862A3A /* PerFrameEqn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerFrameEqn.cpp; path = MilkdropPresetFactory/PerFrameEqn.cpp; sourceTree = ""; }; + 1612C9BE207A859700862A3A /* BuiltinFuncs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BuiltinFuncs.cpp; path = MilkdropPresetFactory/BuiltinFuncs.cpp; sourceTree = ""; }; + 1612C9BF207A859700862A3A /* Param.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Param.cpp; path = MilkdropPresetFactory/Param.cpp; sourceTree = ""; }; + 1612C9C0207A859700862A3A /* PerPointEqn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerPointEqn.cpp; path = MilkdropPresetFactory/PerPointEqn.cpp; sourceTree = ""; }; + 1612C9C1207A859700862A3A /* Expr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Expr.cpp; path = MilkdropPresetFactory/Expr.cpp; sourceTree = ""; }; + 1612C9D4207A85B300862A3A /* NativePresetFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NativePresetFactory.cpp; path = NativePresetFactory/NativePresetFactory.cpp; sourceTree = ""; }; + 1612C9E4207A85DC00862A3A /* etc1_utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = etc1_utils.c; path = Renderer/SOIL2/etc1_utils.c; sourceTree = ""; }; + 1612C9E5207A85DC00862A3A /* SOIL2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SOIL2.c; path = Renderer/SOIL2/SOIL2.c; sourceTree = ""; }; + 1612C9E6207A85DC00862A3A /* image_DXT.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = image_DXT.c; path = Renderer/SOIL2/image_DXT.c; sourceTree = ""; }; + 1612C9E7207A85DC00862A3A /* image_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = image_helper.c; path = Renderer/SOIL2/image_helper.c; sourceTree = ""; }; + 1612C9EE207A878800862A3A /* event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; + 1612C9EF207A878800862A3A /* cocoatoprojectM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoatoprojectM.h; sourceTree = ""; }; + 1612C9F0207A878800862A3A /* fatal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fatal.h; sourceTree = ""; }; + 1612C9F1207A878800862A3A /* glError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = glError.h; sourceTree = ""; }; + 1612C9F2207A878800862A3A /* glew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = glew.h; sourceTree = ""; }; + 1612C9F3207A878800862A3A /* lvtoprojectM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lvtoprojectM.h; sourceTree = ""; }; + 1612C9F4207A878800862A3A /* ConfigFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfigFile.h; sourceTree = ""; }; + 1612C9F5207A878800862A3A /* sdltoprojectM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdltoprojectM.h; sourceTree = ""; }; + 1612C9F6207A878800862A3A /* wipemalloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wipemalloc.h; sourceTree = ""; }; + 1612C9F7207A878800862A3A /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = ""; }; + 1612C9F8207A878800862A3A /* fftsg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fftsg.h; sourceTree = ""; }; + 1612C9F9207A878800862A3A /* dlldefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dlldefs.h; sourceTree = ""; }; + 1612C9FA207A878800862A3A /* glxew.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = glxew.h; sourceTree = ""; }; + 1612C9FB207A878800862A3A /* win32-dirent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "win32-dirent.h"; sourceTree = ""; }; + 1612C9FC207A878800862A3A /* carbontoprojectM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = carbontoprojectM.h; sourceTree = ""; }; + 1612C9FD207A878900862A3A /* projectM-opengl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "projectM-opengl.h"; sourceTree = ""; }; + 1612C9FE207A878900862A3A /* resource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resource.h; sourceTree = ""; }; + 1612CA15207B9ED400862A3A /* PerPointEqn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PerPointEqn.hpp; path = MilkdropPresetFactory/PerPointEqn.hpp; sourceTree = ""; }; + 1612CA16207B9ED400862A3A /* BuiltinFuncs.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = BuiltinFuncs.hpp; path = MilkdropPresetFactory/BuiltinFuncs.hpp; sourceTree = ""; }; + 1612CA17207B9ED400862A3A /* Expr.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Expr.hpp; path = MilkdropPresetFactory/Expr.hpp; sourceTree = ""; }; + 1612CA18207B9ED400862A3A /* MilkdropPresetFactory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MilkdropPresetFactory.hpp; path = MilkdropPresetFactory/MilkdropPresetFactory.hpp; sourceTree = ""; }; + 1612CA19207B9ED400862A3A /* CustomWave.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CustomWave.hpp; path = MilkdropPresetFactory/CustomWave.hpp; sourceTree = ""; }; + 1612CA1A207B9ED400862A3A /* CustomShape.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CustomShape.hpp; path = MilkdropPresetFactory/CustomShape.hpp; sourceTree = ""; }; + 1612CA1B207B9ED400862A3A /* BuiltinParams.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = BuiltinParams.hpp; path = MilkdropPresetFactory/BuiltinParams.hpp; sourceTree = ""; }; + 1612CA1C207B9ED400862A3A /* CValue.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CValue.hpp; path = MilkdropPresetFactory/CValue.hpp; sourceTree = ""; }; + 1612CA1D207B9ED400862A3A /* Func.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Func.hpp; path = MilkdropPresetFactory/Func.hpp; sourceTree = ""; }; + 1612CA1E207B9ED400862A3A /* Eval.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Eval.hpp; path = MilkdropPresetFactory/Eval.hpp; sourceTree = ""; }; + 1612CA1F207B9ED400862A3A /* InitCondUtils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InitCondUtils.hpp; path = MilkdropPresetFactory/InitCondUtils.hpp; sourceTree = ""; }; + 1612CA20207B9ED400862A3A /* PerPixelEqn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PerPixelEqn.hpp; path = MilkdropPresetFactory/PerPixelEqn.hpp; sourceTree = ""; }; + 1612CA21207B9ED400862A3A /* IdlePreset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = IdlePreset.hpp; path = MilkdropPresetFactory/IdlePreset.hpp; sourceTree = ""; }; + 1612CA22207B9ED400862A3A /* PerFrameEqn.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PerFrameEqn.hpp; path = MilkdropPresetFactory/PerFrameEqn.hpp; sourceTree = ""; }; + 1612CA23207B9ED500862A3A /* Parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Parser.hpp; path = MilkdropPresetFactory/Parser.hpp; sourceTree = ""; }; + 1612CA24207B9ED500862A3A /* PresetFrameIO.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PresetFrameIO.hpp; path = MilkdropPresetFactory/PresetFrameIO.hpp; sourceTree = ""; }; + 1612CA25207B9ED500862A3A /* MilkdropPreset.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MilkdropPreset.hpp; path = MilkdropPresetFactory/MilkdropPreset.hpp; sourceTree = ""; }; + 1612CA26207B9ED500862A3A /* InitCond.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = InitCond.hpp; path = MilkdropPresetFactory/InitCond.hpp; sourceTree = ""; }; + 1612CA27207B9ED500862A3A /* Param.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Param.hpp; path = MilkdropPresetFactory/Param.hpp; sourceTree = ""; }; + 1612CA28207B9ED500862A3A /* ParamUtils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ParamUtils.hpp; path = MilkdropPresetFactory/ParamUtils.hpp; sourceTree = ""; }; + 16178A98207A68A300D3B0C8 /* Preset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Preset.cpp; sourceTree = ""; }; + 16178A9B207A68A300D3B0C8 /* PresetLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PresetLoader.cpp; sourceTree = ""; }; + 16178AA0207A68A300D3B0C8 /* projectM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projectM.cpp; sourceTree = ""; }; + 16178AA1207A68A300D3B0C8 /* PipelineMerger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PipelineMerger.cpp; sourceTree = ""; }; + 16178AA5207A68A300D3B0C8 /* PresetFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PresetFactory.cpp; sourceTree = ""; }; + 16178AAE207A68A400D3B0C8 /* PresetChooser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PresetChooser.cpp; sourceTree = ""; }; + 16178AB5207A68A400D3B0C8 /* fftsg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fftsg.cpp; sourceTree = ""; }; + 16178AB6207A68A400D3B0C8 /* timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer.cpp; sourceTree = ""; }; + 16178AB8207A68A500D3B0C8 /* TimeKeeper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeKeeper.cpp; sourceTree = ""; }; + 16178ABA207A68A500D3B0C8 /* PresetFactoryManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PresetFactoryManager.cpp; sourceTree = ""; }; + 16178ABC207A68A500D3B0C8 /* wipemalloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wipemalloc.cpp; sourceTree = ""; }; + 16178ABD207A68A500D3B0C8 /* ConfigFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConfigFile.cpp; sourceTree = ""; }; + 16178AC1207A68A600D3B0C8 /* PCM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PCM.cpp; sourceTree = ""; }; + 16178AC5207A68A600D3B0C8 /* KeyHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyHandler.cpp; sourceTree = ""; }; + 16178AF7207A691100D3B0C8 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + 16178B12207A6F4000D3B0C8 /* libRenderer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRenderer.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1668541B2105E4BC0042793A /* PerlinNoise.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerlinNoise.cpp; path = Renderer/PerlinNoise.cpp; sourceTree = ""; }; + 1668541C2105E4BC0042793A /* RenderItemMatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RenderItemMatcher.cpp; path = Renderer/RenderItemMatcher.cpp; sourceTree = ""; }; + 1668541D2105E4BC0042793A /* VideoEcho.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoEcho.cpp; path = Renderer/VideoEcho.cpp; sourceTree = ""; }; + 1668541E2105E4BC0042793A /* RenderContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RenderContext.cpp; path = Renderer/RenderContext.cpp; sourceTree = ""; }; + 1668541F2105E4BC0042793A /* Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Shader.cpp; path = Renderer/Shader.cpp; sourceTree = ""; }; + 166854202105E4BC0042793A /* BeatDetect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BeatDetect.cpp; path = Renderer/BeatDetect.cpp; sourceTree = ""; }; + 166854212105E4BC0042793A /* RenderItemDistanceMetric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RenderItemDistanceMetric.cpp; path = Renderer/RenderItemDistanceMetric.cpp; sourceTree = ""; }; + 166854222105E4BD0042793A /* Filters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Filters.cpp; path = Renderer/Filters.cpp; sourceTree = ""; }; + 166854232105E4BD0042793A /* PerPixelMesh.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PerPixelMesh.cpp; path = Renderer/PerPixelMesh.cpp; sourceTree = ""; }; + 166854242105E4BD0042793A /* TextureManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextureManager.cpp; path = Renderer/TextureManager.cpp; sourceTree = ""; }; + 166854252105E4BD0042793A /* Pipeline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Pipeline.cpp; path = Renderer/Pipeline.cpp; sourceTree = ""; }; + 166854262105E4BD0042793A /* Waveform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Waveform.cpp; path = Renderer/Waveform.cpp; sourceTree = ""; }; + 166854282105E4BD0042793A /* Renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Renderer.cpp; path = Renderer/Renderer.cpp; sourceTree = ""; }; + 166854292105E4BD0042793A /* ShaderEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShaderEngine.cpp; path = Renderer/ShaderEngine.cpp; sourceTree = ""; }; + 1668542A2105E4BD0042793A /* Texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Texture.cpp; path = Renderer/Texture.cpp; sourceTree = ""; }; + 1668542B2105E4BD0042793A /* Renderable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Renderable.cpp; path = Renderer/Renderable.cpp; sourceTree = ""; }; + 1668542C2105E4BD0042793A /* PipelineContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PipelineContext.cpp; path = Renderer/PipelineContext.cpp; sourceTree = ""; }; + 1668542D2105E4BD0042793A /* MilkdropWaveform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MilkdropWaveform.cpp; path = Renderer/MilkdropWaveform.cpp; sourceTree = ""; }; + 1687172320C33DF300947E7E /* TextureManager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = TextureManager.hpp; path = Renderer/TextureManager.hpp; sourceTree = ""; }; + 1687172420C33DF300947E7E /* Renderable.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Renderable.hpp; path = Renderer/Renderable.hpp; sourceTree = ""; }; + 1687172620C33DF300947E7E /* PipelineContext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PipelineContext.hpp; path = Renderer/PipelineContext.hpp; sourceTree = ""; }; + 1687172720C33DF300947E7E /* RenderItemMatcher.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = RenderItemMatcher.hpp; path = Renderer/RenderItemMatcher.hpp; sourceTree = ""; }; + 1687172820C33DF300947E7E /* BeatDetect.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = BeatDetect.hpp; path = Renderer/BeatDetect.hpp; sourceTree = ""; }; + 1687172920C33DF300947E7E /* Filters.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Filters.hpp; path = Renderer/Filters.hpp; sourceTree = ""; }; + 1687172A20C33DF300947E7E /* RenderItemDistanceMetric.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = RenderItemDistanceMetric.hpp; path = Renderer/RenderItemDistanceMetric.hpp; sourceTree = ""; }; + 1687172B20C33DF300947E7E /* Shader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Shader.hpp; path = Renderer/Shader.hpp; sourceTree = ""; }; + 1687172C20C33DF300947E7E /* Renderer.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Renderer.hpp; path = Renderer/Renderer.hpp; sourceTree = ""; }; + 1687172D20C33DF300947E7E /* MilkdropWaveform.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = MilkdropWaveform.hpp; path = Renderer/MilkdropWaveform.hpp; sourceTree = ""; }; + 1687172E20C33DF300947E7E /* PerlinNoise.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PerlinNoise.hpp; path = Renderer/PerlinNoise.hpp; sourceTree = ""; }; + 1687172F20C33DF300947E7E /* VideoEcho.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = VideoEcho.hpp; path = Renderer/VideoEcho.hpp; sourceTree = ""; }; + 1687173020C33DF300947E7E /* Waveform.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Waveform.hpp; path = Renderer/Waveform.hpp; sourceTree = ""; }; + 1687173220C33DF300947E7E /* Transformation.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Transformation.hpp; path = Renderer/Transformation.hpp; sourceTree = ""; }; + 1687173320C33DF300947E7E /* RenderItemMergeFunction.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = RenderItemMergeFunction.hpp; path = Renderer/RenderItemMergeFunction.hpp; sourceTree = ""; }; + 1687173420C33DF400947E7E /* PerPixelMesh.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = PerPixelMesh.hpp; path = Renderer/PerPixelMesh.hpp; sourceTree = ""; }; + 1687173520C33DF400947E7E /* Pipeline.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Pipeline.hpp; path = Renderer/Pipeline.hpp; sourceTree = ""; }; + 1687173620C33DF400947E7E /* ShaderEngine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ShaderEngine.hpp; path = Renderer/ShaderEngine.hpp; sourceTree = ""; }; + 1687174D20C33E1000947E7E /* RenderContext.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = RenderContext.hpp; path = Renderer/RenderContext.hpp; sourceTree = ""; }; + 168C688F20BB1FDF000AFC1B /* Engine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Engine.cpp; path = Renderer/hlslparser/src/Engine.cpp; sourceTree = ""; }; + 168C689120BB1FDF000AFC1B /* GLSLGenerator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = GLSLGenerator.cpp; path = Renderer/hlslparser/src/GLSLGenerator.cpp; sourceTree = ""; }; + 168C689220BB1FDF000AFC1B /* HLSLParser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HLSLParser.cpp; path = Renderer/hlslparser/src/HLSLParser.cpp; sourceTree = ""; }; + 168C689320BB1FE0000AFC1B /* HLSLTree.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HLSLTree.cpp; path = Renderer/hlslparser/src/HLSLTree.cpp; sourceTree = ""; }; + 168C689420BB1FE0000AFC1B /* HLSLTokenizer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HLSLTokenizer.cpp; path = Renderer/hlslparser/src/HLSLTokenizer.cpp; sourceTree = ""; }; + 168C689520BB1FE0000AFC1B /* CodeWriter.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CodeWriter.cpp; path = Renderer/hlslparser/src/CodeWriter.cpp; sourceTree = ""; }; + 16A49E57207A7C8C00E508EA /* libprojectM.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libprojectM.a; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 1612C9A1207A855D00862A3A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 1612C9A9207A856A00862A3A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16178B0F207A6F4000D3B0C8 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16A49E54207A7C8C00E508EA /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1612C9B0207A857F00862A3A /* MilkdropPresetFactory */ = { + isa = PBXGroup; + children = ( + 1612C9BE207A859700862A3A /* BuiltinFuncs.cpp */, + 1612C9B3207A859700862A3A /* BuiltinParams.cpp */, + 1612C9B8207A859700862A3A /* CustomShape.cpp */, + 1612C9B7207A859700862A3A /* CustomWave.cpp */, + 1612C9B4207A859700862A3A /* Eval.cpp */, + 1612C9C1207A859700862A3A /* Expr.cpp */, + 1612C9B1207A859700862A3A /* Func.cpp */, + 1612C9B6207A859700862A3A /* IdlePreset.cpp */, + 1612C9BB207A859700862A3A /* InitCond.cpp */, + 1612C9BC207A859700862A3A /* MilkdropPreset.cpp */, + 1612C9B2207A859700862A3A /* MilkdropPresetFactory.cpp */, + 1612C9BF207A859700862A3A /* Param.cpp */, + 1612C9B5207A859700862A3A /* Parser.cpp */, + 1612C9BD207A859700862A3A /* PerFrameEqn.cpp */, + 1612C9BA207A859700862A3A /* PerPixelEqn.cpp */, + 1612C9C0207A859700862A3A /* PerPointEqn.cpp */, + 1612C9B9207A859700862A3A /* PresetFrameIO.cpp */, + 1612CA16207B9ED400862A3A /* BuiltinFuncs.hpp */, + 1612CA1B207B9ED400862A3A /* BuiltinParams.hpp */, + 1612CA1A207B9ED400862A3A /* CustomShape.hpp */, + 1612CA19207B9ED400862A3A /* CustomWave.hpp */, + 1612CA1C207B9ED400862A3A /* CValue.hpp */, + 1612CA1E207B9ED400862A3A /* Eval.hpp */, + 1612CA17207B9ED400862A3A /* Expr.hpp */, + 1612CA1D207B9ED400862A3A /* Func.hpp */, + 1612CA21207B9ED400862A3A /* IdlePreset.hpp */, + 1612CA26207B9ED500862A3A /* InitCond.hpp */, + 1612CA1F207B9ED400862A3A /* InitCondUtils.hpp */, + 1612CA25207B9ED500862A3A /* MilkdropPreset.hpp */, + 1612CA18207B9ED400862A3A /* MilkdropPresetFactory.hpp */, + 1612CA27207B9ED500862A3A /* Param.hpp */, + 1612CA28207B9ED500862A3A /* ParamUtils.hpp */, + 1612CA23207B9ED500862A3A /* Parser.hpp */, + 1612CA22207B9ED400862A3A /* PerFrameEqn.hpp */, + 1612CA20207B9ED400862A3A /* PerPixelEqn.hpp */, + 1612CA15207B9ED400862A3A /* PerPointEqn.hpp */, + 1612CA24207B9ED500862A3A /* PresetFrameIO.hpp */, + ); + name = MilkdropPresetFactory; + sourceTree = ""; + }; + 1612C9D3207A85A400862A3A /* NativePresetFactory */ = { + isa = PBXGroup; + children = ( + 1612C9D4207A85B300862A3A /* NativePresetFactory.cpp */, + ); + name = NativePresetFactory; + sourceTree = ""; + }; + 1612C9ED207A877D00862A3A /* Headers */ = { + isa = PBXGroup; + children = ( + 1612C9FC207A878800862A3A /* carbontoprojectM.h */, + 1612C9EF207A878800862A3A /* cocoatoprojectM.h */, + 1612C9F4207A878800862A3A /* ConfigFile.h */, + 1612C9F9207A878800862A3A /* dlldefs.h */, + 1612C9EE207A878800862A3A /* event.h */, + 1612C9F0207A878800862A3A /* fatal.h */, + 1612C9F8207A878800862A3A /* fftsg.h */, + 1612C9F1207A878800862A3A /* glError.h */, + 1612C9F2207A878800862A3A /* glew.h */, + 1612C9FA207A878800862A3A /* glxew.h */, + 1612C9F3207A878800862A3A /* lvtoprojectM.h */, + 1612C9FD207A878900862A3A /* projectM-opengl.h */, + 1612C9FE207A878900862A3A /* resource.h */, + 1612C9F5207A878800862A3A /* sdltoprojectM.h */, + 1612C9F7207A878800862A3A /* timer.h */, + 1612C9FB207A878800862A3A /* win32-dirent.h */, + 1612C9F6207A878800862A3A /* wipemalloc.h */, + ); + name = Headers; + sourceTree = ""; + }; + 161789B7207A675B00D3B0C8 = { + isa = PBXGroup; + children = ( + 1612C9D3207A85A400862A3A /* NativePresetFactory */, + 1612C9B0207A857F00862A3A /* MilkdropPresetFactory */, + 16178B3F207A6FD900D3B0C8 /* Renderer */, + 161789C9207A689400D3B0C8 /* libProjectM */, + 161789C1207A675B00D3B0C8 /* Products */, + 16178AF6207A691100D3B0C8 /* Frameworks */, + ); + sourceTree = ""; + }; + 161789C1207A675B00D3B0C8 /* Products */ = { + isa = PBXGroup; + children = ( + 16178B12207A6F4000D3B0C8 /* libRenderer.a */, + 16A49E57207A7C8C00E508EA /* libprojectM.a */, + 1612C9A4207A855D00862A3A /* libMilkdropPresetFactory.a */, + 1612C9AC207A856A00862A3A /* libNativePresetFactory.a */, + ); + name = Products; + sourceTree = ""; + }; + 161789C9207A689400D3B0C8 /* libProjectM */ = { + isa = PBXGroup; + children = ( + 1612C9ED207A877D00862A3A /* Headers */, + 16178AA0207A68A300D3B0C8 /* projectM.cpp */, + 16178ABD207A68A500D3B0C8 /* ConfigFile.cpp */, + 16178AB5207A68A400D3B0C8 /* fftsg.cpp */, + 16178AC5207A68A600D3B0C8 /* KeyHandler.cpp */, + 16178AC1207A68A600D3B0C8 /* PCM.cpp */, + 16178AA1207A68A300D3B0C8 /* PipelineMerger.cpp */, + 16178A98207A68A300D3B0C8 /* Preset.cpp */, + 16178AAE207A68A400D3B0C8 /* PresetChooser.cpp */, + 16178AA5207A68A300D3B0C8 /* PresetFactory.cpp */, + 16178ABA207A68A500D3B0C8 /* PresetFactoryManager.cpp */, + 16178A9B207A68A300D3B0C8 /* PresetLoader.cpp */, + 16178AB8207A68A500D3B0C8 /* TimeKeeper.cpp */, + 16178AB6207A68A400D3B0C8 /* timer.cpp */, + 16178ABC207A68A500D3B0C8 /* wipemalloc.cpp */, + ); + name = libProjectM; + sourceTree = ""; + }; + 16178AF6207A691100D3B0C8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 16178AF7207A691100D3B0C8 /* OpenGL.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 16178B3F207A6FD900D3B0C8 /* Renderer */ = { + isa = PBXGroup; + children = ( + 166854412105E4C20042793A /* etc */, + 1687172220C33DDF00947E7E /* headers */, + 168C689F20BB265D000AFC1B /* hlslparser */, + 166854202105E4BC0042793A /* BeatDetect.cpp */, + 166854222105E4BD0042793A /* Filters.cpp */, + 1668542D2105E4BD0042793A /* MilkdropWaveform.cpp */, + 1668541B2105E4BC0042793A /* PerlinNoise.cpp */, + 166854232105E4BD0042793A /* PerPixelMesh.cpp */, + 166854252105E4BD0042793A /* Pipeline.cpp */, + 1668542C2105E4BD0042793A /* PipelineContext.cpp */, + 1668542B2105E4BD0042793A /* Renderable.cpp */, + 1668541E2105E4BC0042793A /* RenderContext.cpp */, + 166854282105E4BD0042793A /* Renderer.cpp */, + 166854212105E4BC0042793A /* RenderItemDistanceMetric.cpp */, + 1668541C2105E4BC0042793A /* RenderItemMatcher.cpp */, + 1668541F2105E4BC0042793A /* Shader.cpp */, + 166854292105E4BD0042793A /* ShaderEngine.cpp */, + 1668542A2105E4BD0042793A /* Texture.cpp */, + 166854242105E4BD0042793A /* TextureManager.cpp */, + 1668541D2105E4BC0042793A /* VideoEcho.cpp */, + 166854262105E4BD0042793A /* Waveform.cpp */, + ); + name = Renderer; + sourceTree = ""; + }; + 166854412105E4C20042793A /* etc */ = { + isa = PBXGroup; + children = ( + 1612C9E4207A85DC00862A3A /* etc1_utils.c */, + 1612C9E6207A85DC00862A3A /* image_DXT.c */, + 1612C9E7207A85DC00862A3A /* image_helper.c */, + 1612C9E5207A85DC00862A3A /* SOIL2.c */, + ); + name = etc; + sourceTree = ""; + }; + 1687172220C33DDF00947E7E /* headers */ = { + isa = PBXGroup; + children = ( + 1687172820C33DF300947E7E /* BeatDetect.hpp */, + 1687172920C33DF300947E7E /* Filters.hpp */, + 1687172D20C33DF300947E7E /* MilkdropWaveform.hpp */, + 1687172E20C33DF300947E7E /* PerlinNoise.hpp */, + 1687173420C33DF400947E7E /* PerPixelMesh.hpp */, + 1687173520C33DF400947E7E /* Pipeline.hpp */, + 1687172620C33DF300947E7E /* PipelineContext.hpp */, + 1687172420C33DF300947E7E /* Renderable.hpp */, + 1687174D20C33E1000947E7E /* RenderContext.hpp */, + 1687172C20C33DF300947E7E /* Renderer.hpp */, + 1687172A20C33DF300947E7E /* RenderItemDistanceMetric.hpp */, + 1687172720C33DF300947E7E /* RenderItemMatcher.hpp */, + 1687173320C33DF300947E7E /* RenderItemMergeFunction.hpp */, + 1687172B20C33DF300947E7E /* Shader.hpp */, + 1687173620C33DF400947E7E /* ShaderEngine.hpp */, + 1687172320C33DF300947E7E /* TextureManager.hpp */, + 1687173220C33DF300947E7E /* Transformation.hpp */, + 1687172F20C33DF300947E7E /* VideoEcho.hpp */, + 1687173020C33DF300947E7E /* Waveform.hpp */, + ); + name = headers; + sourceTree = ""; + }; + 168C689F20BB265D000AFC1B /* hlslparser */ = { + isa = PBXGroup; + children = ( + 168C689520BB1FE0000AFC1B /* CodeWriter.cpp */, + 168C688F20BB1FDF000AFC1B /* Engine.cpp */, + 168C689120BB1FDF000AFC1B /* GLSLGenerator.cpp */, + 168C689220BB1FDF000AFC1B /* HLSLParser.cpp */, + 168C689420BB1FE0000AFC1B /* HLSLTokenizer.cpp */, + 168C689320BB1FE0000AFC1B /* HLSLTree.cpp */, + ); + name = hlslparser; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 1612C9A2207A855D00862A3A /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 1612CA30207B9ED500862A3A /* CValue.hpp in Headers */, + 1612CA2D207B9ED500862A3A /* CustomWave.hpp in Headers */, + 1612CA3B207B9ED500862A3A /* Param.hpp in Headers */, + 1612CA34207B9ED500862A3A /* PerPixelEqn.hpp in Headers */, + 1612CA2C207B9ED500862A3A /* MilkdropPresetFactory.hpp in Headers */, + 1612CA2A207B9ED500862A3A /* BuiltinFuncs.hpp in Headers */, + 1612CA36207B9ED500862A3A /* PerFrameEqn.hpp in Headers */, + 1612CA32207B9ED500862A3A /* Eval.hpp in Headers */, + 1612CA35207B9ED500862A3A /* IdlePreset.hpp in Headers */, + 1612CA3A207B9ED500862A3A /* InitCond.hpp in Headers */, + 1612CA3C207B9ED500862A3A /* ParamUtils.hpp in Headers */, + 1612CA37207B9ED500862A3A /* Parser.hpp in Headers */, + 1612CA33207B9ED500862A3A /* InitCondUtils.hpp in Headers */, + 1612CA31207B9ED500862A3A /* Func.hpp in Headers */, + 1612CA2B207B9ED500862A3A /* Expr.hpp in Headers */, + 1612CA29207B9ED500862A3A /* PerPointEqn.hpp in Headers */, + 1612CA38207B9ED500862A3A /* PresetFrameIO.hpp in Headers */, + 1612CA2E207B9ED500862A3A /* CustomShape.hpp in Headers */, + 1612CA2F207B9ED500862A3A /* BuiltinParams.hpp in Headers */, + 1612CA39207B9ED500862A3A /* MilkdropPreset.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 1612C9AA207A856A00862A3A /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16178B10207A6F4000D3B0C8 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 1687174320C33DF400947E7E /* PerlinNoise.hpp in Headers */, + 1687173820C33DF400947E7E /* TextureManager.hpp in Headers */, + 1687173B20C33DF400947E7E /* PipelineContext.hpp in Headers */, + 1687173E20C33DF400947E7E /* Filters.hpp in Headers */, + 1687174920C33DF400947E7E /* PerPixelMesh.hpp in Headers */, + 1687174720C33DF400947E7E /* Transformation.hpp in Headers */, + 1687173D20C33DF400947E7E /* BeatDetect.hpp in Headers */, + 1687173F20C33DF400947E7E /* RenderItemDistanceMetric.hpp in Headers */, + 1687174E20C33E1000947E7E /* RenderContext.hpp in Headers */, + 1687174B20C33DF400947E7E /* ShaderEngine.hpp in Headers */, + 1687173C20C33DF400947E7E /* RenderItemMatcher.hpp in Headers */, + 1687174A20C33DF400947E7E /* Pipeline.hpp in Headers */, + 1687174120C33DF400947E7E /* Renderer.hpp in Headers */, + 1687173920C33DF400947E7E /* Renderable.hpp in Headers */, + 1687174020C33DF400947E7E /* Shader.hpp in Headers */, + 1687174820C33DF400947E7E /* RenderItemMergeFunction.hpp in Headers */, + 1687174520C33DF400947E7E /* Waveform.hpp in Headers */, + 1687174220C33DF400947E7E /* MilkdropWaveform.hpp in Headers */, + 1687174420C33DF400947E7E /* VideoEcho.hpp in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16A49E55207A7C8C00E508EA /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 1612CA03207A878900862A3A /* glew.h in Headers */, + 1612CA0A207A878900862A3A /* dlldefs.h in Headers */, + 1612CA02207A878900862A3A /* glError.h in Headers */, + 1612CA08207A878900862A3A /* timer.h in Headers */, + 1612CA01207A878900862A3A /* fatal.h in Headers */, + 1612CA04207A878900862A3A /* lvtoprojectM.h in Headers */, + 1612C9FF207A878900862A3A /* event.h in Headers */, + 1612CA05207A878900862A3A /* ConfigFile.h in Headers */, + 1612CA0C207A878900862A3A /* win32-dirent.h in Headers */, + 1612CA0F207A878900862A3A /* resource.h in Headers */, + 1612CA00207A878900862A3A /* cocoatoprojectM.h in Headers */, + 1612CA07207A878900862A3A /* wipemalloc.h in Headers */, + 1612CA06207A878900862A3A /* sdltoprojectM.h in Headers */, + 1612CA09207A878900862A3A /* fftsg.h in Headers */, + 1612CA0E207A878900862A3A /* projectM-opengl.h in Headers */, + 1612CA0B207A878900862A3A /* glxew.h in Headers */, + 1612CA0D207A878900862A3A /* carbontoprojectM.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 1612C9A3207A855D00862A3A /* MilkdropPresetFactory */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1612C9A5207A855D00862A3A /* Build configuration list for PBXNativeTarget "MilkdropPresetFactory" */; + buildPhases = ( + 1612C9A0207A855D00862A3A /* Sources */, + 1612C9A1207A855D00862A3A /* Frameworks */, + 1612C9A2207A855D00862A3A /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = MilkdropPresetFactory; + productName = MilkdropPresetFactory; + productReference = 1612C9A4207A855D00862A3A /* libMilkdropPresetFactory.a */; + productType = "com.apple.product-type.library.static"; + }; + 1612C9AB207A856A00862A3A /* NativePresetFactory */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1612C9AD207A856A00862A3A /* Build configuration list for PBXNativeTarget "NativePresetFactory" */; + buildPhases = ( + 1612C9A8207A856A00862A3A /* Sources */, + 1612C9A9207A856A00862A3A /* Frameworks */, + 1612C9AA207A856A00862A3A /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = NativePresetFactory; + productName = NativePresetFactory; + productReference = 1612C9AC207A856A00862A3A /* libNativePresetFactory.a */; + productType = "com.apple.product-type.library.static"; + }; + 16178B11207A6F4000D3B0C8 /* Renderer */ = { + isa = PBXNativeTarget; + buildConfigurationList = 16178B13207A6F4000D3B0C8 /* Build configuration list for PBXNativeTarget "Renderer" */; + buildPhases = ( + 16178B0E207A6F4000D3B0C8 /* Sources */, + 16178B0F207A6F4000D3B0C8 /* Frameworks */, + 16178B10207A6F4000D3B0C8 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Renderer; + productName = Renderer; + productReference = 16178B12207A6F4000D3B0C8 /* libRenderer.a */; + productType = "com.apple.product-type.library.static"; + }; + 16A49E56207A7C8C00E508EA /* projectM */ = { + isa = PBXNativeTarget; + buildConfigurationList = 16A49E58207A7C8C00E508EA /* Build configuration list for PBXNativeTarget "projectM" */; + buildPhases = ( + 16A49E53207A7C8C00E508EA /* Sources */, + 16A49E54207A7C8C00E508EA /* Frameworks */, + 16A49E55207A7C8C00E508EA /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = projectM; + productName = libprojectM; + productReference = 16A49E57207A7C8C00E508EA /* libprojectM.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 161789B8207A675B00D3B0C8 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0920; + ORGANIZATIONNAME = MVSTG; + TargetAttributes = { + 1612C9A3207A855D00862A3A = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + 1612C9AB207A856A00862A3A = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + 16178B11207A6F4000D3B0C8 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + 16A49E56207A7C8C00E508EA = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 161789BB207A675B00D3B0C8 /* Build configuration list for PBXProject "libprojectM" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 161789B7207A675B00D3B0C8; + productRefGroup = 161789C1207A675B00D3B0C8 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 16178B11207A6F4000D3B0C8 /* Renderer */, + 16A49E56207A7C8C00E508EA /* projectM */, + 1612C9A3207A855D00862A3A /* MilkdropPresetFactory */, + 1612C9AB207A856A00862A3A /* NativePresetFactory */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 1612C9A0207A855D00862A3A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1612C9CD207A859800862A3A /* MilkdropPreset.cpp in Sources */, + 1612C9CF207A859800862A3A /* BuiltinFuncs.cpp in Sources */, + 1612C9C2207A859800862A3A /* Func.cpp in Sources */, + 1612C9CA207A859800862A3A /* PresetFrameIO.cpp in Sources */, + 1612C9C5207A859800862A3A /* Eval.cpp in Sources */, + 1612C9D1207A859800862A3A /* PerPointEqn.cpp in Sources */, + 1612C9C7207A859800862A3A /* IdlePreset.cpp in Sources */, + 1612C9D0207A859800862A3A /* Param.cpp in Sources */, + 1612C9CC207A859800862A3A /* InitCond.cpp in Sources */, + 1612C9C8207A859800862A3A /* CustomWave.cpp in Sources */, + 1612C9C9207A859800862A3A /* CustomShape.cpp in Sources */, + 1612C9CE207A859800862A3A /* PerFrameEqn.cpp in Sources */, + 1612C9C4207A859800862A3A /* BuiltinParams.cpp in Sources */, + 1612C9D2207A859800862A3A /* Expr.cpp in Sources */, + 1612C9C6207A859800862A3A /* Parser.cpp in Sources */, + 1612C9C3207A859800862A3A /* MilkdropPresetFactory.cpp in Sources */, + 1612C9CB207A859800862A3A /* PerPixelEqn.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 1612C9A8207A856A00862A3A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1612C9D5207A85B300862A3A /* NativePresetFactory.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16178B0E207A6F4000D3B0C8 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 166854442105E4FC0042793A /* image_helper.c in Sources */, + 166854452105E4FC0042793A /* SOIL2.c in Sources */, + 166854462105E4FC0042793A /* BeatDetect.hpp in Sources */, + 166854482105E4FC0042793A /* Filters.hpp in Sources */, + 1668544B2105E4FC0042793A /* PerlinNoise.hpp in Sources */, + 1668544C2105E4FC0042793A /* PerPixelMesh.hpp in Sources */, + 1668544D2105E4FC0042793A /* Pipeline.hpp in Sources */, + 1668544E2105E4FC0042793A /* PipelineContext.hpp in Sources */, + 1668544F2105E4FC0042793A /* Renderable.hpp in Sources */, + 166854502105E4FC0042793A /* RenderContext.hpp in Sources */, + 166854512105E4FC0042793A /* Renderer.hpp in Sources */, + 166854522105E4FC0042793A /* RenderItemDistanceMetric.hpp in Sources */, + 166854532105E4FC0042793A /* RenderItemMatcher.hpp in Sources */, + 166854542105E4FC0042793A /* RenderItemMergeFunction.hpp in Sources */, + 166854552105E4FC0042793A /* Shader.hpp in Sources */, + 166854572105E4FC0042793A /* ShaderEngine.hpp in Sources */, + 166854582105E4FC0042793A /* TextureManager.hpp in Sources */, + 166854592105E4FD0042793A /* Transformation.hpp in Sources */, + 1668545B2105E4FD0042793A /* VideoEcho.hpp in Sources */, + 1668545C2105E4FD0042793A /* Waveform.hpp in Sources */, + 1668545D2105E4FD0042793A /* CodeWriter.cpp in Sources */, + 1668545E2105E4FD0042793A /* Engine.cpp in Sources */, + 1668545F2105E4FD0042793A /* GLSLGenerator.cpp in Sources */, + 166854612105E4FD0042793A /* HLSLParser.cpp in Sources */, + 166854622105E4FD0042793A /* HLSLTokenizer.cpp in Sources */, + 166854632105E4FD0042793A /* HLSLTree.cpp in Sources */, + 166854652105E4FD0042793A /* BeatDetect.cpp in Sources */, + 166854662105E4FD0042793A /* Filters.cpp in Sources */, + 166854682105E4FD0042793A /* MilkdropWaveform.cpp in Sources */, + 166854692105E4FD0042793A /* PerlinNoise.cpp in Sources */, + 1668546A2105E4FD0042793A /* PerPixelMesh.cpp in Sources */, + 1668546B2105E4FD0042793A /* Pipeline.cpp in Sources */, + 1668546C2105E4FD0042793A /* PipelineContext.cpp in Sources */, + 1668546D2105E4FD0042793A /* Renderable.cpp in Sources */, + 1668546E2105E4FD0042793A /* RenderContext.cpp in Sources */, + 1668546F2105E4FD0042793A /* Renderer.cpp in Sources */, + 166854702105E4FD0042793A /* RenderItemDistanceMetric.cpp in Sources */, + 166854712105E4FD0042793A /* RenderItemMatcher.cpp in Sources */, + 166854722105E4FD0042793A /* Shader.cpp in Sources */, + 166854732105E4FD0042793A /* ShaderEngine.cpp in Sources */, + 166854742105E4FD0042793A /* Texture.cpp in Sources */, + 166854752105E4FD0042793A /* TextureManager.cpp in Sources */, + 166854762105E4FD0042793A /* VideoEcho.cpp in Sources */, + 166854772105E4FD0042793A /* Waveform.cpp in Sources */, + 166854422105E4EC0042793A /* etc1_utils.c in Sources */, + 166854432105E4EF0042793A /* image_DXT.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 16A49E53207A7C8C00E508EA /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 16A49E5E207A7CAE00E508EA /* ConfigFile.cpp in Sources */, + 16A49E62207A7CAE00E508EA /* fftsg.cpp in Sources */, + 16A49E69207A7CAE00E508EA /* PCM.cpp in Sources */, + 1612C9EC207A860000862A3A /* KeyHandler.cpp in Sources */, + 16A49E6B207A7CAE00E508EA /* PipelineMerger.cpp in Sources */, + 16A49E6D207A7CAE00E508EA /* Preset.cpp in Sources */, + 16A49E6F207A7CAE00E508EA /* PresetChooser.cpp in Sources */, + 16A49E71207A7CAE00E508EA /* PresetFactory.cpp in Sources */, + 16A49E73207A7CAE00E508EA /* PresetFactoryManager.cpp in Sources */, + 16A49E75207A7CAE00E508EA /* PresetLoader.cpp in Sources */, + 16A49E78207A7CAE00E508EA /* projectM.cpp in Sources */, + 16A49E7D207A7CAE00E508EA /* TimeKeeper.cpp in Sources */, + 16A49E7F207A7CAE00E508EA /* timer.cpp in Sources */, + 16A49E81207A7CAE00E508EA /* wipemalloc.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 1612C9A6207A855D00862A3A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Debug; + }; + 1612C9A7207A855D00862A3A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Release; + }; + 1612C9AE207A856A00862A3A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Debug; + }; + 1612C9AF207A856A00862A3A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + }; + name = Release; + }; + 161789C2207A675B00D3B0C8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "USE_THREADS=1", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../..", + "$(SRCROOT)/Renderer", + "$(SRCROOT)/", + "$(inherited)", + /usr/local/include, + "$(SRCROOT)/Renderer/hlslparser/src", + ); + LIBRARY_SEARCH_PATHS = /Library/Frameworks; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = ""; + }; + name = Debug; + }; + 161789C3207A675B00D3B0C8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "USE_THREADS=1"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../..", + "$(SRCROOT)/Renderer", + "$(SRCROOT)/", + "$(inherited)", + /usr/local/include, + "$(SRCROOT)/Renderer/hlslparser/src", + ); + LIBRARY_SEARCH_PATHS = /Library/Frameworks; + MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CFLAGS = ""; + }; + name = Release; + }; + 16178B14207A6F4000D3B0C8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + /Library/Frameworks, + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + "GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = ( + "DATADIR_PATH=\\\"\".\"\\\"", + "$(inherited)", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 16178B15207A6F4000D3B0C8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + /Library/Frameworks, + "$(LOCAL_LIBRARY_DIR)/Frameworks", + ); + GCC_PREPROCESSOR_DEFINITIONS = ( + "DATADIR_PATH=\\\"\"/usr/local/share/projectM\"\\\"", + "$(inherited)", + ); + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 16A49E59207A7C8C00E508EA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + "$(USER_LIBRARY_DIR)/Frameworks", + "$(PROJECT_DIR)", + "$(SRCROOT)", + ); + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_NAME = projectM; + }; + name = Debug; + }; + 16A49E5A207A7C8C00E508EA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(LOCAL_LIBRARY_DIR)/Frameworks", + "$(USER_LIBRARY_DIR)/Frameworks", + "$(PROJECT_DIR)", + "$(SRCROOT)", + ); + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_NAME = projectM; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1612C9A5207A855D00862A3A /* Build configuration list for PBXNativeTarget "MilkdropPresetFactory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1612C9A6207A855D00862A3A /* Debug */, + 1612C9A7207A855D00862A3A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1612C9AD207A856A00862A3A /* Build configuration list for PBXNativeTarget "NativePresetFactory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1612C9AE207A856A00862A3A /* Debug */, + 1612C9AF207A856A00862A3A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 161789BB207A675B00D3B0C8 /* Build configuration list for PBXProject "libprojectM" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 161789C2207A675B00D3B0C8 /* Debug */, + 161789C3207A675B00D3B0C8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16178B13207A6F4000D3B0C8 /* Build configuration list for PBXNativeTarget "Renderer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16178B14207A6F4000D3B0C8 /* Debug */, + 16178B15207A6F4000D3B0C8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16A49E58207A7C8C00E508EA /* Build configuration list for PBXNativeTarget "projectM" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16A49E59207A7C8C00E508EA /* Debug */, + 16A49E5A207A7C8C00E508EA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 161789B8207A675B00D3B0C8 /* Project object */; +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Makefile.am projectm-3.1.0/src/libprojectM/Makefile.am --- projectm-2.2.0~git28bb9/src/libprojectM/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,51 @@ +EXTRA_DIST= +CLEANFILES= + +SUBDIRS=Renderer NativePresetFactory MilkdropPresetFactory + +AM_CPPFLAGS = \ + ${my_CFLAGS} \ + -include $(top_builddir)/config.h \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -I$(top_srcdir)/src/libprojectM \ + -I$(top_srcdir)/src/libprojectM/Renderer \ + -I$(top_srcdir)/vendor + +lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library + +# link flags +libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 2:0:0 + +# link libRenderer, MilkdropPresetFactory, NativePresetFactory, and libprojectM sources +libprojectM_la_LIBADD = \ +../libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.la \ +../libprojectM/NativePresetFactory/libNativePresetFactory.la \ +../libprojectM/Renderer/libRenderer.la +libprojectM_la_SOURCES = ConfigFile.cpp Preset.cpp PresetLoader.cpp timer.cpp \ + KeyHandler.cpp PresetChooser.cpp TimeKeeper.cpp PCM.cpp PresetFactory.cpp \ + fftsg.cpp wipemalloc.cpp PipelineMerger.cpp PresetFactoryManager.cpp projectM.cpp \ + Common.hpp PipelineMerger.hpp PresetLoader.hpp\ + HungarianMethod.hpp Preset.hpp RandomNumberGenerators.hpp\ + IdleTextures.hpp PresetChooser.hpp TimeKeeper.hpp\ + KeyHandler.hpp PresetFactory.hpp projectM.hpp\ + PCM.hpp PresetFactoryManager.hpp\ + projectM.hpp projectM-opengl.h \ + ConfigFile.h \ + carbontoprojectM.h \ + cocoatoprojectM.h lvtoprojectM.h\ + dlldefs.h resource.h\ + event.h sdltoprojectM.h\ + fatal.h timer.h\ + fftsg.h win32-dirent.h\ + glError.h wipemalloc.h\ + omptl/omptl_numeric_extentions_ser.h\ + omptl/omptl_algorithm_par.h omptl/omptl_numeric_par.h\ + omptl/omptl_algorithm_ser.h omptl/omptl_numeric_ser.h\ + omptl/omptl_numeric_extentions.h omptl/omptl_tools.h\ + omptl/omptl_numeric_extentions_par.h omptl/omptl omptl/omptl_numeric\ + omptl/omptl_algorithm + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = libprojectM.pc +EXTRA_DIST += libprojectM.pc.in +CLEANFILES += libprojectM.pc diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/BuiltinParams.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/BuiltinParams.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/BuiltinParams.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/BuiltinParams.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -293,7 +293,7 @@ load_builtin_param_float("gamma", (void*)&presetOutputs.fGammaAdj, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fGammaAdj"); load_builtin_param_float("echo_zoom", (void*)&presetOutputs.videoEcho.zoom, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fVideoEchoZoom"); load_builtin_param_float("echo_alpha", (void*)&presetOutputs.videoEcho.a, NULL, P_FLAG_NONE, 0.0, MAX_DOUBLE_SIZE, 0, "fvideoechoalpha"); - load_builtin_param_float("wave_a", (void*)&presetOutputs.wave.a, NULL, P_FLAG_NONE, 0.0, 1.0, 0, "fwavealpha"); + load_builtin_param_float("wave_a", (void*)&presetOutputs.wave.a, NULL, P_FLAG_NONE, 0.2, 1.0, 0, "fwavealpha"); // TEMP FIX: min = 0.2 because some presets have fWaveAlpha=0.0 which is invisible load_builtin_param_float("fwavesmoothing", (void*)&presetOutputs.wave.smoothing, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, ""); load_builtin_param_float("fmodwavealphastart", (void*)&presetOutputs.wave.modOpacityStart, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, ""); load_builtin_param_float("fmodwavealphaend", (void*)&presetOutputs.wave.modOpacityEnd, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, ""); @@ -367,8 +367,8 @@ load_builtin_param_float("mv_x", (void*)&presetOutputs.mv.x_num, NULL,P_FLAG_NONE, 0.0, 64.0, 0.0, "nmotionvectorsx"); load_builtin_param_float("mv_y", (void*)&presetOutputs.mv.y_num, NULL,P_FLAG_NONE, 0.0, 48.0, 0.0, "nmotionvectorsy"); load_builtin_param_float("mv_l", (void*)&presetOutputs.mv.length, NULL,P_FLAG_NONE, 0.0, 5.0, 0.0, ""); - load_builtin_param_float("mv_dy", (void*)&presetOutputs.mv.x_offset, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, ""); - load_builtin_param_float("mv_dx", (void*)&presetOutputs.mv.y_offset, NULL,P_FLAG_NONE, 0.0, 1.0, -1.0, ""); + load_builtin_param_float("mv_dx", (void*)&presetOutputs.mv.x_offset, NULL, P_FLAG_NONE, 0.0, 1.0, -1.0, ""); + load_builtin_param_float("mv_dy", (void*)&presetOutputs.mv.y_offset, NULL,P_FLAG_NONE, 0.0, 1.0, -1.0, ""); load_builtin_param_float("mv_a", (void*)&presetOutputs.mv.a, NULL,P_FLAG_NONE, 0.0, 1.0, 0.0, ""); load_builtin_param_float("time", (void*)&presetInputs.time, NULL,P_FLAG_READONLY, 0.0, MAX_DOUBLE_SIZE, 0.0, ""); diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -project(MilkdropPresetFactory) - -SET(MilkdropPresetFactory_SOURCES - BuiltinFuncs.cpp - Func.cpp MilkdropPreset.cpp - Param.hpp PresetFrameIO.cpp - CustomShape.cpp - Eval.cpp - MilkdropPresetFactory.cpp - PerPixelEqn.cpp BuiltinParams.cpp - InitCond.cpp Parser.cpp - CustomWave.cpp Expr.cpp - PerPointEqn.cpp Param.cpp - PerFrameEqn.cpp - IdlePreset.cpp - ../PresetFactory.cpp -) - -IF(NOT MSVC) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -ENDIF(NOT MSVC) - -INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR}) -LINK_DIRECTORIES(${projectM_BINARY_DIR} ${Renderer_BINARY_DIR}) - -ADD_LIBRARY(MilkdropPresetFactory STATIC ${MilkdropPresetFactory_SOURCES}) -TARGET_LINK_LIBRARIES(MilkdropPresetFactory Renderer) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/CustomWave.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/CustomWave.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/CustomWave.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/CustomWave.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -450,7 +450,7 @@ // Comments: index is not passed, so we assume monotonic increment by 1 is ok here -int CustomWave::add_per_point_eqn(char * name, GenExpr * gen_expr) +int CustomWave::add_per_point_eqn(char * name, Expr * gen_expr) { PerPointEqn * per_point_eqn; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/CustomWave.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -32,7 +32,7 @@ #define CUSTOM_WAVE_DEBUG 0 class CustomWave; -class GenExpr; +class Expr; class PerPointEqn; class Preset; @@ -115,7 +115,7 @@ int per_frame_eqn_string_index; int per_frame_init_eqn_string_index; - int add_per_point_eqn(char * name, GenExpr * gen_expr); + int add_per_point_eqn(char * name, Expr * gen_expr); void evalCustomWaveInitConditions(Preset *preset); diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Eval.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Eval.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Eval.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Eval.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -69,25 +69,22 @@ *infix_negative, *infix_positive; - float eval_gen_expr(GenExpr * gen_expr); - inline GenExpr * opt_gen_expr(GenExpr * gen_expr, int ** param_list); + float eval_gen_expr(Expr * gen_expr); + inline Expr * opt_gen_expr(Expr * gen_expr, int ** param_list); - GenExpr * const_to_expr(float val); - GenExpr * param_to_expr(Param * param); - GenExpr * prefun_to_expr(float (*func_ptr)(), GenExpr ** expr_list, int num_args); - - static TreeExpr * new_tree_expr(InfixOp * infix_op, GenExpr * gen_expr, TreeExpr * left, TreeExpr * right); - static GenExpr * new_gen_expr(int type, void * item); - static ValExpr * new_val_expr(int type, Term *term); + Expr * const_to_expr(float val); + Expr * param_to_expr(Param * param); + Expr * prefun_to_expr(float (*func_ptr)(), Expr ** expr_list, int num_args); + static TreeExpr * new_tree_expr(InfixOp * infix_op, Expr * gen_expr, TreeExpr * left, TreeExpr * right); + static Expr * new_gen_expr(int type, void * item); + static InfixOp * new_infix_op(int type, int precedence); static int init_infix_ops(); static int destroy_infix_ops(); void reset_engine_vars(); - - GenExpr * clone_gen_expr(GenExpr * gen_expr); + TreeExpr * clone_tree_expr(TreeExpr * tree_expr); - ValExpr * clone_val_expr(ValExpr * val_expr); PrefunExpr * clone_prefun_expr(PrefunExpr * prefun_expr); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Expr.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Expr.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Expr.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Expr.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -27,40 +27,16 @@ #include #include "Eval.hpp" -float GenExpr::eval_gen_expr ( int mesh_i, int mesh_j ) -{ - float l; - - if (item == 0) - return EVAL_ERROR; - - switch ( this->type ) - { /* N.B. this code is responsible for 75% of all CPU time. making it faster will help a lot. */ - case VAL_T: - return ( ( ValExpr* ) item )->eval_val_expr ( mesh_i, mesh_j ); - case PREFUN_T: - l = ( ( PrefunExpr * ) item )->eval_prefun_expr ( mesh_i, mesh_j ); - //if (EVAL_DEBUG) DWRITE( "eval_gen_expr: prefix function return value: %f\n", l); - return l; - case TREE_T: - return ( ( TreeExpr* ) ( item ) )->eval_tree_expr ( mesh_i, mesh_j ); - default: - return EVAL_ERROR; - } - -} /* Evaluates functions in prefix form */ -float PrefunExpr::eval_prefun_expr ( int mesh_i, int mesh_j ) +float PrefunExpr::eval ( int mesh_i, int mesh_j ) { - - assert ( func_ptr ); float arg_list_stk[10]; float * arg_list; float * argp; - GenExpr **expr_listp = expr_list; + Expr **expr_listp = expr_list; if (this->num_args > 10) { @@ -77,7 +53,7 @@ /* Evaluate each argument before calling the function itself */ for ( int i = 0; i < num_args; i++ ) { - *(argp++) = (*(expr_listp++))->eval_gen_expr ( mesh_i, mesh_j ); + *(argp++) = (*(expr_listp++))->eval ( mesh_i, mesh_j ); //printf("numargs %x", arg_list[i]); } /* Now we call the function, passing a list of @@ -92,102 +68,251 @@ } -/* Evaluates a value expression */ -float ValExpr::eval_val_expr ( int mesh_i, int mesh_j ) +class PrefunExprOne : public PrefunExpr { + float eval ( int mesh_i, int mesh_j ) + { + float val = expr_list[0]->eval ( mesh_i, mesh_j ); + return (func_ptr)(&val); + } +}; - /* Value is a constant, return the float value */ - if ( type == CONSTANT_TERM_T ) +class ConstantExpr : public Expr +{ + float constant; +public: + ConstantExpr( float value ) : Expr(CONSTANT), constant(value) {} + ConstantExpr( int type, Term *term ) : Expr(CONSTANT), constant(term->constant) {} + bool isConstant() { - return ( term.constant ); + return true; } + float eval(int mesh_i, int mesh_j ) + { + return constant; + } + std::ostream &to_string(std::ostream &out) + { + out << constant; return out; + } +}; - /* Value is variable, dereference it */ - if ( type == PARAM_TERM_T ) +class ParameterExpr : public Expr +{ +protected: + Term term; +public: + ParameterExpr( int _type, Term *_term ) : Expr(PARAMETER), term(*_term) {} + float eval(int mesh_i, int mesh_j ) = 0; + std::ostream& to_string(std::ostream& out) { - switch ( term.param->type ) - { + out << term.param->name; + return out; + } +}; - case P_TYPE_BOOL: +class BoolParameterExpr : public ParameterExpr +{ +public: + BoolParameterExpr( int _type, Term *_term ) : ParameterExpr(_type,_term) {} + float eval ( int mesh_i, int mesh_j ) + { + assert( term.param->type == P_TYPE_BOOL ); + return ( float ) ( * ( ( bool* ) ( term.param->engine_val ) ) ); + } +}; +class IntParameterExpr : public ParameterExpr +{ +public: + IntParameterExpr( int _type, Term *_term ) : ParameterExpr(_type,_term) {} + float eval ( int mesh_i, int mesh_j ) + { + assert( term.param->type == P_TYPE_INT ); + return ( float ) ( * ( ( int* ) ( term.param->engine_val ) ) ); + } +}; +class FloatParameterExpr : public ParameterExpr +{ +public: + FloatParameterExpr( int _type, Term *_term ) : ParameterExpr(_type,_term) {} + float eval ( int mesh_i, int mesh_j ); +}; +/* TODO optimize FloatParameterExpr::eval() further. +// - flag "never matrix" parameters +// - always pass in 2d matrix. instead of using (i, -1) for 1d matrix, we could just use (0, i) and avoid check +// - instead of using matrix_flag to give "copy on write" behavior, maybe pre-copy from engine_val to matrix[] +*/ +float FloatParameterExpr::eval ( int mesh_i, int mesh_j ) +{ + assert( term.param->type == P_TYPE_DOUBLE ); + if ( term.param->matrix_flag | ( term.param->flags & P_FLAG_ALWAYS_MATRIX ) ) + { + /* Sanity check the matrix is there... */ + assert ( term.param->matrix != NULL ); + /// @slow boolean check could be expensive in this critical (and common) step of evaluation + if ( mesh_i >= 0 ) + { + if ( mesh_j >= 0 ) + { + return ( ( ( float** ) term.param->matrix ) [mesh_i][mesh_j] ); + } + else + { + // issue 64, make sure we're not reading a P_FLAG_PER_PIXEL matrix variable + if (!(term.param->flags & P_FLAG_PER_PIXEL)) + return ( ( ( float* ) term.param->matrix ) [mesh_i] ); + } + } + //assert(mesh_i >=0); + } + //std::cout << term.param->name << ": " << (*((float*)term.param->engine_val)) << std::endl; + return * ( ( float* ) ( term.param->engine_val ) ); +} - return ( float ) ( * ( ( bool* ) ( term.param->engine_val ) ) ); - case P_TYPE_INT: +class MultAndAddExpr : public Expr +{ + Expr *a, *b, *c; +public: + MultAndAddExpr(Expr *_a, Expr *_b, Expr *_c) : Expr(OTHER), + a(_a), b(_b), c(_c) + { + } + ~MultAndAddExpr() { + delete a; + delete b; + delete c; + } + float eval(int mesh_i, int mesh_j) + { + float a_value = a->eval(mesh_i,mesh_j); + float b_value = b->eval(mesh_i,mesh_j); + float c_value = c->eval(mesh_i,mesh_j); + return a_value * b_value + c_value; + } + std::ostream &to_string(std::ostream &out) + { + out << "(" << a << " * " << b << ") + " << c; + return out; + } +}; - return ( float ) ( * ( ( int* ) ( term.param->engine_val ) ) ); - case P_TYPE_DOUBLE: - - - if ( term.param->matrix_flag | ( term.param->flags & P_FLAG_ALWAYS_MATRIX ) ) - { - - /* Sanity check the matrix is there... */ - assert ( term.param->matrix != NULL ); - - /// @slow boolean check could be expensive in this critical (and common) step of evaluation - if ( mesh_i >= 0 ) - { - if ( mesh_j >= 0 ) - { - return ( ( ( float** ) term.param->matrix ) [mesh_i][mesh_j] ); - } - else - { - return ( ( ( float* ) term.param->matrix ) [mesh_i] ); - } - } - //assert(mesh_i >=0); - } - //std::cout << term.param->name << ": " << (*((float*)term.param->engine_val)) << std::endl; - return * ( ( float* ) ( term.param->engine_val ) ); - default: - return EVAL_ERROR; +std::ostream &TreeExpr::to_string(std::ostream &out) +{ + if (NULL == infix_op) + { + out << gen_expr; + } + else + { + out << "(" << left << " "; + switch ( infix_op->type ) + { + case INFIX_ADD: + out << "+"; break; + case INFIX_MINUS: + out << "-"; break; + case INFIX_MULT: + out << "*"; break; + case INFIX_MOD: + out << "%"; break; + case INFIX_OR: + out << "|"; break; + case INFIX_AND: + out << "&"; break; + case INFIX_DIV: + out << "/"; break; + default: + out << "infix_op_ERROR"; break; } + out << " " << right << ")"; } - /* Unknown type, return failure */ - return PROJECTM_FAILURE; + return out; } -/* Evaluates an expression tree */ -float TreeExpr::eval_tree_expr ( int mesh_i, int mesh_j ) +/* NOTE: Parser.cpp directly manipulates TreeExpr, so it is easier to optimizer AFTER parsing + * than while building up the tree initially + */ +Expr *TreeExpr::optimize() { - - float left_arg, right_arg; - - /* A leaf node, evaluate the general expression. If the expression is null as well, return zero */ - if ( infix_op == NULL ) + if (infix_op == NULL) { - if ( gen_expr == NULL ) - return 0; - else - return gen_expr->eval_gen_expr ( mesh_i, mesh_j ); + Expr *opt = gen_expr->optimize(); + if (opt != gen_expr) + delete gen_expr; + gen_expr = NULL; + return opt; } - - /* Otherwise, this node is an infix operator. Evaluate - accordingly */ - - /* Safe guard in case the user gave a partially written expression */ - if (left == NULL) { - if (infix_op == Eval::infix_mult) - left_arg = 1; - else - left_arg = 0; + if (left != NULL) + { + Expr *l = left->optimize(); + if (l != left) + delete left; + left = l; } - else - left_arg = left->eval_tree_expr ( mesh_i, mesh_j ); + if (right != NULL) + { + Expr *r = right->optimize(); + if (r != right) + delete right; + right = r; + } + if (left == NULL) + { + Expr *opt = right; + right = NULL; + return opt; + } + if (right == NULL) + { + Expr *opt = left; + left = NULL; + return opt; + } + if (left->isConstant() && right->isConstant()) + return Expr::const_to_expr(eval(-1, -1)); - /* Safe guard in case the user gave a partially written expression */ - if (right == NULL) { - if (infix_op == Eval::infix_mult) - right_arg = 1; + // this is gratuitious, but a*b+c is super common, so as proof-of-concept, let's make a special Expr + if (infix_op->type == INFIX_ADD && + ((left->clazz == TREE && ((TreeExpr *)left)->infix_op->type == INFIX_MULT) || + (right->clazz == TREE && ((TreeExpr *)right)->infix_op->type == INFIX_MULT))) + { + Expr *a, *b, *c; + if (left->clazz == TREE && ((TreeExpr *)left)->infix_op->type == INFIX_MULT) + { + a = ((TreeExpr *)left)->left; + b = ((TreeExpr *)left)->right; + c = right; + ((TreeExpr *)left)->left = NULL; + ((TreeExpr *)left)->right = NULL; + right = NULL; + } else - right_arg = 0; + { + a = ((TreeExpr *)right)->left; + b = ((TreeExpr *)right)->right; + c = left; + ((TreeExpr *)right)->left = NULL; + ((TreeExpr *)right)->right = NULL; + left = NULL; + } + return new MultAndAddExpr(a,b,c); } - else - right_arg = right->eval_tree_expr ( mesh_i, mesh_j ); + return this; +} + +/* Evaluates an expression tree */ +float TreeExpr::eval ( int mesh_i, int mesh_j ) +{ + float left_arg, right_arg; + /* shouldn't be null if we've called optimize() */ + assert(NULL != infix_op); + + left_arg = left->eval ( mesh_i, mesh_j ); + right_arg = right->eval ( mesh_i, mesh_j ); switch ( infix_op->type ) { @@ -221,34 +346,16 @@ } /* Converts a float value to a general expression */ -GenExpr * GenExpr::const_to_expr ( float val ) +Expr * Expr::const_to_expr ( float val ) { - - GenExpr * gen_expr; - ValExpr * val_expr; Term term; - term.constant = val; - - if ( ( val_expr = new ValExpr ( CONSTANT_TERM_T, &term ) ) == NULL ) - return NULL; - - gen_expr = new GenExpr ( VAL_T, ( void* ) val_expr ); - - if ( gen_expr == NULL ) - { - delete val_expr; - } - - return gen_expr; + return new ConstantExpr( CONSTANT_TERM_T, &term ); } /* Converts a regular parameter to an expression */ -GenExpr * GenExpr::param_to_expr ( Param * param ) +Expr * Expr::param_to_expr ( Param * param ) { - - GenExpr * gen_expr = NULL; - ValExpr * val_expr = NULL; Term term; if ( param == NULL ) @@ -267,87 +374,90 @@ making the parser handle the case where parameters are essentially per pixel equation substitutions */ - term.param = param; - if ( ( val_expr = new ValExpr ( PARAM_TERM_T, &term ) ) == NULL ) - return NULL; - if ( ( gen_expr = new GenExpr ( VAL_T, ( void* ) val_expr ) ) == NULL ) + switch ( param->type ) { - delete val_expr; - return NULL; + case P_TYPE_BOOL: + return new BoolParameterExpr( PARAM_TERM_T, &term ); + case P_TYPE_INT: + return new IntParameterExpr( PARAM_TERM_T, &term ); + case P_TYPE_DOUBLE: + return new FloatParameterExpr( PARAM_TERM_T, &term ); } - return gen_expr; + return NULL; } /* Converts a prefix function to an expression */ -GenExpr * GenExpr::prefun_to_expr ( float ( *func_ptr ) ( void * ), GenExpr ** expr_list, int num_args ) +Expr * Expr::prefun_to_expr ( float ( *func_ptr ) ( void * ), Expr ** expr_list, int num_args ) { - - GenExpr * gen_expr; PrefunExpr * prefun_expr; - - prefun_expr = new PrefunExpr(); - - if ( prefun_expr == NULL ) - return NULL; - + if (num_args == 1) + prefun_expr = new PrefunExprOne(); + else + prefun_expr = new PrefunExpr(); prefun_expr->num_args = num_args; prefun_expr->func_ptr = ( float ( * ) ( void* ) ) func_ptr; prefun_expr->expr_list = expr_list; - - gen_expr = new GenExpr ( PREFUN_T, ( void* ) prefun_expr ); - - if ( gen_expr == NULL ) - delete prefun_expr; - - return gen_expr; + return prefun_expr; } /* Creates a new tree expression */ -TreeExpr::TreeExpr ( InfixOp * _infix_op, GenExpr * _gen_expr, TreeExpr * _left, TreeExpr * _right ) : +TreeExpr::TreeExpr ( InfixOp * _infix_op, Expr * _gen_expr, TreeExpr * _left, TreeExpr * _right ) : + Expr( TREE ), infix_op ( _infix_op ), gen_expr ( _gen_expr ), left ( _left ), right ( _right ) {} - -/* Creates a new value expression */ -ValExpr::ValExpr ( int _type, Term * _term ) :type ( _type ) +class TreeExprAdd : public TreeExpr { +public: + TreeExprAdd( InfixOp * _infix_op, Expr * _gen_expr, TreeExpr * _left, TreeExpr * _right ) : + TreeExpr( _infix_op, _gen_expr, _left, _right) {} + float eval( int mesh_i, int mesh_j) + { + return left->eval(mesh_i, mesh_j) + right->eval(mesh_i, mesh_j); + } +}; +class TreeExprMinus : public TreeExpr +{ +public: + TreeExprMinus( InfixOp * _infix_op, Expr * _gen_expr, TreeExpr * _left, TreeExpr * _right ) : + TreeExpr( _infix_op, _gen_expr, _left, _right) {} + float eval( int mesh_i, int mesh_j) + { + return left->eval(mesh_i, mesh_j) - right->eval(mesh_i, mesh_j); + } +}; - //val_expr->type = _type; - term.constant = _term->constant; - term.param = _term->param; - - //return val_expr; -} - -/* Creates a new general expression */ - -GenExpr::GenExpr ( int _type, void * _item ) :type ( _type ), item ( _item ) {} - -/* Frees a general expression */ -GenExpr::~GenExpr() +class TreeExprMult : public TreeExpr { +public: + TreeExprMult( InfixOp * _infix_op, Expr * _gen_expr, TreeExpr * _left, TreeExpr * _right ) : + TreeExpr( _infix_op, _gen_expr, _left, _right) {} + float eval( int mesh_i, int mesh_j) + { + return left->eval(mesh_i, mesh_j) * right->eval(mesh_i, mesh_j); + } +}; - switch ( type ) +TreeExpr * TreeExpr::create( InfixOp * _infix_op, Expr * _gen_expr, TreeExpr * _left, TreeExpr * _right ) +{ + if ( NULL != _infix_op ) { - case VAL_T: - delete ( ( ValExpr* ) item ); - break; - case PREFUN_T: - delete ( ( PrefunExpr* ) item ); - break; - case TREE_T: - delete ( ( TreeExpr* ) item ); - break; + if ( _infix_op->type == INFIX_ADD ) + return new TreeExprAdd( _infix_op, _gen_expr, _left, _right); + if ( _infix_op->type == INFIX_MINUS ) + return new TreeExprMinus( _infix_op, _gen_expr, _left, _right); + if ( _infix_op->type == INFIX_MULT ) + return new TreeExprMult( _infix_op, _gen_expr, _left, _right); } + return new TreeExpr( _infix_op, _gen_expr, _left, _right ); } /* Frees a function in prefix notation */ PrefunExpr::~PrefunExpr() { - int i; /* Free every element in expression list */ @@ -358,10 +468,6 @@ free ( expr_list ); } -/* Frees values of type VARIABLE and CONSTANT */ -ValExpr::~ValExpr() -{} - /* Frees a tree expression */ TreeExpr::~TreeExpr() { @@ -390,13 +496,41 @@ } /* Initializes an infix operator */ -InfixOp::InfixOp ( int type, int precedence ) +InfixOp::InfixOp ( int _type, int _precedence ) { - - this->type = type; - this->precedence = precedence; + this->type = _type; + this->precedence = _precedence; } +PrefunExpr::PrefunExpr() : Expr(FUNCTION) +{ +} +Expr *PrefunExpr::optimize() +{ + bool constant_args = true; + for (int i=0 ; i < num_args ; i++) + { + Expr *orig = expr_list[i]; + expr_list[i] = orig->optimize(); + if (orig != expr_list[i]) + delete orig; + constant_args &= expr_list[i]->isConstant(); + } + // TODO most functions can be pre-evaluated if inputs are constant, but not all + return this; +} -PrefunExpr::PrefunExpr() {} +std::ostream& PrefunExpr::to_string(std::ostream& out) +{ + char comma = ' '; + out << "("; + for (int i=0 ; i < num_args ; i++) + { + out << comma; + out << expr_list[i]; + comma = ','; + } + out << ")"; + return out; +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Expr.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Expr.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Expr.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Expr.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -31,6 +31,7 @@ #include "dlldefs.h" #include "CValue.hpp" +#include class Param; @@ -58,65 +59,79 @@ Term() { this->constant = 0; this->param = 0; } }; + -/* General Expression Type */ -class GenExpr +enum ExprClass { -public: - int type; - void * item; - - ~GenExpr(); - - GenExpr( int type, void *item ); - float eval_gen_expr(int mesh_i, int mesh_j); - - static GenExpr *const_to_expr( float val ); - static GenExpr *param_to_expr( Param *param ); - static GenExpr *prefun_to_expr( float (*func_ptr)(void *), GenExpr **expr_list, int num_args ); + TREE, CONSTANT, PARAMETER, FUNCTION, OTHER }; -/* Value expression, contains a term union */ -class ValExpr +class Expr { public: - int type; - Term term; + ExprClass clazz; + Expr(ExprClass c) : clazz(c) {}; + virtual ~Expr() {}; + virtual Expr *optimize() { return this; }; + virtual bool isConstant() { return false; }; + virtual float eval(int mesh_i, int mesh_j) = 0; + virtual std::ostream& to_string(std::ostream &out) + { + std::cout << "nyi"; return out; + } - ~ValExpr(); - ValExpr( int type, Term *term ); - - float eval_val_expr(int mesh_i, int mesh_j); + static Expr *const_to_expr( float val ); + static Expr *param_to_expr( Param *param ); + static Expr *prefun_to_expr( float (*func_ptr)(void *), Expr **expr_list, int num_args ); }; +inline std::ostream& operator<<(std::ostream& out, Expr *expr) +{ + if (NULL == expr) + out << "NULL"; + else + expr->to_string(out); + return out; +} + /* A binary expression tree ordered by operator precedence */ -class TreeExpr +class TreeExpr : public Expr { +protected: + TreeExpr( InfixOp *infix_op, Expr *gen_expr, + TreeExpr *left, TreeExpr *right ); public: + static TreeExpr *create( InfixOp *infix_op, Expr *gen_expr, + TreeExpr *left, TreeExpr *right ); InfixOp * infix_op; /* null if leaf */ - GenExpr * gen_expr; - TreeExpr *left, *right; + Expr * gen_expr; + // NOTE: before optimize() left and right will always be TreeExpr + Expr *left, *right; + // these are for type-safe access in Parser.cpp + TreeExpr *&leftTree() { return *(TreeExpr **)&left; }; + TreeExpr *&rightTree() { return *(TreeExpr **)&right; }; ~TreeExpr(); - TreeExpr( InfixOp *infix_op, GenExpr *gen_expr, - TreeExpr *left, TreeExpr *right ); - float eval_tree_expr(int mesh_i, int mesh_j); + Expr *optimize(); + float eval(int mesh_i, int mesh_j); + std::ostream& to_string(std::ostream &out); }; /* A function expression in prefix form */ -class PrefunExpr +class PrefunExpr : public Expr { public: float (*func_ptr)(void*); int num_args; - GenExpr **expr_list; + Expr **expr_list; PrefunExpr(); ~PrefunExpr(); /* Evaluates functions in prefix form */ - float eval_prefun_expr(int mesh_i, int mesh_j); - + Expr *optimize(); + float eval(int mesh_i, int mesh_j); + std::ostream& to_string(std::ostream &out); }; #endif /** _EXPR_H */ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Makefile.am projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Makefile.am --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,20 @@ +noinst_LTLIBRARIES=libMilkdropPresetFactory.la + +libMilkdropPresetFactory_la_SOURCES= \ +BuiltinFuncs.cpp Func.cpp BuiltinParams.cpp IdlePreset.cpp Parser.cpp \ +InitCond.cpp PerFrameEqn.cpp CustomShape.cpp \ +PerPixelEqn.cpp CustomWave.cpp MilkdropPreset.cpp PerPointEqn.cpp \ +Eval.cpp MilkdropPresetFactory.cpp PresetFrameIO.cpp \ +Expr.cpp Param.cpp \ +BuiltinFuncs.hpp Func.hpp ParamUtils.hpp\ +BuiltinParams.hpp IdlePreset.hpp Parser.hpp\ +CValue.hpp InitCond.hpp PerFrameEqn.hpp\ +CustomShape.hpp InitCondUtils.hpp PerPixelEqn.hpp\ +CustomWave.hpp MilkdropPreset.hpp PerPointEqn.hpp\ +Eval.hpp MilkdropPresetFactory.hpp PresetFrameIO.hpp\ +Expr.hpp Param.hpp + +: +libMilkdropPresetFactory_la_CPPFLAGS = ${my_CFLAGS} \ +-include $(top_builddir)/config.h \ +-I$(top_srcdir)/src/libprojectM diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -93,17 +93,13 @@ delete(*pos); } customWaves.clear(); - customShapes.clear(); - presetOutputs().customWaves.clear(); - presetOutputs().customShapes.clear(); - presetOutputs().drawables.clear(); - + customShapes.clear(); } /* Adds a per pixel equation according to its string name. This will be used only by the parser */ -int MilkdropPreset::add_per_pixel_eqn(char * name, GenExpr * gen_expr) +int MilkdropPreset::add_per_pixel_eqn(char * name, Expr * gen_expr) { PerPixelEqn * per_pixel_eqn = NULL; @@ -298,6 +294,11 @@ loadPresetFile(pathname); postloadInitialize(); + + if (!presetOutputs().compositeShader.programSource.empty()) + pipeline().compositeShaderFilename = pathname; + if (!presetOutputs().warpShader.programSource.empty()) + pipeline().warpShaderFilename = pathname; } void MilkdropPreset::initialize(std::istream & in) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -31,14 +31,14 @@ MilkdropPresetFactory::~MilkdropPresetFactory() { - std::cerr << "[~MilkdropPresetFactory] destroy infix ops" << std::endl; +// std::cerr << "[~MilkdropPresetFactory] destroy infix ops" << std::endl; Eval::destroy_infix_ops(); - std::cerr << "[~MilkdropPresetFactory] destroy builtin func" << std::endl; +// std::cerr << "[~MilkdropPresetFactory] destroy builtin func" << std::endl; BuiltinFuncs::destroy_builtin_func_db(); - std::cerr << "[~MilkdropPresetFactory] delete preset out puts" << std::endl; +// std::cerr << "[~MilkdropPresetFactory] delete preset out puts" << std::endl; delete(_presetOutputs); delete(_presetOutputs2); - std::cerr << "[~MilkdropPresetFactory] done" << std::endl; +// std::cerr << "[~MilkdropPresetFactory] done" << std::endl; } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.xcodeproj/project.pbxproj projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.xcodeproj/project.pbxproj --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.xcodeproj/project.pbxproj 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPresetFactory.xcodeproj/project.pbxproj 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,290 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 48; + objects = { + +/* Begin PBXFileReference section */ + 161789D0207A68A200D3B0C8 /* CustomShape.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CustomShape.cpp; sourceTree = ""; }; + 161789D1207A68A200D3B0C8 /* Func.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Func.cpp; sourceTree = ""; }; + 161789D2207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPreset.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-MilkdropPreset.lo"; sourceTree = ""; }; + 161789D3207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPixelEqn.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-PerPixelEqn.lo"; sourceTree = ""; }; + 161789D4207A68A200D3B0C8 /* MilkdropPreset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MilkdropPreset.cpp; sourceTree = ""; }; + 161789D5207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Eval.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-Eval.o"; sourceTree = ""; }; + 161789D6207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomShape.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-CustomShape.o"; sourceTree = ""; }; + 161789D7207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinFuncs.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-BuiltinFuncs.lo"; sourceTree = ""; }; + 161789D8207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerFrameEqn.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-PerFrameEqn.lo"; sourceTree = ""; }; + 161789D9207A68A200D3B0C8 /* .DS_Store */ = {isa = PBXFileReference; lastKnownFileType = file; path = .DS_Store; sourceTree = ""; }; + 161789DA207A68A200D3B0C8 /* PerPointEqn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PerPointEqn.cpp; sourceTree = ""; }; + 161789DB207A68A200D3B0C8 /* Parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Parser.hpp; sourceTree = ""; }; + 161789DC207A68A200D3B0C8 /* PresetFrameIO.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PresetFrameIO.hpp; sourceTree = ""; }; + 161789DD207A68A200D3B0C8 /* Eval.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Eval.hpp; sourceTree = ""; }; + 161789DE207A68A200D3B0C8 /* IdlePreset.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = IdlePreset.hpp; sourceTree = ""; }; + 161789DF207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Param.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-Param.lo"; sourceTree = ""; }; + 161789E0207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPointEqn.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-PerPointEqn.lo"; sourceTree = ""; }; + 161789E1207A68A200D3B0C8 /* PerFrameEqn.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PerFrameEqn.hpp; sourceTree = ""; }; + 161789E2207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPresetFactory.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-MilkdropPresetFactory.lo"; sourceTree = ""; }; + 161789E3207A68A200D3B0C8 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 161789E4207A68A200D3B0C8 /* BuiltinParams.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = BuiltinParams.hpp; sourceTree = ""; }; + 161789E5207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinParams.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-BuiltinParams.o"; sourceTree = ""; }; + 161789E6207A68A200D3B0C8 /* PerPixelEqn.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PerPixelEqn.hpp; sourceTree = ""; }; + 161789E7207A68A200D3B0C8 /* MilkdropPresetFactory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MilkdropPresetFactory.cpp; sourceTree = ""; }; + 161789E8207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPointEqn.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-PerPointEqn.o"; sourceTree = ""; }; + 161789E9207A68A200D3B0C8 /* BuiltinFuncs.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltinFuncs.cpp; sourceTree = ""; }; + 161789EA207A68A200D3B0C8 /* CValue.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CValue.hpp; sourceTree = ""; }; + 161789EB207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerFrameEqn.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-PerFrameEqn.o"; sourceTree = ""; }; + 161789EC207A68A200D3B0C8 /* Expr.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Expr.cpp; sourceTree = ""; }; + 161789ED207A68A200D3B0C8 /* Param.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Param.hpp; sourceTree = ""; }; + 161789EE207A68A200D3B0C8 /* CustomWave.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CustomWave.hpp; sourceTree = ""; }; + 161789EF207A68A200D3B0C8 /* InitCond.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InitCond.cpp; sourceTree = ""; }; + 161789F0207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Param.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-Param.o"; sourceTree = ""; }; + 161789F1207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomWave.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-CustomWave.o"; sourceTree = ""; }; + 161789F2207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Func.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-Func.o"; sourceTree = ""; }; + 161789F3207A68A200D3B0C8 /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + 161789F4207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PresetFrameIO.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-PresetFrameIO.o"; sourceTree = ""; }; + 161789F5207A68A200D3B0C8 /* BuiltinParams.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BuiltinParams.cpp; sourceTree = ""; }; + 161789F6207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomShape.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-CustomShape.lo"; sourceTree = ""; }; + 161789F7207A68A200D3B0C8 /* PerPixelEqn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PerPixelEqn.cpp; sourceTree = ""; }; + 161789F8207A68A200D3B0C8 /* MilkdropPresetFactory.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MilkdropPresetFactory.hpp; sourceTree = ""; }; + 161789F9207A68A200D3B0C8 /* BuiltinFuncs.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = BuiltinFuncs.hpp; sourceTree = ""; }; + 161789FA207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Parser.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-Parser.lo"; sourceTree = ""; }; + 161789FB207A68A200D3B0C8 /* Param.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Param.cpp; sourceTree = ""; }; + 161789FC207A68A200D3B0C8 /* Expr.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Expr.hpp; sourceTree = ""; }; + 161789FD207A68A200D3B0C8 /* CustomWave.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CustomWave.cpp; sourceTree = ""; }; + 161789FE207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinFuncs.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-BuiltinFuncs.o"; sourceTree = ""; }; + 161789FF207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PresetFrameIO.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-PresetFrameIO.lo"; sourceTree = ""; }; + 16178A00207A68A200D3B0C8 /* InitCond.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = InitCond.hpp; sourceTree = ""; }; + 16178A01207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPixelEqn.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-PerPixelEqn.o"; sourceTree = ""; }; + 16178A02207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPreset.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-MilkdropPreset.o"; sourceTree = ""; }; + 16178A03207A68A200D3B0C8 /* libMilkdropPresetFactory_la-InitCond.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-InitCond.lo"; sourceTree = ""; }; + 16178A04207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomWave.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-CustomWave.lo"; sourceTree = ""; }; + 16178A05207A68A200D3B0C8 /* ParamUtils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ParamUtils.hpp; sourceTree = ""; }; + 16178A06207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPresetFactory.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-MilkdropPresetFactory.o"; sourceTree = ""; }; + 16178A07207A68A200D3B0C8 /* libMilkdropPresetFactory_la-InitCond.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-InitCond.o"; sourceTree = ""; }; + 16178A08207A68A200D3B0C8 /* CustomShape.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CustomShape.hpp; sourceTree = ""; }; + 16178A09207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Expr.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-Expr.lo"; sourceTree = ""; }; + 16178A0A207A68A200D3B0C8 /* Func.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Func.hpp; sourceTree = ""; }; + 16178A0B207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Func.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-Func.lo"; sourceTree = ""; }; + 16178A0C207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Parser.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-Parser.o"; sourceTree = ""; }; + 16178A0D207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Expr.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-Expr.o"; sourceTree = ""; }; + 16178A0E207A68A200D3B0C8 /* MilkdropPreset.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MilkdropPreset.hpp; sourceTree = ""; }; + 16178A0F207A68A200D3B0C8 /* .deps */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .deps; sourceTree = ""; }; + 16178A10207A68A200D3B0C8 /* libMilkdropPresetFactory.la */ = {isa = PBXFileReference; lastKnownFileType = text; path = libMilkdropPresetFactory.la; sourceTree = ""; }; + 16178A11207A68A200D3B0C8 /* .libs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .libs; sourceTree = ""; }; + 16178A12207A68A200D3B0C8 /* Makefile.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; + 16178A13207A68A200D3B0C8 /* PerPointEqn.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PerPointEqn.hpp; sourceTree = ""; }; + 16178A14207A68A200D3B0C8 /* Parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Parser.cpp; sourceTree = ""; }; + 16178A15207A68A200D3B0C8 /* PresetFrameIO.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PresetFrameIO.cpp; sourceTree = ""; }; + 16178A16207A68A200D3B0C8 /* Eval.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Eval.cpp; sourceTree = ""; }; + 16178A17207A68A200D3B0C8 /* IdlePreset.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = IdlePreset.cpp; sourceTree = ""; }; + 16178A18207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinParams.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-BuiltinParams.lo"; sourceTree = ""; }; + 16178A19207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Eval.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-Eval.lo"; sourceTree = ""; }; + 16178A1A207A68A200D3B0C8 /* libMilkdropPresetFactory_la-IdlePreset.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libMilkdropPresetFactory_la-IdlePreset.lo"; sourceTree = ""; }; + 16178A1B207A68A200D3B0C8 /* PerFrameEqn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PerFrameEqn.cpp; sourceTree = ""; }; + 16178A1C207A68A200D3B0C8 /* InitCondUtils.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = InitCondUtils.hpp; sourceTree = ""; }; + 16178A1D207A68A200D3B0C8 /* libMilkdropPresetFactory_la-IdlePreset.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libMilkdropPresetFactory_la-IdlePreset.o"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + 161789CA207A68A200D3B0C8 = { + isa = PBXGroup; + children = ( + 161789D0207A68A200D3B0C8 /* CustomShape.cpp */, + 161789D1207A68A200D3B0C8 /* Func.cpp */, + 161789D2207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPreset.lo */, + 161789D3207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPixelEqn.lo */, + 161789D4207A68A200D3B0C8 /* MilkdropPreset.cpp */, + 161789D5207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Eval.o */, + 161789D6207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomShape.o */, + 161789D7207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinFuncs.lo */, + 161789D8207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerFrameEqn.lo */, + 161789D9207A68A200D3B0C8 /* .DS_Store */, + 161789DA207A68A200D3B0C8 /* PerPointEqn.cpp */, + 161789DB207A68A200D3B0C8 /* Parser.hpp */, + 161789DC207A68A200D3B0C8 /* PresetFrameIO.hpp */, + 161789DD207A68A200D3B0C8 /* Eval.hpp */, + 161789DE207A68A200D3B0C8 /* IdlePreset.hpp */, + 161789DF207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Param.lo */, + 161789E0207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPointEqn.lo */, + 161789E1207A68A200D3B0C8 /* PerFrameEqn.hpp */, + 161789E2207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPresetFactory.lo */, + 161789E3207A68A200D3B0C8 /* Makefile */, + 161789E4207A68A200D3B0C8 /* BuiltinParams.hpp */, + 161789E5207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinParams.o */, + 161789E6207A68A200D3B0C8 /* PerPixelEqn.hpp */, + 161789E7207A68A200D3B0C8 /* MilkdropPresetFactory.cpp */, + 161789E8207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPointEqn.o */, + 161789E9207A68A200D3B0C8 /* BuiltinFuncs.cpp */, + 161789EA207A68A200D3B0C8 /* CValue.hpp */, + 161789EB207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerFrameEqn.o */, + 161789EC207A68A200D3B0C8 /* Expr.cpp */, + 161789ED207A68A200D3B0C8 /* Param.hpp */, + 161789EE207A68A200D3B0C8 /* CustomWave.hpp */, + 161789EF207A68A200D3B0C8 /* InitCond.cpp */, + 161789F0207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Param.o */, + 161789F1207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomWave.o */, + 161789F2207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Func.o */, + 161789F3207A68A200D3B0C8 /* Makefile.am */, + 161789F4207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PresetFrameIO.o */, + 161789F5207A68A200D3B0C8 /* BuiltinParams.cpp */, + 161789F6207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomShape.lo */, + 161789F7207A68A200D3B0C8 /* PerPixelEqn.cpp */, + 161789F8207A68A200D3B0C8 /* MilkdropPresetFactory.hpp */, + 161789F9207A68A200D3B0C8 /* BuiltinFuncs.hpp */, + 161789FA207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Parser.lo */, + 161789FB207A68A200D3B0C8 /* Param.cpp */, + 161789FC207A68A200D3B0C8 /* Expr.hpp */, + 161789FD207A68A200D3B0C8 /* CustomWave.cpp */, + 161789FE207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinFuncs.o */, + 161789FF207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PresetFrameIO.lo */, + 16178A00207A68A200D3B0C8 /* InitCond.hpp */, + 16178A01207A68A200D3B0C8 /* libMilkdropPresetFactory_la-PerPixelEqn.o */, + 16178A02207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPreset.o */, + 16178A03207A68A200D3B0C8 /* libMilkdropPresetFactory_la-InitCond.lo */, + 16178A04207A68A200D3B0C8 /* libMilkdropPresetFactory_la-CustomWave.lo */, + 16178A05207A68A200D3B0C8 /* ParamUtils.hpp */, + 16178A06207A68A200D3B0C8 /* libMilkdropPresetFactory_la-MilkdropPresetFactory.o */, + 16178A07207A68A200D3B0C8 /* libMilkdropPresetFactory_la-InitCond.o */, + 16178A08207A68A200D3B0C8 /* CustomShape.hpp */, + 16178A09207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Expr.lo */, + 16178A0A207A68A200D3B0C8 /* Func.hpp */, + 16178A0B207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Func.lo */, + 16178A0C207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Parser.o */, + 16178A0D207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Expr.o */, + 16178A0E207A68A200D3B0C8 /* MilkdropPreset.hpp */, + 16178A0F207A68A200D3B0C8 /* .deps */, + 16178A10207A68A200D3B0C8 /* libMilkdropPresetFactory.la */, + 16178A11207A68A200D3B0C8 /* .libs */, + 16178A12207A68A200D3B0C8 /* Makefile.in */, + 16178A13207A68A200D3B0C8 /* PerPointEqn.hpp */, + 16178A14207A68A200D3B0C8 /* Parser.cpp */, + 16178A15207A68A200D3B0C8 /* PresetFrameIO.cpp */, + 16178A16207A68A200D3B0C8 /* Eval.cpp */, + 16178A17207A68A200D3B0C8 /* IdlePreset.cpp */, + 16178A18207A68A200D3B0C8 /* libMilkdropPresetFactory_la-BuiltinParams.lo */, + 16178A19207A68A200D3B0C8 /* libMilkdropPresetFactory_la-Eval.lo */, + 16178A1A207A68A200D3B0C8 /* libMilkdropPresetFactory_la-IdlePreset.lo */, + 16178A1B207A68A200D3B0C8 /* PerFrameEqn.cpp */, + 16178A1C207A68A200D3B0C8 /* InitCondUtils.hpp */, + 16178A1D207A68A200D3B0C8 /* libMilkdropPresetFactory_la-IdlePreset.o */, + ); + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXLegacyTarget section */ + 161789CF207A68A200D3B0C8 /* MilkdropPresetFactory */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(ACTION)"; + buildConfigurationList = 16178A1E207A68A200D3B0C8 /* Build configuration list for PBXLegacyTarget "MilkdropPresetFactory" */; + buildPhases = ( + ); + buildToolPath = /usr/bin/make; + buildWorkingDirectory = /Users/cyber/dev/projectm/src/libprojectM/MilkdropPresetFactory; + dependencies = ( + ); + name = MilkdropPresetFactory; + passBuildSettingsInEnvironment = 1; + productName = MilkdropPresetFactory; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXProject section */ + 161789CB207A68A200D3B0C8 /* Project object */ = { + isa = PBXProject; + attributes = { + }; + buildConfigurationList = 161789CE207A68A200D3B0C8 /* Build configuration list for PBXProject "MilkdropPresetFactory" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 161789CA207A68A200D3B0C8; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 161789CF207A68A200D3B0C8 /* MilkdropPresetFactory */, + ); + }; +/* End PBXProject section */ + +/* Begin XCBuildConfiguration section */ + 161789CC207A68A200D3B0C8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx10.6; + }; + name = Debug; + }; + 161789CD207A68A200D3B0C8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + SDKROOT = macosx10.6; + }; + name = Release; + }; + 16178A1F207A68A200D3B0C8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DEBUGGING_SYMBOLS = YES; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = MilkdropPresetFactory; + }; + name = Debug; + }; + 16178A20207A68A200D3B0C8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = MilkdropPresetFactory; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 161789CE207A68A200D3B0C8 /* Build configuration list for PBXProject "MilkdropPresetFactory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 161789CC207A68A200D3B0C8 /* Debug */, + 161789CD207A68A200D3B0C8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16178A1E207A68A200D3B0C8 /* Build configuration list for PBXLegacyTarget "MilkdropPresetFactory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16178A1F207A68A200D3B0C8 /* Debug */, + 16178A20207A68A200D3B0C8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 161789CB207A68A200D3B0C8 /* Project object */; +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/MilkdropPreset.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -95,7 +95,7 @@ /// Used by parser /// @bug refactor - int add_per_pixel_eqn( char *name, GenExpr *gen_expr ); + int add_per_pixel_eqn( char *name, Expr *gen_expr ); /// Accessor method to retrieve the absolute file path of the loaded MilkdropPreset /// \returns a file path string diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Param.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Param.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Param.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Param.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -47,6 +47,7 @@ flags (_flags), matrix_flag (0), engine_val(_engine_val), + local_value(0.0), matrix (_matrix), default_init_val (_default_init_val), upper_bound (_upper_bound), @@ -62,10 +63,11 @@ type(P_TYPE_DOUBLE), flags(P_FLAG_USERDEF), matrix_flag(0), + local_value(0.0), matrix(0) { - engine_val = new float(); + engine_val = (float *)&local_value; default_init_val.float_val = DEFAULT_DOUBLE_IV; upper_bound.float_val = DEFAULT_DOUBLE_UB; @@ -73,18 +75,10 @@ /// @note may have fixed a recent bug. testing *((float*)engine_val) = default_init_val.float_val; - - -} + } /* Free's a parameter type */ Param::~Param() { - - // I hate this, but will let it be for now - if (flags & P_FLAG_USERDEF) { - delete((double*)engine_val); - } - if (PARAM_DEBUG) printf("~Param: freeing \"%s\".\n", name.c_str()); } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Param.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Param.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Param.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Param.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -57,7 +57,10 @@ class InitCond; class Param; class Preset; -//#include + +#ifdef __SSE2__ +#include +#endif /* Parameter Type */ class Param { @@ -72,6 +75,9 @@ CValue upper_bound; /* this parameter's upper bound */ CValue lower_bound; /* this parameter's lower bound */ + // for a local variable, engine_val can point here + float local_value; + /// Create a new parameter Param(std::string name, short int type, short int flags, void * eqn_val, void *matrix, diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Parser.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Parser.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Parser.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -251,15 +251,15 @@ /* Parse input in the form of "exp, exp, exp, ...)" Returns a general expression list */ -GenExpr **Parser::parse_prefix_args(std::istream & fs, int num_args, MilkdropPreset * preset) +Expr **Parser::parse_prefix_args(std::istream & fs, int num_args, MilkdropPreset * preset) { int i, j; - GenExpr ** expr_list; /* List of arguments to function */ - GenExpr * gen_expr; + Expr ** expr_list; /* List of arguments to function */ + Expr * gen_expr; /* Malloc the expression list */ - expr_list = (GenExpr**)wipemalloc(sizeof(GenExpr*)*num_args); + expr_list = (Expr**)wipemalloc(sizeof(Expr*)*num_args); /* Malloc failed */ if (expr_list == NULL) @@ -331,7 +331,7 @@ char string[MAX_TOKEN_SIZE]; - GenExpr * gen_expr; + Expr * gen_expr; if (init_string != 0) @@ -715,19 +715,17 @@ } - /* Parses a general expression, this function is the meat of the parser */ -GenExpr * Parser::parse_gen_expr ( std::istream & fs, TreeExpr * tree_expr, MilkdropPreset * preset) +Expr * Parser::_parse_gen_expr ( std::istream & fs, TreeExpr * tree_expr, MilkdropPreset * preset) { - int i; char string[MAX_TOKEN_SIZE]; token_t token; - GenExpr * gen_expr; + Expr * gen_expr; float val; Param * param = NULL; Func * func; - GenExpr ** expr_list; + Expr ** expr_list; switch (token = parseToken(fs,string)) { @@ -759,7 +757,7 @@ } /* Convert function to expression */ - if ((gen_expr = GenExpr::prefun_to_expr((float (*)(void *))func->func_ptr, expr_list, func->getNumArgs())) == NULL) + if ((gen_expr = Expr::prefun_to_expr((float (*)(void *))func->func_ptr, expr_list, func->getNumArgs())) == NULL) { if (PARSE_DEBUG) printf("parse_prefix_args: failed to convert prefix function to general expression (LINE %d) \n", line_count); @@ -818,7 +816,7 @@ if (PARSE_DEBUG) printf("parse_gen_expr: plus used as prefix (LINE %d)\n", line_count); /* Treat prefix plus as implict 0 preceding operator */ - gen_expr = GenExpr::const_to_expr(0); + gen_expr = Expr::const_to_expr(0); return parse_infix_op(fs, tPositive, insert_gen_expr(gen_expr, &tree_expr), preset); } @@ -829,7 +827,7 @@ { /* Use the negative infix operator, but first add an implicit zero to the operator tree */ - gen_expr = GenExpr::const_to_expr(0); + gen_expr = Expr::const_to_expr(0); //return parse_gen_expr(fs, insert_gen_expr(gen_expr, &tree_expr), preset); return parse_infix_op(fs, tNegative, insert_gen_expr(gen_expr, &tree_expr), preset); } @@ -863,7 +861,7 @@ /* CASE 1: Check if string is a just a floating point number */ if (string_to_float(string, &val) != PROJECTM_PARSE_ERROR) { - if ((gen_expr = GenExpr::const_to_expr(val)) == NULL) + if ((gen_expr = Expr::const_to_expr(val)) == NULL) { if (tree_expr) delete tree_expr; @@ -898,7 +896,7 @@ /* Convert parameter to an expression */ - if ((gen_expr = GenExpr::param_to_expr(param)) == NULL) + if ((gen_expr = Expr::param_to_expr(param)) == NULL) { delete tree_expr; return NULL; @@ -932,7 +930,7 @@ } /* Convert parameter to an expression */ - if ((gen_expr = GenExpr::param_to_expr(param)) == NULL) + if ((gen_expr = Expr::param_to_expr(param)) == NULL) { delete tree_expr; return NULL; @@ -955,7 +953,7 @@ } /* Convert parameter to an expression */ - if ((gen_expr = GenExpr::param_to_expr(param)) == NULL) + if ((gen_expr = Expr::param_to_expr(param)) == NULL) { delete tree_expr; return NULL; @@ -981,6 +979,21 @@ } +Expr * Parser::parse_gen_expr ( std::istream & fs, TreeExpr * tree_expr, MilkdropPreset * preset) +{ + Expr *gen_expr = _parse_gen_expr( fs, tree_expr, preset ); + if (NULL == gen_expr) + return NULL; + //std::cout << gen_expr << std::endl; + Expr *opt = gen_expr->optimize(); + + if (opt != gen_expr) { + delete gen_expr; + } + //std::cout << opt << std::endl << std::endl; + return opt; +} + /* Inserts expressions into tree according to operator precedence. If root is null, a new tree is created, with infix_op as only element */ @@ -999,7 +1012,7 @@ if (*root == NULL) { - new_root = new TreeExpr(infix_op, NULL, NULL, NULL); + new_root = TreeExpr::create(infix_op, NULL, NULL, NULL); *root = new_root; return new_root; } @@ -1009,7 +1022,7 @@ if ((*root)->infix_op == NULL) { - new_root = new TreeExpr(infix_op, NULL, *root, NULL); + new_root = TreeExpr::create(infix_op, NULL, *root, NULL); (*root) = new_root; return new_root; } @@ -1020,7 +1033,7 @@ if (infix_op->precedence >= (*root)->infix_op->precedence) { - new_root = new TreeExpr(infix_op, NULL, *root, NULL); + new_root = TreeExpr::create(infix_op, NULL, *root, NULL); (*root) = new_root; return new_root; } @@ -1035,7 +1048,7 @@ } -TreeExpr * Parser::insert_gen_expr(GenExpr * gen_expr, TreeExpr ** root) +TreeExpr * Parser::insert_gen_expr(Expr * gen_expr, TreeExpr ** root) { TreeExpr * new_root; @@ -1053,7 +1066,7 @@ if (*root == NULL) { - new_root = new TreeExpr(NULL, gen_expr, NULL, NULL); + new_root = TreeExpr::create(NULL, gen_expr, NULL, NULL); *root = new_root; return new_root; } @@ -1067,7 +1080,7 @@ } /* A recursive helper function to insert general expression elements into the operator tree */ -int Parser::insert_gen_rec(GenExpr * gen_expr, TreeExpr * root) +int Parser::insert_gen_rec(Expr * gen_expr, TreeExpr * root) { /* Trivial Case: root is null */ @@ -1085,7 +1098,7 @@ if ((root->left == NULL) && (root->infix_op != NULL)) { - root->left = new TreeExpr(NULL, gen_expr, NULL, NULL); + root->left = TreeExpr::create(NULL, gen_expr, NULL, NULL); return PROJECTM_SUCCESS; } @@ -1095,7 +1108,7 @@ if ((root->right == NULL) && (root->infix_op != NULL)) { - root->right = new TreeExpr(NULL, gen_expr, NULL, NULL); + root->right = TreeExpr::create(NULL, gen_expr, NULL, NULL); return PROJECTM_SUCCESS; } @@ -1103,8 +1116,8 @@ this succeeds then return. If it fails, try recursing down to the right */ - if (insert_gen_rec(gen_expr, root->left) == PROJECTM_FAILURE) - return insert_gen_rec(gen_expr, root->right); + if (insert_gen_rec(gen_expr, root->leftTree()) == PROJECTM_FAILURE) + return insert_gen_rec(gen_expr, root->rightTree()); /* Impossible for control flow to reach here, but in the world of C programming, who knows... */ @@ -1131,14 +1144,14 @@ I don't think this will ever happen */ if (root->left == NULL) { - root->left = new TreeExpr(infix_op, NULL, root->left, NULL); + root->left = TreeExpr::create(infix_op, NULL, root->leftTree(), NULL); return PROJECTM_SUCCESS; } /* Right tree is empty, attach this operator to it */ if (root->right == NULL) { - root->right = new TreeExpr(infix_op, NULL, root->right, NULL); + root->right = TreeExpr::create(infix_op, NULL, root->rightTree(), NULL); return PROJECTM_SUCCESS; } @@ -1149,29 +1162,29 @@ then insert the expression here, attaching the old right branch to the left of the new expression */ - if (root->right->infix_op == NULL) + if (root->rightTree()->infix_op == NULL) { - root->right = new TreeExpr(infix_op, NULL, root->right, NULL); + root->right = TreeExpr::create(infix_op, NULL, root->rightTree(), NULL); return PROJECTM_SUCCESS; } /* Traverse deeper if the inserting operator precedence is less than the the root's right operator precedence */ - if (infix_op->precedence < root->right->infix_op->precedence) - return insert_infix_rec(infix_op, root->right); + if (infix_op->precedence < root->rightTree()->infix_op->precedence) + return insert_infix_rec(infix_op, root->rightTree()); /* Otherwise, insert the operator here */ - root->right = new TreeExpr(infix_op, NULL, root->right, NULL); + root->right = TreeExpr::create(infix_op, NULL, root->rightTree(), NULL); return PROJECTM_SUCCESS; } /* Parses an infix operator */ -GenExpr * Parser::parse_infix_op(std::istream & fs, token_t token, TreeExpr * tree_expr, MilkdropPreset * preset) +Expr * Parser::parse_infix_op(std::istream & fs, token_t token, TreeExpr * tree_expr, MilkdropPreset * preset) { - GenExpr * gen_expr; + Expr * gen_expr; switch (token) { @@ -1212,7 +1225,7 @@ case tRPr: case tComma: if (PARSE_DEBUG) printf("parse_infix_op: terminal found (LINE %d)\n", line_count); - gen_expr = new GenExpr(TREE_T, (void*)tree_expr); + gen_expr = tree_expr; assert(gen_expr); return gen_expr; default: @@ -1358,7 +1371,7 @@ char string[MAX_TOKEN_SIZE]; Param * param; PerFrameEqn * per_frame_eqn; - GenExpr * gen_expr; + Expr * gen_expr; if (parseToken(fs, string) != tEq) @@ -1408,7 +1421,7 @@ Param * param; PerFrameEqn * per_frame_eqn; - GenExpr * gen_expr; + Expr * gen_expr; if (fs.fail()) return NULL; @@ -1558,7 +1571,7 @@ Param * param = NULL; CValue init_val; InitCond * init_cond; - GenExpr * gen_expr; + Expr * gen_expr; float val; token_t token; @@ -1604,7 +1617,7 @@ } /* Compute initial condition value */ - val = gen_expr->eval_gen_expr(-1,-1); + val = gen_expr->eval(-1,-1); /* Free the general expression now that we are done with it */ delete gen_expr; @@ -1698,6 +1711,7 @@ break; } else { line_count++; + out_buffer->push_back('\n'); return; } } @@ -2192,7 +2206,7 @@ { Param * param; - GenExpr * gen_expr; + Expr * gen_expr; char string[MAX_TOKEN_SIZE]; PerFrameEqn * per_frame_eqn; CustomWave * custom_wave; @@ -2451,6 +2465,8 @@ line_mode = CUSTOM_SHAPE_PER_FRAME_INIT_LINE_MODE; init_cond->evaluate(true); + + delete init_cond; return PROJECTM_SUCCESS; } @@ -2458,7 +2474,7 @@ { Param * param; - GenExpr * gen_expr; + Expr * gen_expr; PerFrameEqn * per_frame_eqn; char string[MAX_TOKEN_SIZE]; @@ -2520,7 +2536,7 @@ { Param * param; - GenExpr * gen_expr; + Expr * gen_expr; PerFrameEqn * per_frame_eqn; char string[MAX_TOKEN_SIZE]; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Parser.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Parser.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/Parser.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/Parser.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -29,7 +29,7 @@ #ifndef _PARSER_H #define _PARSER_H //#define PARSE_DEBUG 2 -#define PARSE_DEBUG 1 +#define PARSE_DEBUG 0 #include @@ -122,7 +122,7 @@ class CustomShape; class CustomWave; -class GenExpr; +class Expr; class InfixOp; class PerFrameEqn; class MilkdropPreset; @@ -155,17 +155,17 @@ static int parse_line( std::istream & fs, MilkdropPreset * preset ); static int get_string_prefix_len(char * string); - static TreeExpr * insert_gen_expr(GenExpr * gen_expr, TreeExpr ** root); + static TreeExpr * insert_gen_expr(Expr * gen_expr, TreeExpr ** root); static TreeExpr * insert_infix_op(InfixOp * infix_op, TreeExpr ** root); static token_t parseToken(std::istream & fs, char * string); - static GenExpr ** parse_prefix_args(std::istream & fs, int num_args, MilkdropPreset * preset); - static GenExpr * parse_infix_op(std::istream & fs, token_t token, TreeExpr * tree_expr, MilkdropPreset * preset); - static GenExpr * parse_sign_arg(std::istream & fs); + static Expr ** parse_prefix_args(std::istream & fs, int num_args, MilkdropPreset * preset); + static Expr * parse_infix_op(std::istream & fs, token_t token, TreeExpr * tree_expr, MilkdropPreset * preset); + static Expr * parse_sign_arg(std::istream & fs); static int parse_float(std::istream & fs, float * float_ptr); static int parse_int(std::istream & fs, int * int_ptr); - static int insert_gen_rec(GenExpr * gen_expr, TreeExpr * root); + static int insert_gen_rec(Expr * gen_expr, TreeExpr * root); static int insert_infix_rec(InfixOp * infix_op, TreeExpr * root); - static GenExpr * parse_gen_expr(std::istream & fs, TreeExpr * tree_expr, MilkdropPreset * preset); + static Expr * parse_gen_expr(std::istream & fs, TreeExpr * tree_expr, MilkdropPreset * preset); static PerFrameEqn * parse_implicit_per_frame_eqn(std::istream & fs, char * param_string, int index, MilkdropPreset * preset); static InitCond * parse_per_frame_init_eqn(std::istream & fs, MilkdropPreset * preset, std::map * database); static int parse_wavecode_prefix(char * token, int * id, char ** var_string); @@ -186,7 +186,8 @@ static int parse_shape_per_frame_eqn(std::istream & fs, CustomShape * custom_shape, MilkdropPreset * preset); static int parse_wave_per_frame_eqn(std::istream & fs, CustomWave * custom_wave, MilkdropPreset * preset); static bool wrapsToNextLine(const std::string & str); +private: + static Expr * _parse_gen_expr(std::istream & fs, TreeExpr * tree_expr, MilkdropPreset * preset); }; #endif /** !_PARSER_H */ - diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -43,10 +43,10 @@ fflush(stdout); } - //*((float*)per_frame_eqn->param->engine_val) = eval_gen_expr(per_frame_eqn->gen_expr); + //*((float*)per_frame_eqn->param->engine_val) = eval(per_frame_eqn->gen_expr); assert(gen_expr); assert(param); - param->set_param(gen_expr->eval_gen_expr(-1,-1)); + param->set_param(gen_expr->eval(-1,-1)); if (PER_FRAME_EQN_DEBUG) printf(" = %.4f\n", *((float*)param->engine_val)); @@ -63,5 +63,5 @@ } /* Create a new per frame equation */ -PerFrameEqn::PerFrameEqn(int _index, Param * _param, GenExpr * _gen_expr) : +PerFrameEqn::PerFrameEqn(int _index, Param * _param, Expr * _gen_expr) : index(_index), param(_param), gen_expr(_gen_expr) {} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerFrameEqn.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -31,7 +31,7 @@ #define PER_FRAME_EQN_DEBUG 0 -class GenExpr; +class Expr; class Param; class PerFrameEqn; @@ -39,9 +39,9 @@ public: int index; /* a unique id for each per frame eqn (generated by order in preset files) */ Param *param; /* parameter to be assigned a value */ - GenExpr *gen_expr; /* expression that paremeter is equal to */ + Expr *gen_expr; /* expression that paremeter is equal to */ - PerFrameEqn(int index, Param * param, GenExpr * gen_expr); + PerFrameEqn(int index, Param * param, Expr * gen_expr); ~PerFrameEqn(); /// Evaluate the per frame equation diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -38,7 +38,7 @@ /* Evaluates a per pixel equation */ void PerPixelEqn::evaluate(int mesh_i, int mesh_j) { - GenExpr * eqn_ptr = 0; + Expr * eqn_ptr = 0; eqn_ptr = this->gen_expr; @@ -47,13 +47,13 @@ if (param_matrix == 0) { assert(param->engine_val); - (*(float*)param->engine_val) = eqn_ptr->eval_gen_expr(mesh_i, mesh_j); + (*(float*)param->engine_val) = eqn_ptr->eval(mesh_i, mesh_j); } else { assert(!(eqn_ptr == NULL || param_matrix == NULL)); - param_matrix[mesh_i][mesh_j] = eqn_ptr->eval_gen_expr(mesh_i, mesh_j); + param_matrix[mesh_i][mesh_j] = eqn_ptr->eval(mesh_i, mesh_j); /* Now that this parameter has been referenced with a per pixel equation, we let the evaluator know by setting @@ -64,7 +64,7 @@ } } -PerPixelEqn::PerPixelEqn(int _index, Param * _param, GenExpr * _gen_expr):index(_index), param(_param), gen_expr(_gen_expr) { +PerPixelEqn::PerPixelEqn(int _index, Param * _param, Expr * _gen_expr):index(_index), param(_param), gen_expr(_gen_expr) { assert(index >= 0); assert(param != 0); diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPixelEqn.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -43,7 +43,7 @@ #define WARP_OP 9 #define NUM_OPS 10 /* obviously, this number is dependent on the number of existing per pixel operations */ -class GenExpr; +class Expr; class Param; class PerPixelEqn; class Preset; @@ -53,13 +53,13 @@ int index; /* used for splay tree ordering. */ int flags; /* primarily to specify if this variable is user-defined */ Param *param; - GenExpr *gen_expr; + Expr *gen_expr; void evalPerPixelEqns( Preset *preset ); void evaluate(int mesh_i, int mesh_j); virtual ~PerPixelEqn(); - PerPixelEqn(int index, Param * param, GenExpr * gen_expr); + PerPixelEqn(int index, Param * param, Expr * gen_expr); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPointEqn.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -42,7 +42,7 @@ { float * param_matrix; - GenExpr * eqn_ptr; + Expr * eqn_ptr; // samples = CustomWave::interface_wave->samples; @@ -51,8 +51,7 @@ if (param->matrix == NULL) { assert(param->matrix_flag == false); - (*(float*)param->engine_val) = eqn_ptr->eval_gen_expr(i,-1); - + (*(float*)param->engine_val) = eqn_ptr->eval(i,-1); return; } @@ -62,7 +61,7 @@ param_matrix = (float*)param->matrix; // -1 is because per points only use one dimension - param_matrix[i] = eqn_ptr->eval_gen_expr(i, -1); + param_matrix[i] = eqn_ptr->eval(i, -1); /* Now that this parameter has been referenced with a per @@ -76,7 +75,7 @@ } -PerPointEqn::PerPointEqn(int _index, Param * _param, GenExpr * _gen_expr, int _samples): +PerPointEqn::PerPointEqn(int _index, Param * _param, Expr * _gen_expr, int _samples): index(_index), samples(_samples), param(_param), diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PerPointEqn.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -30,7 +30,7 @@ #define _PER_POINT_EQN_H class CustomWave; -class GenExpr; +class Expr; class Param; class PerPointEqn; @@ -39,10 +39,10 @@ int index; int samples; // the number of samples to iterate over Param *param; - GenExpr * gen_expr; + Expr * gen_expr; ~PerPointEqn(); void evaluate(int i); - PerPointEqn( int index, Param *param, GenExpr *gen_expr, int samples); + PerPointEqn( int index, Param *param, Expr *gen_expr, int samples); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -6,10 +6,16 @@ #include #include "Renderer/BeatDetect.hpp" +#ifdef __SSE2__ +#include +#endif + + PresetInputs::PresetInputs() : PipelineContext() { } + void PresetInputs::update(const BeatDetect & music, const PipelineContext & context) { // Reflect new values form the beat detection unit @@ -28,12 +34,38 @@ this->progress = context.progress; } + +float **alloc_mesh(size_t gx, size_t gy) +{ + // round gy up to multiple 4 (for possible SSE optimization) + gy = (gy+3) & ~(size_t)3; + + float **mesh = (float **)wipe_aligned_alloc(gx * sizeof(float *)); + float *m = (float *)wipe_aligned_alloc(gx * gy * sizeof(float)); + for ( int x = 0; x < gx; x++ ) + mesh[x] = m + (gy * x); + return mesh; +} + +float **free_mesh(float **mesh) +{ + wipe_aligned_free(mesh[0]); + wipe_aligned_free(mesh); + return NULL; +} + +void copy_mesh(float **dst, float **src, int gx, int gy) +{ + memcpy(dst[0], src[0], gx*gy*sizeof(float)); +} + + void PresetInputs::Initialize ( int gx, int gy ) { int x, y; - this->gx =gx; - this->gy= gy; + this->gx = gx; + this->gy = gy; /// @bug no clue if this block belongs here @@ -47,47 +79,14 @@ ang_per_pixel = 0; // *** - this->x_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->x_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->y_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x y_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->rad_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->rad_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->theta_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x theta_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - - this->origtheta= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->origtheta[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->origrad= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->origrad[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->origx= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->origx[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->origy= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->origy[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } + this->x_mesh = alloc_mesh(gx, gy); + this->y_mesh = alloc_mesh(gx, gy); + this->rad_mesh = alloc_mesh(gx, gy); + this->theta_mesh= alloc_mesh(gx, gy); + this->origtheta = alloc_mesh(gx, gy); + this->origrad = alloc_mesh(gx, gy); + this->origx = alloc_mesh(gx, gy); + this->origy = alloc_mesh(gx, gy); for ( x=0;xorigtheta[x][y]=atan2 ( ( ( this->origy[x][y]-.5 ) *2 ), ( ( this->origx[x][y]-.5 ) *2 ) ); } } - - - } + PresetOutputs::PresetOutputs() : Pipeline() {} + PresetOutputs::~PresetOutputs() { assert(this->gx > 0); - for ( int x = 0; x < this->gx; x++ ) - { - free(this->sx_mesh[x]); - free(this->sy_mesh[x]); - free(this->dy_mesh[x]); - free(this->dx_mesh[x]); - free(this->cy_mesh[x]); - free(this->cx_mesh[x]); - - free(this->warp_mesh[x]); - free(this->zoom_mesh[x]); - free(this->zoomexp_mesh[x]); - free(this->rot_mesh[x]); - free(this->orig_x[x]); - free(this->orig_y[x]); - free(this->rad_mesh[x]); - } - - free(this->rad_mesh); - free(this->sx_mesh); - free(this->sy_mesh); - free(this->dy_mesh); - free(this->dx_mesh); - free(this->cy_mesh); - free(this->cx_mesh); - free(this->warp_mesh); - free(this->zoom_mesh); - free(this->zoomexp_mesh); - free(this->rot_mesh); - free(this->orig_x); - free(this->orig_y); - + this->rad_mesh = free_mesh(this->rad_mesh); + this->sx_mesh = free_mesh(this->sx_mesh); + this->sy_mesh = free_mesh(this->sy_mesh); + this->dy_mesh = free_mesh(this->dy_mesh); + this->dx_mesh = free_mesh(this->dx_mesh); + this->cy_mesh = free_mesh(this->cy_mesh); + this->cx_mesh = free_mesh(this->cx_mesh); + this->warp_mesh = free_mesh(this->warp_mesh); + this->zoom_mesh = free_mesh(this->zoom_mesh); + this->zoomexp_mesh = free_mesh(this->zoomexp_mesh); + this->rot_mesh = free_mesh(this->rot_mesh); + this->orig_x = free_mesh(this->orig_x); + this->orig_y = free_mesh(this->orig_y); + + customWaves.clear(); + customShapes.clear(); + drawables.clear(); } + void PresetOutputs::Render(const BeatDetect &music, const PipelineContext &context) { PerPixelMath(context); @@ -155,18 +139,22 @@ for (PresetOutputs::cshape_container::iterator pos = customShapes.begin(); pos != customShapes.end(); ++pos) - { - if( (*pos)->enabled==1) drawables.push_back((*pos)); - } + { + if ((*pos)->enabled==1) + drawables.push_back((*pos)); + } for (PresetOutputs::cwave_container::iterator pos = customWaves.begin(); pos != customWaves.end(); ++pos) - { - if( (*pos)->enabled==1) drawables.push_back((*pos)); - } + { + if ((*pos)->enabled==1) + drawables.push_back((*pos)); + } - drawables.push_back(&wave); - if(bDarkenCenter==1) drawables.push_back(&darkenCenter); + drawables.push_back(&wave); + + if (bDarkenCenter==1) + drawables.push_back(&darkenCenter); drawables.push_back(&border); compositeDrawables.clear(); @@ -186,256 +174,356 @@ } -void PresetOutputs::PerPixelMath(const PipelineContext &context) +// N.B. The more optimization that can be done on this method, the better! This is called a lot and can probably be improved. +void PresetOutputs::PerPixelMath_c(const PipelineContext &context) { - - int x, y; - float fZoom2, fZoom2Inv; - - for (x = 0; x < gx; x++) + for (int x = 0; x < gx; x++) { - for (y = 0; y < gy; y++) + for (int y = 0; y < gy; y++) { - fZoom2 = std::pow(this->zoom_mesh[x][y], std::pow(this->zoomexp_mesh[x][y], + const float fZoom2 = std::pow(this->zoom_mesh[x][y], std::pow(this->zoomexp_mesh[x][y], rad_mesh[x][y] * 2.0f - 1.0f)); - fZoom2Inv = 1.0f / fZoom2; + const float fZoom2Inv = 1.0f / fZoom2; this->x_mesh[x][y] = this->orig_x[x][y] * 0.5f * fZoom2Inv + 0.5f; + this->x_mesh[x][y] = (this->x_mesh[x][y] - this->cx_mesh[x][y]) / this->sx_mesh[x][y] + this->cx_mesh[x][y]; this->y_mesh[x][y] = this->orig_y[x][y] * 0.5f * fZoom2Inv + 0.5f; + this->y_mesh[x][y] = (this->y_mesh[x][y] - this->cy_mesh[x][y]) / this->sy_mesh[x][y] + this->cy_mesh[x][y]; } } - for (x = 0; x < gx; x++) + const float fWarpTime = context.time * this->fWarpAnimSpeed; + const float fWarpScaleInv = 1.0f / this->fWarpScale; + float f[4]; + f[0] = 11.68f + 4.0f * cosf(fWarpTime * 1.413f + 10); + f[1] = 8.77f + 3.0f * cosf(fWarpTime * 1.113f + 7); + f[2] = 10.54f + 3.0f * cosf(fWarpTime * 1.233f + 3); + f[3] = 11.49f + 4.0f * cosf(fWarpTime * 0.933f + 5); + + for (int x = 0; x < gx; x++) { - for (y = 0; y < gy; y++) + for (int y = 0; y < gy; y++) { - this->x_mesh[x][y] = (this->x_mesh[x][y] - this->cx_mesh[x][y]) - / this->sx_mesh[x][y] + this->cx_mesh[x][y]; + const float orig_x = this->orig_x[x][y]; + const float orig_y = this->orig_y[x][y]; + const float warp_mesh = this->warp_mesh[x][y] * 0.0035f; + + this->x_mesh[x][y] += + (warp_mesh * sinf(fWarpTime * 0.333f + fWarpScaleInv * (orig_x * f[0] - orig_y * f[3]))) + + (warp_mesh * cosf(fWarpTime * 0.753f - fWarpScaleInv * (orig_x * f[1] - orig_y * f[2]))); + + this->y_mesh[x][y] += + (warp_mesh * cosf(fWarpTime * 0.375f - fWarpScaleInv * (orig_x * f[2] + orig_y * f[1]))) + + (warp_mesh * sinf(fWarpTime * 0.825f + fWarpScaleInv * (orig_x * f[0] + orig_y * f[3]))); } } - for (x = 0; x < gx; x++) + for (int x = 0; x < gx; x++) { - for (y = 0; y < gy; y++) + for (int y = 0; y < gy; y++) { - this->y_mesh[x][y] = (this->y_mesh[x][y] - this->cy_mesh[x][y]) - / this->sy_mesh[x][y] + this->cy_mesh[x][y]; + const float u2 = this->x_mesh[x][y] - this->cx_mesh[x][y]; + const float v2 = this->y_mesh[x][y] - this->cy_mesh[x][y]; + + const float rot = this->rot_mesh[x][y]; + const float cos_rot = cosf(rot); + const float sin_rot = sinf(rot); + + this->x_mesh[x][y] = u2 * cos_rot - v2 * sin_rot + this->cx_mesh[x][y] - this->dx_mesh[x][y]; + this->y_mesh[x][y] = u2 * sin_rot + v2 * cos_rot + this->cy_mesh[x][y] - this->dy_mesh[x][y]; } } +} - float fWarpTime = context.time * this->fWarpAnimSpeed; - float fWarpScaleInv = 1.0f / this->fWarpScale; - float f[4]; - f[0] = 11.68f + 4.0f * cosf(fWarpTime * 1.413f + 10); - f[1] = 8.77f + 3.0f * cosf(fWarpTime * 1.113f + 7); - f[2] = 10.54f + 3.0f * cosf(fWarpTime * 1.233f + 3); - f[3] = 11.49f + 4.0f * cosf(fWarpTime * 0.933f + 5); - for (x = 0; x < gx; x++) +#ifdef __SSE2__ + +// is there an SSE way to do this? +inline __m128 _mm_pow(__m128 x, __m128 y) +{ + float X[4]; + float Y[4]; + _mm_store_ps(X,x); + _mm_store_ps(Y,y); + X[0] = __builtin_powf(X[0],Y[0]); + X[1] = __builtin_powf(X[1],Y[1]); + X[2] = __builtin_powf(X[2],Y[2]); + X[3] = __builtin_powf(X[3],Y[3]); + return _mm_load_ps(X); +} +inline void _mm_sincosf(__m128 x, __m128 &sinx, __m128 &cosx) +{ + float X[4], S[4], C[4]; + _mm_store_ps(X,x); + S[0] = sinf(X[0]); + C[0] = cosf(X[0]); + S[1] = sinf(X[1]); + C[1] = cosf(X[1]); + S[2] = sinf(X[2]); + C[2] = cosf(X[2]); + S[3] = sinf(X[3]); + C[3] = cosf(X[3]); + sinx = _mm_load_ps(S); + cosx = _mm_load_ps(C); +} +inline __m128 _mm_sinf(__m128 x) +{ + float X[4]; + _mm_store_ps(X,x); + X[0] = sinf(X[0]); + X[1] = sinf(X[1]); + X[2] = sinf(X[2]); + X[3] = sinf(X[3]); + return _mm_load_ps(X); +} +inline __m128 _mm_cosf(__m128 x) +{ + float X[4]; + _mm_store_ps(X,x); + X[0] = cosf(X[0]); + X[1] = cosf(X[1]); + X[2] = cosf(X[2]); + X[3] = cosf(X[3]); + return _mm_load_ps(X); +} + + +void PresetOutputs::PerPixelMath_sse(const PipelineContext &context) +{ + for (int x = 0; x < gx; x++) { - for (y = 0; y < gy; y++) + for (int y = 0; y < gy; y += 4) { - this->x_mesh[x][y] += this->warp_mesh[x][y] * 0.0035f * sinf(fWarpTime * 0.333f - + fWarpScaleInv * (this->orig_x[x][y] * f[0] - this->orig_y[x][y] * f[3])); - this->y_mesh[x][y] += this->warp_mesh[x][y] * 0.0035f * cosf(fWarpTime * 0.375f - - fWarpScaleInv * (this->orig_x[x][y] * f[2] + this->orig_y[x][y] * f[1])); - this->x_mesh[x][y] += this->warp_mesh[x][y] * 0.0035f * cosf(fWarpTime * 0.753f - - fWarpScaleInv * (this->orig_x[x][y] * f[1] - this->orig_y[x][y] * f[2])); - this->y_mesh[x][y] += this->warp_mesh[x][y] * 0.0035f * sinf(fWarpTime * 0.825f - + fWarpScaleInv * (this->orig_x[x][y] * f[0] + this->orig_y[x][y] * f[3])); + // fZoom2 = std::pow(this->zoom_mesh[x][y], std::pow(this->zoomexp_mesh[x][y], + // rad_mesh[x][y] * 2.0f - 1.0f)); + __m128 rad_mesh_scaled = + _mm_sub_ps( + _mm_mul_ps( + _mm_load_ps(&this->rad_mesh[x][y]), + _mm_set_ps1(2.0f)), + _mm_set_ps1(1.0f)); + __m128 zoom_mesh = _mm_load_ps(&this->zoom_mesh[x][y]); + __m128 zoomexp_mesh = _mm_load_ps(&this->zoomexp_mesh[x][y]); + __m128 fZoom2 = _mm_pow(zoom_mesh, _mm_pow(zoomexp_mesh, rad_mesh_scaled)); + // fZoom2Inv = 1.0f / fZoom2; + __m128 fZoomInv = _mm_rcp_ps(fZoom2); + + // this->x_mesh[x][y] = this->orig_x[x][y] * 0.5f * fZoom2Inv + 0.5f; + __m128 x_mesh = + _mm_add_ps( + _mm_mul_ps( + _mm_load_ps(&this->orig_x[x][y]), + _mm_mul_ps(fZoomInv,_mm_set_ps1(0.5f))), // CONSIDER: common sub-expression + _mm_set_ps1(0.5f)); + // this->x_mesh[x][y] = (this->x_mesh[x][y] - this->cx_mesh[x][y]) / this->sx_mesh[x][y] + this->cx_mesh[x][y]; + __m128 cx_mesh = _mm_load_ps(&this->cx_mesh[x][y]); + __m128 sx_mesh = _mm_load_ps(&this->sx_mesh[x][y]); + _mm_store_ps(&this->x_mesh[x][y], + _mm_add_ps( + _mm_div_ps( + _mm_sub_ps(x_mesh,cx_mesh), + sx_mesh), + cx_mesh + )); + + // this->y_mesh[x][y] = this->orig_y[x][y] * 0.5f * fZoom2Inv + 0.5f; + __m128 y_mesh = + _mm_add_ps( + _mm_mul_ps( + _mm_load_ps(&this->orig_y[x][y]), + _mm_mul_ps(fZoomInv,_mm_set_ps1(0.5f))), + _mm_set_ps1(0.5f)); + // this->y_mesh[x][y] = (this->y_mesh[x][y] - this->cy_mesh[x][y]) / this->sy_mesh[x][y] + this->cy_mesh[x][y]; + __m128 cy_mesh = _mm_load_ps(&this->cy_mesh[x][y]); + __m128 sy_mesh = _mm_load_ps(&this->sy_mesh[x][y]); + _mm_store_ps(&this->y_mesh[x][y], + _mm_add_ps( + _mm_div_ps( + _mm_sub_ps(y_mesh,cy_mesh), + sy_mesh), + cy_mesh + )); } } - for (x = 0; x < gx; x++) - { - for (y = 0; y < gy; y++) - { - float u2 = this->x_mesh[x][y] - this->cx_mesh[x][y]; - float v2 = this->y_mesh[x][y] - this->cy_mesh[x][y]; - - float cos_rot = cosf(this->rot_mesh[x][y]); - float sin_rot = sinf(this->rot_mesh[x][y]); - this->x_mesh[x][y] = u2 * cos_rot - v2 * sin_rot + this->cx_mesh[x][y]; - this->y_mesh[x][y] = u2 * sin_rot + v2 * cos_rot + this->cy_mesh[x][y]; + const float fWarpTime = context.time * this->fWarpAnimSpeed; + const float fWarpScaleInv = 1.0f / this->fWarpScale; + const float f[4] = + { + 11.68f + 4.0f * cosf(fWarpTime * 1.413f + 10), + 8.77f + 3.0f * cosf(fWarpTime * 1.113f + 7), + 10.54f + 3.0f * cosf(fWarpTime * 1.233f + 3), + 11.49f + 4.0f * cosf(fWarpTime * 0.933f + 5) + }; + for (int x = 0; x < gx; x++) + { + for (int y = 0; y < gy; y+=4) + { + //float orig_x = this->orig_x[x][y]; + //float orig_y = this->orig_y[x][y]; + //float warp_mesh = this->warp_mesh[x][y] * 0.0035f; + const __m128 orig_x = _mm_load_ps(&this->orig_x[x][y]); + const __m128 orig_y = _mm_load_ps(&this->orig_y[x][y]); + const __m128 warp_mesh = _mm_mul_ps(_mm_load_ps(&this->warp_mesh[x][y]), _mm_set_ps1(0.0035f)); + + // this->x_mesh[x][y] += + // (warp_mesh * sinf(fWarpTime * 0.333f + fWarpScaleInv * (orig_x * f[0] - orig_y * f[3]))) + + // (warp_mesh * cosf(fWarpTime * 0.753f - fWarpScaleInv * (orig_x * f[1] - orig_y * f[2]))); + _mm_store_ps(&this->x_mesh[x][y], + _mm_add_ps(_mm_load_ps(&this->x_mesh[x][y]), + _mm_add_ps( + _mm_mul_ps(warp_mesh, _mm_sinf( + _mm_add_ps( + _mm_set_ps1(fWarpTime*0.333f), + _mm_mul_ps(_mm_set_ps1(fWarpScaleInv), + _mm_sub_ps( + _mm_mul_ps(orig_x, _mm_set_ps1(f[0])), + _mm_mul_ps(orig_y, _mm_set_ps1(f[3])) + ))))), + _mm_mul_ps(warp_mesh, _mm_cosf( + _mm_sub_ps( + _mm_set_ps1(fWarpTime*0.753f), + _mm_mul_ps(_mm_set_ps1(fWarpScaleInv), + _mm_sub_ps( + _mm_mul_ps(orig_x, _mm_set_ps1(f[1])), + _mm_mul_ps(orig_y, _mm_set_ps1(f[2])) + )))))))); + + // this->y_mesh[x][y] += + // (warp_mesh * cosf(fWarpTime * 0.375f - fWarpScaleInv * (orig_x * f[2] + orig_y * f[1]))) + + // (warp_mesh * sinf(fWarpTime * 0.825f + fWarpScaleInv * (orig_x * f[0] + orig_y * f[3]))); + _mm_store_ps(&this->y_mesh[x][y], + _mm_add_ps(_mm_load_ps(&this->y_mesh[x][y]), + _mm_add_ps( + _mm_mul_ps(warp_mesh, _mm_cosf( + _mm_sub_ps( + _mm_set_ps1(fWarpTime*0.375f), + _mm_mul_ps(_mm_set_ps1(fWarpScaleInv), + _mm_add_ps( + _mm_mul_ps(orig_x, _mm_set_ps1(f[2])), + _mm_mul_ps(orig_y, _mm_set_ps1(f[1])) + ))))), + _mm_mul_ps(warp_mesh, _mm_sinf( + _mm_add_ps( + _mm_set_ps1(fWarpTime*0.825f), + _mm_mul_ps(_mm_set_ps1(fWarpScaleInv), + _mm_add_ps( + _mm_mul_ps(orig_x, _mm_set_ps1(f[0])), + _mm_mul_ps(orig_y, _mm_set_ps1(f[3])) + )))))))); } } + for (int x = 0; x < gx; x++) + { + for (int y = 0; y < gy; y+=4) + { + // const float u2 = this->x_mesh[x][y] - this->cx_mesh[x][y]; + // const float v2 = this->y_mesh[x][y] - this->cy_mesh[x][y]; + const __m128 u2 = _mm_sub_ps(_mm_load_ps(&this->x_mesh[x][y]),_mm_load_ps(&this->cx_mesh[x][y])); + const __m128 v2 = _mm_sub_ps(_mm_load_ps(&this->y_mesh[x][y]),_mm_load_ps(&this->cy_mesh[x][y])); + + // const float rot = this->rot_mesh[x][y]; + // const float cos_rot = cosf(rot); + // const float sin_rot = sinf(rot); + __m128 sin_rot, cos_rot; + _mm_sincosf(_mm_load_ps(&this->rot_mesh[x][y]), sin_rot, cos_rot); + + // this->x_mesh[x][y] = u2 * cos_rot - v2 * sin_rot + this->cx_mesh[x][y] - this->dx_mesh[x][y]; + _mm_store_ps(&this->x_mesh[x][y], + _mm_add_ps( + _mm_sub_ps(_mm_mul_ps(u2, cos_rot), _mm_mul_ps(v2,sin_rot)), + _mm_sub_ps(_mm_load_ps(&this->cx_mesh[x][y]), _mm_load_ps(&this->dx_mesh[x][y])) + )); + // this->y_mesh[x][y] = u2 * sin_rot + v2 * cos_rot + this->cy_mesh[x][y] - this->dy_mesh[x][y]; + _mm_store_ps(&this->y_mesh[x][y], + _mm_add_ps( + _mm_add_ps(_mm_mul_ps(u2, sin_rot), _mm_mul_ps(v2,cos_rot)), + _mm_sub_ps(_mm_load_ps(&this->cy_mesh[x][y]), _mm_load_ps(&this->dy_mesh[x][y])) + )); + } + } +} +#endif - for (x = 0; x < gx; x++) - for (y = 0; y < gy; y++) - this->x_mesh[x][y] -= this->dx_mesh[x][y]; - - for (x = 0; x < gx; x++) - for (y = 0; y < gy; y++) - this->y_mesh[x][y] -= this->dy_mesh[x][y]; +void PresetOutputs::PerPixelMath(const PipelineContext &context) +{ +#ifdef __SSE2__ + PerPixelMath_sse(context); +#else + PerPixelMath_c(context); +#endif } void PresetOutputs::Initialize ( int gx, int gy ) { - assert(gx > 0); + this->gx = gx; - this->gy= gy; + this->gy = gy; staticPerPixel = true; - setStaticPerPixel(gx,gy); assert(this->gx > 0); int x; - this->x_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->x_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->y_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->y_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->sx_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->sx_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->sy_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->sy_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->dx_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->dx_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->dy_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->dy_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->cx_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->cx_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->cy_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->cy_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->zoom_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->zoom_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->zoomexp_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->zoomexp_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->rot_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->rot_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } + this->x_mesh = alloc_mesh( gx, gy ); + this->y_mesh = alloc_mesh( gx, gy ); + this->sx_mesh = alloc_mesh( gx, gy ); + this->sy_mesh = alloc_mesh( gx, gy ); + this->dx_mesh = alloc_mesh( gx, gy ); + this->dy_mesh = alloc_mesh( gx, gy ); + this->cx_mesh = alloc_mesh( gx, gy ); + this->cy_mesh = alloc_mesh( gx, gy ); + this->zoom_mesh = alloc_mesh( gx, gy ); + this->zoomexp_mesh = alloc_mesh( gx, gy ); + this->rot_mesh = alloc_mesh( gx, gy ); + + this->warp_mesh = alloc_mesh( gx, gy ); + this->rad_mesh = alloc_mesh( gx, gy ); + this->orig_x = alloc_mesh( gx, gy ); + this->orig_y = alloc_mesh( gx, gy ); - this->warp_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->warp_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->rad_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( x = 0; x < gx; x++ ) - { - this->rad_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->orig_x = (float **) wipemalloc(gx * sizeof(float *)); + //initialize reference grid values for (x = 0; x < gx; x++) { - this->orig_x[x] = (float *) wipemalloc(gy * sizeof(float)); - } - this->orig_y = (float **) wipemalloc(gx * sizeof(float *)); - for (x = 0; x < gx; x++) - { - this->orig_y[x] = (float *) wipemalloc(gy * sizeof(float)); - } - - //initialize reference grid values - for (x = 0; x < gx; x++) + for (int y = 0; y < gy; y++) { - for (int y = 0; y < gy; y++) - { - float origx = x / (float) (gx - 1); - float origy = -((y / (float) (gy - 1)) - 1); - - rad_mesh[x][y]=hypot ( ( origx-.5 ) *2, ( origy-.5 ) *2 ) * .7071067; - orig_x[x][y] = (origx - .5) * 2; - orig_y[x][y] = (origy - .5) * 2; - } + float origx = x / (float) (gx - 1); + float origy = -((y / (float) (gy - 1)) - 1); + + rad_mesh[x][y]=hypot ( ( origx-.5 ) *2, ( origy-.5 ) *2 ) * .7071067; + orig_x[x][y] = (origx - .5) * 2; + orig_y[x][y] = (origy - .5) * 2; } + } } + PresetInputs::~PresetInputs() { - for ( int x = 0; x < this->gx; x++ ) - { - - - free ( this->origtheta[x] ); - free ( this->origrad[x] ); - free ( this->origx[x] ); - free ( this->origy[x] ); - - free ( this->x_mesh[x] ); - free ( this->y_mesh[x] ); - free ( this->rad_mesh[x] ); - free ( this->theta_mesh[x] ); - - } - - - free ( this->origx ); - free ( this->origy ); - free ( this->origrad ); - free ( this->origtheta ); - - free ( this->x_mesh ); - free ( this->y_mesh ); - free ( this->rad_mesh ); - free ( this->theta_mesh ); - - this->origx = NULL; - this->origy = NULL; - this->origtheta = NULL; - this->origrad = NULL; - - this->x_mesh = NULL; - this->y_mesh = NULL; - this->rad_mesh = NULL; - this->theta_mesh = NULL; + this->origx = free_mesh ( this->origx ); + this->origy = free_mesh ( this->origy ); + this->origrad = free_mesh ( this->origrad ); + this->origtheta = free_mesh ( this->origtheta ); + this->x_mesh = free_mesh ( this->x_mesh ); + this->y_mesh = free_mesh ( this->y_mesh ); + this->rad_mesh = free_mesh ( this->rad_mesh ); + this->theta_mesh = free_mesh ( this->theta_mesh ); } void PresetInputs::resetMesh() { - int x,y; - assert ( x_mesh ); assert ( y_mesh ); assert ( rad_mesh ); assert ( theta_mesh ); - for ( x=0;xgx;x++ ) - { - for ( y=0;ygy;y++ ) - { - x_mesh[x][y]=this->origx[x][y]; - y_mesh[x][y]=this->origy[x][y]; - rad_mesh[x][y]=this->origrad[x][y]; - theta_mesh[x][y]=this->origtheta[x][y]; - } - } - + copy_mesh(this->x_mesh, this->origx, gx, gy); + copy_mesh(this->y_mesh, this->origy, gx, gy); + copy_mesh(this->rad_mesh, this->origrad, gx, gy); + copy_mesh(this->theta_mesh, this->origtheta, gx, gy); } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/MilkdropPresetFactory/PresetFrameIO.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -138,6 +138,12 @@ float **orig_x; //original mesh float **orig_y; float **rad_mesh; + +private: + void PerPixelMath_c( const PipelineContext &context); +#ifdef __SSE2__ + void PerPixelMath_sse( const PipelineContext &context); +#endif }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/CMakeLists.txt projectm-3.1.0/src/libprojectM/NativePresetFactory/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/NativePresetFactory/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -project(NativePresetFactory) - -SET(NativePresetFactory_SOURCES NativePresetFactory.cpp) - -IF(NOT MSVC) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -ENDIF(NOT MSVC) -find_library(DL_LIBRARIES dl) - -if(MSVC) - SET (MATH_LIBRARIES ) -else(MSVC) - SET (MATH_LIBRARIES m) -endif(MSVC) - -INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${Renderer_SOURCE_DIR}) -ADD_LIBRARY(NativePresetFactory STATIC ${NativePresetFactory_SOURCES}) -TARGET_LINK_LIBRARIES(NativePresetFactory Renderer ${MATH_LIBRARIES} ${DL_LIBRARIES}) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/Makefile.am projectm-3.1.0/src/libprojectM/NativePresetFactory/Makefile.am --- projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/NativePresetFactory/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,10 @@ +noinst_LTLIBRARIES=libNativePresetFactory.la + +libNativePresetFactory_la_SOURCES= \ + NativePreset.hpp NativePresetFactory.hpp \ + MilkdropCompatability.hpp NativePresetFactory.cpp \ + MilkdropCompatability.hpp NativePreset.hpp NativePresetFactory.hpp + +libNativePresetFactory_la_CPPFLAGS = ${my_CFLAGS} \ + -include $(top_builddir)/config.h \ + -I$(top_srcdir)/src/libprojectM diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp projectm-3.1.0/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/NativePresetFactory/NativePresetFactory.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -1,7 +1,7 @@ // // C++ Interface: NativePresetFactory // -// Description: +// Description: // // // Author: Carmelo Piccione , (C) 2008 @@ -26,16 +26,16 @@ virtual ~NativePresetFactory(); - virtual std::auto_ptr allocate(const std::string & url, const std::string & name = std::string(), + virtual std::auto_ptr allocate(const std::string & url, const std::string & name = std::string(), const std::string & author = std::string()); - virtual std::string supportedExtensions() const { return "so"; } + virtual std::string supportedExtensions() const { return "so dylib"; } private: PresetLibrary * loadLibrary(const std::string & url); typedef std::map PresetLibraryMap; PresetLibraryMap _libraries; - + }; #endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/NativePresetFactory.xcodeproj/project.pbxproj projectm-3.1.0/src/libprojectM/NativePresetFactory/NativePresetFactory.xcodeproj/project.pbxproj --- projectm-2.2.0~git28bb9/src/libprojectM/NativePresetFactory/NativePresetFactory.xcodeproj/project.pbxproj 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/NativePresetFactory/NativePresetFactory.xcodeproj/project.pbxproj 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,160 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 48; + objects = { + +/* Begin PBXFileReference section */ + 16178A27207A68A200D3B0C8 /* MilkdropCompatability.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MilkdropCompatability.hpp; sourceTree = ""; }; + 16178A28207A68A200D3B0C8 /* .DS_Store */ = {isa = PBXFileReference; lastKnownFileType = file; path = .DS_Store; sourceTree = ""; }; + 16178A29207A68A200D3B0C8 /* libNativePresetFactory_la-NativePresetFactory.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = "libNativePresetFactory_la-NativePresetFactory.o"; sourceTree = ""; }; + 16178A2A207A68A200D3B0C8 /* NativePresetFactory.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = NativePresetFactory.cpp; sourceTree = ""; }; + 16178A2B207A68A200D3B0C8 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 16178A2C207A68A200D3B0C8 /* Makefile.am */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.am; sourceTree = ""; }; + 16178A2D207A68A200D3B0C8 /* libNativePresetFactory_la-NativePresetFactory.lo */ = {isa = PBXFileReference; lastKnownFileType = text; path = "libNativePresetFactory_la-NativePresetFactory.lo"; sourceTree = ""; }; + 16178A2E207A68A200D3B0C8 /* libNativePresetFactory.la */ = {isa = PBXFileReference; lastKnownFileType = text; path = libNativePresetFactory.la; sourceTree = ""; }; + 16178A2F207A68A200D3B0C8 /* NativePreset.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = NativePreset.hpp; sourceTree = ""; }; + 16178A30207A68A200D3B0C8 /* .deps */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .deps; sourceTree = ""; }; + 16178A31207A68A200D3B0C8 /* .libs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .libs; sourceTree = ""; }; + 16178A32207A68A200D3B0C8 /* Makefile.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; + 16178A33207A68A200D3B0C8 /* NativePresetFactory.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = NativePresetFactory.hpp; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + 16178A21207A68A200D3B0C8 = { + isa = PBXGroup; + children = ( + 16178A27207A68A200D3B0C8 /* MilkdropCompatability.hpp */, + 16178A28207A68A200D3B0C8 /* .DS_Store */, + 16178A29207A68A200D3B0C8 /* libNativePresetFactory_la-NativePresetFactory.o */, + 16178A2A207A68A200D3B0C8 /* NativePresetFactory.cpp */, + 16178A2B207A68A200D3B0C8 /* Makefile */, + 16178A2C207A68A200D3B0C8 /* Makefile.am */, + 16178A2D207A68A200D3B0C8 /* libNativePresetFactory_la-NativePresetFactory.lo */, + 16178A2E207A68A200D3B0C8 /* libNativePresetFactory.la */, + 16178A2F207A68A200D3B0C8 /* NativePreset.hpp */, + 16178A30207A68A200D3B0C8 /* .deps */, + 16178A31207A68A200D3B0C8 /* .libs */, + 16178A32207A68A200D3B0C8 /* Makefile.in */, + 16178A33207A68A200D3B0C8 /* NativePresetFactory.hpp */, + ); + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXLegacyTarget section */ + 16178A26207A68A200D3B0C8 /* NativePresetFactory */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(ACTION)"; + buildConfigurationList = 16178A34207A68A200D3B0C8 /* Build configuration list for PBXLegacyTarget "NativePresetFactory" */; + buildPhases = ( + ); + buildToolPath = /usr/bin/make; + buildWorkingDirectory = /Users/cyber/dev/projectm/src/libprojectM/NativePresetFactory; + dependencies = ( + ); + name = NativePresetFactory; + passBuildSettingsInEnvironment = 1; + productName = NativePresetFactory; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXProject section */ + 16178A22207A68A200D3B0C8 /* Project object */ = { + isa = PBXProject; + attributes = { + }; + buildConfigurationList = 16178A25207A68A200D3B0C8 /* Build configuration list for PBXProject "NativePresetFactory" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 16178A21207A68A200D3B0C8; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 16178A26207A68A200D3B0C8 /* NativePresetFactory */, + ); + }; +/* End PBXProject section */ + +/* Begin XCBuildConfiguration section */ + 16178A23207A68A200D3B0C8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = NO; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx10.6; + }; + name = Debug; + }; + 16178A24207A68A200D3B0C8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + COPY_PHASE_STRIP = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + SDKROOT = macosx10.6; + }; + name = Release; + }; + 16178A35207A68A200D3B0C8 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + DEBUGGING_SYMBOLS = YES; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_FIX_AND_CONTINUE = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = NativePresetFactory; + }; + name = Debug; + }; + 16178A36207A68A200D3B0C8 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = NativePresetFactory; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 16178A25207A68A200D3B0C8 /* Build configuration list for PBXProject "NativePresetFactory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16178A23207A68A200D3B0C8 /* Debug */, + 16178A24207A68A200D3B0C8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16178A34207A68A200D3B0C8 /* Build configuration list for PBXLegacyTarget "NativePresetFactory" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16178A35207A68A200D3B0C8 /* Debug */, + 16178A36207A68A200D3B0C8 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 16178A22207A68A200D3B0C8 /* Project object */; +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/PCM.cpp projectm-3.1.0/src/libprojectM/PCM.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/PCM.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/PCM.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -42,14 +42,14 @@ // number of samples specified. #include PCM::PCM() { - initPCM( 2048 ); + _initPCM( 2048 ); #ifdef DEBUG std::cerr << "[PCM] MAX SAMPLES:" << maxsamples << std::endl; #endif } -void PCM::initPCM(int samples) { +void PCM::_initPCM(int samples) { int i; waveSmoothing = 0; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/PCM.hpp projectm-3.1.0/src/libprojectM/PCM.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/PCM.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/PCM.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -58,7 +58,6 @@ static int maxsamples; PCM(); ~PCM(); - void initPCM(int maxsamples); void addPCMfloat(const float *PCMdata, int samples); void addPCM16(short [2][512]); void addPCM16Data(const short* pcm_data, short samples); @@ -68,6 +67,8 @@ void freePCM(); int getPCMnew(float *PCMdata, int channel, int freq, float smoothing, int derive,int reset); +private: + void _initPCM(int maxsamples); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/PipelineMerger.cpp projectm-3.1.0/src/libprojectM/PipelineMerger.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/PipelineMerger.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/PipelineMerger.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -112,12 +112,16 @@ if(ratio < 0.5) { - out.compositeShader = a.compositeShader; - out.warpShader = a.warpShader; + out.compositeShader = a.compositeShader; + out.warpShader = a.warpShader; + out.warpShaderFilename = a.warpShaderFilename; + out.compositeShaderFilename = a.compositeShaderFilename; } else { - out.compositeShader = b.compositeShader; - out.warpShader = b.warpShader; + out.compositeShader = b.compositeShader; + out.warpShader = b.warpShader; + out.warpShaderFilename = b.warpShaderFilename; + out.compositeShaderFilename = b.compositeShaderFilename; } } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/PresetFactory.cpp projectm-3.1.0/src/libprojectM/PresetFactory.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/PresetFactory.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/PresetFactory.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -15,8 +15,8 @@ return std::string(); else { path = url.substr(pos + 3, url.length()); - std::cout << "[PresetFactory] path is " << path << std::endl; - std::cout << "[PresetFactory] url is " << url << std::endl; +// std::cout << "[PresetFactory] path is " << path << std::endl; + std::cout << "[PresetFactory] url is " << url << std::endl; return url.substr(0, pos); } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/PresetLoader.cpp projectm-3.1.0/src/libprojectM/PresetLoader.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/PresetLoader.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/PresetLoader.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -16,14 +16,14 @@ #include #include -#ifdef LINUX +#ifdef __unix__ extern "C" { #include } #endif -#ifdef MACOS +#ifdef __APPLE__ extern "C" { #include @@ -63,7 +63,7 @@ // Clear the directory entry collection clear(); - + // If directory already opened, close it first if ( _dir ) { @@ -121,7 +121,7 @@ // Give all presets equal rating of 3 - why 3? I don't know _ratings = std::vector(TOTAL_RATING_TYPES, RatingList( _presetNames.size(), 3 )); _ratingsSums = std::vector(TOTAL_RATING_TYPES, 3 * _presetNames.size()); - + assert ( _entries.size() == _presetNames.size() ); @@ -144,7 +144,7 @@ std::auto_ptr PresetLoader::loadPreset ( const std::string & url ) const { - std::cout << "Loading preset " << url << std::endl; +// std::cout << "Loading preset " << url << std::endl; try { /// @bug probably should not use url for preset name @@ -194,10 +194,10 @@ void PresetLoader::setRating(unsigned int index, int rating, const PresetRatingType ratingType) { assert ( index >=0 ); - + const unsigned int ratingTypeIndex = static_cast(ratingType); assert (index < _ratings[ratingTypeIndex].size()); - + _ratingsSums[ratingTypeIndex] -= _ratings[ratingTypeIndex][index]; _ratings[ratingTypeIndex][index] = rating; @@ -219,7 +219,7 @@ for (int i = 0; i < ratings.size(); i++) _ratingsSums[i] += ratings[i]; - + return _entries.size()-1; } @@ -228,12 +228,12 @@ _entries.erase ( _entries.begin() + index ); _presetNames.erase ( _presetNames.begin() + index ); - + for (int i = 0; i < _ratingsSums.size(); i++) { _ratingsSums[i] -= _ratings[i][index]; _ratings[i].erase ( _ratings[i].begin() + index ); } - + } @@ -269,8 +269,8 @@ { _entries.insert ( _entries.begin() + index, url ); _presetNames.insert ( _presetNames.begin() + index, presetName ); - - + + for (int i = 0; i < _ratingsSums.size();i++) { _ratingsSums[i] += _ratings[i][index]; @@ -278,6 +278,6 @@ } assert ( _entries.size() == _presetNames.size() ); - - + + } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/PresetLoader.hpp projectm-3.1.0/src/libprojectM/PresetLoader.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/PresetLoader.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/PresetLoader.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -9,7 +9,7 @@ #include "win32-dirent.h" #endif -#ifdef LINUX +#ifdef __unix__ #include #endif @@ -31,15 +31,15 @@ class PresetLoader { public: - - - /// Initializes the preset loader with the target directory specified + + + /// Initializes the preset loader with the target directory specified PresetLoader(int gx, int gy, std::string dirname); - + ~PresetLoader(); - + /// Load a preset by specifying its unique identifier given when the preset url - /// was added to this loader + /// was added to this loader std::auto_ptr loadPreset(unsigned int index) const; std::auto_ptr loadPreset ( const std::string & url ) const; /// Add a preset to the loader's collection. @@ -48,17 +48,17 @@ /// \param rating an integer representing the goodness of the preset /// \returns The unique index assigned to the preset in the collection. Used with loadPreset unsigned int addPresetURL ( const std::string & url, const std::string & presetName, const RatingList & ratings); - + /// Add a preset to the loader's collection. /// \param index insertion index /// \param url an url referencing the preset /// \param presetName a name for the preset /// \param rating an integer representing the goodness of the preset void insertPresetURL (unsigned int index, const std::string & url, const std::string & presetName, const RatingList & ratings); - + /// Clears all presets from the collection - inline void clear() { - _entries.clear(); _presetNames.clear(); + inline void clear() { + _entries.clear(); _presetNames.clear(); _ratings = std::vector(TOTAL_RATING_TYPES, RatingList()); clearRatingsSum(); } @@ -66,8 +66,8 @@ inline void clearRatingsSum() { _ratingsSums = std::vector(TOTAL_RATING_TYPES, 0); } - - const std::vector & getPresetRatings() const; + + const std::vector & getPresetRatings() const; const std::vector & getPresetRatingsSums() const; /// Removes a preset from the loader @@ -76,29 +76,29 @@ /// Sets the rating of a preset to a new value void setRating(unsigned int index, int rating, const PresetRatingType ratingType); - + /// Get a preset rating given an index int getPresetRating ( unsigned int index, const PresetRatingType ratingType) const; - + /// Get a preset url given an index const std::string & getPresetURL ( unsigned int index) const; - + /// Get a preset name given an index const std::string & getPresetName ( unsigned int index) const; - - /// Returns the number of presets in the active directory + + /// Returns the number of presets in the active directory inline std::size_t size() const { return _entries.size(); } - - /// Sets the directory where the loader will search for files + + /// Sets the directory where the loader will search for files void setScanDirectory(std::string pathname); /// Returns the directory path associated with this preset chooser inline const std::string & directoryName() const { return _dirname; } - + /// Rescans the active preset directory void rescan(); void setPresetName(unsigned int index, std::string name); @@ -115,7 +115,7 @@ // Indexed by ratingType, preset position. std::vector _ratings; - + }; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Agitator.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Agitator.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Agitator.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Agitator.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.504000 -fDecay=0.900000 -fVideoEchoZoom=0.999592 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.311604 -fWaveSmoothing=0.450000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=0.010000 -fWarpScale=0.438651 -fZoomExponent=0.999994 -fShader=0.000000 -zoom=1.000156 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.990099 -sy=0.990099 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.100000 -ob_r=0.000000 -ob_g=0.600000 -ob_b=0.500000 -ob_a=0.100000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=0.100000 -nMotionVectorsX=12.799995 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.5*sin(1.2*frame) + 0.3*sin(1.9*frame); -per_frame_2=wave_g = wave_g + 0.7*sin(1.1*frame) + 0.4*cos(1.6*frame); -per_frame_3=wave_b = wave_b + 0.2*sin(1.3*frame) + 0.4*sin(2*frame); -per_pixel_1=rot=rot + (0.5 + 0.1*sin(bass)-rad)*pow(bass,3)/50; -per_pixel_2=zoom= zoom + (0.5 + 0.3*tan(3*bass_att)-rad)*(cos(pow(rad,2.4))+(0.2*mid_att)); -per_pixel_3=warp = warp + if (above(bass,1.34), 0.5*(0.5+ 0.1*sin(bass)-rad)*(cos(pow(rad,2.4))+(5*bass_att)), 0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.611434 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.900000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = wave_x + 0.12*sin(0.2*time) - 0.15*cos(0.1*time) + 0.1*sin(0.2*time); -per_frame_2=wave_y = wave_y + 0.1*sin(0.3*time) - 0.2*sin(0.88*time) + 0.13*cos(0.7*time); -per_frame_3=dx = dx + 0.04*sin(1.24*time); -per_frame_4=dy = dy + 0.04*sin(1.12*time); -per_frame_5=wave_r = wave_r + 0.35*sin(1.13*time) + 0.1245*sin(2.34*time); -per_frame_6=wave_g = wave_g + 0.35*sin(1.23*time) + 0.12*sin(2.134*time); -per_frame_7=wave_b = wave_b + 0.35*sin(1.33*time) + 0.12*sin(2.5*time); -per_frame_8=wave_mystery = wave_mystery + 0.00*sin(time); -per_frame_9=turn = above(bass_att,turn)*2 + (1-above(bass_att,turn))*((turn-1.3)*0.96+1.3); -per_frame_10=turnr = equal(turn,2)*0.089*sin(time*6.6) + (1-equal(turn,2))*turnr; -per_frame_11=simp = simp * 0.35*sin(1.2*time) - 0.62*sin(0.7*time) + 1.5*sin(turn); -per_frame_12=rot = rot + 1.05*((0.25*simp)*10*turnr); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.611434 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.900000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = wave_x + 0.12*sin(0.2*time) - 0.15*cos(0.1*time) + 0.1*sin(0.2*time); -per_frame_2=wave_y = wave_y + 0.1*sin(0.3*time) - 0.2*sin(0.88*time) + 0.13*cos(0.7*time); -per_frame_3=dx = dx + 0.04*sin(1.24*time); -per_frame_4=dy = dy + 0.04*sin(1.12*time); -per_frame_5=wave_r = wave_r + 0.35*sin(1.13*time) + 0.1245*sin(2.34*time); -per_frame_6=wave_g = wave_g + 0.35*sin(1.23*time) + 0.12*sin(2.134*time); -per_frame_7=wave_b = wave_b + 0.35*sin(1.33*time) + 0.12*sin(2.5*time); -per_frame_8=wave_mystery = wave_mystery + 0.00*sin(time); -per_frame_9=turn = above(bass_att,turn)*2 + (1-above(bass_att,turn))*((turn-1.3)*0.96+1.3); -per_frame_10=turnr = equal(turn,2)*0.089*sin(time*6.6) + (1-equal(turn,2))*turnr; -per_frame_11=simp = simp * 0.35*sin(1.2*time) - 0.62*sin(0.7*time) + 1.5*sin(turn); -per_frame_12=rot = rot + 1.05*((0.25*simp)*10*turnr); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.990000 -fVideoEchoZoom=0.999600 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.053726 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999513 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010100 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.900000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.900000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.5*sin(time*1.13); -per_frame_2=wave_g = wave_g + 0.5*sin(time*1.23); -per_frame_3=wave_b = wave_b + 0.5*sin(time*1.33); -per_frame_4= -per_frame_5=wave_x = wave_x + 0.05*sin(time); -per_frame_6=wave_y = wave_y + 0.05*cos(time); -per_frame_7= -per_frame_8=ib_r = ib_r + 0.25*sin(time); -per_frame_9=ib_g = ib_g + 0.25*cos(time); -per_frame_10=ib_b = ib_b + 0.25*sin(0.5*time); -per_pixel_1=zoom = zoom + 0.05*(sin(abs(50*sin(0.1*time))*rad) * sin(sin(time*2*sin(24*ang)*-rad))*3 * cos(rad)); -per_pixel_2=rot = rot + 0.1*sin(0.2+ 0.5*sin(time)-rad); -per_pixel_3=cx = cx + 1.1*(0.99*(0.5-rad))*sin(0.733*time)*below(sin(time),cos(time)); -per_pixel_4=cy = cy + 1.1*(0.99*(0.5-rad))*cos(0.953*time)*above(sin(time),cos(0.5*time)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Airs.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Airs.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Airs.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Airs.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.220183 -fVideoEchoAlpha=0.400000 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.785805 -fWaveScale=0.796894 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.100000 -ob_b=0.200000 -ob_a=0.500000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.500000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(4*time) + 0.15*sin(2.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(3.7*time) + 0.15*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(3.84*time) + 0.15*sin(2.3*time); -per_frame_4= -per_frame_5=ib_r = wave_r; -per_frame_6=ib_g = wave_g; -per_frame_7=ib_b = wave_b; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=dx = dx + 0.03975*pow(rad,x*2)*sin(time); -per_pixel_6=dy = dy + 0.03975*pow(rad,x*2)*cos(time); -per_pixel_7=zoom = zoom - 0.125*pow(rad,x*6)*cos(ang*6); -per_pixel_8=rot = rot - 0.25*(0.75*sin(1.25*time)*pow(rad,x)*sin(1.45*time))*sin(time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.220183 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.241455 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.004500 -ob_r=1.000000 -ob_g=0.800000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.500000 -nMotionVectorsX=3.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(1.4*time) + 0.15*sin(1.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(1.7*time) + 0.15*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(1.84*time) + 0.15*sin(2.3*time); -per_frame_4= -per_frame_5=ib_r = wave_g; -per_frame_6=ib_g = wave_b; -per_frame_7=ib_b = wave_r; -per_frame_8=ob_r = wave_b; -per_frame_9=ob_g = wave_r; -per_frame_10=ob_b = wave_g; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=randomize = sin(time) - 0.75*cos(1.52*time) + 1.52*sin(5.5*time) - rand(2); -per_pixel_6=dx = dx + 0.07*pow(rad,x*2)*sin(time) + dx_r*1.75*sin(0.25-rad*randomize); -per_pixel_7=dy = dy + 0.07*pow(rad,x*2)*cos(time) + dy_r*1.75*sin(0.25-rad*randomize); -per_pixel_8=zoom = zoom - 0.1*pow(rad,x*0.6 + y*0.6)*cos(rad*randomize)*2*sin(time); -per_pixel_9=rot = rot - 0.25*(0.75*sin(1.25*time)*pow(rad,x)*sin(1.45*time))*sin(time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.700000 -fDecay=0.990000 -fVideoEchoZoom=0.451116 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.535239 -fWaveSmoothing=0.000000 -fWaveParam=-0.800000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5= -per_frame_6=ob_r = wave_b; -per_frame_7=ob_g = wave_r; -per_frame_8=ob_b = wave_g; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=orb = ((0.5 - 0.5*sin(12*(sin(rad*time+ang))*(ang*time+rad)*time+rad))-2*rad); -per_pixel_6= -per_pixel_7=zoom = zoom + 0.1*sin(0.6*cos(0.33*(0.6*sin(1.52*time)*orb + (orb*0.8*cos(2.2*time))+ ((cos(orb))*0.7*sin(time)))))*(above(zoom,0.3)*0); -per_pixel_8= -per_pixel_9=sx = sx + (orb)*0.2*abs((above(sin(1.2*time),0))*sin(0.8*time)); -per_pixel_10=sy = sy + (-orb)*0.2*abs((below(sin(1.45*time),0))*cos(0.63*time)); -per_pixel_11= -per_pixel_12=dx = dx + 2*dx_r; -per_pixel_13=dy = dy+ 2*dy_r; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.950000 -fVideoEchoZoom=1.347848 -fVideoEchoAlpha=0.600000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.266718 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=orb = (0.05 + 0.25*sin(0.6*time + 0.62*cos(time))-(0.5/rad)); -per_pixel_6= -per_pixel_7=zoom = zoom + (bass_att)*abs(0.33*(0.6*sin(1.52*time)*(0.25-rad) + ((0.5-rad)*0.8*cos(2.2*time))+ ((2*orb+(2-rad))*0.7*sin(time))))*0.4; -per_pixel_8= -per_pixel_9=sx = sx + (0.5-rad)*0.2*abs((above(sin(time),0))*sin(time)); -per_pixel_10=sy = sy + (0.5-rad)*0.2*abs((below(sin(time),0))*cos(time)); -per_pixel_11= -per_pixel_12=dx = dx + dx_r; -per_pixel_13=dy = dy+ dy_r; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.490000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.972362 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=0.999998 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.050000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.800000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.4*(0.25*sin(1.4*time)) + 0.25*sin(7.25*time); -per_frame_2=wave_g = wave_g + 0.34*(0.25*sin(1.7*time)) + 0.25*sin(6.11*time); -per_frame_3=wave_b = wave_b + 0.3*(0.25*sin(1.84*time)) + 0.25*sin(9.3*time); -per_frame_4=warp = 0; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.025*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.025*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=dx = dx + dx_r*(above(x,0.45+0.45*sin(1.5*time))*below(x,0.55+0.45*sin(1.5*time))); -per_pixel_6=dy = dy + dy_r*(above(y,0.45+0.45*cos(1.25*time))*below(y,0.55+0.45*cos(1.25*time))); -per_pixel_7=cx = cx + bass*(above(x,0.35+0.45*sin(1.05*time))*below(x,0.65+0.45*sin(1.05*time))); -per_pixel_8=cy = cy + bass*(above(y,0.35+0.45*cos(1.75*time))*below(y,0.65+0.45*cos(1.75*time))); -per_pixel_9=rot = rot + 0.15*((0.43*rad)*(5*cos(dx*dy-bass_att+(0.5-rad))*2-rad))*abs(0.5*(2*sin(0.2*time))); -per_pixel_10=zoom = zoom - 0.02*(abs(cos(12*ang))+0.4*rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999837 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.599171 -fWaveSmoothing=0.900000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=20.009382 -fWarpScale=5.427911 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.100000 -wave_b=1.000000 -wave_x=0.400000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=1.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=4.800000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(4*time) + 0.15*sin(2.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(3.7*time) + 0.15*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(3.84*time) + 0.15*sin(2.3*time); -per_frame_4=//wave_y = wave_y + 0.24*sin(2.5*time); -per_frame_5=wave_x = 0.5 + 0.25*sin(time); -per_frame_6=wave_y = 0.5 + 0.25*cos(time); -per_frame_7=ib_r = above(sin(0.2*time),-0.333)*1*below(sin(0.2*time),0.333); -per_frame_8=ib_g = below(sin(0.2*time),-0.333)*1; -per_frame_9=ib_b = above(sin(0.2*time),0.333)*1; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4=dy = dy + 0.001; -per_pixel_5=//warp = warp + dy_r*50* (if (above(x*cos(1.2*time), sin(1.62*time)), if(below(x*sin(1.72*time),cos(1.8*time)), if(below(y,sin(3*time)), + 1*bass, 0), 0), 0)); -per_pixel_6=rot = rot + 0.4*(1-rad)*0.5*sin(70*dy_r+dx_r*60); -per_pixel_7=zoom = zoom + 0.01*(1-rad*2)*0.03*(0.5-rad*0.1*sin(time)); -per_pixel_8=dy = dy + (0.005*sin(cos(x*time)*1.76*sin(0.52*time*cos(max(0.075*bass_att,0.0005*time))))); -per_pixel_9=dx = dx + (0.005*cos(sin(y*time)*1.54*sin(0.79*time*sin(max(0.075*treb_att,0.0005*time))))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antidote.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antidote.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antidote.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antidote.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999837 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.972360 -fWaveSmoothing=0.500000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=20.009382 -fWarpScale=5.427911 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.400000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=4.800000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(4*time) + 0.15*sin(2.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(3.7*time) + 0.15*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(3.84*time) + 0.15*sin(2.3*time); -per_frame_4=//wave_y = wave_y + 0.24*sin(2.5*time); -per_frame_5=wave_x = 0.5 + 0.15*sin(time); -per_pixel_1=//thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=//dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=//dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=//warp = warp + dy_r*50* (if (above(x*cos(1.2*time), sin(1.62*time)), if(below(x*sin(1.72*time),cos(1.8*time)), if(below(y,sin(3*time)), + 1*bass, 0), 0), 0)); -per_pixel_6= -per_pixel_7=dy = dy + (0.005*sin(cos(x*time)*1.76*sin(0.52*time*cos(max(0.075*bass_att,0.0005*time))))); -per_pixel_8=dx = dx + (0.005*cos(sin(y*time)*1.54*sin(0.79*time*sin(max(0.075*treb_att,0.0005*time))))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=5.427025 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.972360 -fWaveSmoothing=0.500000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=0.010000 -fWarpScale=1.766487 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.400000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=4.800000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(1.4*time) + 0.15*sin(2.5*time+2*mid); -per_frame_2=wave_g = wave_g + 0.35*sin(1.7*time) + 0.15*sin(2.11*time+2.2*treb); -per_frame_3=wave_b = wave_b + 0.35*sin(1.84*time) + 0.15*sin(2.3*time+2*bass); -per_frame_4=//wave_y = wave_y + 0.24*sin(2.5*time); -per_frame_5=wave_x = 0.75 + 0.45*sin(sin(0.5*bass_att-0.4*treb_att)*sin(time)); -per_frame_6=//warp = warp + (0.8*bass_att - 0.8*treb_att)*0.25; -per_pixel_1=//thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=//dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=//dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=//warp = warp + dy_r*50* (if (above(x*cos(1.2*time), sin(1.62*time)), if(below(x*sin(1.72*time),cos(1.8*time)), if(below(y,sin(3*time)), + 1*bass, 0), 0), 0)); -per_pixel_6= -per_pixel_7=dy = dy + (0.004*sin(cos(x*2.25*time)*0.86*sin(0.52*time*cos(max(0.075*bass_att,0.0005*time))))); -per_pixel_8=dx = dx + (0.004*cos(sin(y*2.25*time)*0.94*sin(0.79*time*sin(max(0.075*treb_att,0.0005*time))))); -per_pixel_9=dy = dy - sin((1+x)*time*0.94)*(0.005*above(y,sin(1.14*time+0.02*treb_att))); -per_pixel_10=dx = dx + sin((0.25-y)*time*0.97)*(0.005*above(x,cos(1.2*time+0.02*bass_att))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antique Abyss.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antique Abyss.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Antique Abyss.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Antique Abyss.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.700000 -fDecay=0.980000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=2.000454 -fWaveSmoothing=0.540000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.700000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.300000 -ob_a=0.200000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.200000 -ib_b=0.300000 -ib_a=0.100000 -nMotionVectorsX=25.599995 -nMotionVectorsY=33.600002 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.300000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.150000 -per_frame_1=wave_r = wave_r + (0.35*sin(1.4*time*bass) + 0.25*sin(2.5*time))*4*treb*time; -per_frame_2=wave_g = wave_g + (0.35*sin(1.7*time*mid) - 0.25*sin(1.11*time))*4*bass*time; -per_frame_3=wave_b = wave_b + (0.35*sin(1.84*time*treb) + 0.25*sin(2.3*time))*4*mid*time; -per_frame_4=warp = 0; -per_frame_5=mv_g = 0.3 + 0.25*sin(wave_r); -per_frame_6=mv_r = 0.3 + 0.25*cos(wave_b); -per_frame_7=mv_b = 0.3 + 0.15*sin(wave_g); -per_frame_8=mv_x = mv_x - 3*bass; -per_frame_9=mv_y = mv_y - 4*treb; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4=zoom = zoom - 0.26*rad*(0.7+0.1*sin(4*bass*time)-rad); -per_pixel_5=dy= dy + 1.99*dy_r*(rad*sin(5*treb_att))*(1-rad); -per_pixel_6=dx = dx + 1.5*dx_r *(rad*cos(5*bass_att))*(0.6*rad-0.7-rad); -per_pixel_7=rot = rot + abs(0.8*(0.7*sin(bass*treb)*x-0.033*cos(ang))*(1-rad)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.350000 -fDecay=1.000000 -fVideoEchoZoom=1.503739 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=2.905225 -fWaveSmoothing=0.360000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.408391 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5=//decay = 0.995 + 0.004*sin(0.5*time); -per_frame_6=wave_x = 0.01; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=dy = dy - 0.025*(1-y)*above(y,0.95); -per_pixel_6=dy = dy - 0.025*(y)*below(y,0.94); -per_pixel_7= -per_pixel_8=warp = warp + 0.25*(bass-treb)*above(y,0.9); -per_pixel_9=zoom = zoom - 0.02*(rad)*(above(y,0.9)); -per_pixel_10=sx = sx - above(x, 0.35 + 0.35*sin(time))*below(x,0.65 + 0.35*sin(time))* -per_pixel_11=above(y,0.8)*0.008*sin(time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.001000 -fDecay=1.000000 -fVideoEchoZoom=1.469141 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.386134 -fWaveScale=1.568857 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999513 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010100 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.800000 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.5*sin(time*1.13); -per_frame_2=wave_g = wave_g + 0.5*sin(time*1.23); -per_frame_3=wave_b = wave_b + 0.5*sin(time*1.33); -per_pixel_1=zoom = zoom + 0.25*(0.05*bass_att + sin(sin(time+rad))*0.3 - cos(rad)*0.1); -per_pixel_2=rot = 0.06*sin(rad); -per_pixel_3=dx = dx + 0.008*(0.99*1-rad)*sin(0.733*time); -per_pixel_4=dy = dy + 0.008*(0.99*1-rad)*cos(0.953*time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=2.448626 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.310603 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.999900 -fShader=0.000000 -zoom=0.999999 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.200000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.600000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5=ib_r =wave_r; -per_frame_6=ib_g = wave_g; -per_frame_7=ib_b = wave_b; -per_frame_8=wave_mystery = wave_mystery + 0.3*time; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=zoom = zoom - 0.2*(1.5-rad)*sin(bass/2*treb_att)*(rad*2*(rad*abs(sin(9*ang)))); -per_pixel_6=rot = rot + dy_r*(2-zoom)*0.3*cos(bass)*20; -per_pixel_7=rot = rot - 0.4*(rad*cos(abs(12*ang)))*below(rad,0.3+ 0.4*sin(bass)); -per_pixel_8=dx = dx + 0.5*abs(rad+x-0.5*(bass/y*0.2))*dx_r; -per_pixel_9=dy = dy + 0.5*abs(rad+y-0.5*(treb/x*0.2))*dy_r; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Blender.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Blender.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Blender.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Blender.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.999997 -fVideoEchoAlpha=0.400000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=3.915820 -fWaveSmoothing=0.500000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = wave_x + 0.15*sin(time); -per_frame_2=wave_y = wave_y + 0.15*cos(time); -per_frame_3=wave_r = wave_r + 0.9; -per_frame_4=wave_g = 0.9 - 0.5*bass; -per_frame_5=wave_b = 0.9 - 0.5*bass; -per_pixel_1=rot = rot - 0.1*min((2-rad)*bass_att,(2-rad)*treb_att); -per_pixel_2=grad = sqrt(x*x + y*y)*2; -per_pixel_3=dx = dx - 0.02*(1-rad); -per_pixel_4=dy = dy + 0.02*(1-rad); -per_pixel_5=zoom = zoom - max(grad*(bass/8 - treb/8), 0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Bow To Gravity.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Bow To Gravity.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Bow To Gravity.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Bow To Gravity.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.930000 -fVideoEchoZoom=0.999837 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.796896 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.999995 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.010000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.500000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5=ob_r = 0.5*wave_r; -per_frame_6=ob_b = 0.5*wave_g; -per_frame_7=ob_g = 0.5*wave_b; -per_frame_8=ib_r = wave_g; -per_frame_9=ib_g = wave_b; -per_frame_10=ib_b = wave_r; -per_frame_11=wave_mystery = wave_mystery + 25*sin(3-1*(sin(0.001*time))); -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4=dx = dx + above(x,0.5)*x*0.005; -per_pixel_5=dx = dx - below(x,0.5)*(1-x)*0.005; -per_pixel_6=dy = dy + above(y,0.5)*y*0.005; -per_pixel_7=dy = dy + below(y,0.5)*(1-y)*0.005; -per_pixel_8=zoom = zoom - 100*((1-rad)*((1.5*rad)*0.005 + 0.004*sin(0.5*bass_att))); -per_pixel_9= -per_pixel_10=rot = rot + (cos(bass_att*treb_att)/(1-treb)+0.5*time)*0.0005; -per_pixel_11=zoomexp = 0.8 + 1+sin(treb_att); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Brakefreak.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Brakefreak.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Brakefreak.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Brakefreak.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.880270 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.020000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=1.000000 -ob_a=1.000000 -ib_size=0.020000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=ib_r = wave_r*0.5; -per_frame_5=ib_g = wave_g*0.5; -per_frame_6=ib_b = wave_b*0.5; -per_frame_7=ob_r = wave_b; -per_frame_8=ob_g = wave_r; -per_frame_9=ob_b = wave_g; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=rot = rot + 0.06*(0.1*(time))+(0.5*(0.5-rad))+rad; -per_pixel_6=rot = rot - 0.1*sqr(0.5*cos(ang*time)*bass_att); -per_pixel_7=zoom = zoom - 0.04*(sin(rad)); -per_pixel_8=zoom = zoom - 0.1*above(y,0.5)*sqr(0.5*sin(ang*time)*bass_att); -per_pixel_9=zoom = zoom - 0.1*below(y,0.5)*sqr(0.5*cos(ang*time)*treb_att); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Candy Avian.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Candy Avian.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Candy Avian.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Candy Avian.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.923483 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=2.063785 -fWaveScale=0.724297 -fWaveSmoothing=0.500000 -fWaveParam=-0.300000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.500333 -fZoomExponent=1.000000 -fShader=0.100000 -zoom=0.990099 -rot=0.000000 -cx=0.500000 -cy=0.410000 -dx=-0.003990 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.200000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.100000 -nMotionVectorsX=55.680000 -nMotionVectorsY=47.999996 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.250000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.4*sin(1.5*time) + 0.25*sin(2.14*time); -per_frame_2=wave_b = wave_b + 0.41*sin(1.2*time) + 0.26*sin(2.11*time); -per_frame_3=wave_g = wave_g + 0.4*sin(1.34*time) + 0.25*sin(2.34*time); -per_frame_4=ib_r = 4; -per_frame_5=ib_g = 0; -per_frame_6=ib_b = 0; -per_frame_7=wave_x = wave_x + -per_frame_8=if(above(wave_y,0.75),0.40*sin(time), 0.15*sin(time)); -per_frame_9=wave_y = wave_y + 0.30*cos(0.9*time); -per_frame_10=cx = cx + -per_frame_11=if(above(wave_x,0.5), +0.0*sin(7*treb_att), -0.0*sin(7*mid_att)); -per_frame_12=cy = cy + -per_frame_13=if(above(wave_x,0.5), +0.0*cos(7*bass_att), -0.0*cos(7*mid_att)); -per_frame_14=ob_r = 0.5*sin(treb)*time; -per_frame_15=ob_b = 0.5*sin(mid)*0.9*time; -per_frame_16=ob_g = 0.5*sin(bass)*0.8*time; -per_frame_17=warp = warp + if (above(bass_att,1.5), 1.5, 0); -per_frame_18=rot = rot + 0.08*sin(3*time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.325446 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.200000 -wave_g=0.200000 -wave_b=0.200000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.030000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.030000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=1.000000 -ib_a=0.100000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.4*sin(0.622*time) + 0.3*sin(0.155*time); -per_frame_2=wave_g = wave_g + 0.4*sin(0.45*time) + 0.3*sin(0.674*time); -per_frame_3=wave_b = wave_b + 0.4*sin(0.256*time) + 0.3*sin(0.35*time); -per_frame_4=ob_r = 1- wave_r; -per_frame_5=ob_g = 1 - wave_g; -per_frame_6=ob_b = 1-wave_b; -per_frame_7=ib_r = 0.9*ob_r; -per_frame_8=ib_g = 0.9*ob_g; -per_frame_9=ib_b = 0.9*ob_b; -per_frame_10=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_frame_11=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_12=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_13=dx = dx + dx_r; -per_frame_14=dy = dy + dy_r; -per_pixel_1=rot = rot + 0.04*sin(time*(rad)); -per_pixel_2=zoom = zoom + 0.025*cos(time*(rad)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=2.006758 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=1 -fWaveAlpha=100.000000 -fWaveScale=0.999835 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.010000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=1.000000 -ib_a=0.010000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=basstrip = above(bass_att,basstrip)*2 + (1-above(bass_att,basstrip))*((basstrip-1.3)*0.96+1.3); -per_frame_2=basswack = equal(basstrip,2)*0.97*sin(time*2) + (1-equal(basstrip,2))*basswack; -per_frame_3=trebtrip = above(treb_att,trebtrip)*2 + (1-above(treb_att,trebtrip))*((trebtrip-1.3)*0.96+1.3); -per_frame_4=trebwack = equal(trebtrip,2)*0.97*sin(time*2.5) + (1-equal(trebtrip,2))*trebwack; -per_frame_5=midtrip = above(mid_att,midtrip)*2 + (1-above(mid_att,midtrip))*((midtrip-1.3)*0.96+1.3); -per_frame_6=midwack = equal(midtrip,2)*0.97*sin(time*2.75) + (1-equal(midtrip,2))*midwack; -per_frame_7=wave_r = wave_r + 0.75*basswack; -per_frame_8=wave_g = wave_g + 0.75*trebwack; -per_frame_9=wave_b = wave_b + 0.75*midwack; -per_frame_10=ob_r = 1- wave_r; -per_frame_11=ob_g = 1 - wave_g; -per_frame_12=ob_b = 1-wave_b; -per_frame_13=ib_r = 0.9*ob_r; -per_frame_14=ib_g = 0.9*ob_g; -per_frame_15=ib_b = 0.9*ob_b; -per_frame_16=volt = (bass_att+treb_att+mid_att)/3; -per_frame_17=zoom = zoom - 0.005; -per_frame_18=zoom = zoom + if (above(volt,0.75),- 0.005*(1-rad), 0); -per_frame_19=sy = sy + if (below(volt,0.83), - 0.01*(0.5-rad), 0); -per_pixel_1=//thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=//dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=//dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4=rot = rot + 0.05*sin(time*(rad*cos(time*12*ang))); -per_pixel_5=zoom = zoom + 0.025*cos(time*(0.5-rad)); -per_pixel_6=rot = rot - 0.05*((sin(time)-rad)*(0.9+abs(sin(rad*12)))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.400279 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.200000 -wave_g=0.200000 -wave_b=0.200000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.030000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.030000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=1.000000 -ib_a=0.100000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.4*sin(0.622*time) + 0.3*sin(0.155*time); -per_frame_2=wave_g = wave_g + 0.4*sin(0.45*time) + 0.3*sin(0.674*time); -per_frame_3=wave_b = wave_b + 0.4*sin(0.256*time) + 0.3*sin(0.35*time); -per_frame_4=ob_r = 1- wave_r; -per_frame_5=ob_g = 1 - wave_g; -per_frame_6=ob_b = 1-wave_b; -per_frame_7=ib_r = 0.9*ob_r; -per_frame_8=ib_g = 0.9*ob_g; -per_frame_9=ib_b = 0.9*ob_b; -per_frame_10=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_frame_11=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_12=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_13=dx = dx + 0.0*dx_r + if(above(gup,0), + 0.8*gup*dx_r, 0) + if(above(gslup,0), + 0.535*gslup*dx_r, 0); -per_frame_14=dy = dy + 0.0*dy_r + if(above(gup,0), + 0.8*gup*dy_r, 0) + if(above(glsup,0), + 0.535*gslup*dy_r, 0); -per_frame_15=gup = +2*sin(time) + sin(0.75*time); -per_frame_16=gslup = sin(0.655*time) - sin(0.176*time); -per_pixel_1=rot = rot + 0.04*sin(time*(rad)); -per_pixel_2=zoom = zoom + 0.025*cos(time*(rad)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.868317 -fWaveScale=0.484545 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.010000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.250000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + (0.5*sin(12*treb)*3.12*time)/5; -per_frame_2=wave_b = wave_b + (0.5*sin(12*bass)*3.17*time)/5; -per_frame_3=wave_g =wave_g + (0.5*sin(12*mid)*3.22*time)/5; -per_frame_4=zoom = zoom + 0.01; -per_pixel_1=sx = sx + if (above(rad, 0.38), +0.01, 0); -per_pixel_2=sy = sy + if (above(rad, 0.38), +0.01, 0); -per_pixel_3=warp = warp + if (above(rad,0.56 + 0.05*sin(time)), +0.5*(sin(rad)), 0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Circlefacade.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Circlefacade.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Circlefacade.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Circlefacade.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.220186 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.459160 -fWaveScale=0.010000 -fWaveSmoothing=0.900000 -fWaveParam=-0.340000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.100000 -wave_y=0.900000 -ob_size=0.070000 -ob_r=1.000000 -ob_g=1.000000 -ob_b=1.000000 -ob_a=0.100000 -ib_size=0.010000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = 0.5 + 0.3*sin(0.75*time); -per_frame_2=wave_y = 0.5 + 0.3*cos(0.75*time); -per_frame_3=ob_r = ob_r + 0.445*sin(1.52*time); -per_frame_4=ob_g = ob_g + 0.436*sin(1.062*time); -per_frame_5=ob_b = ob_b + 0.325*sin(1.22*time); -per_frame_6=ib_a = ib_a + 5*tan(0.5*time); -per_frame_7=zoom = zoom - 0.1*zoom; -per_pixel_1=dx = dx + (sin(rad)*0.05)*0.76*sin(1.2255*time); -per_pixel_2=dy = dy + (sin(rad)*0.05)*0.76*cos(1.435*time); -per_pixel_3=rot = rot + (0.1*max(above(dx,dy),above(dy,dx))*bass_att)*(0.75-rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Contortion.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Contortion.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Contortion.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Contortion.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999996 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=2 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.691364 -fWaveSmoothing=0.000000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.200000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5=ob_r = 0.3 + 0.3*sin(1.56*time); -per_frame_6=ob_g = 0.3 + 0.3*sin(2.15*time); -per_frame_7=ob_b = 0.3 + 0.3*cos(1.4*time); -per_frame_8=ib_r = 0.3 + 0.3*cos(1.83*time); -per_frame_9=ib_g = 0.3 + 0.3*cos(1.02*time); -per_frame_10=ib_b = 0.3 + 0.3*sin(2*time); -per_frame_11=ing = 2*sin(0.25*time); -per_frame_12=wave_x = wave_x + 0.57*sin(time); -per_frame_13=wave_y = wave_y + 0.57*cos(time); -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=rot = rot + above(bass,1)*0.25*(1-rad)*(100*dx_r); -per_pixel_6=zoom = zoom - 0.2*(1-rad); -per_pixel_7=cx = cx + above(bass,1)*0.25*sin(time)*(100*dy_r); -per_pixel_8=cy = cy + above(bass,1)*0.25*cos(time)*(100*dy_r); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.301000 -fDecay=1.000000 -fVideoEchoZoom=0.999996 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.003415 -fWaveScale=2.630066 -fWaveSmoothing=0.900000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=100.000000 -fWarpScale=0.010000 -fZoomExponent=11.202057 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=63.936001 -nMotionVectorsY=47.952000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.050000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.800000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5=ob_r = 0.3 + 0.3*sin(1.56*time); -per_frame_6=ob_g = 0.3 + 0.3*sin(2.15*time); -per_frame_7=ob_b = 0.3 + 0.3*cos(1.4*time); -per_frame_8=ib_r = 0.3 + 0.3*cos(1.83*time); -per_frame_9=ib_g = 0.3 + 0.3*cos(1.02*time); -per_frame_10=ib_b = 0.3 + 0.3*sin(2*time); -per_frame_11=ing = 2*sin(0.25*time); -per_frame_12=wave_x = wave_x + 0.2*sin(time); -per_frame_13=wave_y = wave_y + 0.2*cos(time); -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=rot = rot + 0.5*(0.5-rad)*(5*sin(0.48*time*dy_r)*sin(time)); -per_pixel_6=zoom = zoom - 0.015*(0.65 - 0.25*sin((dx_r+dy_r)*20*bass)+rad); -per_pixel_7=cx = cx + .45*sin(time)*(0.75*sin(1.25*time*dy_r)*cos(0.74*sin(dx_r*2*time))); -per_pixel_8=cy = cy + .45*cos(time)*(0.75*cos(1.6*time*dx_r)*sin(0.74*cos(dy_r*2*time))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Crystal Storm.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Crystal Storm.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Crystal Storm.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Crystal Storm.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=0.649956 -fVideoEchoAlpha=0.300000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.691363 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.931011 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.001000 -ob_r=1.000000 -ob_g=1.000000 -ob_b=1.000000 -ob_a=0.500000 -ib_size=0.001000 -ib_r=0.500000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=0.500000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.050000 -per_frame_1=rot = rot + 0.1*(0.4*sin(bass) - 0.4*sin(treb) / 0.4*sin(mid))*sin(5*time); -per_frame_2=wave_x = wave_x + 0.1*sin(time) - 0.157*sin(1.73*time); -per_frame_3=wave_y = wave_y - 0.126*sin(time) + 0.15*cos(1.1*time); -per_frame_5=zoom = zoom + 0.01*bass*0.005*sqrt(treb/bass); -per_pixel_1=rot = rot + 0.05*min(abs(1-rad*cos(bass))*tan(bass),-(abs(1-rad*sin(treb))*sin(time))); -per_pixel_2=dx = dx + (0.025*sin(bass))*0.8*abs(5*bass-5*treb); -per_pixel_3=dy = dy + (0.015*cos(treb))*0.8*abs(5*treb - 5*bass); -per_pixel_4=cy = cy + (0.8*rad/time)*bass; -per_pixel_5=zoom = zoom - 0.05*log(1.5-rad); \ No newline at end of file diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.074098 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.451117 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.500000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_frame_5=wave_x = wave_x + 0.12*sin(time); -per_frame_6=wave_y = wave_y + 0.12*sin(1.24*time); -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=zoom = zoom - abs(0.6*sin(((sin(cos(time)+0.5*sin(1.6*bass)-0.44*cos(1.1*mid))+sin(-rad)))* -per_pixel_6=(sin(bass)*(0.5-rad)))); -per_pixel_7=zoom = zoom + 0.02*(2-rad); -per_pixel_8=dx = dx + dx_r; -per_pixel_9=dy = dy + dy_r; -per_pixel_10=dx = dx + abs(0.005*(1.2*cos(bass*0.73*time) + 1.2*sin((0.5-rad)*2.1*time))); -per_pixel_11=dy = dy + abs(0.005*(1.2*sin(bass*0.73*time) + 1.2*cos((0.5-rad)*1.3*time))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Elastoid.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Elastoid.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Elastoid.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Elastoid.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.970000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.655694 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(4*time) + 0.15*sin(2.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(3.7*time) + 0.15*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(3.84*time) + 0.15*sin(2.3*time); -per_frame_4=ob_r = wave_r; -per_frame_5=ob_g = wave_g; -per_frame_6=ob_b=wave_b; -per_frame_7=zoom = zoom - 0.02; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=m1 = 2*sin(1.25*time); -per_pixel_6=m2 = 1.25*sin(4*time); -per_pixel_7=m3 = 5*sin(0.33*time); -per_pixel_8=sx = sx + if (above(m1,m2), if (above(m1,m3), dx_r, -dx_r), dx_r*1.75)*(.75-rad); -per_pixel_9=sy = sy + if (above(m2,m3), if (above(m3,m1), dy_r, dy_r*1.5), dy_r*0.75)*(.75-rad); -per_pixel_10=dx = dx + if (above(m2,m1), if (below(m1,m3), dx_r, dx_r*0.66), dx_r*1.8)*(.75-rad); -per_pixel_11=dy = dy + if (above(m3,m1), if(below(m2,m3), -dy_r, dy_r*1.25), dy_r*0.8)*(0.75-rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Floater Society.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Floater Society.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Floater Society.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Floater Society.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.350000 -fDecay=0.950000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.294621 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.050000 -ob_r=0.200000 -ob_g=0.300000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=1.920000 -nMotionVectorsY=23.999998 -mv_dx=-0.060000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(4*time) + 0.25*sin(2.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(3.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(3.84*time) + 0.25*sin(2.3*time); -per_frame_4=wave_mystery = sin(time); -per_frame_5=mv_l = mv_l + 2*sin(time); -per_frame_6=mv_r = wave_r; -per_frame_7=mv_g = wave_g; -per_frame_8=mv_b = wave_b; -per_frame_9=warp = 0; -per_frame_10=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_frame_11=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_12=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_13=bass_seek = below(bass_seek,bass) + bass_att - (above(bass_att,bass_seek) -bass); -per_frame_14=trip = 0.4*bass_seek; -per_frame_15=dy = dy + dy_r*trip*cos(time); -per_frame_16=dx = dx + dx_r*trip*sin(time); -per_frame_17=zoom = zoom - 0.025*trip*thresh; -per_frame_18=rot = rot + 0.015*trip*thresh; -per_pixel_1=dy = dy - 0.95-rad*dx; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Flowing Form.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Flowing Form.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Flowing Form.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Flowing Form.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.920000 -fVideoEchoZoom=1.343302 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.611957 -fWaveSmoothing=0.000000 -fWaveParam=0.080000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.999834 -fWarpScale=100.000000 -fZoomExponent=1.200114 -fShader=1.000000 -zoom=1.010011 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.020000 -dy=0.020000 -warp=0.059958 -sx=0.999998 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.300000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.100000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.100000 -ob_a=0.500000 -ib_size=0.000000 -ib_r=0.550000 -ib_g=0.250000 -ib_b=0.050000 -ib_a=0.700000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.023*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%200,0); -per_frame_7=ob_r = wave_g; -per_frame_8=ob_g = wave_b; -per_frame_9=ob_b = wave_r; -per_pixel_1=sx=sx+0.5*cos((y*2-1)*6+time*1.53+(x*2-1)*3.2); -per_pixel_2=sy=sy+0.5*cos((x*2-1)*8+time*1.71+(y*2-1)*4.3); -per_pixel_3=zoom = zoom - 0.01*ang; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.599181 -fWaveSmoothing=0.900000 -fWaveParam=-0.200000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=bass_tick = above(bass_att,bass_tick)*2 + (1-above(bass_att,bass_tick))* -per_frame_2=((bass_tick-1.3)*0.96+1.3); -per_frame_3=treb_tick = above(treb_att,treb_tick)*2 + (1-above(treb_att,treb_tick))* -per_frame_4=((treb_tick-1.3)*0.96+1.3); -per_frame_5=mid_tick = above(mid_att,mid_tick)*2 + (1-above(mid_att,mid_tick))* -per_frame_6=((mid_tick-1.3)*0.96+1.3); -per_frame_7=bass_shift = equal(bass_tick,2)*0.95*sin(time*5) + (1-equal(bass_tick,2))*bass_shift; -per_frame_8=treb_shift = equal(treb_tick,2)*0.95*sin(time*5) + (1-equal(treb_tick,2))*treb_shift; -per_frame_9=mid_shift = equal(mid_tick,2)*0.95*sin(time*5) + (1-equal(mid_tick,2))*mid_shift; -per_frame_10=wave_mystery = wave_mystery + 0.15*sin(time) + 0.2*sin(0.2*time); -per_frame_11=wave_r = wave_r +bass_shift+0.3; -per_frame_12=wave_g = wave_g+treb_shift; -per_frame_13=wave_b = wave_b +mid_shift; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4=rot = rot + 2*abs((0.9*dy_r)*bass)*sin(0.7*time); -per_pixel_5=zoom = zoom + 10*(0.2*rad*(3-bass/cos(rad/12)*2*tan(12)))*(0.002*sin(ang*(12*sin(8*bass)))); -per_pixel_6=cx = cx + 0.3*sin(3*dy_r); -per_pixel_7=cy = cy + 0.3*cos(3*dx_r); -per_pixel_8=dy = dy + 1.7*dy_r; -per_pixel_9=dx = dx + 1.7*dx_r; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Multiviola.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Multiviola.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Multiviola.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Multiviola.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999998 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.010000 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.55*sin(2.4*mid*time) +0.925*cos(2.25*bass)*time; -per_frame_2=wave_g = wave_g + 0.55*cos(3.7*treb*time) + 0.925*tan(1.11*mid)*time; -per_frame_3=wave_b = wave_b + 0.55*tan(2.84*bass*time)+ 0.925*sin(3.3*treb)*-time; -per_frame_4=warp = 0; -per_frame_5=wave_x = wave_x + 0.25*sin(2*time); -per_frame_6=wave_y = wave_y + 0.25*cos(2*time); -per_frame_7=wave_mystery = wave_mystery - sqr(0.06*bass_att+(wave_x-wave_y)) -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4= -per_pixel_5=rot = rot + (tan(rad)*0.5*tan(0.8-rad))*(3*(0.7*bass)); -per_pixel_6=zoom = zoom - 0.05*sin(rad*tan(rad*time)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Negative Sun III.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Negative Sun III.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Aderrasi - Negative Sun III.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Aderrasi - Negative Sun III.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.010000 -fWaveSmoothing=0.500000 -fWaveParam=-0.200000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.25*sin(1.4*time) + 0.25*sin(2.25*time); -per_frame_2=wave_g = wave_g + 0.25*sin(1.7*time) + 0.25*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.25*sin(1.84*time) + 0.25*sin(2.3*time); -per_frame_4=warp = 0; -per_pixel_1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_2=dx_r = equal(thresh,2)*0.015*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_3=dy_r = equal(thresh,2)*0.015*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_pixel_4=zoom = zoom + 0.01; -per_pixel_5=zoom = zoom + (0.05 + 0.04*sin(time))*(0.2*sin(ang*time)); -per_pixel_6=rot = rot + 0.01*(0.5*cos(ang*5*bass*time)); -per_pixel_7= -per_pixel_8=dx = dx + 0.1*above(rad,0.25)*dx_r; -per_pixel_9=dy = dy + 0.1*above(rad,0.25)*dy_r; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/bmelgren - Godhead.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/bmelgren - Godhead.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/bmelgren - Godhead.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/bmelgren - Godhead.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.975000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.285749 -fWaveSmoothing=0.900000 -fWaveParam=0.600000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.380217 -rot=0.020000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.198054 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = bass-1; -per_frame_2=wave_g = mid-1.2; -per_frame_3=wave_b = treb-.5; -per_pixel_1=rot=0.1*pow(ang,3); -per_pixel_2=zoom=sin(pow(rad,mid))+.8; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=5.277897 -fWaveSmoothing=0.000000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=-0.240000 -cx=0.650000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.887449 -sy=1.051010 -wave_r=0.400000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=1.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=warp/bass; -per_frame_2=x_wave_x = 0.5+0.3*sin(bass+treb+mid); -per_frame_3=wave_r = 1 + sin(-x_wave_x*6.28); -per_frame_4=wave_g = abs(sin(2*x_wave_x*6.28)); -per_frame_5=wave_b = sin(x_wave_x*6.28); -per_frame_6=treb_effect = if(above(treb_att,1.4),pow(0.99,treb_att),1); -per_frame_7=net_effect = if(above(bass_att,0.8*treb_att),1,treb_effect); -per_frame_8=zoom = net_effect; -per_frame_9=rot = rot + rot_residual/1.5; -per_frame_10=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_11=shift = (tan(time*7)) -0.05; -per_frame_12=shift = if(above(shift,0),0,if(below(shift,-0.1),-0.1,shift)); -per_frame_13=rot_residual = if(equal(bass_thresh,2),shift,rot_residual); -per_frame_14=q1=net_effect; -per_frame_15=q2=bass_thresh; -per_pixel_1=rot = rot + if(equal(tan(ang), q1), rot, tan(q1-rad)/q2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.560000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.400000 -nVideoEchoOrientation=1 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=64 -nMotionVectorsY=1 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.599180 -fWaveSmoothing=0.750000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.844378 -sy=1.061520 -wave_r=0.400000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -per_frame_1=warp=0; -per_frame_2=x_wave_x = 0.5+0.3*sin(bass+treb+mid); -per_frame_3=wave_r = 1 + sin(-x_wave_x*6.28); -per_frame_4=wave_g = abs(sin(2*x_wave_x*6.28)); -per_frame_5=wave_b = sin(x_wave_x*6.28); -per_frame_6=treb_effect = if(above(treb_att,1.4),pow(0.99,treb_att),1); -per_frame_7=net_effect = if(above(bass_att,0.8*treb_att),1,treb_effect); -per_frame_8=zoom = net_effect*1.027; -per_frame_9=rot = rot + rot_residual; -per_frame_10=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_11=shift = (tan(time*7)) -0.05; -per_frame_12=shift = if(above(shift,0),0,if(below(shift,-0.1),-0.1,shift)); -per_frame_13=rot_residual = if(equal(bass_thresh,2),shift,rot_residual); -per_pixel_1=rot = rot + if(equal(sin(ang), 1), rot, sin(1-rad)/sqr(bass_att*1.5)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.950000 -fVideoEchoZoom=3.007504 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.880224 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.074097 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = wave_r + .5*sin(time*333) + bass*.3; -per_frame_3=wave_g = wave_g + .5*sin(time*222) + treb*.3; -per_frame_4=wave_b = wave_b + .5*sin(time*111) + mid*.3; -per_frame_5=rot = .4*sin(mid_att*.05); -per_pixel_1=ray = pow(rad,1.8)+.05; -per_pixel_2=zoom = (ray/rad)*1.4 + .3*sin(ang*(bass*5))+(bass*.2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/bmelgren - Take this highway.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/bmelgren - Take this highway.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/bmelgren - Take this highway.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/bmelgren - Take this highway.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,66 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.925000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=2.850142 -fWaveSmoothing=0.360000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.380217 -rot=0.020000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.198054 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=ff = 0.01*frame; -per_frame_2=wave_r = 0.5*sin(5*ff/bass)+0.5; -per_frame_3=wave_g = 0.5*cos(ff/mid)+0.5; -per_frame_4=wave_b = 0.5*cos(3*ff/treb)+0.5; -per_pixel_1=rot=0.1*pow(ang,3); -per_pixel_2=zoom=sin(pow(rad,3))+(.6*mid_att); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/CatalystTheElder - Electric Rosebud_Phat_texture_edit.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/CatalystTheElder - Electric Rosebud_Phat_texture_edit.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/CatalystTheElder - Electric Rosebud_Phat_texture_edit.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/CatalystTheElder - Electric Rosebud_Phat_texture_edit.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.925000 -fVideoEchoZoom=1.228237 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.034055 -fWaveScale=1.285700 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.400000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.300000 -wave_g=0.830000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.995947 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.344836 -shapecode_0_r=0.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//rot = 0.1*sin(ang); -shape_0_per_frame2=tex_ang=sin(time/3)*6.14; -shape_0_per_frame3=tex_zoom=.345+(bass*.03); -shapecode_1_enabled=1 -shapecode_1_sides=24 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.379369 -shapecode_1_ang=0.753982 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.842832 -shapecode_1_r=0.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=g = g + 0.5*cos(time*2.23); -shape_1_per_frame2=b = b + 0.5*tan(time*2.33); -shape_1_per_frame3=x=(sin(time)*0.3+0.5)+(treb_att*0.1); -shape_1_per_frame4=y=(cos(time)*0.3+0.5)+(treb_att*0.1); -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_g = wave_g + 0.5*cos(time*2.23); -per_frame_2=wave_b = wave_b + 0.5*tan(time*2.33); -per_pixel_1=//rot = (0.01*(sin(time)))-rad; -per_pixel_2=zoom = 1.1+(bass/10); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Che - Escape.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Che - Escape.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Che - Escape.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Che - Escape.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.950000 -fVideoEchoZoom=1.000498 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000416 -fWaveScale=0.608285 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.000000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000154 -fShader=0.000000 -zoom=1.000223 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.150000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.050000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=14.400005 -mv_dx=0.000000 -mv_dy=-0.010000 -mv_l=0.350000 -mv_r=0.900000 -mv_g=0.500000 -mv_b=0.000000 -mv_a=1.000000 -per_frame_1=// timed sidon sensor -per_frame_2=// le = signal level; desired average value = 2 -per_frame_3=le=1.4*bass_att+.1*bass+.5*treb; -per_frame_4=pulse=above(le,th); -per_frame_5=// pulsefreq = running average of interval between last 5 pulses -per_frame_6=pulsefreq=if(equal(pulsefreq,0),2, -per_frame_7=if(pulse,.8*pulsefreq+.2*(time-lastpulse),pulsefreq)); -per_frame_8=lastpulse=if(pulse,time,lastpulse); -per_frame_9=// bt = relative time; 0 = prev beat; 1 = expected beat -per_frame_10=bt=(time-lastbeat)/(.5*beatfreq+.5*pulsefreq); -per_frame_11=// hccp = handcicap for th driven by bt -per_frame_12=hccp=(.03/(bt+.2))+.5*if(band(above(bt,.8),below(bt,1.2)), -per_frame_13=(pow(sin((bt-1)*7.854),4)-1),0); -per_frame_14=beat=band(above(le,th+hccp),btblock); -per_frame_15=btblock=1-above(le,th+hccp); -per_frame_16=lastbeat=if(beat,time,lastbeat); -per_frame_17=beatfreq=if(equal(beatfreq,0),2, -per_frame_18=if(beat,.8*beatfreq+.2*(time-lastbeat),beatfreq)); -per_frame_19=// th = threshold -per_frame_20=th=if(above(le,th),le+114/(le+10)-7.407, -per_frame_21=th+th*.07/(th-12)+below(th,2.7)*.1*(2.7-th)); -per_frame_22=th=if(above(th,6),6,th); -per_frame_23= -per_frame_24=q8=30/fps; -per_frame_25=ccl=ccl+beat; -per_frame_26=minorccl=minorccl+le*q8; -per_frame_27=q7=ccl+.0002*minorccl; -per_frame_28=q6=3.7*ccl+.01*minorccl; -per_frame_29=ob_size=.3+.3*sin(16*ccl+.007*minorccl); -per_frame_30=ib_a=.5+.4*sin(.01*minorccl+ccl); -per_frame_31=wave_r=.7+.3*sin(.04*ccl+.01*minorccl); -per_frame_32=wave_g=.7+.3*sin(.02*ccl+.012*minorccl); -per_frame_33=wave_b=.3+.3*sin(36*ccl+.013*minorccl); -per_frame_34=ib_r=.25+.25*sin(72*ccl+.016*minorccl); -per_frame_35=ib_g=.25+.25*sin(48*ccl+.021*minorccl); -per_frame_36=ib_b=.5+.3*sin(86*ccl)+.2*(.028*minorccl); -per_frame_37= -per_frame_38=echo_alpha=.5+.5*cos(68*ccl+.0041*minorccl); -per_frame_39=echo_zoom=exp(sin(13.7*ccl+.017*minorccl)); -per_frame_40=echo_orient=ccl%4; -per_frame_41= -per_frame_42=mvrot=ccl%6; -per_frame_43=mv_r=if(above(mvrot,2),if(above(mvrot,4),.039, -per_frame_44=if(equal(mvrot,3),.137,.835)),if(above(mvrot,1),.651, -per_frame_45=if(equal(mvrot,0),1,.773))); -per_frame_46=mv_g=if(above(mvrot,2),if(above(mvrot,4),.267, -per_frame_47=if(equal(mvrot,3),.886,.176)),if(above(mvrot,1),.804, -per_frame_48=if(equal(mvrot,0),1,.38))); -per_frame_49=mv_b=if(above(mvrot,2),if(above(mvrot,4),.694, -per_frame_50=if(equal(mvrot,3),.776,.851)),if(above(mvrot,1),.114, -per_frame_51=if(equal(mvrot,0),1,.145))); -per_pixel_1=zone=below(sin(sin(49*q7)*14*x-sin(36*q7)*14*y),-.2); -per_pixel_2=zoom=1+.33*q8*if(zone,-.5+.1*sin(1.08*q6),.5+.1*sin(.96*q6)); -per_pixel_3=zoomexp=exp(sin(if(zone,q6,-q6))); -per_pixel_4=rot=q8*.03*sin(q6+q7+q7*zone); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Che - Terracarbon Stream.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Che - Terracarbon Stream.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Che - Terracarbon Stream.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Che - Terracarbon Stream.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000499 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.030740 -fWaveScale=0.498516 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.000000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000158 -fShader=0.000000 -zoom=1.000223 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.100000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.060000 -ib_size=0.035000 -ib_r=0.250000 -ib_g=0.450000 -ib_b=0.250000 -ib_a=0.290000 -nMotionVectorsX=19.199999 -nMotionVectorsY=14.400005 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=2.500000 -mv_r=0.060000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.200000 -per_frame_1=// timed sidon sensor -per_frame_2=// le = signal level; desired average value = 2 -per_frame_3=le=1.4*bass_att+.1*bass+.5*treb; -per_frame_4=pulse=above(le,th); -per_frame_5=// pulsefreq = running average of interval between last 5 pulses -per_frame_6=pulsefreq=if(equal(pulsefreq,0),2, -per_frame_7=if(pulse,.8*pulsefreq+.2*(time-lastpulse),pulsefreq)); -per_frame_8=lastpulse=if(pulse,time,lastpulse); -per_frame_9=// bt = relative time; 0 = prev beat; 1 = expected beat -per_frame_10=bt=(time-lastbeat)/(.5*beatfreq+.5*pulsefreq); -per_frame_11=// hccp = handcicap for th driven by bt -per_frame_12=hccp=(.03/(bt+.2))+.5*if(band(above(bt,.8),below(bt,1.2)), -per_frame_13=(pow(sin((bt-1)*7.854),4)-1),0); -per_frame_14=beat=band(above(le,th+hccp),btblock); -per_frame_15=btblock=1-above(le,th+hccp); -per_frame_16=lastbeat=if(beat,time,lastbeat); -per_frame_17=beatfreq=if(equal(beatfreq,0),2, -per_frame_18=if(beat,.8*beatfreq+.2*(time-lastbeat),beatfreq)); -per_frame_19=// th = threshold -per_frame_20=th=if(above(le,th),le+114/(le+10)-7.407, -per_frame_21=th+th*.07/(th-12)+below(th,2.7)*.1*(2.7-th)); -per_frame_22=th=if(above(th,6),6,th); -per_frame_23=thccl=thccl+(th-2.5144); -per_frame_24= -per_frame_25=q1=le; -per_frame_26=q2=thccl+.2*leccl; -per_frame_27=leccl=leccl+dle*le; -per_frame_28=dle=if(beat,-dle,dle); -per_frame_29=bccl=bccl+beat; -per_frame_30= -per_frame_31=wave_r=.1+.8*sqr(sin(.011*thccl))+.1*sin(leccl*.061); -per_frame_32=wave_g=.1+.8*sqr(sin(.013*thccl))+.1*cos(leccl*.067); -per_frame_33=wave_b=.1+.8*sqr(cos(.017*thccl))+.1*sin(leccl*.065); -per_frame_34= -per_frame_35=ib_r=ib_r+.1*sin(1.3*time+.012*leccl); -per_frame_36=ib_g=ib_g+.1*sin(1.7*time+.019*leccl); -per_frame_37=ib_b=ib_b+.1*sin(1.9*time+.017*leccl); -per_frame_38=mv_r=.5*(ib_r+wave_r);mv_g=.5*(ib_g+wave_g);mv_b=.5*(ib_b+wave_b); -per_frame_39=mv_a=.5*sqr(sin(.01*leccl+bccl)); -per_frame_40= -per_frame_41=echo_alpha=.5+.2*cos(.07*leccl+.02*thccl); -per_frame_42=eo=if(band(equal(bccl%3,0),beat),rand(4),eo); -per_frame_43=q3=(equal(eo,2)+equal(eo,1))*equal(bccl%2,0); -per_frame_44=q4=(equal(eo,0)+equal(eo,3))*equal(bccl%2,0); -per_frame_45=echo_orient=eo; -per_pixel_1=dqv=above(x,.5)-above(y,.5); -per_pixel_2=rot=sin(sin(rad*(13+5*sin(.01*q2))+.06*q2)*q1*.01); -per_pixel_3=zoom=1+if(q3,dqv,1)*.1*sin(7*ang+.03*q2); -per_pixel_4=zoom=if(q4,if(below(rad,.8*sqr(sin(.016*q2))),.75+.4*cos(.021*q2),zoom),zoom); -per_frame_init_1=dle=1; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/presets/CMakeLists.txt projectm-3.1.0/src/libprojectM/presets/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/libprojectM/presets/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/presets/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -PROJECT(presets-projectm) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/CrystalHigh - mad ravetriping.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/CrystalHigh - mad ravetriping.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/CrystalHigh - mad ravetriping.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/CrystalHigh - mad ravetriping.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.963999 -fVideoEchoZoom=1.902700 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=33.469448 -fWaveScale=100.000000 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.240000 -fModWaveAlphaEnd=1.300001 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.009514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.035000 -ob_r=0.340000 -ob_g=0.340000 -ob_b=0.340000 -ob_a=0.380000 -ib_size=0.020000 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.210000 -nMotionVectorsX=28.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=MyVolume = min(bass+mid+treb,5); -per_frame_2=decay = 1 - 0.01*MyVolume; -per_frame_3=wave_r = 0.30 + 0.15*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_4=wave_r = if(above(bass,1.2),wave_r + 0.35,wave_r); -per_frame_5=wave_g = 0.30 + 0.15*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_6=wave_b = 0.30 + 0.15*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_7=wave_b = if(above(wave_r,0.8),wave_b-0.25,wave_b); -per_frame_8=ib_a = max(sin(time),0); -per_frame_9=ib_size = 0.010 + 0.002*MyVolume; -per_frame_10=ob_a = 0.380 + 0.1*MyVolume; -per_frame_11=ob_size = 0.050 - 0.004*MyVoulme; -per_frame_12=ib_r = 0.340 + 0.2*sin(time*0.5413); -per_frame_13=ib_g = 0.340 + 0.2*sin(time*0.6459); -per_frame_14=ib_b = 0.340 + 0.2*sin(time*0.7354); -per_frame_15=ob_r = 0.340 + 0.2*sin(time*0.7251); -per_frame_16=ob_r = if(above(bass,1.2),ob_r + 0.35,ob_r); -per_frame_17=ob_g = 0.340 + 0.2*sin(time*0.5315); -per_frame_18=ob_b = 0.340 + 0.2*sin(time*0.6349); -per_frame_19=ob_b = if(above(ob_r,0.8),ob_b-0.25,ob_b); -per_frame_20=zoom = max(sin(bass-bass_residual*10),0.2); -per_frame_21=rot = mid_residual*2.5; -per_frame_22=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_23=bass_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*bass_residual; -per_frame_24=mid_thresh = above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*0.92+1.3); -per_frame_25=mid_residual = equal(mid_thresh,2)*0.013*sin(time*7) + (1-equal(mid_thresh,2))*mid_residual; -per_frame_26=monitor = zoom; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.220183 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.241455 -fWaveSmoothing=0.000000 -fWaveParam=-0.261032 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.526528 -wave_g=0.324083 -wave_b=0.134239 -wave_x=0.482812 -wave_y=0.467471 -ob_size=0.004500 -ob_r=0.071102 -ob_g=0.089654 -ob_b=0.514650 -ob_a=0.985207 -ib_size=0.005000 -ib_r=0.491715 -ib_g=0.022579 -ib_b=0.569085 -ib_a=0.949768 -nMotionVectorsX=3.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.505893 -mv_dy=-0.993957 -mv_l=5.000000 -mv_r=0.835033 -mv_g=0.249397 -mv_b=0.055806 -mv_a=0.175581 -per_frame_1=wave_r = wave_r + 0.45*( 0.6*sin(1.517*time) + 0.4*mid_effect ); -per_frame_2=wave_b = wave_b + 0.45*( 0.6*sin(1.088*time) + 0.4*bass_effect ); -per_frame_3=wave_g = wave_g + 0.45*( 0.6*sin(1.037*time) + 0.4*treb_effect ); -per_frame_4=zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.020*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*below(frame%5,1); -per_frame_7=volume = 0.3*(bass+mid+att); -per_frame_8=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_9=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_10=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_11=peakbass_att = max(bass_att,peakbass_att); -per_frame_12=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_13=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_14=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_15=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_16=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_17=effect = if(beat,effect+rand(5)+1,effect); -per_frame_18=effect = if(above(effect,5),effect-6,effect); -per_frame_19=q1 = effect+2; -per_frame_20=monitor = q1; -per_frame_21=wave_mode = wave_g * wave_b; -per_frame_22=wave_r = time + treb; -per_frame_23=wave_r=if(below(wave_r,0.0), 0.0, wave_r); -per_frame_24=wave_r=if(above(wave_r,1.0), 1.0, wave_r); -per_frame_25=wave_mode=if(below(wave_mode,0), 0, wave_mode); -per_frame_26=wave_mode=if(above(wave_mode,7.0), 7.0, wave_mode); -per_frame_27=wave_r=if(below(wave_r,0.0), 0.0, wave_r); -per_frame_28=wave_r=if(above(wave_r,1.0), 1.0, wave_r); -per_pixel_1=zoom=zoom+0.04*sin(ang*int(q1)+time*2.6); -per_pixel_2=cy = x * b; -per_pixel_3=cy=if(below(cy,-1.0), -1.0, cy); -per_pixel_4=cy=if(above(cy,2.0), 2.0, cy); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.s and PieturP - Starfield.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.s and PieturP - Starfield.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.s and PieturP - Starfield.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.s and PieturP - Starfield.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,597 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.500000 -fVideoEchoZoom=3.012146 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.005000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.010000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.799999 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=256 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=1 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.028414 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=advance=advance+ (abs(bass+treb+mid)*.01); -wave_0_per_frame2=advance=if( above(advance,2) , 0, advance); -wave_0_per_frame3=t1=advance; -wave_0_per_frame4=ab=ab+(abs(bass+treb+mid)*.001); -wave_0_per_frame5=ab=if(above(ab,628),0,ab); -wave_0_per_frame6=t2=ab; -wave_0_per_frame7= -wave_0_per_point1=s=sample*6.28; -wave_0_per_point2= -wave_0_per_point3=//plot random x position via function of sample pos; -wave_0_per_point4=xp=sin(s)+sin(s*0.34)+sin(s*24.3)+sin(s*13.8); -wave_0_per_point5=xp=xp*.17; -wave_0_per_point6=//plot random y position via function of sample pos; -wave_0_per_point7=yp=cos(s)+sin(s*0.24)+cos(s*17.4)+sin(s*37.7); -wave_0_per_point8=yp=yp*.17; -wave_0_per_point9=//plot random z position via function of sample pos; -wave_0_per_point10=zp=cos(s)+cos(s*5.24)+cos(s*47.4)+cos(s*27.7); -wave_0_per_point11=zp=zp*0.25; -wave_0_per_point12= -wave_0_per_point13=//pull stars toward screen -wave_0_per_point14=zp=zp + 1 - t1; -wave_0_per_point15= -wave_0_per_point16=//correct when below 0 -wave_0_per_point17=zp=if( below(zp,0) , zp+2 , zp ); -wave_0_per_point18=zp=zp*0.7; -wave_0_per_point19= -wave_0_per_point20=x2=sin(time*.2)*.125; -wave_0_per_point21=y2=cos(time*.2)*.125; -wave_0_per_point22=x=(xp/zp + 0.5)+x2; -wave_0_per_point23=y=(yp/zp + 0.5)+y2; -wave_0_per_point24= -wave_0_per_point25= -wave_0_per_point26=h=sin(t2)*.5+.5; -wave_0_per_point27= -wave_0_per_point28=//darken far stars -wave_0_per_point29=//a=(1 - zp*0.5); -wave_0_per_point30=l=(1-zp*.5); -wave_0_per_point31=s=(1-zp*.5); -wave_0_per_point32= -wave_0_per_point33= -wave_0_per_point34= -wave_0_per_point35=////////////////////////////////////////////////////////////////////////////// -wave_0_per_point36=// -wave_0_per_point37=// HSL to RGB by PieturP -wave_0_per_point38=// -wave_0_per_point39=// hue h ( 0 - 1 ) rr ( 0 - 1 ) -wave_0_per_point40=// saturation s ( 0 - 1 ) - > gg ( 0 - 1 ) -wave_0_per_point41=// luminance l ( 0 - 1 ) bb ( 0 - 1 ) -wave_0_per_point42=// -wave_0_per_point43=cc=(6*h); -wave_0_per_point44=cc=if(below(cc,1),0,if(below(cc,2),1,if(below(cc,3),2,if(below(cc,4),3,if(below(cc,5),4,5))))); -wave_0_per_point45=zf=(6*h)-cc; -wave_0_per_point46=zm=l; -wave_0_per_point47=zp=l*(1-s); -wave_0_per_point48=zq=l*(1-s*zf); -wave_0_per_point49=zt=l*(1-s*(1-zf)); -wave_0_per_point50=rr=if(equal(cc,0),zm,if(equal(cc,1),zq,if(equal(cc,2),zp,if(equal(cc,3),zp,if(equal(cc,4),zt,zm))))); -wave_0_per_point51=gg=if(equal(cc,0),zt,if(equal(cc,1),zm,if(equal(cc,2),zm,if(equal(cc,3),zq,if(equal(cc,4),zp,zp))))); -wave_0_per_point52=bb=if(equal(cc,0),zp,if(equal(cc,1),zp,if(equal(cc,2),zt,if(equal(cc,3),zm,if(equal(cc,4),zm,zq))))); -wave_0_per_point53=rr=if(equal(s,0),l,rr); -wave_0_per_point54=gg=if(equal(s,0),l,gg); -wave_0_per_point55=bb=if(equal(s,0),l,bb); -wave_0_per_point56= -wave_0_per_point57=////////////////////////////////////////////////////////////////////////////// -wave_0_per_point58= -wave_0_per_point59=r=rr; -wave_0_per_point60=g=gg; -wave_0_per_point61=b=bb; -wave_0_per_point62= -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=256 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=1 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.028414 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_frame1=advance=advance+ (abs(bass+treb+mid)*.01); -wave_1_per_frame2=advance=if( above(advance,2) , 0, advance); -wave_1_per_frame3=t1=advance; -wave_1_per_frame4=ab=ab+(abs(bass+treb+mid)*.001); -wave_1_per_frame5=ab=if(above(ab,628),0,ab); -wave_1_per_frame6=t2=ab; -wave_1_per_frame7= -wave_1_per_point1=s=sample*6.28; -wave_1_per_point2= -wave_1_per_point3=//plot random x position via function of sample pos; -wave_1_per_point4=xp=sin(s)+sin(s*0.34)+sin(s*24.3)+sin(s*13.8); -wave_1_per_point5=xp=xp*.20; -wave_1_per_point6=//plot random y position via function of sample pos; -wave_1_per_point7=yp=cos(s)+sin(s*0.24)+cos(s*17.4)+sin(s*37.7); -wave_1_per_point8=yp=yp*.20; -wave_1_per_point9=//plot random z position via function of sample pos; -wave_1_per_point10=zp=cos(s)+cos(s*5.24)+cos(s*47.4)+cos(s*27.7); -wave_1_per_point11=zp=zp*0.25; -wave_1_per_point12= -wave_1_per_point13= -wave_1_per_point14= -wave_1_per_point15=//pull stars toward screen -wave_1_per_point16=zp=zp + 1 - t1; -wave_1_per_point17= -wave_1_per_point18=//correct when below 0 -wave_1_per_point19=zp=if( below(zp,0) , zp+2 , zp ); -wave_1_per_point20= -wave_1_per_point21=//darken far stars -wave_1_per_point22=//a=(1 - zp*0.5); -wave_1_per_point23= -wave_1_per_point24=zp=zp*0.705; -wave_1_per_point25= -wave_1_per_point26=x=xp/zp + 0.5; -wave_1_per_point27=y=yp/zp + 0.5; -wave_1_per_point28= -wave_1_per_point29=h=sin(t2)*.5+.5; -wave_1_per_point30= -wave_1_per_point31=s=(1-zp*.5); -wave_1_per_point32=l=(zp*.5); -wave_1_per_point33= -wave_1_per_point34= -wave_1_per_point35=////////////////////////////////////////////////////////////////////////////// -wave_1_per_point36=// -wave_1_per_point37=// HSL to RGB by PieturP -wave_1_per_point38=// -wave_1_per_point39=// hue h ( 0 - 1 ) rr ( 0 - 1 ) -wave_1_per_point40=// saturation s ( 0 - 1 ) - > gg ( 0 - 1 ) -wave_1_per_point41=// luminance l ( 0 - 1 ) bb ( 0 - 1 ) -wave_1_per_point42=// -wave_1_per_point43=cc=(6*h); -wave_1_per_point44=cc=if(below(cc,1),0,if(below(cc,2),1,if(below(cc,3),2,if(below(cc,4),3,if(below(cc,5),4,5))))); -wave_1_per_point45=zf=(6*h)-cc; -wave_1_per_point46=zm=l; -wave_1_per_point47=zp=l*(1-s); -wave_1_per_point48=zq=l*(1-s*zf); -wave_1_per_point49=zt=l*(1-s*(1-zf)); -wave_1_per_point50=rr=if(equal(cc,0),zm,if(equal(cc,1),zq,if(equal(cc,2),zp,if(equal(cc,3),zp,if(equal(cc,4),zt,zm))))); -wave_1_per_point51=gg=if(equal(cc,0),zt,if(equal(cc,1),zm,if(equal(cc,2),zm,if(equal(cc,3),zq,if(equal(cc,4),zp,zp))))); -wave_1_per_point52=bb=if(equal(cc,0),zp,if(equal(cc,1),zp,if(equal(cc,2),zt,if(equal(cc,3),zm,if(equal(cc,4),zm,zq))))); -wave_1_per_point53=rr=if(equal(s,0),l,rr); -wave_1_per_point54=gg=if(equal(s,0),l,gg); -wave_1_per_point55=bb=if(equal(s,0),l,bb); -wave_1_per_point56= -wave_1_per_point57=////////////////////////////////////////////////////////////////////////////// -wave_1_per_point58= -wave_1_per_point59=r=rr; -wave_1_per_point60=g=gg; -wave_1_per_point61=b=bb; -wave_1_per_point62= -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=1 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.999996 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_frame1=vol = (bass_att + mid_att + treb_att)*.333333; -wave_2_per_frame2=vol_avg = .1*(vol_avg*9 + vol); -wave_2_per_frame3=vg = vol_avg*.1; -wave_2_per_frame4=//t1 = if(above(vg,1.8),1.8,vg); -wave_2_per_frame5=t1=time*.3; -wave_2_per_frame6=//t2=sin(time)*1.5+2; -wave_2_per_frame7=//t3=.25; -wave_2_per_frame8=//t2=sin(time*.071)*1.2+4.1; -wave_2_per_frame9=t2=2; -wave_2_per_frame10=t3=0; -wave_2_per_frame11=t4=0; -wave_2_per_point1=tm=if(above(yp,0.98),t1,tm); -wave_2_per_point2=ex=if(above(yp,0.98),t2,ex); -wave_2_per_point3=//ex=2; -wave_2_per_point4=sp=.01; -wave_2_per_point5=yp=if(above(xp,0.9998),yp+sp,yp); -wave_2_per_point6=xp=if(above(xp,0.9998),0,xp+sp); -wave_2_per_point7=yp=if(above(yp,0.9998),0,yp); -wave_2_per_point8=x=((xp*ex)*.1+.5)-(.05*ex)-t3; -wave_2_per_point9=y=((yp*ex)*.1+.5)-(.05*ex)-t4; -wave_2_per_point10= -wave_2_per_point11=//g=sin(xp*yp*1.506+tm); -wave_2_per_point12=//b=sin(xp*yp*3.142+tm); -wave_2_per_point13=//r=cos(xp*yp*1.506+tm); -wave_2_per_point14= -wave_2_per_point15=r=sin(xp*3.14+tm)*sin(yp*3.14+tm); -wave_2_per_point16=g=sin(xp*6.28+tm)*sin(yp*6.28+tm); -wave_2_per_point17=b=.4; -wave_2_per_point18= -wave_2_per_point19= -wave_2_per_point20= -wave_2_per_point21= -wave_2_per_point22= -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=1 -wavecode_3_bUseDots=1 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.000000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_frame1=vol = (bass_att + mid_att + treb_att)*.333333; -wave_3_per_frame2=vol_avg = .1*(vol_avg*9 + vol); -wave_3_per_frame3=vg = vol_avg*.1; -wave_3_per_frame4=t1 = if(above(vg,1.8),1.8,vg); -wave_3_per_point1=tm = q1; -wave_3_per_point2=sp = sample*6.28*8*6; -wave_3_per_point3= -wave_3_per_point4=vol = (value1+value2)*.5; -wave_3_per_point5=it = it*above(sample,0); -wave_3_per_point6=it = it + 1; -wave_3_per_point7=rad = .5 + vol; -wave_3_per_point8=ra = rad*sin(sample*3.14); -wave_3_per_point9=ox = ra*sin(sp); -wave_3_per_point10=oy = sin(sample*3.14-1.57)*rad; -wave_3_per_point11=oz = ra*cos(sp); -wave_3_per_point12= -wave_3_per_point13=xang = tm*.132; -wave_3_per_point14=sxang = 0; -wave_3_per_point15=yang = tm*.153; -wave_3_per_point16=ayang = 0; -wave_3_per_point17=zang = tm*.110; -wave_3_per_point18=azang = 0; -wave_3_per_point19=fov = 0.6 + 0.2*sin(tm); -wave_3_per_point20=fov = .5; -wave_3_per_point21= -wave_3_per_point22=mx = ox*cos(zang) - oy*sin(zang); -wave_3_per_point23=my = ox*sin(zang) + oy*cos(zang); -wave_3_per_point24=ox = mx; -wave_3_per_point25=oy = my; -wave_3_per_point26=mx = ox*cos(yang) + oz*sin(yang); -wave_3_per_point27=mz = - ox*sin(yang) + oz*cos(yang); -wave_3_per_point28=ox = mx; -wave_3_per_point29=oz = mz; -wave_3_per_point30=my = oy*cos(xang) - oz*sin(xang); -wave_3_per_point31=mz = oy*sin(xang) + oz*cos(xang); -wave_3_per_point32=oy = my; -wave_3_per_point33=oz = mz; -wave_3_per_point34= -wave_3_per_point35=oz = oz - 2; -wave_3_per_point36=x = ox*fov/oz + 0.5; -wave_3_per_point37=x = (x-.5)*0.75 + 0.5; -wave_3_per_point38=y = oy*fov/oz + 0.5; -wave_3_per_point39= -wave_3_per_point40=r = 1; -wave_3_per_point41=g = .25+.25*sin(sp); -wave_3_per_point42=b = 0; -wave_3_per_point43=a = .5 + (oz+2)*.5; -wave_3_per_point44=a = a*below(z,2); -wave_3_per_point45=minrgb = min(r,min(g,b)); -wave_3_per_point46=maxrgb = max(r,max(g,b)); -wave_3_per_point47=l = (maxrgb-minrgb)*.5; -wave_3_per_point48=diff = maxrgb-minrgb; -wave_3_per_point49=sum = maxrgb+minrgb; -wave_3_per_point50=s = if(above(l,0.5),diff/(2-sum),diff/sum)*(1-equal(l,0)); -wave_3_per_point51=h = if(equal(r,maxrgb),(g-b)/diff,if(equal(g,maxrgb),2+(b-r)/diff,4+(r-g)/diff)); -wave_3_per_point52=h = h*0.1666666; -wave_3_per_point53=h = if(below(h,0),0,if(above(h,1),1,h)); -wave_3_per_point54= -wave_3_per_point55=h = h + time*0.05*1.324; -wave_3_per_point56=h = h - int(h); -wave_3_per_point57= -wave_3_per_point58=tmpb = if(below(l,0.5),l*(1+s),(l+s)-(s*l)); -wave_3_per_point59=tmpa = 2*l - tmpb; -wave_3_per_point60=hvr = h + .333333; -wave_3_per_point61=hvr = if(below(hvr,0),hvr+1,if(above(hvr,1),hvr-1,hvr)); -wave_3_per_point62=hvg = h; -wave_3_per_point63=hvg = if(below(hvg,0),hvg+1,if(above(hvg,1),hvg-1,hvg)); -wave_3_per_point64=hvb = h - .333333; -wave_3_per_point65=hvb = if(below(hvb,0),hvb+1,if(above(hvb,1),hvb-1,hvb)); -wave_3_per_point66= -wave_3_per_point67=r = if(below(6*hvr,1),tmpa+(tmpb-tmpa)*6*hvr, if(below(2*hvr,1),tmpb, if(below(hvr*3,2),tmpa+(tmpb-tmpa)*(.666666-hvr)*6,tmpa))); -wave_3_per_point68=g = if(below(6*hvg,1),tmpa+(tmpb-tmpa)*6*hvg, if(below(2*hvg,1),tmpb, if(below(hvg*3,2),tmpa+(tmpb-tmpa)*(.666666-hvg)*6,tmpa))); -wave_3_per_point69=b = if(below(6*hvb,1),tmpa+(tmpb-tmpa)*6*hvb, if(below(2*hvb,1),tmpb, if(below(hvb*3,2),tmpa+(tmpb-tmpa)*(.666666-hvb)*6,tmpa))); -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=1 -shapecode_0_x=0.140000 -shapecode_0_y=0.170000 -shapecode_0_rad=2.207644 -shapecode_0_ang=3.141593 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.255374 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=0.000000 -shapecode_1_enabled=0 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_textured=1 -shapecode_1_x=0.140000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100996 -shapecode_1_ang=3.141593 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=3.241264 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.600000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1= -shape_1_per_frame2=p=p+.62; -shape_1_per_frame3=slowp=slowp+.062; -shape_1_per_frame4=p=below(p,6.283)*p; -shape_1_per_frame5=slowp=below(slowp,6.283)*slowp; -shape_1_per_frame6=x=sin(p)*.35+.5; -shape_1_per_frame7=y=cos(p)*.35+.5; -shape_1_per_frame8=h=sin(slowp)*.5+.5; -shape_1_per_frame9=s=1; -shape_1_per_frame10=l=1; -shape_1_per_frame11=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_1_per_frame12=// -shape_1_per_frame13=// HSL to RGB by PieturP -shape_1_per_frame14=// -shape_1_per_frame15=// hue h ( 0 - 0.9 ) rr ( 0 - 1 ) -shape_1_per_frame16=// saturation s ( 0 - 1 ) - > gg ( 0 - 1 ) -shape_1_per_frame17=// luminance l ( 0 - 1 ) bb ( 0 - 1 ) -shape_1_per_frame18=// -shape_1_per_frame19=cc=(6*h); -shape_1_per_frame20=cc=if(below(cc,1),0,if(below(cc,2),1,if(below(cc,3),2,if(below(cc,4),3,if(below(cc,5),4,5))))); -shape_1_per_frame21=zf=(6*h)-cc; -shape_1_per_frame22=zm=l; -shape_1_per_frame23=zp=l*(1-s); -shape_1_per_frame24=zq=l*(1-s*zf); -shape_1_per_frame25=zt=l*(1-s*(1-zf)); -shape_1_per_frame26=monitor=zq; -shape_1_per_frame27=rr=if(equal(cc,0),zm,if(equal(cc,1),zq,if(equal(cc,2),zp,if(equal(cc,3),zp,if(equal(cc,4),zt,zm))))); -shape_1_per_frame28=gg=if(equal(cc,0),zt,if(equal(cc,1),zm,if(equal(cc,2),zm,if(equal(cc,3),zq,if(equal(cc,4),zp,zp))))); -shape_1_per_frame29=bb=if(equal(cc,0),zp,if(equal(cc,1),zp,if(equal(cc,2),zt,if(equal(cc,3),zm,if(equal(cc,4),zm,zq))))); -shape_1_per_frame30=rr=if(equal(s,0),l,rr); -shape_1_per_frame31=gg=if(equal(s,0),l,gg); -shape_1_per_frame32=bb=if(equal(s,0),l,bb); -shape_1_per_frame33= -shape_1_per_frame34=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_1_per_frame35=r=rr; -shape_1_per_frame36=g=gg; -shape_1_per_frame37=b=bb; -shape_1_per_frame38= -shape_1_per_frame39=h=sin(slowp)*.5+.5; -shape_1_per_frame40=l=.5; -shape_1_per_frame41=s=.55; -shape_1_per_frame42=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_1_per_frame43=// -shape_1_per_frame44=// HSL to RGB by PieturP -shape_1_per_frame45=// -shape_1_per_frame46=// hue h ( 0 - 0.9 ) rr ( 0 - 1 ) -shape_1_per_frame47=// saturation s ( 0 - 1 ) - > gg ( 0 - 1 ) -shape_1_per_frame48=// luminance l ( 0 - 1 ) bb ( 0 - 1 ) -shape_1_per_frame49=// -shape_1_per_frame50=cc=(6*h); -shape_1_per_frame51=cc=if(below(cc,1),0,if(below(cc,2),1,if(below(cc,3),2,if(below(cc,4),3,if(below(cc,5),4,5))))); -shape_1_per_frame52=zf=(6*h)-cc; -shape_1_per_frame53=zm=l; -shape_1_per_frame54=zp=l*(1-s); -shape_1_per_frame55=zq=l*(1-s*zf); -shape_1_per_frame56=zt=l*(1-s*(1-zf)); -shape_1_per_frame57=monitor=zq; -shape_1_per_frame58=rr=if(equal(cc,0),zm,if(equal(cc,1),zq,if(equal(cc,2),zp,if(equal(cc,3),zp,if(equal(cc,4),zt,zm))))); -shape_1_per_frame59=gg=if(equal(cc,0),zt,if(equal(cc,1),zm,if(equal(cc,2),zm,if(equal(cc,3),zq,if(equal(cc,4),zp,zp))))); -shape_1_per_frame60=bb=if(equal(cc,0),zp,if(equal(cc,1),zp,if(equal(cc,2),zt,if(equal(cc,3),zm,if(equal(cc,4),zm,zq))))); -shape_1_per_frame61=rr=if(equal(s,0),l,rr); -shape_1_per_frame62=gg=if(equal(s,0),l,gg); -shape_1_per_frame63=bb=if(equal(s,0),l,bb); -shape_1_per_frame64= -shape_1_per_frame65=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_1_per_frame66=r2=rr; -shape_1_per_frame67=g2=gg; -shape_1_per_frame68=b2=bb; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.791410 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.561512 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=1 -shapecode_3_textured=0 -shapecode_3_x=0.140000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.123235 -shapecode_3_ang=3.141593 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=3.241264 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=0.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1= -shape_3_per_frame2=p=p+.314; -shape_3_per_frame3=slowp=slowp+.00628; -shape_3_per_frame4=p=below(p,6.283)*p; -shape_3_per_frame5=slowp=below(slowp,6.283)*slowp; -shape_3_per_frame6=my=my+(mid*mid*mid)*.02; -shape_3_per_frame7=turn=below(sin(my)*.5+.5,.5); -shape_3_per_frame8=x=if(equal(turn,1),sin(p)*.3+.5,sin(628-p)*.3+.5); -shape_3_per_frame9=y=if(equal(turn,1),cos(p)*.3+.5,cos(628-p)*.3+.5); -shape_3_per_frame10=h=sin(slowp)*.5+.5; -shape_3_per_frame11=s=min(abs(bass*.6),1); -shape_3_per_frame12=l=1; -shape_3_per_frame13=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_3_per_frame14=// -shape_3_per_frame15=// HSL to RGB by PieturP -shape_3_per_frame16=// -shape_3_per_frame17=// hue h ( 0 - 0.9 ) rr ( 0 - 1 ) -shape_3_per_frame18=// saturation s ( 0 - 1 ) - > gg ( 0 - 1 ) -shape_3_per_frame19=// luminance l ( 0 - 1 ) bb ( 0 - 1 ) -shape_3_per_frame20=// -shape_3_per_frame21=cc=(6*h); -shape_3_per_frame22=cc=if(below(cc,1),0,if(below(cc,2),1,if(below(cc,3),2,if(below(cc,4),3,if(below(cc,5),4,5))))); -shape_3_per_frame23=zf=(6*h)-cc; -shape_3_per_frame24=zm=l; -shape_3_per_frame25=zp=l*(1-s); -shape_3_per_frame26=zq=l*(1-s*zf); -shape_3_per_frame27=zt=l*(1-s*(1-zf)); -shape_3_per_frame28=monitor=zq; -shape_3_per_frame29=rr=if(equal(cc,0),zm,if(equal(cc,1),zq,if(equal(cc,2),zp,if(equal(cc,3),zp,if(equal(cc,4),zt,zm))))); -shape_3_per_frame30=gg=if(equal(cc,0),zt,if(equal(cc,1),zm,if(equal(cc,2),zm,if(equal(cc,3),zq,if(equal(cc,4),zp,zp))))); -shape_3_per_frame31=bb=if(equal(cc,0),zp,if(equal(cc,1),zp,if(equal(cc,2),zt,if(equal(cc,3),zm,if(equal(cc,4),zm,zq))))); -shape_3_per_frame32=rr=if(equal(s,0),l,rr); -shape_3_per_frame33=gg=if(equal(s,0),l,gg); -shape_3_per_frame34=bb=if(equal(s,0),l,bb); -shape_3_per_frame35= -shape_3_per_frame36=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_3_per_frame37=r=rr; -shape_3_per_frame38=g=gg; -shape_3_per_frame39=b=bb; -shape_3_per_frame40= -shape_3_per_frame41=h=sin(slowp)*.5+.5; -shape_3_per_frame42=l=min(abs(bass*.6),1); -shape_3_per_frame43=s=1; -shape_3_per_frame44=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_3_per_frame45=// -shape_3_per_frame46=// HSL to RGB by PieturP -shape_3_per_frame47=// -shape_3_per_frame48=// hue h ( 0 - 0.9 ) rr ( 0 - 1 ) -shape_3_per_frame49=// saturation s ( 0 - 1 ) - > gg ( 0 - 1 ) -shape_3_per_frame50=// luminance l ( 0 - 1 ) bb ( 0 - 1 ) -shape_3_per_frame51=// -shape_3_per_frame52=cc=(6*h); -shape_3_per_frame53=cc=if(below(cc,1),0,if(below(cc,2),1,if(below(cc,3),2,if(below(cc,4),3,if(below(cc,5),4,5))))); -shape_3_per_frame54=zf=(6*h)-cc; -shape_3_per_frame55=zm=l; -shape_3_per_frame56=zp=l*(1-s); -shape_3_per_frame57=zq=l*(1-s*zf); -shape_3_per_frame58=zt=l*(1-s*(1-zf)); -shape_3_per_frame59=monitor=zq; -shape_3_per_frame60=rr=if(equal(cc,0),zm,if(equal(cc,1),zq,if(equal(cc,2),zp,if(equal(cc,3),zp,if(equal(cc,4),zt,zm))))); -shape_3_per_frame61=gg=if(equal(cc,0),zt,if(equal(cc,1),zm,if(equal(cc,2),zm,if(equal(cc,3),zq,if(equal(cc,4),zp,zp))))); -shape_3_per_frame62=bb=if(equal(cc,0),zp,if(equal(cc,1),zp,if(equal(cc,2),zt,if(equal(cc,3),zm,if(equal(cc,4),zm,zq))))); -shape_3_per_frame63=rr=if(equal(s,0),l,rr); -shape_3_per_frame64=gg=if(equal(s,0),l,gg); -shape_3_per_frame65=bb=if(equal(s,0),l,bb); -shape_3_per_frame66= -shape_3_per_frame67=/////////////////////////////////////////////////////////////////////////////////////////////// -shape_3_per_frame68=r2=rr; -shape_3_per_frame69=g2=gg; -shape_3_per_frame70=b2=bb; -shape_3_per_frame71=border_r=rr; -shape_3_per_frame72=border_g=gg; -shape_3_per_frame73=border_b=bb; -per_frame_1=decay=.8; -per_frame_2=warp=0; -per_frame_3=dx=0; -per_frame_4=dy=0; -per_frame_5=zoom=1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.940000 -fVideoEchoZoom=0.498313 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=1.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.030000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=43.199997 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=0.910000 -mv_b=0.710000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.491382 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=.5+q4;y=.5+q5; -shapecode_1_enabled=0 -shapecode_1_sides=24 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.444842 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.819541 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=tex_ang=0.01; -shape_1_per_frame2=x=.5+q4;y=.5+q5; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=zoom=1; -per_frame_init_2=xpos=0; -per_frame_init_3=ypos=0; -per_frame_1=decay=1; -per_frame_2= -per_frame_3=vol= (bass+mid+treb)*0.55; -per_frame_4=vol=vol; -per_frame_5= -per_frame_6= -per_frame_7=mv_r = 0.5 + 0.4*sin(time*1.324); -per_frame_8=mv_g = 0.5 + 0.4*cos(time*1.371); -per_frame_9= -per_frame_10= -per_frame_11= -per_frame_12= -per_frame_13=zoom=.9; -per_frame_14= -per_frame_15=musictime=musictime+vol; -per_frame_16=q4=sin(musictime*0.02)*0.3; -per_frame_17=q5=sin(musictime*0.01)*0.3; -per_frame_18= -per_frame_19=dx=sin(musictime*0.1)*0.07; -per_frame_20=dy=cos(musictime*0.069)*0.07; -per_frame_21= -per_frame_22= -per_frame_23= -per_frame_24= -per_frame_25=monitor=rot; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm_textured.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm_textured.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm_textured.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Cool Bug_arm_textured.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.940000 -fVideoEchoZoom=0.999995 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=1.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.030000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=9.600006 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=0.910000 -mv_b=0.710000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.491382 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=.5+q4;y=.5+q5; -shapecode_1_enabled=0 -shapecode_1_sides=24 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.444842 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.819541 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=tex_ang=0.01; -shape_1_per_frame2=x=.5+q4;y=.5+q5; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=zoom=1; -per_frame_init_2=xpos=0; -per_frame_init_3=ypos=0; -per_frame_1=decay=1; -per_frame_2= -per_frame_3=vol= (bass+mid+treb)*0.55; -per_frame_4=vol=vol; -per_frame_5= -per_frame_6= -per_frame_7=mv_r = 0.5 + 0.4*sin(time*1.324); -per_frame_8=mv_g = 0.5 + 0.4*cos(time*1.371); -per_frame_9= -per_frame_10= -per_frame_11= -per_frame_12= -per_frame_13=zoom=.9; -per_frame_14= -per_frame_15=musictime=musictime+vol; -per_frame_16=q4=sin(musictime*0.02)*0.3; -per_frame_17=q5=sin(musictime*0.01)*0.3; -per_frame_18= -per_frame_19=dx=sin(musictime*0.1)*0.07; -per_frame_20=dy=cos(musictime*0.069)*0.07; -per_frame_21= -per_frame_22= -per_frame_23= -per_frame_24= -per_frame_25=monitor=rot; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer_Peacock.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer_Peacock.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer_Peacock.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer_Peacock.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,250 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.940000 -fVideoEchoZoom=1.615167 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=9.600006 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=0.910000 -mv_b=0.710000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.491382 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.050000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=.5+q4;y=.5+q5; -shape_0_per_frame2=r=sin(time*0.7)*3*(bass*0.2); -shape_0_per_frame3=g=sin(time*0.5)*4*(treb*2); -shapecode_1_enabled=0 -shapecode_1_sides=24 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.018423 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.819541 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=tex_ang=0.01; -shape_1_per_frame2=x=.5-q4; -shape_1_per_frame3=y=.5-q5; -shapecode_2_enabled=1 -shapecode_2_sides=24 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.221671 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=2.987774 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1= -per_frame_init_2=zoom=1; -per_frame_init_3=xpos=0; -per_frame_init_4=ypos=0; -per_frame_1=decay=1; -per_frame_2= -per_frame_3=vol= (bass+mid+treb)*0.55; -per_frame_4=vol=vol; -per_frame_5= -per_frame_6= -per_frame_7=mv_r = 0.5 + 0.4*sin(time*1.324); -per_frame_8=mv_g = 0.5 + 0.4*cos(time*1.371); -per_frame_9= -per_frame_10= -per_frame_11=//ib_r=bass; -per_frame_12=//ib_g=treb; -per_frame_13=zoom=.9; -per_frame_14= -per_frame_15=musictime=musictime+vol; -per_frame_16= -per_frame_17=q4=0; -per_frame_18=q5=0; -per_frame_19=//q4=sin(musictime*0.02)*0.1; -per_frame_20=//q5=sin(musictime*0.01)*0.1; -per_frame_21= -per_frame_22=dx=sin(musictime*0.1)*0.07; -per_frame_23=dy=cos(musictime*0.069)*0.07; -per_frame_24= -per_frame_25= -per_frame_26= -per_frame_27= -per_frame_28=monitor=rot; -per_pixel_1=rd=sqrt( sqr( (x-0.5-q4)*3) + sqr( (y-0.5+q5)*2 ) ); -per_pixel_2=cx=0.5+q4; -per_pixel_3=cy=0.5-q5; -per_pixel_4= -per_pixel_5=zoom=(rd*rd)/2.5; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate B.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate B.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate B.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate B.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,250 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.940000 -fVideoEchoZoom=0.597148 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=9.600006 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=0.910000 -mv_b=0.710000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.491382 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=.5+q4;y=.5+q5; -shapecode_1_enabled=1 -shapecode_1_sides=24 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.018423 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.819541 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=tex_ang=0.01; -shape_1_per_frame2=x=.5-q4; -shape_1_per_frame3=y=.5-q5; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1= -per_frame_init_2=zoom=1; -per_frame_init_3=xpos=0; -per_frame_init_4=ypos=0; -per_frame_1=decay=1; -per_frame_2= -per_frame_3=vol= (bass+mid+treb)*0.55; -per_frame_4=vol=vol; -per_frame_5= -per_frame_6= -per_frame_7=mv_r = 0.5 + 0.4*sin(time*1.324); -per_frame_8=mv_g = 0.5 + 0.4*cos(time*1.371); -per_frame_9= -per_frame_10= -per_frame_11= -per_frame_12= -per_frame_13=zoom=.9; -per_frame_14= -per_frame_15=musictime=musictime+vol; -per_frame_16= -per_frame_17=q4=0; -per_frame_18=q5=0; -per_frame_19=//=sin(musictime*0.02)*0.3; -per_frame_20=//q5=sin(musictime*0.01)*0.3; -per_frame_21= -per_frame_22=dx=sin(musictime*0.1)*0.07; -per_frame_23=dy=cos(musictime*0.069)*0.07; -per_frame_24= -per_frame_25= -per_frame_26= -per_frame_27= -per_frame_28=monitor=rot; -per_pixel_1=rd=sqrt( sqr( (x-0.5-q4)*1.7) + sqr( (y-0.5+q5)*1.2 ) )+0.001; -per_pixel_2=cx=0.5+q4; -per_pixel_3=cy=0.5-q5; -per_pixel_4= -per_pixel_5=zoom=pow(rd,sin(time)+2.5)*2.0; -per_pixel_6=zoom=max(zoom,0.1) -per_pixel_7= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate box_mix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate box_mix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate box_mix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S.+Phat Fractical_dancer - pulsate box_mix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,247 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.940000 -fVideoEchoZoom=1.970816 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=1 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.150000 -ob_r=1.000000 -ob_g=1.000000 -ob_b=1.000000 -ob_a=1.000000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=1.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.700000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.244862 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=.5+q4;y=.5+q5; -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.402702 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=2.238868 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=tex_ang=3.14; -shape_1_per_frame2=tex_zoom=2.235; -shape_1_per_frame3=x=.5-q5; -shape_1_per_frame4=y=.5-q4; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1= -per_frame_init_2=zoom=1; -per_frame_init_3=xpos=0; -per_frame_init_4=ypos=0; -per_frame_1=decay=1; -per_frame_2= -per_frame_3=vol= (bass+mid+treb)*0.55; -per_frame_4=vol=vol; -per_frame_5= -per_frame_6= -per_frame_7=mv_r = 0.5 + 0.4*sin(time*1.324); -per_frame_8=mv_g = 0.5 + 0.4*cos(time*1.371); -per_frame_9= -per_frame_10= -per_frame_11= -per_frame_12=musictime=musictime+vol; -per_frame_13= -per_frame_14=//q4=0; -per_frame_15=q5=0; -per_frame_16=q4=sin(musictime*0.02)*0.4; -per_frame_17=q5=sin(musictime*0.01)*0.3; -per_frame_18= -per_frame_19=dx=sin(musictime*0.1)*0.07; -per_frame_20=dy=cos(musictime*0.069)*0.07; -per_frame_21= -per_frame_22= -per_frame_23= -per_frame_24= -per_frame_25=monitor=rot; -per_pixel_1=rd=sqrt( sqr( (x-0.5-q4)*1.7) + sqr( (y-0.5+q5)*1.2 ) )+0.001; -per_pixel_2= -per_pixel_3=cx=0.5+q4; -per_pixel_4=cy=0.5-q5; -per_pixel_5= -per_pixel_6=zoom=pow(rd,sin(time)+3.5)/10.5 + .5; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S. - skylight a3 [trip colors flux2]_phat_Multi_shaped2_zoe_colours5.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S. - skylight a3 [trip colors flux2]_phat_Multi_shaped2_zoe_colours5.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Eo.S. - skylight a3 [trip colors flux2]_phat_Multi_shaped2_zoe_colours5.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Eo.S. - skylight a3 [trip colors flux2]_phat_Multi_shaped2_zoe_colours5.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,276 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.500000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.019788 -fWaveScale=0.011726 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.010284 -fWarpScale=0.010000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999957 -sy=0.999997 -wave_r=0.500000 -wave_g=0.400000 -wave_b=0.300000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.600000 -ob_g=0.500000 -ob_b=0.800000 -ob_a=0.000000 -ib_size=0.015000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.020000 -mv_dy=-0.020000 -mv_l=1.000000 -mv_r=0.490000 -mv_g=0.480000 -mv_b=0.300001 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=5 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.670888 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=6.283185 -shapecode_0_tex_zoom=0.429222 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=flux=q5*9; -shape_0_per_frame2=fluxs=max(flux,0); -shape_0_per_frame3=fluxs=min(fluxs,1); -shape_0_per_frame4=bs=q1*above(q1,0.8) + (q1*0.2 * below(q1,0.8)); -shape_0_per_frame5=advflux=(bs*fluxs) + (-bs * (1-fluxs)); -shape_0_per_frame6=adv=adv+advflux; -shape_0_per_frame7=advs=adv/256; -shape_0_per_frame8= -shape_0_per_frame9= -shape_0_per_frame10=ang=advs; -shape_0_per_frame11=rad=1.471 + sin(advs*16)*0.4; -shape_0_per_frame12=a2=1-(sin(time)*0.4); -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.350000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.816695 -shapecode_1_r=0.400000 -shapecode_1_g=0.400000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.100000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=y=0.1 + q2*0.4; -shape_1_per_frame2=rad=q2/2; -shape_1_per_frame3=ang=-q2*2; -shape_1_per_frame4= -shape_1_per_frame5=r=0.90 + (sin(time/2))*0.50; -shape_1_per_frame6=g=0.90 + (sin(time/2 + 2)) * 0.50; -shape_1_per_frame7=b=0.90 + (sin(time/2 + 4)) * 0.50; -shape_1_per_frame8= -shape_1_per_frame9= -shape_1_per_frame10=r2=0.70 + (sin(time/2))*0.50; -shape_1_per_frame11=g2=0.70 + (sin(time/2 + 2)) * 0.50; -shape_1_per_frame12=b2=0.70 + (sin(time/2 + 4)) * 0.50 -shape_1_per_frame13= -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.089251 -shapecode_2_ang=2.890265 -shapecode_2_tex_ang=2.890265 -shapecode_2_tex_zoom=0.483654 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=flux=q5*9; -shape_2_per_frame2=fluxs=max(flux,0); -shape_2_per_frame3=fluxs=min(fluxs,1); -shape_2_per_frame4=bs=q1*above(q1,0.8) + (q1*0.5 * below(q1,0.8)); -shape_2_per_frame5=advflux=(bs*fluxs) + (-bs * (1-fluxs)); -shape_2_per_frame6=adv=adv+advflux; -shape_2_per_frame7=advs=adv/178; -shape_2_per_frame8= -shape_2_per_frame9=//ang=sin(time/6)*6.4; -shape_2_per_frame10=ang=advs; -shape_2_per_frame11=rad=1.671 + sin(advs*16)*0.4; -shapecode_3_enabled=1 -shapecode_3_sides=3 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.840000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=0.980000 -shapecode_3_g=1.000000 -shapecode_3_b=0.980000 -shapecode_3_a=0.800000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.090000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x=sin(time/2)*0.4 + 0.5; -shape_3_per_frame2=y=sin(time)*0.4+0.5; -shape_3_per_frame3=rad=(q2*q2)/2;; -shape_3_per_frame4=ang=q2*2; -shape_3_per_frame5= -shape_3_per_frame6=r=0.70 + (sin(time/2))*0.50; -shape_3_per_frame7=g=0.70 + (sin(time/2 + 2)) * 0.50; -shape_3_per_frame8=b=0.70 + (sin(time/2 + 4)) * 0.50 -per_frame_init_1=mv_x=64;mv_y=48; -per_frame_init_2=nut=0; -per_frame_init_3=stp=0;stq=0; -per_frame_init_4=rtp=0;rtq=0; -per_frame_init_5=wvr=0; -per_frame_init_6=decay=0; -per_frame_init_7=dcsp=0; -per_frame_init_8=q1=0;q2=0;q3=0 -per_frame_1=decay=.96; -per_frame_2=zoom=1.000; -per_frame_3=speed=0.80; -per_frame_4=speedinv=1-speed; -per_frame_5=q1=(qa*speed + bass*speedinv); -per_frame_6=q2=(qb*speed + mid *speedinv); -per_frame_7=q3=(qc*speed + (treb*0.8)*speedinv); -per_frame_8=qa=q1; -per_frame_9=qb=q2; -per_frame_10=qc=q3; -per_frame_11=flux=sin(time/2); -per_frame_12=q4=flux * 0.5 + 0.5; -per_frame_13=q5=flux; -per_frame_14=ib_r=sin(time/2)*0.5 + 0.5; -per_frame_15=ib_g=sin(time/2 + 2)* 0.5 + 0.5; -per_frame_16=ib_b=sin(time/2 + 4)* 0.5 + 0.5; -per_frame_17=ib_size=sin(time/3)*0.05; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/EvilJim - Follow the ball.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/EvilJim - Follow the ball.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/EvilJim - Follow the ball.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/EvilJim - Follow the ball.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.999608 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.250302 -fWaveSmoothing=0.000000 -fWaveParam=-0.250000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=0.990097 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r=bass*2; -per_frame_2=wave_g=mid*4; -per_frame_3=wave_b=treb*0.6; -per_pixel_1=dx=if(above(x,bass*0.6),0.02,-0.02); -per_pixel_2=dy=if(above(y,treb_att*0.5),0.02,-0.02); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/EvilJim - Ice Drops.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/EvilJim - Ice Drops.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/EvilJim - Ice Drops.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/EvilJim - Ice Drops.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=0.999601 -fVideoEchoAlpha=0.499900 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=1 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.199862 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=2.000000 -fModWaveAlphaEnd=2.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000353 -fZoomExponent=1.000157 -fShader=0.000000 -zoom=0.999511 -rot=0.000000 -cx=0.500001 -cy=0.050000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000158 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.999000 -wave_y=0.000000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=warp=0; -per_frame_2=wave_r=treb; -per_frame_3=wave_g=mid; -per_frame_4=wave_b=bass; -per_frame_5=dy=bass/50; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - brainstem activation.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - brainstem activation.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - brainstem activation.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - brainstem activation.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,393 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.140000 -fDecay=0.980000 -fVideoEchoZoom=1.001827 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=1.285751 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=5.582132 -fWarpScale=2.188900 -fZoomExponent=1.001827 -fShader=1.000000 -zoom=1.009509 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999900 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.020000 -ob_r=0.900000 -ob_g=0.700000 -ob_b=0.100000 -ob_a=0.300000 -ib_size=0.010000 -ib_r=0.700000 -ib_g=0.450000 -ib_b=0.050000 -ib_a=0.300000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.030000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=1 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=1 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=0.400000 -wavecode_0_g=1.000000 -wavecode_0_b=0.300000 -wavecode_0_a=1.000000 -wave_0_per_point1=//left and right angles -wave_0_per_point2=la=.25+(treb_att*.09)+(.2*sin(time)); -wave_0_per_point3=ra=-.25-(treb*.09)+(.2*cos(time)); -wave_0_per_point4= -wave_0_per_point5=//left or right? -wave_0_per_point6=branch=rand(2); -wave_0_per_point7= -wave_0_per_point8=//base -wave_0_per_point9=wx=if(equal(sc,0),.5,wx); -wave_0_per_point10=wy=if(equal(sc,0),.1,wy); -wave_0_per_point11= -wave_0_per_point12=wx=if(equal(sc,1),.5,wx); -wave_0_per_point13=wy=if(equal(sc,1),.4,wy); -wave_0_per_point14= -wave_0_per_point15=//calculate previous branch length -wave_0_per_point16=d=if(below(sc,2),.3,.7*d+(bass_att*.003)); -wave_0_per_point17= -wave_0_per_point18=//angle -wave_0_per_point19=wainc=if(equal(branch,1),la,ra); -wave_0_per_point20= -wave_0_per_point21=wa=if(below(sc,2),3.1415927*.5,wa+wainc); -wave_0_per_point22= -wave_0_per_point23=//branches -wave_0_per_point24=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_0_per_point25=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_0_per_point26= -wave_0_per_point27=//sample count -wave_0_per_point28=sc=if(equal(sc,10),0,sc+1); //depth setting -wave_0_per_point29= -wave_0_per_point30=a=if(below(sc,2),0,.1); -wave_0_per_point31= -wave_0_per_point32=x=wx; -wave_0_per_point33=y=wy; -wave_0_per_point34= -wave_0_per_point35=r=treb_att*.65; -wave_0_per_point36=g=mid_att*.65; -wave_0_per_point37=b=abs(sin(time*.6)); -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=1 -wavecode_1_scaling=0.999998 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=0.020000 -wave_1_per_point1=//left and right angles -wave_1_per_point2=la=.15+(treb_att*.09)+(.2*sin(time)); -wave_1_per_point3=ra=-.15-(treb*.09)+(.2*cos(time)); -wave_1_per_point4= -wave_1_per_point5=//left or right? -wave_1_per_point6=branch=rand(2); -wave_1_per_point7= -wave_1_per_point8=//base -wave_1_per_point9=wx=if(equal(sc,0),.5,wx); -wave_1_per_point10=wy=if(equal(sc,0),.35,wy); -wave_1_per_point11= -wave_1_per_point12=wx=if(equal(sc,1),.5,wx); -wave_1_per_point13=wy=if(equal(sc,1),.4,wy); -wave_1_per_point14= -wave_1_per_point15=//calculate previous branch length -wave_1_per_point16=d=if(below(sc,2),.3,.7*d+(treb_att*.003)); -wave_1_per_point17= -wave_1_per_point18=//angle -wave_1_per_point19=wainc=if(equal(branch,1),la,ra); -wave_1_per_point20= -wave_1_per_point21=wa=if(below(sc,2),3.1415927*.5,wa+wainc); -wave_1_per_point22= -wave_1_per_point23=//branches -wave_1_per_point24=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_1_per_point25=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_1_per_point26= -wave_1_per_point27=//sample count -wave_1_per_point28=sc=if(equal(sc,10),0,sc+1); //depth setting -wave_1_per_point29= -wave_1_per_point30=a=if(below(sc,2),0,.04); -wave_1_per_point31= -wave_1_per_point32=x=wx; -wave_1_per_point33=y=wy; -wave_1_per_point34= -wave_1_per_point35=r=sin(time); -wave_1_per_point36=g=sin(time+.23); -wave_1_per_point37=b=sin(time*.6); -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=1 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=0.000000 -wave_2_per_point1=//left and right angles -wave_2_per_point2=la=.2+(treb_att*.09)+(.2*sin(time)); -wave_2_per_point3=ra=-.2-(treb*.09)+(.2*cos(time)); -wave_2_per_point4= -wave_2_per_point5=//left or right? -wave_2_per_point6=branch=rand(2); -wave_2_per_point7= -wave_2_per_point8=//base -wave_2_per_point9=wx=if(equal(sc,0),.5,wx); -wave_2_per_point10=wy=if(equal(sc,0),.1,wy); -wave_2_per_point11= -wave_2_per_point12=wx=if(equal(sc,1),.5,wx); -wave_2_per_point13=wy=if(equal(sc,1),.4,wy); -wave_2_per_point14= -wave_2_per_point15=//calculate previous branch length -wave_2_per_point16=d=if(below(sc,2),.3,.7*d); -wave_2_per_point17= -wave_2_per_point18=//angle -wave_2_per_point19=wainc=if(equal(branch,1),la,ra); -wave_2_per_point20= -wave_2_per_point21=wa=if(below(sc,2),3.1415927*.5,wa+wainc); -wave_2_per_point22= -wave_2_per_point23=//branches -wave_2_per_point24=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_2_per_point25=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_2_per_point26= -wave_2_per_point27=//sample count -wave_2_per_point28=sc=if(equal(sc,10),0,sc+1); //depth setting -wave_2_per_point29= -wave_2_per_point30=a=if(below(sc,2),0,.1); -wave_2_per_point31= -wave_2_per_point32=x=wx; -wave_2_per_point33=y=wy; -wavecode_3_enabled=1 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=1 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=0.700000 -wavecode_3_g=0.700000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_point1=//left and right angles -wave_3_per_point2=la=.5+(treb_att*.09)+(.2*sin(time)); -wave_3_per_point3=ra=-.5-(treb*.09)+(.2*cos(time)); -wave_3_per_point4= -wave_3_per_point5=//left or right? -wave_3_per_point6=branch=rand(2); -wave_3_per_point7= -wave_3_per_point8=//base -wave_3_per_point9=wx=if(equal(sc,0),.5,wx); -wave_3_per_point10=wy=if(equal(sc,0),.1,wy); -wave_3_per_point11= -wave_3_per_point12=wx=if(equal(sc,1),.5,wx); -wave_3_per_point13=wy=if(equal(sc,1),.45,wy); -wave_3_per_point14= -wave_3_per_point15=//calculate previous branch length -wave_3_per_point16=d=if(below(sc,2),.3,.4*d+(treb_att*.003)); -wave_3_per_point17= -wave_3_per_point18=//angle -wave_3_per_point19=wainc=if(equal(branch,1),la,ra); -wave_3_per_point20= -wave_3_per_point21=wa=if(below(sc,2),3.1415927*-.5,wa+wainc); -wave_3_per_point22= -wave_3_per_point23=//branches -wave_3_per_point24=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_3_per_point25=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_3_per_point26= -wave_3_per_point27=//sample count -wave_3_per_point28=sc=if(equal(sc,10),0,sc+1); //depth setting -wave_3_per_point29= -wave_3_per_point30=a=if(below(sc,2),0,.02); -wave_3_per_point31= -wave_3_per_point32=x=wx; -wave_3_per_point33=y=wy; -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.506271 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.513405 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=0.800000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang=time; -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.650000 -shapecode_1_rad=0.320330 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=2.006753 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=x=(sin(time)*.05)+.5; -shape_1_per_frame2= -shape_1_per_frame3=ang=time*.25; -shape_1_per_frame4=rad=rad+(treb_att*treb_att*.1); -shape_1_per_frame5= -shape_1_per_frame6=r=sin(time*.1); -shape_1_per_frame7=g=sin(time*.25); -shape_1_per_frame8=b=sin(time*.75); -shape_1_per_frame9= -shape_1_per_frame10=r2=bass_att*.65; -shape_1_per_frame11=g2=mid_att*.65; -shape_1_per_frame12=b2=treb_att*.65; -shapecode_2_enabled=1 -shapecode_2_sides=3 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.320000 -shapecode_2_y=0.340000 -shapecode_2_rad=0.364567 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.608034 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=ang=time; -shape_2_per_frame2= -shape_2_per_frame3=rad=rad+(bass*bass*.1); -shape_2_per_frame4= -shape_2_per_frame5=r=sin(time*.2); -shape_2_per_frame6=g=sin(time*.5); -shape_2_per_frame7=b=sin(time*1.25); -shape_2_per_frame8= -shape_2_per_frame9=r2=bass_att*.65; -shape_2_per_frame10=g2=mid_att*.65; -shape_2_per_frame11=b2=treb_att*.65; -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.700000 -shapecode_3_rad=0.501256 -shapecode_3_ang=0.188496 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.999998 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=0.400000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -per_frame_1=ob_r=abs(sin(time)); -per_frame_2=ob_g=abs(sin(time*.05)); -per_pixel_1=//rotation -per_pixel_2=rb=(above(treb,.7)*rad*sin(time*3)*3); -per_pixel_3=ra=if(above(rb,0),1,ra-.05); -per_pixel_4= -per_pixel_5=ra=if(above(ra,1),1,ra); -per_pixel_6=ra=if(below(ra,0),0,ra); -per_pixel_7= -per_pixel_8=rot=rot+(rb*ra*ra*.1); -per_pixel_9= -per_pixel_10=//zoom -per_pixel_11=zb=(above(bass,.7)*rad*sin(time*2)*2); -per_pixel_12=za=if(above(zb,0),1,za-.05); -per_pixel_13= -per_pixel_14=za=if(above(za,1),1,za); -per_pixel_15=za=if(below(za,0),0,za); -per_pixel_16= -per_pixel_17=zoom=zoom+(zb*za*za*.1); -per_pixel_18= -per_pixel_19=dx=dx+(zb*za*za*(1-rad)*.23*above(ra,0)); -per_pixel_20=dy=dy+(y*sin(time)*.01*ang); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - crazy diamond.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - crazy diamond.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - crazy diamond.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - crazy diamond.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,267 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.210000 -fDecay=0.945000 -fVideoEchoZoom=0.996628 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.204473 -fWaveScale=0.430332 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.110000 -fModWaveAlphaEnd=1.500000 -fWarpAnimSpeed=0.010000 -fWarpScale=1.331000 -fZoomExponent=2.063786 -fShader=1.000000 -zoom=1.374256 -rot=0.580000 -cx=0.500000 -cy=0.500000 -dx=-0.000000 -dy=0.099900 -warp=1.599100 -sx=1.220000 -sy=0.999900 -wave_r=0.750000 -wave_g=0.750000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.800000 -ib_size=0.210000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.400006 -mv_dx=0.020000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.800000 -mv_g=0.800000 -mv_b=1.000000 -mv_a=0.100000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=1 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=1 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=1 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=branch=rand(2); -wave_1_per_point2= -wave_1_per_point3=//base -wave_1_per_point4=wx=if(equal(sc,0),.5,wx); -wave_1_per_point5=wy=if(equal(sc,0),.1,wy); -wave_1_per_point6= -wave_1_per_point7=wx=if(equal(sc,1),.5,wx); -wave_1_per_point8=wy=if(equal(sc,1),.4,wy); -wave_1_per_point9= -wave_1_per_point10=//calculate previous branch length -wave_1_per_point11=d=if(below(sc,2),.3,.7*d); -wave_1_per_point12= -wave_1_per_point13=//angle -wave_1_per_point14=wainc=if(equal(branch,1),.2,-.2); -wave_1_per_point15= -wave_1_per_point16=wa=if(below(sc,2),3.1415927*.5,wa+wainc); -wave_1_per_point17= -wave_1_per_point18=//branches -wave_1_per_point19=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_1_per_point20=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_1_per_point21= -wave_1_per_point22=//sample count -wave_1_per_point23=sc=if(equal(sc,11),0,sc+1); -wave_1_per_point24= -wave_1_per_point25=a=if(below(sc,2),0,.1); -wave_1_per_point26= -wave_1_per_point27=x=wx; -wave_1_per_point28=y=wy; -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.542788 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.311603 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang=time; -shape_0_per_frame2= -shape_0_per_frame3=r2=abs(sin(time)); -shape_0_per_frame4=g2=abs(cos(time)); -shape_0_per_frame5=b2=treb_att*.65; -shape_0_per_frame6= -shape_0_per_frame7=rad=rad+(bass_att*.1); -shapecode_1_enabled=1 -shapecode_1_sides=6 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.197883 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.691360 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=r=abs(sin(time*.1)); -shape_1_per_frame2=g=abs(sin(time*.25)); -shape_1_per_frame3= -shape_1_per_frame4=b2=abs(sin(time*.3)); -shape_1_per_frame5= -shape_1_per_frame6=x=(sin(time+.23)*.5)+.5; -shape_1_per_frame7=y=(cos(time*.21)*.5)+.5; -shape_1_per_frame8=ang=time; -shapecode_2_enabled=1 -shapecode_2_sides=3 -shapecode_2_additive=1 -shapecode_2_thickOutline=1 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.270481 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.200000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.100000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=ang=time; -shape_2_per_frame2=rad=abs(sin(time*.25)); -shape_2_per_frame3= -shape_2_per_frame4=tex_zoom=bass*treb_att; -shapecode_3_enabled=1 -shapecode_3_sides=6 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.120321 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -shape_3_per_frame1=ang=time; -shape_3_per_frame2=rad=rad+(treb*.01); -per_frame_1=sx=sx+bass_att*.04; -per_frame_2=sy=sy+treb_att*.04; -per_frame_3= -per_frame_4=cx=.5+(sin(time)*.2); -per_frame_5=cy=.5+(sin(time*.3)*.1); -per_frame_6= -per_frame_7=rot=rot+(treb*bass*.01); -per_frame_8= -per_frame_9=warp=warp+if(above(bass,1.4),bass*8*sin(time*.2),bass); -per_pixel_1=rot=rot+(1-rad)*sin(time)*.5; -per_pixel_2= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - cthulhus asshole (bad breakfast remix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - cthulhus asshole (bad breakfast remix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - cthulhus asshole (bad breakfast remix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - cthulhus asshole (bad breakfast remix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.210000 -fDecay=0.955000 -fVideoEchoZoom=0.996628 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=1.285751 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.691361 -fWarpScale=58.384487 -fZoomExponent=10.591505 -fShader=1.000000 -zoom=0.979819 -rot=1.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.100000 -warp=34.955837 -sx=1.220179 -sy=0.999988 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.300000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.200000 -nMotionVectorsX=21.473322 -nMotionVectorsY=15.907337 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=1 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=1 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.542788 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.311603 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=0.600000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang=time; -shape_0_per_frame2= -shape_0_per_frame3=r2=abs(sin(time)); -shape_0_per_frame4=g2=abs(cos(time*.33)); -shape_0_per_frame5=b2=treb_att*.65; -shape_0_per_frame6= -shape_0_per_frame7=rad=rad+(bass_att*.1); -shape_0_per_frame8= -shape_0_per_frame9=sides=3+int(treb_att*3); -shape_0_per_frame10=tex_zoom=tex_zoom+(sin(time)*treb*above(treb,1)); -shapecode_1_enabled=0 -shapecode_1_sides=5 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.808142 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.905271 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=r=abs(sin(time*.1)); -shape_1_per_frame2=g=abs(sin(time*.25)); -shape_1_per_frame3= -shape_1_per_frame4=b2=abs(sin(time*.3)); -shape_1_per_frame5= -shape_1_per_frame6=ang=time; -shape_1_per_frame7=x=rand(100)*.01; -shape_1_per_frame8=y=rand(100)*.01; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=cx=.5+(sin(time)*.2); -per_frame_2=cy=.5+(sin(time*.3)*.2); -per_frame_3= -per_frame_4=ob_b=abs(sin(time*.2)); -per_frame_5=ob_r=abs(sin(time*.1)); -per_frame_6= -per_frame_7=ib_g=abs(sin(time*.05)); -per_frame_8= -per_frame_9=rot=sin(time*.05); -per_pixel_1=rot=rot+(1-rad)*sin(time)*.5; -per_pixel_2= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - cthulhus asshole.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - cthulhus asshole.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - cthulhus asshole.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - cthulhus asshole.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,285 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.210000 -fDecay=0.945000 -fVideoEchoZoom=1.100897 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=1.285751 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=10.141068 -fShader=1.000000 -zoom=0.979819 -rot=1.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.100000 -warp=1.599181 -sx=1.220179 -sy=0.999991 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.100000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.210000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=21.473322 -nMotionVectorsY=15.907337 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=1 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=branch=rand(2); -wave_0_per_point2= -wave_0_per_point3=//base -wave_0_per_point4=wx=if(equal(sc,0),.5,wx); -wave_0_per_point5=wy=if(equal(sc,0),.1,wy); -wave_0_per_point6= -wave_0_per_point7=wx=if(equal(sc,1),.5,wx); -wave_0_per_point8=wy=if(equal(sc,1),.4,wy); -wave_0_per_point9= -wave_0_per_point10=//calculate previous branch length -wave_0_per_point11=d=if(below(sc,2),.3,.7*d); -wave_0_per_point12= -wave_0_per_point13=//angle -wave_0_per_point14=wainc=if(equal(branch,1),.2+(tren*.1),-.2-(treb*.1)); -wave_0_per_point15= -wave_0_per_point16=wa=if(below(sc,2),3.1415927*.5,wa+wainc); -wave_0_per_point17= -wave_0_per_point18=//branches -wave_0_per_point19=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_0_per_point20=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_0_per_point21= -wave_0_per_point22=//sample count -wave_0_per_point23=sc=if(equal(sc,11),0,sc+1); -wave_0_per_point24= -wave_0_per_point25=a=if(below(sc,2),0,.1); -wave_0_per_point26= -wave_0_per_point27=r=abs(sin(time*.5)); -wave_0_per_point28=g=abs(sin(time*.25)); -wave_0_per_point29=b=treb_att*.65; -wave_0_per_point30= -wave_0_per_point31=x=wx; -wave_0_per_point32=y=wy; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=1 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=branch=rand(2); -wave_1_per_point2= -wave_1_per_point3=//base -wave_1_per_point4=wx=if(equal(sc,0),.5,wx); -wave_1_per_point5=wy=if(equal(sc,0),.1,wy); -wave_1_per_point6= -wave_1_per_point7=wx=if(equal(sc,1),.5,wx); -wave_1_per_point8=wy=if(equal(sc,1),.4,wy); -wave_1_per_point9= -wave_1_per_point10=//calculate previous branch length -wave_1_per_point11=d=if(below(sc,2),.3,.7*d); -wave_1_per_point12= -wave_1_per_point13=//angle -wave_1_per_point14=wainc=if(equal(branch,1),.2,-.2); -wave_1_per_point15= -wave_1_per_point16=wa=if(below(sc,2),3.1415927*.5,wa+wainc); -wave_1_per_point17= -wave_1_per_point18=//branches -wave_1_per_point19=wx=if(above(sc,2),wx+cos(wa)*d,wx); -wave_1_per_point20=wy=if(above(sc,2),wy+sin(wa)*d,wy); -wave_1_per_point21= -wave_1_per_point22=//sample count -wave_1_per_point23=sc=if(equal(sc,11),0,sc+1); -wave_1_per_point24= -wave_1_per_point25=a=if(below(sc,2),0,.1); -wave_1_per_point26= -wave_1_per_point27=x=wx; -wave_1_per_point28=y=wy; -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.542788 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.311603 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang=time; -shape_0_per_frame2= -shape_0_per_frame3=r2=abs(sin(time)); -shape_0_per_frame4=g2=abs(cos(time)); -shape_0_per_frame5=b2=treb_att*.65; -shape_0_per_frame6= -shape_0_per_frame7=rad=rad+(bass_att*.1); -shapecode_1_enabled=0 -shapecode_1_sides=100 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.621745 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=0.248315 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.050000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shape_1_per_frame1=r=abs(sin(time*.1)); -shape_1_per_frame2=g=abs(sin(time*.25)); -shape_1_per_frame3= -shape_1_per_frame4=b2=abs(sin(time*.3)); -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=sx=sx+bass_att*.04; -per_frame_2=sy=sy+treb_att*.04; -per_frame_3= -per_frame_4=cx=.5+(sin(time)*.2); -per_frame_5=cy=.5+(sin(time*.3)*.1); -per_pixel_1=rot=rot+(1-rad)*sin(time)*.5; -per_pixel_2= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - plasma temptation.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - plasma temptation.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - plasma temptation.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - plasma temptation.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.950000 -fVideoEchoZoom=1.447720 -fVideoEchoAlpha=0.800000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=2.000000 -fModWaveAlphaEnd=2.000000 -fWarpAnimSpeed=3.300369 -fWarpScale=2.670993 -fZoomExponent=100.000000 -fShader=1.000000 -zoom=0.819143 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=36.971127 -sx=3.544923 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=20.160004 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.400000 -mv_r=1.000000 -mv_g=0.400000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=1 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=x=rand(1); -wave_0_per_point2=y=rand(1); -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.900000 -shapecode_0_g=0.700000 -shapecode_0_b=0.900000 -shapecode_0_a=0.700000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=(sin(time)+1)*.5; -shape_0_per_frame2=y=(bass_att*.5)+(sin(time*.5)*.2); -shape_0_per_frame3= -shape_0_per_frame4=ang=time; -shape_0_per_frame5=rad=bass*.5; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.808139 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.220183 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.500000 -shapecode_1_r2=0.900000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.800000 -shapecode_1_a2=0.500000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.731599 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=5.026548 -shapecode_2_tex_zoom=0.248318 -shapecode_2_r=0.800000 -shapecode_2_g=0.300000 -shapecode_2_b=0.800000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.100000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=rad=bass*.9; -shape_2_per_frame2=ang=time; -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.200000 -shapecode_3_b=0.300000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.100000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x=(cos((time+.233)*.2)+1)*.5; -shape_3_per_frame2=y=(sin(time*.1)+1)*.5+(sin(time*.13)*.5); -shape_3_per_frame3= -shape_3_per_frame4=rad=treb*.2; -per_pixel_1=direc=if(above(treb,1.3),direc*-1,direc); -per_pixel_2= -per_pixel_3=zoom=zoom+sin(x*treb*mid*.1)*direc*-1; -per_pixel_4=rot=rot+(cos(y*bass)*x)*direc; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - quark matrix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - quark matrix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/fiShbRaiN - quark matrix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/fiShbRaiN - quark matrix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,270 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.500000 -fVideoEchoZoom=0.996630 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.644006 -fWaveScale=0.389575 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.900000 -fWarpAnimSpeed=1.000000 -fWarpScale=5.053414 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=0.999514 -rot=-0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=-0.000000 -warp=11.202050 -sx=100.000000 -sy=0.972365 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=6.399996 -nMotionVectorsY=14.400005 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=1.000000 -mv_g=0.100000 -mv_b=0.300000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=ma=ma+(above(bass,1)*3.1415*.01*bass); -wave_0_per_point2=ma=ma-(above(treb,1)*3.1415*.01*treb); -wave_0_per_point3=ma=ma-.002; -wave_0_per_point4= -wave_0_per_point5=mx=mx+(.0002*tan(ma)); -wave_0_per_point6=my=my+(.0002*sin(ma)); -wave_0_per_point7= -wave_0_per_point8=mx=if(above(mx,.9),(.9-mx),mx); -wave_0_per_point9=my=if(above(my,.9),(.9-my),my); -wave_0_per_point10=mx=if(below(mx,.1),(.9+mx),mx); -wave_0_per_point11=my=if(below(my,.1),(.9+my),my); -wave_0_per_point12= -wave_0_per_point13=x=mx; -wave_0_per_point14=y=my; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=ma=ma+(above(bass,1)*3.1415*.05*bass); -wave_1_per_point2=ma=ma-(above(mid,1)*3.1415*.05*mid); -wave_1_per_point3=ma=ma-.001; -wave_1_per_point4= -wave_1_per_point5=mx=mx+(.0001*cos(ma)); -wave_1_per_point6=my=my+(.0001*tan(ma)); -wave_1_per_point7= -wave_1_per_point8=mx=if(above(mx,.9),(.9-mx),mx); -wave_1_per_point9=my=if(above(my,.9),(.9-my),my); -wave_1_per_point10=mx=if(below(mx,.1),(.9+mx),mx); -wave_1_per_point11=my=if(below(my,.1),(.9+my),my); -wave_1_per_point12= -wave_1_per_point13=x=mx; -wave_1_per_point14=y=my; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=ma=ma+(above(mid,1)*3.1415*.01*mid); -wave_2_per_point2=ma=ma-(above(treb,1)*3.1415*.01*treb); -wave_2_per_point3=ma=ma+.001; -wave_2_per_point4= -wave_2_per_point5=mx=mx+(.0004*cos(ma)); -wave_2_per_point6=my=my+(.0004*tan(ma)); -wave_2_per_point7= -wave_2_per_point8=mx=if(above(mx,.9),(.9-mx),mx); -wave_2_per_point9=my=if(above(my,.9),(.9-my),my); -wave_2_per_point10=mx=if(below(mx,.1),(.9+mx),mx); -wave_2_per_point11=my=if(below(my,.1),(.9+my),my); -wave_2_per_point12= -wave_2_per_point13=x=mx; -wave_2_per_point14=y=my; -wavecode_3_enabled=1 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_point1=ma=ma+(above(bass,.5)*3.1415*.02*bass); -wave_3_per_point2=ma=ma-(above(treb,.5)*3.1415*.02*treb); -wave_3_per_point3=ma=ma+.001; -wave_3_per_point4= -wave_3_per_point5=mx=mx+(.0004*tan(ma)); -wave_3_per_point6=my=my+(.0004*sin(ma)); -wave_3_per_point7= -wave_3_per_point8=mx=if(above(mx,.9),(.9-mx),mx); -wave_3_per_point9=my=if(above(my,.9),(.9-my),my); -wave_3_per_point10=mx=if(below(mx,.1),(.9+mx),mx); -wave_3_per_point11=my=if(below(my,.1),(.9+my),my); -wave_3_per_point12= -wave_3_per_point13=x=mx; -wave_3_per_point14=y=my; -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.791418 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.628319 -shapecode_0_tex_zoom=0.369711 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=0.500000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=r=treb; -shape_0_per_frame2=tex_zoom=treb; -shape_0_per_frame3=tex_ang=bass*10; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=1.256637 -shapecode_1_tex_zoom=0.999996 -shapecode_1_r=0.300000 -shapecode_1_g=0.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=rad=mid; -shapecode_2_enabled=0 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.808142 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=1.256637 -shapecode_2_tex_zoom=1.220186 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.300000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.900000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=tex_zoom=1+(treb*.1); -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=echo_orient=(bass+treb+mid*10%4); -per_pixel_1=zoom=zoom+((rand(2)*rand(10)*rad*bass*.05)*rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - 0 To 60.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - 0 To 60.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - 0 To 60.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - 0 To 60.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=3.500000 -fGammaAdj=1.000000 -fDecay=0.970000 -fVideoEchoZoom=1.008000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.091679 -fWaveScale=0.721421 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.007348 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.115109 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000005 -dy=0.000000 -warp=0.010000 -sx=0.999998 -sy=1.000000 -wave_r=0.760000 -wave_g=0.480000 -wave_b=0.390000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=4.800000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=3.000000 -mv_r=0.669900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.000000 -per_frame_1=wave_b = rand(100)/100; -per_frame_2=wave_r = rand(100)/100; -per_frame_3=wave_g = rand(100)/100; -per_frame_4=wave_y = wave_y; -per_frame_5=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_7=vol =bass+treb+mid; -per_frame_8=dx = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_9=dy = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_10=dx_r = equal(bass_thresh,2)*0.016*sin(time*3) + (1-equal(bass_eff,2))*dx_r; -per_frame_11=dy_r = equal(bass_thresh,2)*0.012*sin(time*7) + (1-equal(bass_eff,2))*dy_r; -per_frame_12=rot = rot + 0.070*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_13=q1=sin(time*.7*.5)+(dx_r*dy_r)+(dx*dy); -per_frame_14=q2=sin(time*.7*.2)+(dx_r*dy_r); -per_frame_15=q3=0.1*(atan(abs(-rad+.5)))*q2; -per_pixel_1=zoom=zoom+.05*q3+.05*q1+bass_eff; -per_pixel_2=dx = .01*atan((rad)/.1*sin((dx_r*dy_r)*20+time*5)); -per_pixel_3=zoom = zoom + bass_eff + rad*.2*(q2)-vol; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - A Blur.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - A Blur.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - A Blur.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - A Blur.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.500000 -fGammaAdj=1.000000 -fDecay=0.985000 -fVideoEchoZoom=0.998100 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.597149 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999500 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000005 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=43.200001 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=4.500000 -mv_r=0.759900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.915*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.025*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.810*time) + 0.40*sin(0.950*time) ); -per_frame_4=wave_x = wave_x + 0.4*sin(1.85*time); -per_frame_5=wave_y = wave_y + 0.2*sin(1.85*time); -per_frame_6=dx = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_7=dy = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_8=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_9=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_10=decay = decay - 0.05*equal(frame%16,0); -per_frame_11=zoom = zoom + 0.05 * cos(ang-ang); -per_frame_12=rot = bass_eff/bass_thresh-0.05; -per_frame_13=monitor=zoom; -per_pixel_1=sx=sx+0.07*sin(rad*18 + time*9); -per_pixel_2=sy=sy+0.07*sin(rad*18 + time*9); -per_pixel_3= -per_pixel_4= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Lifesavor Anyone.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Lifesavor Anyone.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Lifesavor Anyone.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Lifesavor Anyone.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -[preset00] -fRating=2.500000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=1.008081 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.997766 -fWaveScale=0.653090 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=100.000000 -fShader=0.000000 -zoom=0.999500 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000005 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.350000 -wave_g=0.550000 -wave_b=0.450000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=1.000000 -ob_b=0.200000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=43.200001 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=2.500000 -mv_r=0.759900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.000000 -per_frame_1=wave_r = rand(100)/100; -per_frame_2=wave_g = rand(100)/100; -per_frame_3=wave_b = rand(100)/100; -per_pixel_1=zoom = pow(rad,0.05)+.05/bass; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - New meetings.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - New meetings.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - New meetings.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - New meetings.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -[preset00] -fRating=2.500000 -fGammaAdj=1.000000 -fDecay=0.985000 -fVideoEchoZoom=0.998100 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=4.050169 -fWaveScale=0.597149 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999500 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000005 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=43.200001 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.500001 -mv_r=0.759900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.915*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.025*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.810*time) + 0.40*sin(0.950*time) ); -per_frame_4=wave_y = wave_y + 0.2*sin(1.85*time); -per_frame_5=time = time/100; -per_frame_6=cx = cx + 0.225*( 0.60*sin(0.350*time) + 0.40*sin(0.350*time) ); -per_frame_7=cy = cy + 0.225*( 0.60*sin(0.350*time) + 0.40*sin(0.350*time) ); -per_frame_8=dx = 0.05 + 0.009*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_9=dy = 0.0005 + 0.009*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_10=xwave_x = wave_x + 0.250*( 0.60*sin(2.112*time) + 0.40*sin(1.589*time) ); -per_frame_11=xwave_y = wave_y + 0.250*( 0.60*sin(1.752*time) + 0.40*sin(2.298*time) ); -per_frame_12=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_13=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_14=decay = decay - 0.05*equal(frame%16,0); -per_frame_15=zoom = decay; -per_frame_16=rot = bass_eff/bass_thresh; -per_frame_17=ob_size = rot-bass; -per_frame_18=ib_a = 1-bass_eff; -per_frame_19=ib_r = 1-wave_r; -per_frame_20=ib_b = 1-wave_g; -per_frame_21=ib_g = 1-wave_b; -per_pixel_1=sx=sx+0.07*sin(rad*18 + time*9); -per_pixel_2=sy=sy+0.07*sin(rad*18 + time*9); -per_pixel_3=zoom=zoom + 0.005*tan(ang-ang); -per_pixel_4=ray = pow(rad,1.85)+.037; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Quicksand.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Quicksand.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Quicksand.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Quicksand.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -[preset00] -fRating=4.500000 -fGammaAdj=1.000000 -fDecay=0.992000 -fVideoEchoZoom=1.008000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.499226 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999500 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000005 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.760000 -wave_g=0.480000 -wave_b=0.390000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=1.000000 -ob_b=0.200000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.669900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.200000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.915*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.025*time) ); -per_frame_3=vol = (5*bass + 3*mid + 2*treb)/10; -per_frame_4=wave_x = wave_x + 0.03*vol*sin(0.727*time); -per_frame_5=wave_y = wave_y + 0.04*vol*sin(0.777*time); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_7=dx = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_8=dy = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_9=monitor = time; -per_pixel_1=cx = (0.25&(x*5-0.5))*0.1+0.025; -per_pixel_2=cy = (0.25&(y*5-0.5))*0.1+0.025; -per_pixel_3=sx = sx -.005-abs(x-1)*.01; -per_pixel_4=sy = sy -.005-abs(x-1)*.01; -per_pixel_5=zoom = pow(rad,0.05)+.050; -per_pixel_6=rot = 0.03*sin(0.84*time)-0.013*cos(0.784*time)+0.02*sin(1-rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - simple.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - simple.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - simple.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - simple.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.999000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.796630 -fWaveScale=0.543759 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.020000 -cy=0.020001 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.100000 -wave_g=0.400000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.600000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=19.200027 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.040000 -per_frame_1=warp = 0; -per_frame_2=dx = dx - .0005; -per_frame_3=dy = dy - .0005; -per_frame_4=wave_r = abs(wave_r + 0.1*(sin(time*0.346) + sin(time*1.334))); -per_frame_5=wave_g = wave_g + 0.1*(sin(time*0.763) + sin(time*1.231)); -per_frame_6=wave_b = wave_b + 0.2*(sin(time*0.695) + sin(time*0.367)); -per_frame_7=decay=decay-0.01*(frame%1); -per_frame_8=wave_x = 0.5+0.1*sin(time+rand(100)/100); -per_frame_9=dx = dx + dx_residual; -per_frame_10=dy = dy + dy_residual; -per_frame_11=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_12=dx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_13=dy_residual = equal(bass_thresh,2)*0.012*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; -per_frame_14=mv_r=wave_g+bass; -per_frame_15=mv_g=wave_r+treb; -per_pixel_1=dx = .01*atan((rad)/.1*sin((x*dy)*20+time*5)); -per_pixel_2=zoom = zoom + rad*.08; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Stand Still!.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Stand Still!.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Stand Still!.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Stand Still!.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.500000 -fGammaAdj=2.200000 -fDecay=0.980000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.610095 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.000000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.000000 -cy=0.000000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.400000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=8.319999 -nMotionVectorsY=2.400000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=2.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = rand(100)/100; -per_frame_2=wave_g = rand(100)/100; -per_frame_3=wave_b = rand(100)/100; -per_frame_4=wave_x = wave_x + if(above(wave_y,.75), - 0.1*tan(time), + 0.1*tan(time))-.4+((cos(vol))/2)*myeff; -per_frame_5=wave_y = wave_y + if(below(wave_x,.75), -0.1*tan(time), +0.1*tan(time))-.4+((cos(vol))/2)*myeff; -per_frame_6=cx = cx + 0.410*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time)+vol ); -per_frame_7=cy = cy + 0.410*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time)+vol ); -per_frame_8=zoom = zoom + 0.020*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time)*vol ); -per_frame_9=rot = rot + 0.005*( 0.60*sin(0.281*time) + 0.40*sin(0.839*time)*vol ); -per_frame_10=vol = (bass_att+bass+mid+mid_att+treb+treb_att); -per_frame_11=myeff=(wave_x + if(above(wave_y,0.75), + 0.1*tan(time), + 0.1*tan(time))+.4+((cos(vol))/2) & wave_y + 0.40*sin(8*mid)+.25+(vol/10)); -per_frame_12=dx = dx + 0.085*pow(rad,y*2)*sin(time)/vol; -per_frame_13=dy = dy + 0.085*pow(rad,y*2)*cos(time)/vol; -per_frame_14=sx = sx + 0.0555*pow(rad,x*2)*sin(time)/vol; -per_frame_15=sy = sy + 0.0777*pow(rad,y*2)*sin(time); -per_frame_16=monitor = vol; -per_frame_17= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.995000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.241456 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.741921 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999900 -sy=0.999900 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.400000 -ob_a=0.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.300000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=6.400000 -nMotionVectorsY=1.440001 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.759900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.722)); -per_frame_3=wave_g = wave_g + 0.4*sin(time*1.931); -per_frame_4=vol=0.15*(bass_att+bass+mid+mid_att); -per_frame_5=dx_r=if(equal(q3,0),if(above(x,xpos),dx*q1-xpos,dx+q2-xpos),dx); -per_frame_6=dy_r=if(equal(q3,0),if(above(y,ypos),dy*q1-ypos,dy+q2-ypos),dy); -per_frame_7=rot = rot+0.05*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_8=mytime=.7; -per_frame_9=q1=sin(time*mytime*4); -per_frame_10=q2=cos(time*mytime*2); -per_frame_11=q3=abs(rad-.5)*(q2*q1); -per_frame_12=xpos=.5/vol; -per_frame_13=ypos=.5/vol; -per_frame_14=wave_x=.5+0.1*sin(time+rand(100)/100); -per_frame_15=wave_y=.5+0.1*cos(time+rand(100)/100); -per_frame_16=ib_r=q3+q2; -per_frame_17=ib_b=q2+q1; -per_frame_18=ib_g=q1+q3; -per_pixel_1=zoom = if(below(q1,0),0.5*x,if(equal(q2,0),0.9*(1-x),if(above(q3,0),0.9*y,0.9*(1-y)))) + 0.6 - 0.13*(min(q3,0.3)); -per_pixel_2= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Window Reflection 6.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Window Reflection 6.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Window Reflection 6.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Window Reflection 6.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.995000 -fVideoEchoZoom=0.199862 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.149765 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.010000 -fShader=0.000000 -zoom=0.999800 -rot=0.800000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999900 -sy=0.999800 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.300000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.722)); -per_frame_3=wave_g = wave_g + 0.4*sin(time*1.931); -per_frame_4=vol=0.15*(bass_att+bass+mid+mid_att); -per_frame_5=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_7=q1=bass_eff+sin(time*mytime*4); -per_frame_8=q2=bas_eff+cos(time*mytime*2); -per_frame_9=q3=bass_eff+abs(rad+.5)+(q2*q5); -per_frame_10=q4=bass_thresh+abs(.9*5)*(dx_r*dy_r)*(dx*dy); -per_frame_11=q5=bass_tresh+cos(.2*2)*(dx_r*dy_r); -per_frame_12=q6=bass_thresh+0.1*(atan(abs(-rad+.5)))*q1; -per_frame_13=q7=if(above(bass+bass_att,2),-1.5+bass+bass_att,0); -per_frame_14=q8=below(rad- 0.1*x,0.18); -per_frame_15=q9=if(above(rad,.5),.9+rad,.5+bass*3%1000*.1); -per_frame_16=dx=q8; -per_frame_17=zoom=q9+0.4; -per_frame_18=monitor=zoom; -per_pixel_1=rot=zoom; -per_frame_init_1=myzoom=if(below(q1,q6),0.3*dx,if(equal(q2,q5),0.2*(1-dx),if(above(q3,q4),0.3*dy,0.2*(1-dy)+if(equal(q4,q3),0.3* dx, if(above(q5,q2),0.25*(1-dx),if(below(q6,q1),0.3*dy,0.25*(1-dy)+if(equal(q7,q9),0.3*dx, if(below(q8,q7),0.2*(1-dx),if(equal(q9,q6),0.3*dy,0.2*(1-dy)))))))))) + .8 - 0.02*(min(q6+q1,.5))*bass_eff; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.241456 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.550300 -fShader=0.000000 -zoom=0.999899 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999900 -sy=0.999900 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.400000 -ob_a=0.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.300000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=3.200000 -nMotionVectorsY=2.400006 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.759900 -mv_g=0.480000 -mv_b=0.390000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.722)); -per_frame_3=wave_g = wave_g + 0.4*sin(time*1.931); -per_frame_4=vol=0.15*(bass_att+bass+mid+mid_att); -per_frame_5=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_7=dx = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_8=dy = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_9=dx_r=if(equal(q3,0),if(above(x,xpos),dx*q1-xpos,dx+q2-xpos),dx); -per_frame_10=dy_r=if(equal(q3,0),if(above(y,ypos),dy*q1-ypos,dy+q2-ypos),dy); -per_frame_11=rot = rot+0.15*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_12=mytime=.9; -per_frame_13=xpos=.5/vol; -per_frame_14=ypos=.5/vol; -per_frame_15=q1=sin(time*mytime*4); -per_frame_16=q2=cos(time*mytime*2); -per_frame_17=q3=abs(rad+.5)+(q2*q5); -per_frame_18=q4=abs(.9*5)*(dx_r*dy_r)*(dx*dy); -per_frame_19=q5=cos(.2*2)*(dx_r*dy_r); -per_frame_20=q6=0.1*(atan(abs(-rad+.5)))*q1; -per_frame_21=q7=q1+q2+q3+q4+q5+q6; -per_frame_22=wave_x=.5+0.1*sin(time+rand(100)/100); -per_frame_23=wave_y=.5+0.1*cos(time+rand(100)/100); -per_frame_24=ib_r=q3+q2; -per_frame_25=ib_b=q2+q1; -per_frame_26=ib_g=q1+q3; -per_frame_27=monitor=q3; -per_pixel_1=zoom= if(below(q1,q6),0.5*x,if(equal(q2,q5),0.9*(1-x),if(above(q3,q4),0.5*y,0.9*(1-y)+if(below(q4,q3),0.5* xpos, if(equal(q5,q2),0.9*(1-xpos),if(above(q6,q1),0.9*ypos,0.3*(1-ypos))))))) + .8 - 0.03*(min(q7+q1,1)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.995000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.499227 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.880200 -fShader=0.000000 -zoom=0.999800 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999900 -sy=0.999899 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.300000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=19.200027 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.722)); -per_frame_3=wave_g = wave_g + 0.4*sin(time*1.931); -per_frame_4=vol=0.15*(bass_att+bass+mid+mid_att); -per_frame_5=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_7=dx = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_8=dy = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_9=dx_r=if(equal(q3,0),if(above(x,xpos),dx*q1-xpos,dx+q2-xpos),dx); -per_frame_10=dy_r=if(equal(q3,0),if(above(y,ypos),dy*q1-ypos,dy+q2-ypos),dy); -per_frame_11=rot = rot+0.05*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_12=mytime=.9; -per_frame_13=xpos=.5/vol; -per_frame_14=ypos=.5/vol; -per_frame_15=q1=bass_eff+sin(time*mytime*4); -per_frame_16=q2=bas_eff+cos(time*mytime*2); -per_frame_17=q3=bass_eff+abs(rad+.5)+(q2*q5); -per_frame_18=q4=bass_thresh+abs(.9*5)*(dx_r*dy_r)*(dx*dy); -per_frame_19=q5=bass_tresh+cos(.2*2)*(dx_r*dy_r); -per_frame_20=q6=bass_thresh+0.1*(atan(abs(-rad+.5)))*q1; -per_frame_21=q7=if(above(bass+bass_att,2),-1.5+bass+bass_att,0); -per_frame_22=q8=below(rad- 0.1*x,0.18); -per_frame_23=q9=if(below(rad,.5),.9+rad,.5+bass*3%1000*.1); -per_frame_24=wave_y = wave_y + 0.2*sin(1.85*time); -per_frame_25=wave_x = wave_x + 0.5*sin(1.85*time); -per_frame_26=cx = cx - (cx+0.07*sin(rad*18 + time*9))+(zoom + 0.005*tan(ang-ang)); -per_frame_27=cy = cy - (cy+0.07*sin(rad*18 + time*9))+(zoom + 0.005*tan(ang-ang)); -per_frame_28=ib_r=q3+q2; -per_frame_29=ib_b=q2+q1; -per_frame_30=ib_g=q1+q3; -per_frame_31=ib_size=0.000; -per_frame_32=monitor=bass; -per_pixel_1=zoom= if(below(q1,q6),0.3*x,if(equal(q2,q5),0.2*(1-x),if(above(q3,q4),0.3*y,0.2*(1-y)+if(equal(q4,q3),0.3* xpos, if(above(q5,q2),0.25*(1-xpos),if(below(q6,q1),0.3*ypos,0.25*(1-ypos)+if(equal(q7,q9),0.3*x, if(below(q8,q7),0.2*(1-x),if(equal(q9,q6),0.3*y,0.2*(1-y)))))))))) + .8 - 0.02*(min(q6+q1,.5)); -per_pixel_2=dx = .01*atan((rad)/.1*sin((dx_r*dy_r)*20+time*5)); -per_pixel_3=sx=zoom; -per_pixel_4= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 3.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 3.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 3.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Fvese - Zoom Effects With A Twist 3.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.995000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.499227 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.880200 -fShader=0.000000 -zoom=0.999800 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999900 -sy=0.999899 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.300000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=19.200027 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.722)); -per_frame_3=wave_g = wave_g + 0.4*sin(time*1.931); -per_frame_4=vol=0.15*(bass_att+bass+mid+mid_att); -per_frame_5=bass_eff = max(max(bass,bass_att)-1,0); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_7=dx = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_8=dy = 0.005 + 0.002*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_9=dx_r=if(equal(q3,0),if(above(x,xpos),dx*q1-xpos,dx+q2-xpos),dx); -per_frame_10=dy_r=if(equal(q3,0),if(above(y,ypos),dy*q1-ypos,dy+q2-ypos),dy); -per_frame_11=rot = rot+0.05*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_12=mytime=.9; -per_frame_13=xpos=.5/vol; -per_frame_14=ypos=.5/vol; -per_frame_15=q1=bass_eff+sin(time*mytime*4); -per_frame_16=q2=bas_eff+cos(time*mytime*2); -per_frame_17=q3=bass_eff+abs(rad+.5)+(q2*q5); -per_frame_18=q4=bass_thresh+abs(.9*5)*(dx_r*dy_r)*(dx*dy); -per_frame_19=q5=bass_tresh+cos(.2*2)*(dx_r*dy_r); -per_frame_20=q6=bass_thresh+0.1*(atan(abs(-rad+.5)))*q1; -per_frame_21=q7=if(above(bass+bass_att,2),-1.5+bass+bass_att,0); -per_frame_22=q8=below(rad- 0.1*x,0.18); -per_frame_23=q9=if(below(rad,.5),.9+rad,.5+bass*3%1000*.1); -per_frame_24=wave_y = wave_y + 0.2*sin(1.85*time); -per_frame_25=wave_x = wave_x + 0.5*sin(1.85*time); -per_frame_26=cx = cx - (cx+0.07*sin(rad*18 + time*9))+(zoom + 0.005*tan(ang-ang)); -per_frame_27=cy = cy - (cy+0.07*sin(rad*18 + time*9))+(zoom + 0.005*tan(ang-ang)); -per_frame_28=ib_r=q3+q2; -per_frame_29=ib_b=q2+q1; -per_frame_30=ib_g=q1+q3; -per_frame_31=ib_size=0.000; -per_frame_32=monitor=bass; -per_pixel_1=zoom= if(below(q1,q6),0.3*x,if(equal(q2,q5),0.2*(1-x),if(above(q3,q4),0.3*y,0.2*(1-y)+if(equal(q4,q3),0.3* xpos, if(above(q5,q2),0.25*(1-xpos),if(below(q6,q1),0.3*ypos,0.25*(1-ypos)+if(equal(q7,q9),0.3*x, if(below(q8,q7),0.2*(1-x),if(equal(q9,q6),0.3*y,0.2*(1-y)))))))))) + .8 - 0.02*(min(q6+q1,.5)); -per_pixel_2=dx = .01*atan((rad)/.1*sin((dx_r*dy_r)*20+time*5)); -per_pixel_3=sx=zoom; -per_pixel_4=rot=zoom/20 \ No newline at end of file diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,261 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.700000 -fDecay=0.940000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=-0.020000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.550000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.100000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.900000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.400000 -shape_0_per_frame1=ang = time*0.4;; -shape_0_per_frame2=x = 0.5 + 0.08*cos(time*1.3) + 0.03*cos(time*0.7); -shape_0_per_frame3=y = 0.5 + 0.08*sin(time*1.4) + 0.03*sin(time*0.7); -shape_0_per_frame4=r =0.5 + 0.5*sin(q8*0.613 + 1); -shape_0_per_frame5=g = 0.5 + 0.5*sin(q8*0.763 + 2); -shape_0_per_frame6=b = 0.5 + 0.5*sin(q8*0.771 + 5); -shape_0_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.635 + 4); -shape_0_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.616+ 1); -shape_0_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.538 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=32 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.400000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.300000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shape_1_per_frame1=ang = time*1.7; -shape_1_per_frame2=x = 0.5 + 0.08*cos(time*1.1) + 0.03*cos(time*0.7); -shape_1_per_frame3=y = 0.5 + 0.08*sin(time*1.1) + 0.03*sin(time*0.7); -shape_1_per_frame4=r = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_1_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(tq8*0.638 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.400000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.500000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=ang = time*1.24; -shape_2_per_frame2=x = 0.5 - 0.08*cos(time*1.07) + 0.03*cos(time*0.7); -shape_2_per_frame3=y = 0.5 - 0.08*sin(time*1.33) + 0.03*sin(time*0.7); -shape_2_per_frame4=g = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_2_per_frame5=b = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_2_per_frame6=r = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_2_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_2_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_2_per_frame9=b2 = 0.5 + 0.5*sin(q8*.638 + 3); -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=ob_r = 0.5 + 0.4*sin(time*1.324); -per_frame_2=ob_g = 0.5 + 0.4*cos(time*1.371); -per_frame_3=ob_b = 0.5+0.4*sin(2.332*time); -per_frame_4=ib_r = 0.5 + 0.25*sin(time*1.424); -per_frame_5=ib_g = 0.25 + 0.25*cos(time*1.871); -per_frame_6=ib_b = 1-ob_b; -per_frame_7=volume = 0.15*(bass+bass_att+treb+treb_att+mid+mid_att); -per_frame_8=xamptarg = if(equal(frame%15,0),min(0.5*volume*bass_att,0.5),xamptarg); -per_frame_9=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_10=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_11=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_12=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_13=xpos = xpos + 0.001*xspeed; -per_frame_14=dx = xpos*0.05; -per_frame_15=yamptarg = if(equal(frame%15,0),min(0.3*volume*treb_att,0.5),yamptarg); -per_frame_16=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_17=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_18=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_19=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_20=ypos = ypos + 0.001*yspeed; -per_frame_21=dy = ypos*0.05; -per_frame_22=wave_a = 0; -per_frame_23=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_24=oldq8 = q8; -per_frame_25=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_26=rot = 0.4 + 1.5*sin(time*0.273) + 0.4*sin(time*0.379+3); -per_pixel_1=zoom =( log(sqrt(2)-rad) -0.24)*1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Blasto.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Blasto.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Blasto.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Blasto.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=12.162793 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.131195 -fWaveSmoothing=0.720000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.019963 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.018800 -sx=1.000000 -sy=0.999831 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=wave_r = wave_r + .255*sin(time*.366); -per_frame_2=wave_g = wave_g + .255*sin(time*.222); -per_frame_3=wave_b = wave_b + .255*sin(time*.288); -per_frame_4=wave_r = wave_r + bass*.3; -per_frame_5=wave_g = wave_g + treb*.3; -per_frame_6=wave_b = wave_b + mid*.3; -per_frame_7=decay = .75 + .05*sin(time*2) - treb*.05; -per_pixel_1= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Cosmic Dust 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Cosmic Dust 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Cosmic Dust 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Cosmic Dust 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.900000 -fDecay=0.980000 -fVideoEchoZoom=1.169360 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.299999 -fWaveScale=1.694000 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=3.138000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.053000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.263000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.800000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=wave_r = wave_r + 0.650*( 0.60*sin(1.437*time) + 0.40*sin(0.970*time) ); -per_frame_2=wave_g = wave_g + 0.650*( 0.60*sin(1.344*time) + 0.40*sin(0.841*time) ); -per_frame_3=wave_b = wave_b + 0.650*( 0.60*sin(1.251*time) + 0.40*sin(1.055*time) ); -per_frame_4=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.210*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.210*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=dx = dx + 0.010*( 0.60*sin(0.234*time) + 0.40*sin(0.277*time) ); -per_frame_8=dy = dy + 0.010*( 0.60*sin(0.284*time) + 0.40*sin(0.247*time) ); -per_frame_9=decay = decay - 0.01*equal(frame%6,0); -per_frame_10=dx = dx + dx_residual; -per_frame_11=dy = dy + dy_residual; -per_frame_12=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_13=dx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_14=dy_residual = equal(bass_thresh,2)*0.012*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Cruzin'.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Cruzin'.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Cruzin'.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Cruzin'.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -[preset00] -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.000000 -fWaveScale=1.691672 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=3.138000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000300 -rot=0.000000 -cx=0.500000 -cy=0.110000 -dx=0.000000 -dy=-0.001000 -warp=0.024300 -sx=1.001992 -sy=1.004987 -wave_r=0.000000 -wave_g=0.570000 -wave_b=1.000000 -wave_x=0.650000 -wave_y=0.500000 -per_frame_1=wave_r = wave_r + 0.250*( 0.60*sin(10.937*time) + 0.40*sin(1.470*time) ); -per_frame_2=wave_g = wave_g + 0.300*( 0.60*sin(11.344*time) + 0.40*sin(1.041*time) ); -per_frame_3=wave_b = wave_b + 0.250*( 0.60*sin(21.251*time) + 0.40*sin(1.355*time) ); -per_frame_4=rot = rot + 0.004*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=decay = decay - 0.01*equal(frame%6,0); -per_pixel_1=du = (x-cx)*2; -per_pixel_2=dv = (y-cy)*2; -per_pixel_3=q = 0.01*pow(du*du+dv*dv,1.5); -per_pixel_4=dx = q*du; -per_pixel_5=dy = q*dv; -per_pixel_6= -fRating=4.000000 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Downward Spiral.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Downward Spiral.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Downward Spiral.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Downward Spiral.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.900000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=2.717574 -fWaveSmoothing=0.900000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.990000 -rot=0.060000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=0.999900 -wave_r=1.000000 -wave_g=0.400000 -wave_b=0.100000 -wave_x=0.500000 -wave_y=0.600000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.120*( 0.60*sin(0.733*time) + 0.40*sin(0.345*time) ); -per_frame_2=wave_g = wave_g + 0.120*( 0.60*sin(0.600*time) + 0.40*sin(0.456*time) ); -per_frame_3=wave_b = wave_b + 0.100*( 0.60*sin(0.510*time) + 0.40*sin(0.550*time) ); -per_pixel_1=rot=rot*(-0.2+pow(cos(rad*8+ang-time*0.8),2)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Dynamic Swirls 1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Dynamic Swirls 1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Dynamic Swirls 1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Dynamic Swirls 1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fGammaAdj=2.700000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.634243 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.380000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=q1 = (cx*2-1) + 0.62*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_5=q2 = (cy*2-1) + 0.62*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_6=q3 = (cx*2-1) + 0.62*( 0.60*sin(0.174*-time) + 0.40*sin(0.364*time) ); -per_frame_7=q4 = (cy*2-1) + 0.62*( 0.60*sin(0.234*time) + 0.40*sin(0.271*-time) ); -per_frame_8=decay = decay - 0.01*equal(frame%5,0); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -fRating=2.000000 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Dynamic Swirls 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Dynamic Swirls 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Dynamic Swirls 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Dynamic Swirls 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fGammaAdj=2.700000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.100000 -fWaveScale=4.695139 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.670000 -fModWaveAlphaEnd=0.970000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.007964 -rot=0.020000 -cx=0.499999 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999667 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.700000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=q1 = (cx*2-1) + 0.32*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_5=q2 = (cy*2-1) + 0.52*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_6=q3 = (cx*2-1) + 0.32*( 0.60*sin(0.174*-time) + 0.40*sin(0.364*time) ); -per_frame_7=q4 = (cy*2-1) + 0.52*( 0.60*sin(0.234*time) + 0.40*sin(0.271*-time) ); -per_frame_8=decay = decay - 0.01*equal(frame%5,0); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.012/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.012/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -fRating=2.000000 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Eddies 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Eddies 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Eddies 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Eddies 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.700000 -fDecay=0.980000 -fVideoEchoZoom=1.645405 -fVideoEchoAlpha=0.400000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.605989 -fWaveScale=0.870018 -fWaveSmoothing=0.100000 -fWaveParam=-0.300000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.593743 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=-0.010000 -warp=0.278033 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.140000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=q1 = (cx*2-1) + 0.62*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_5=q2 = (cy*2-1) + 0.62*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_6=q3 = (cx*2-1) + 0.62*( 0.60*sin(0.174*-time) + 0.40*sin(0.364*time) ); -per_frame_7=q4 = (cy*2-1) + 0.62*( 0.60*sin(0.234*time) + 0.40*sin(0.271*-time) ); -per_frame_8=decay = decay - 0.01*equal(frame%5,0); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = dx + mult*sin(ang2-1.5); -per_pixel_7=dy = dy + mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Eggs.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Eggs.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Eggs.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Eggs.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.500000 -fWaveScale=2.720000 -fWaveSmoothing=0.770000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.046000 -rot=0.020000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.420000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.470000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.023*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=cx = cx + 0.070*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_7=cy = cy + 0.070*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_pixel_1=zoom=zoom+0.27*sin(time*1.55+rad*5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - El Cubismo.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - El Cubismo.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - El Cubismo.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - El Cubismo.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.500000 -fWaveScale=2.720000 -fWaveSmoothing=0.770000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.046000 -rot=0.020000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.420000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.470000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.023*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=cx = cx + 0.070*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_7=cy = cy + 0.070*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_pixel_1=dx=dx-0.05*sin(time*1.35+(x*2-1)*18); -per_pixel_2=dy=dy-0.05*sin(time*1.79+(y*2-1)*9); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Feedback 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Feedback 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Feedback 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Feedback 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,231 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.900000 -fVideoEchoZoom=0.710682 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.311604 -fWaveScale=1.228910 -fWaveSmoothing=0.000000 -fWaveParam=0.200000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999902 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.207965 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.006500 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.370000 -shapecode_0_y=0.500000 -shapecode_0_rad=2.999997 -shapecode_0_ang=3.644249 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.500000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.300000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=1.000000 -shape_0_init1=t1 = rand(100)*0.01; -shape_0_init2=t2 = rand(100)*0.01; -shape_0_per_frame1=ang = time*(0.3 + 0.1*t1); -shape_0_per_frame2=rad = rad * (0.9 + 0.2*t2); -shape_0_per_frame3=r = min(1,max(0,r + 0.2*sin(time*0.417 + 1))); -shape_0_per_frame4=g = min(1,max(0,g + 0.2*sin(time*0.391 + 2))); -shape_0_per_frame5=b = min(1,max(0,b + 0.2*sin(time*0.432 + 4))); -shape_0_per_frame6=r2 = min(1,max(0,r2 + 0.2*sin(time*0.657 + 3))); -shape_0_per_frame7=g2 = min(1,max(0,g2 + 0.2*sin(time*0.737 + 5))); -shape_0_per_frame8=b2 = min(1,max(0,b2 + 0.2*sin(time*0.884 + 6))); -shapecode_1_enabled=1 -shapecode_1_sides=50 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.370000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.706533 -shapecode_1_ang=3.644249 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.800000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_init1=t1 = rand(100)*0.01; -shape_1_init2=t2 = rand(100)*0.01; -shape_1_per_frame1=x = x + 0.05*sin(time*1.25+3); -shape_1_per_frame2=y = y + 0.03*sin(time*1.49+1); -shape_1_per_frame3=ang = time*(0.3 + 0.1*t1); -shape_1_per_frame4=rad = rad * (0.9 + 0.2*t2); -shape_1_per_frame5=r = min(1,max(0,r + 0.1*sin(time*0.417 + 1))); -shape_1_per_frame6=g = min(1,max(0,g + 0.1*sin(time*0.391 + 2))); -shape_1_per_frame7=b = min(1,max(0,b + 0.1*sin(time*0.432 + 4))); -shape_1_per_frame8=r2 = min(1,max(0,r2 + 0.1*sin(time*0.457 + 3))); -shape_1_per_frame9=g2 = min(1,max(0,g2 + 0.1*sin(time*0.437 + 5))); -shape_1_per_frame10=b2 = min(1,max(0,b2 + 0.1*sin(time*0.484 + 6))); -shapecode_2_enabled=1 -shapecode_2_sides=50 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.670000 -shapecode_2_y=0.430000 -shapecode_2_rad=0.706533 -shapecode_2_ang=4.209736 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.800000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_init1=t1 = rand(100)*0.01; -shape_2_init2=t2 = rand(100)*0.01; -shape_2_per_frame1=x = x + 0.05*sin(time*2.17); -shape_2_per_frame2=y = y + 0.03*sin(time*1.83); -shape_2_per_frame3=ang = time*(0.3 + 0.1*t1); -shape_2_per_frame4=rad = rad * (0.9 + 0.2*t2); -shape_2_per_frame5=r = min(1,max(0,r + 0.1*sin(time*0.417 + 1))); -shape_2_per_frame6=g = min(1,max(0,g + 0.1*sin(time*0.391 + 2))); -shape_2_per_frame7=b = min(1,max(0,b + 0.1*sin(time*0.432 + 4))); -shape_2_per_frame8=r2 = min(1,max(0,r2 + 0.1*sin(time*0.457 + 3))); -shape_2_per_frame9=g2 = min(1,max(0,g2 + 0.1*sin(time*0.437 + 5))); -shape_2_per_frame10=b2 = min(1,max(0,b2 + 0.1*sin(time*0.484 + 6))); -shapecode_3_enabled=1 -shapecode_3_sides=60 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.161222 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=x = x + 0.2*sin(time*1.14); -shape_3_per_frame2=y = y + 0.1*sin(time*0.93+2); -per_frame_1=wave_mystery = time*0.2; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - High Dynamic Range.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - High Dynamic Range.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - High Dynamic Range.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - High Dynamic Range.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,227 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.500000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=4 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=32.544682 -fWaveScale=0.503666 -fWaveSmoothing=0.558000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.870000 -fModWaveAlphaEnd=1.289900 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000012 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=16 -shapecode_0_additive=1 -shapecode_0_thickOutline=1 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.879999 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.060000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang = time*1.4; -shape_0_per_frame2=x = q1; -shape_0_per_frame3=y = q2; -shape_0_per_frame4=r = 0.5 + 0.5*sin(time*0.713 + 1); -shape_0_per_frame5=g = 0.5 + 0.5*sin(time*0.563 + 2); -shape_0_per_frame6=b = 0.5 + 0.5*sin(time*0.654 + 5); -shape_0_per_frame7=r2 = 0.5 + 0.5*sin(time*0.885 + 4); -shape_0_per_frame8=g2 = 0.5 + 0.5*sin(time*0.556+ 1); -shape_0_per_frame9=b2 = 0.5 + 0.5*sin(time*0.638 + 3); -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1= -per_frame_2=// in this example, q1 and q2 act as the center of zooming -per_frame_3=// AND as the position of custom shape #1... -per_frame_4=q1 = 0.5 + 0.32*cos(time*0.4); -per_frame_5=q2 = 0.5 + 0.22*sin(time*0.4); -per_frame_6= -per_frame_7=//wave_x = q1; -per_frame_8=wave_y = q2; -per_pixel_1=dx = (x-q1)*0.02; -per_pixel_2=dy = (y-q2)*0.02; -per_pixel_3= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Nautilus.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Nautilus.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Nautilus.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Nautilus.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.990000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.058150 -fWaveSmoothing=0.750000 -fWaveParam=0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=-0.820000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.999999 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=rot = rot + 0.73*sin(time*0.065); -per_frame_2=zoom=zoom+rot*0.2; -per_frame_3=warp=warp+max(0,(bass_att-1.2)*4.5); -per_frame_4=decay = decay - 0.01*equal(frame%20,0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Octopus Ever Changing.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Octopus Ever Changing.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Octopus Ever Changing.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Octopus Ever Changing.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.868656 -fWaveScale=1.420825 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.010000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.076000 -sx=1.000000 -sy=1.000000 -wave_r=0.950000 -wave_g=0.350000 -wave_b=0.450000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.000*( 0.60*sin(1.517*time) + 0.40*sin(1.580*time) ); -per_frame_2=wave_g = wave_g + 0.300*( 0.60*sin(1.088*time) + 0.40*sin(1.076*time) ); -per_frame_3=wave_b = wave_b + 0.300*( 0.60*sin(1.037*time) + 0.40*sin(0.922*time) ); -per_frame_4=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=q1=cos(1.41*time); -per_frame_8=q2=time + 0.3*sin(time*1.47); -per_frame_9=cx=cx+0.2*sin(q1*0.5); -per_frame_10=cy=cy+0.2*sin(q2*0.4); -per_pixel_1=rot=rot+0.05*sin(rad*(13.5 + 5.5*sin(time*0.1623)) + q2*1.3 + q*1.31); -per_pixel_2=zoom=zoom+0.05*sin(ang*10.0 + rad*(7.5 + 1.5*sin(time*0.13)) + q2*1.63 + q); -per_pixel_3=zoom=zoom+0.05-0.05*rad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Octopus Gold.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Octopus Gold.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Octopus Gold.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Octopus Gold.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=6.562210 -fWaveScale=2.673533 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=2.143588 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.010000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.004791 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.800000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=8.000000 -nMotionVectorsY=6.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = wave_x + 0.200*( 0.60*sin(0.394*time) + 0.40*sin(0.475*time) ); -per_frame_2=wave_y = wave_y + 0.200*( 0.60*sin(0.442*time) + 0.40*sin(0.321*time) ); -per_frame_3=wave_r = wave_r + 0.300*( 0.60*sin(1.517*time) + 0.40*sin(1.580*time) ); -per_frame_4=wave_g = wave_g + 0.200*( 0.60*sin(1.088*time) + 0.40*sin(1.076*time) ); -per_frame_5=wave_b = wave_b + 1.000*( 0.60*sin(3.422*time) + 0.40*sin(2.494*time) ); -per_frame_6=rot = rot + 0.040*( 0.60*sin(0.181*time) + 0.40*sin(0.279*time) ); -per_frame_7=cx = cx + 0.110*( 0.60*sin(0.174*time) + 0.40*sin(0.204*time) ); -per_frame_8=cy = cy + 0.110*( 0.60*sin(0.193*time) + 0.40*sin(0.237*time) ); -per_frame_9=zoom=zoom+0.01+0.037*sin(time*0.93) + 0.03*sin(time*0.01); -per_frame_10=q1=cos(0.23*time); -per_frame_11=q2=time + 0.3*sin(time*0.21); -per_frame_12=cx=cx+0.2*sin(q1*0.5); -per_frame_13=cy=cy+0.2*sin(q2*0.4); -per_pixel_1=rot=rot+0.05*sin(rad*(9.5 + 5.5*sin(time*0.0823)) + q2*1.3); -per_pixel_2=zoom=zoom+0.05*sin(ang*6 + rad*(5.5 + 1.5*sin(time*0.04)) + q2*1.63 + q); -per_pixel_3=zoom=zoom+0.05-0.05*rad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Octopus.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Octopus.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Octopus.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Octopus.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.990000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=2.426125 -fWaveScale=1.881700 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.020000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.076000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.150000 -wave_b=0.350000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 1.000*( 0.60*sin(1.517*time) + 0.40*sin(1.580*time) ); -per_frame_2=wave_g = wave_g + 1.000*( 0.60*sin(1.088*time) + 0.40*sin(1.076*time) ); -per_frame_3=wave_b = wave_b + 1.000*( 0.60*sin(1.037*time) + 0.40*sin(0.922*time) ); -per_frame_4=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=q1=cos(1.41*time); -per_frame_8=q2=time + 0.3*sin(time*1.47); -per_pixel_1=rot=rot+0.05*sin(rad*13.5 + q2*1.3 + q*1.31); -per_pixel_2=zoom=zoom+0.05*sin(ang*10.0 + rad*7.5 + q2*1.63 + q); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.500000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.605000 -fWaveSmoothing=0.558000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.870000 -fModWaveAlphaEnd=1.289900 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.064000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.700000 -wave_g=0.700000 -wave_b=0.700000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.3*( 0.60*sin(0.633*time) + 0.40*sin(0.845*time) ); -per_frame_2=wave_g = wave_g + 0.3*( 0.60*sin(0.370*time) + 0.40*sin(0.656*time) ); -per_frame_3=wave_b = wave_b + 0.3*( 0.60*sin(0.740*time) + 0.40*sin(0.520*time) ); -per_frame_4=zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%50,0); -per_frame_7=zoom=zoom+(bass_att-1)*0.001; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.693000 -fDecay=0.970000 -fVideoEchoZoom=1.628259 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.200000 -fWaveScale=1.093260 -fWaveSmoothing=0.100000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=3.259127 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.180378 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.380000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.010000 -ib_r=0.550000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.100000 -nMotionVectorsX=57.599998 -nMotionVectorsY=44.160000 -mv_dx=0.002000 -mv_dy=0.002000 -mv_l=5.000000 -mv_r=0.700000 -mv_g=0.400000 -mv_b=0.500000 -mv_a=0.100000 -per_frame_1=mv_r = wave_r + 0.35*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=mv_g = wave_g + 0.35*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=mv_b = wave_b + 0.35*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time)); -per_frame_4=q1 = (cx*2-1) + 0.62*( 0.60*sin(0.474*time) + 0.40*sin(0.394*time) ); -per_frame_5=q2 = (cy*2-1) + 0.62*( 0.60*sin(0.413*time) + 0.40*sin(0.323*time) ); -per_frame_6=q3 = (cx*2-1) + 0.62*( 0.60*sin(0.274*-time) + 0.40*sin(0.464*time) ); -per_frame_7=q4 = (cy*2-1) + 0.62*( 0.60*sin(0.334*time) + 0.40*sin(0.371*-time) ); -per_frame_8=decay = decay - 0.01*equal(frame%5,0); -per_frame_9=cy = cy + 0.1*sin(time*0.245); -per_frame_10=cx = cx + 0.1*cos(time*0341); -per_frame_11=wave_mystery = 2; -per_frame_12=//mv_l = 2*max(max(bass,bass_att)-1.2,0); -per_frame_13=warp = warp * pow(2, 0.6*sin(time*0.194)); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008/(dist+0.7); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.993000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.010000 -fWaveSmoothing=0.700000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.197884 -sx=0.999667 -sy=0.999900 -wave_r=0.550000 -wave_g=0.550000 -wave_b=0.550000 -wave_x=0.500000 -wave_y=0.680000 -ob_size=0.010000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.700000 -ib_size=0.010000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_l=0.000000 -mv_r=0.800000 -mv_g=0.800000 -mv_b=0.800000 -mv_a=1.000000 -per_frame_1=mv_r = mv_r + 0.2*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=mv_g = mv_g + 0.2*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=mv_b = mv_b + 0.2*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=q1 = (cx*2-1) + 0.6*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_5=q2 = (cy*2-1) + 0.6*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_6=ob_r = 1- 0.4*abs(q1); -per_frame_7=ob_g = 0.3*abs(q2); -per_frame_8=ob_b = 0.4*abs(q1); -per_frame_9=wave_x = 1-abs(q2)-0.05; -per_frame_10=wave_y = 1-abs(q1)-0.06; -per_frame_11=wave_r = wave_r + 0.4*( 0.60*sin(0.514*time) + 0.40*sin(1.211*time) ); -per_frame_12=wave_b = wave_b + 0.4*( 0.60*sin(0.714*time) + 0.40*sin(q2) ); -per_frame_13=wave_g = wave_g + 0.4*( 0.60*sin(10*q1) + 0.40*sin(10*q2) ); -per_pixel_1=du = (x*2-1) - q1; -per_pixel_2=dv = (y*2-1) - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv) + time*0.15; -per_pixel_5=mult = 0.65*sin(dist*0.05); -per_pixel_6=dx = mult*sin(ang2*2-1.5); -per_pixel_7=dy = mult*cos(ang2*2-1.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss & Sperl - Cruzin' (Moody).prjm" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss & Sperl - Cruzin' (Moody).prjm" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss & Sperl - Cruzin' (Moody).prjm" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss & Sperl - Cruzin' (Moody).prjm" 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -[preset00] -fRating=1.000000 -fGammaAdj=2 -fDecay=0.98 -fVideoEchoZoom=2 -fVideoEchoAlpha=0 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4 -fWaveScale=1.691672 -fWaveSmoothing=0.5 -fWaveParam=0 -fModWaveAlphaStart=0.75 -fModWaveAlphaEnd=0.95 -fWarpAnimSpeed=1 -fWarpScale=3.138 -fZoomExponent=1 -fShader=0 -zoom=1.0003 -rot=0 -cx=0.5 -cy=0.11 -dx=0 -dy=-0.001 -warp=0.0243 -sx=1.001992 -sy=1.004987 -wave_r=0 -wave_g=0.57 -wave_b=1 -wave_x=0.65 -wave_y=0.5 -per_frame_1=wave_r = mood_r; -per_frame_2=wave_g = mood_g; -per_frame_3=wave_b = mood_b; -per_frame_4=rot = rot + 0.004*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=decay = decay - 0.01*equal(frame%6,0); -per_pixel_1=du = (x-cx)*2; -per_pixel_2=dv = (y-cy)*2; -per_pixel_3=q = 0.01*pow(du*du+dv*dv,1.5); -per_pixel_4=dx = q*du; -per_pixel_5=dy = q*dv; -per_pixel_6= -fRating=4 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.994000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.499998 -fWaveScale=1.524161 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.334695 -fWarpScale=3.928016 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=0.961000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.771011 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.030000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.010000 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.500000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = wave_x + 0.2900*( 0.60*sin(2.121*time) + 0.40*sin(1.621*time) ); -per_frame_2=wave_y = wave_y + 0.2900*( 0.60*sin(1.742*time) + 0.40*sin(2.322*time) ); -per_frame_3=wave_r = wave_r + 0.350*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_4=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_5=wave_b = wave_b + 0.350*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_6=rot = rot + 0.35*( 0.60*sin(0.21*time) + 0.30*sin(0.339*time) ); -per_frame_7=cx = cx + 0.30*( 0.60*sin(0.374*time) + 0.14*sin(0.194*time) ); -per_frame_8=cy = cy + 0.37*( 0.60*sin(0.274*time) + 0.10*sin(0.394*time) ); -per_frame_9=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_10=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_11=ib_b = ib_b + 0.2*sin(time*0.7354); -per_frame_12= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.994000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.499998 -fWaveScale=1.524161 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.334695 -fWarpScale=3.928016 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=0.961000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.771011 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.030000 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.100000 -per_frame_1=wave_x = wave_x + 0.2900*( 0.60*sin(2.121*time) + 0.40*sin(1.621*time) ); -per_frame_2=wave_y = wave_y + 0.2900*( 0.60*sin(1.742*time) + 0.40*sin(2.322*time) ); -per_frame_3=wave_r = wave_r + 0.350*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_4=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_5=wave_b = wave_b + 0.350*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_6=rot = rot + 0.35*( 0.60*sin(0.21*time) + 0.30*sin(0.339*time) ); -per_frame_7=cx = cx + 0.30*( 0.60*sin(0.374*time) + 0.14*sin(0.194*time) ); -per_frame_8=cy = cy + 0.37*( 0.60*sin(0.274*time) + 0.10*sin(0.394*time) ); -per_frame_9=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_10=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_11=ib_b = ib_b + 0.2*sin(time*0.7354); -per_frame_12= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 3.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 3.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 3.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 3.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.994000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.499998 -fWaveScale=1.524161 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.334695 -fWarpScale=3.928016 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=0.961000 -rot=0.220000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.771011 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.028500 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.100000 -per_frame_1=wave_x = wave_x + 0.2900*( 0.60*sin(2.121*time) + 0.40*sin(1.621*time) ); -per_frame_2=wave_y = wave_y + 0.2900*( 0.60*sin(1.742*time) + 0.40*sin(2.322*time) ); -per_frame_3=wave_r = wave_r + 0.350*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_4=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_5=wave_b = wave_b + 0.350*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_6=blah = 0.5/(wave_r+wave_g+wave_b); -per_frame_7=wave_r = wave_r*blah; wave_g = wave_g*blah; wave_b = wave_b*blah; -per_frame_8=rot = rot + 0.12*( 0.60*sin(0.21*time) + 0.40*sin(0.339*time) ); -per_frame_9=cx = cx + 0.30*( 0.60*sin(0.374*time) + 0.14*sin(0.194*time) ); -per_frame_10=cy = cy + 0.37*( 0.60*sin(0.274*time) + 0.10*sin(0.394*time) ); -per_frame_11=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_12=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_13=ib_b = ib_b + 0.2*sin(time*0.7354); -per_frame_14=blah = 0.4/(ib_r+ib_g+ib_b)*3; -per_frame_15=ib_r = ib_r*blah; ib_g = ib_g*blah; ib_b = ib_b*blah; -per_frame_16= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 4.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 4.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 4.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 4.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=1.000000 -fGammaAdj=1.994000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.499998 -fWaveScale=1.524161 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.334695 -fWarpScale=3.928016 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=0.961000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.771011 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.028500 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.100000 -per_frame_1=wave_x = wave_x + 0.2900*( 0.60*sin(2.121*time) + 0.40*sin(1.621*time) ); -per_frame_2=wave_y = wave_y + 0.2900*( 0.60*sin(1.742*time) + 0.40*sin(2.322*time) ); -per_frame_3=wave_r = wave_r + 0.350*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_4=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_5=wave_b = wave_b + 0.350*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_6=blah = 0.5/(wave_r+wave_g+wave_b); -per_frame_7=wave_r = wave_r*blah; wave_g = wave_g*blah; wave_b = wave_b*blah; -per_frame_8=rot = rot + 0.35*( 0.60*sin(0.21*time) + 0.30*sin(0.339*time) ); -per_frame_9=cx = cx + 0.30*( 0.60*sin(0.374*time) + 0.14*sin(0.194*time) ); -per_frame_10=cy = cy + 0.37*( 0.60*sin(0.274*time) + 0.10*sin(0.394*time) ); -per_frame_11=dx = dx + 0.01*( 0.60*sin(0.324*time) + 0.40*sin(0.234*time) ); -per_frame_12=dy = dy + 0.01*( 0.60*sin(0.244*time) + 0.40*sin(0.264*time) ); -per_frame_13=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_14=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_15=ib_b = ib_b + 0.2*sin(time*0.7354); -per_frame_16=blah = 12.4/(ib_r+ib_g+ib_b)*3; -per_frame_17=ib_r = ib_r*blah; ib_g = ib_g*blah; ib_b = ib_b*blah; -per_frame_18= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 5.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 5.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - Swirlie 5.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - Swirlie 5.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.994000 -fDecay=0.990000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.000000 -fWaveScale=1.693514 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.451118 -fWarpScale=3.928016 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=0.961000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=7.397955 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.950000 -ob_size=0.030000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.010000 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.500000 -per_frame_1=wave_x = wave_x + 0.0200*( 0.60*sin(0.821*time) + 0.40*sin(0.621*time) ); -per_frame_2=wave_y = wave_y + 0.0200*( 0.60*sin(0.942*time) + 0.40*sin(0.722*time) ); -per_frame_3=wave_r = wave_r + 0.350*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_4=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_5=wave_b = wave_b + 0.350*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_6=rot = rot + 0.35*( 0.60*sin(0.21*time) + 0.30*sin(0.339*time) ); -per_frame_7=cx = cx + 0.30*( 0.60*sin(0.374*time) + 0.14*sin(0.194*time) ); -per_frame_8=cy = cy + 0.37*( 0.60*sin(0.274*time) + 0.10*sin(0.394*time) ); -per_frame_9=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_10=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_11=ib_b = ib_b + 0.2*sin(time*0.7354); -per_frame_12= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=10.140000 -fWaveScale=1.235000 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=2.301000 -fShader=0.000000 -zoom=1.099000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.290000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_x = wave_x + 0.250*( 0.60*sin(2.121*time) + 0.40*sin(1.621*time) ); -per_frame_2=wave_y = wave_y + 0.250*( 0.60*sin(1.742*time) + 0.40*sin(2.322*time) ); -per_frame_3=wave_r = wave_r + 0.500*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_4=wave_g = wave_g + 0.500*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_5=wave_b = wave_b + 0.500*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_6=zoom = zoom + 0.010*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_7=rot = rot + 0.035*( 0.60*sin(0.381*time) + 0.40*sin(0.539*time) ); -per_frame_8=cx = cx + 0.030*( 0.60*sin(0.374*time) + 0.40*sin(0.194*time) ); -per_frame_9=cy = cy + 0.037*( 0.60*sin(0.274*time) + 0.40*sin(0.394*time) ); -per_frame_10=q = time; -per_frame_11=dx = dx + 0.019*( 0.60*sin(100.334*q)+ 0.40*sin(250.277*q)); -per_frame_12=dy = dy + 0.019*( 0.60*sin(200.384*q) + 0.40*sin(150.247*q)); -per_frame_13=sx = sx + 0.010*( 0.60*sin(0.313*time) + 0.40*sin(0.383*time) ); -per_pixel_1=rot=rot+rad*0.18*sin(0.6*time*0.439+0.4*time*0.338); Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/headphones.tga and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/headphones.tga differ diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=33.469135 -fWaveScale=0.931008 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.000000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=5.725291 -fZoomExponent=4.778017 -fShader=0.000000 -zoom=1.093507 -rot=-0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.066200 -sx=0.905286 -sy=1.010000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.470000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=19.199995 -nMotionVectorsY=14.400000 -mv_l=3.000000 -mv_r=0.600000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.100000 -per_frame_1=wave_r = wave_r + 1*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_b = wave_b + 1*( 1.60*sin(1.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_g = wave_g +1*(1.50*sin(1.900*time)+.40*sin(1*time) ); -per_frame_4=rot=.140*sin(time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot - MOTIVATION!.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot - MOTIVATION!.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot - MOTIVATION!.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot - MOTIVATION!.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=1.000000 -fGammaAdj=1.000000 -fDecay=0.960000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.236877 -fWaveSmoothing=0.630000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=1.248000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_2=treb_thresh=above(treb_att,treb_thresh)*2+ -per_frame_3=(1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*0.96+1.3); -per_frame_4=mid_thresh=above(mid_att,mid_thresh)*2+ -per_frame_5=(1-above(mid_mid_att,mid_thresh))*((mid_thresh-1.3)*0.96+1.3); -per_frame_6=vol_thresh=bass_thresh+treb_thresh+mid_thresh; -per_frame_7=q1=bass_thresh; -per_frame_8=q2=treb_thresh; -per_frame_9=q3=mid_thresh; -per_frame_10=q4=vol_thresh; -per_frame_11=wave_g=1-(abs(q1/2/2)); -per_frame_12=wave_r=1-(abs(Q2/2/2)); -per_frame_13=wave_g=1-(abs(q3/2/2)); -per_frame_14= -per_pixel_1=zoom=zoom+.1*Sin(Abs(rad/3.14)+.6*sin(above(Q1,1.594)+.1*sin(Q1))); -per_pixel_2=rot=rot+.1*sin(rad*3.14)*sin(if(above(q2,1.6),.5,-.5))+(.01*Rad)*sin(above(q1,1.7)); -per_pixel_3=dx=dx+.01*Sin(rad*5)*Sin(if(above(q3,1.2),.5,-.5))*sin(rad*50-q1)+.005*Sin(Q2*rad*50); -per_pixel_4=dy=dy-.01*sin(rad*5)*sin(if(above(q2,1.5),.5,-.5))*sin(rad*500-q2)-.005*sin(q1*rad*50); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999600 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.763002 -fWaveSmoothing=0.270000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.010000 -fShader=0.000000 -zoom=0.998531 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.900000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.230000 -nMotionVectorsX=0.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=ob_r = 0.7 - 0.3*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=ob_g = 0.5- 0.4*sin(time*5.924); -per_frame_3=ob_b = 0.45 - 0.3*cos(time*0.816); -per_frame_4=warp =0; -per_frame_5=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_6=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_7=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_8=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_9=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_10=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_11=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_12=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_13=lastbeat = if(beat,time,lastbeat); -per_frame_14=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_15=q5 = if(beat,0.1*rand(1000),oldq5); -per_frame_16=oldq5 = q5; -per_frame_17=q3 = if(beat,0.1*rand(1000),oldq3); -per_frame_18=oldq3 = q3; -per_frame_19=ib_size = 0.02; -per_frame_20=ib_r = ib_r + 0.5*sin(time*2.424); -per_frame_21=ib_g = ib_g + 0.5*sin(time*2.247); -per_frame_22=ib_b = ib_b - 0.5*sin(time*1.131); -per_frame_23=dx = dx -0.008*(0.6*sin(time*0.23)+0.5*cos(time*0.153)); -per_frame_24=dy = dy - 0.008*(0.6*sin(time*0.21)+0.5*cos(time*0.142)); -per_frame_25=echo_zoom=echo_zoom-.3*sin(Time*(q5/2/2/2/2/2/2/2)); -per_frame_26=//echo_alpha=1; -per_pixel_1=box=abs(x*2-0.4*sin(q3))%2 + abs(y*2+0.4*sin(q5))%2; -per_pixel_2=q1 = 4.05+(sin(x+0.237*time)-cos(y+0.513*time)); -per_pixel_3=zoom = if(above(box,1),q1*.1,zoom); -per_pixel_4=rot = if(above(box,1),sin(0.885*time),0)*((ang/2/2/2)-rad)*Sin(q5)/2; -per_pixel_5=dx = if(above(box,1),sin(0.542*time),0.005*sin((y-0.5)*96)+0.005*sin((y-0.5)*128)); -per_pixel_6=dy= if(above(box,1),sin(0.581*time),0.001*cos((x-0.5)*128)+0.001*cos((x-0.5)*96)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,250 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001715 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999999 -rot=-0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.006000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.500000 -ib_r=0.400000 -ib_g=0.400000 -ib_b=0.400000 -ib_a=0.000000 -nMotionVectorsX=38.399994 -nMotionVectorsY=14.400005 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.000000 -shapecode_0_y=0.870000 -shapecode_0_rad=0.310900 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=3.141500 -shapecode_0_tex_zoom=2.216710 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=textured=1; -shape_0_per_frame2=tex_ang=tex_ang+1*sin(time*.65*q2); -shape_0_per_frame3=ang=ang+1*sin(time*.62); -shape_0_per_frame4=x=.5-.3*sin(time*.34); -shape_0_per_frame5=y=.5+.3*sin(time*.53); -shape_0_per_frame6=rad=rad-.5*sin(time*.53); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.000000 -shapecode_1_y=0.620000 -shapecode_1_rad=0.307832 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=2.448630 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=textured=1; -shape_1_per_frame2=tex_ang=tex_ang+1*sin(time*.23*q4); -shape_1_per_frame3=ang=ang+1*sin(time*.75); -shape_1_per_frame4=x=.5-.3*sin(time*.12); -shape_1_per_frame5=y=.5+.3*sin(time*.65); -shape_1_per_frame6=rad=rad+.5*sin(time*.75); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.000000 -shapecode_2_y=0.370000 -shapecode_2_rad=0.317160 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=2.448629 -shapecode_2_r=1.000000 -shapecode_2_g=0.400000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.400000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=0.400000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=textured=1; -shape_2_per_frame2=tex_ang=tex_ang+1*sin(time*.34*q3); -shape_2_per_frame3=ang=ang+1*sin(time*.12); -shape_2_per_frame4=x=.5-.3*sin(time*.23); -shape_2_per_frame5=y=.5+.3*sin(time*.56); -shape_2_per_frame6=rad=rad+.5*sin(time*.12); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.000000 -shapecode_3_y=0.110000 -shapecode_3_rad=0.314020 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=2.216713 -shapecode_3_r=0.000000 -shapecode_3_g=1.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=textured=1; -shape_3_per_frame2=tex_ang=tex_ang+1*sin(time*.12*q6); -shape_3_per_frame3=ang=ang+1*sin(time*.65); -shape_3_per_frame4=x=.5-.3*sin(time*.54); -shape_3_per_frame5=y=.5+.3*sin(time*.23); -shape_3_per_frame6=rad=rad+.4*sin(time*.43); -per_frame_1=vol_att=(treb_att*.25)+(mid_att*.25)+(bass_att*.25+.5*sin(vol))/vol; -per_frame_2=vol=bass+treb+mid; -per_frame_3=new_bass=(bass*.25+.5*sin(bass_att*.25)); -per_frame_4=new_treb=(treb*.25+.5*sin(treb_att*.25)); -per_frame_5=new_mid=(mid*.25+.4*sin(mid_att*.25)); -per_frame_6=bass_c=q1-1*sin(bass_stt&time*.54); -per_frame_7=treb_c=q2-1*sin(treb_att&time*.44); -per_frame_8=mid_c=q3-1*sin(mid_att&time*.24); -per_frame_9=vol_c=q4-1*sin(vol_att&time*.64); -per_frame_10=q1=sin(bass-new_bass&time*.63); -per_frame_11=q2=sin(treb-new_treb&time*.43); -per_frame_12=q3=sin(mid-new_mid&time*.23); -per_frame_13=q4=sin(vol&time*.65); -per_frame_14=q5=bass_c; -per_frame_15=q6=treb_c; -per_frame_16=q7=mid_c; -per_frame_17=q8=vol_c; -per_frame_18= -per_frame_19= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot - Texture Boxes (Remix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot - Texture Boxes (Remix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot - Texture Boxes (Remix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot - Texture Boxes (Remix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001715 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999999 -rot=-0.000000 -cx=0.500000 -cy=0.500000 -dx=0.194000 -dy=0.400000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.500000 -ib_r=0.400000 -ib_g=0.400000 -ib_b=0.400000 -ib_a=0.000000 -nMotionVectorsX=38.399994 -nMotionVectorsY=14.400005 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.000000 -shapecode_0_y=0.870000 -shapecode_0_rad=0.310900 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=3.141500 -shapecode_0_tex_zoom=2.216710 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=tx=0+1*sin(q1); -shape_0_per_frame2=textured=if(below(.5,tx),0,1); -shape_0_per_frame3=tex_ang=tex_ang+1*sin(time*.65*q2); -shape_0_per_frame4=ang=ang+1*sin(time*.62); -shape_0_per_frame5=x=.5-.3*sin(time*.34); -shape_0_per_frame6=y=.5+.3*sin(time*.53); -shape_0_per_frame7= -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.000000 -shapecode_1_y=0.620000 -shapecode_1_rad=0.307832 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=2.448630 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=tx=0+1*sin(q2); -shape_1_per_frame2=textured=if(below(.5,tx),0,1); -shape_1_per_frame3=tex_ang=tex_ang+1*sin(time*.23*q4); -shape_1_per_frame4=ang=ang+1*sin(time*.75); -shape_1_per_frame5=x=.5-.3*sin(time*.12); -shape_1_per_frame6=y=.5+.3*sin(time*.65); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.000000 -shapecode_2_y=0.370000 -shapecode_2_rad=0.317160 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=2.448629 -shapecode_2_r=1.000000 -shapecode_2_g=0.400000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.400000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=0.400000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=tx=0+1*sin(q3); -shape_2_per_frame2=textured=if(below(.5,tx),0,1); -shape_2_per_frame3=tex_ang=tex_ang+1*sin(time*.34*q3); -shape_2_per_frame4=ang=ang+1*sin(time*.12); -shape_2_per_frame5=x=.5-.3*sin(time*.23); -shape_2_per_frame6=y=.5+.3*sin(time*.56); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.000000 -shapecode_3_y=0.110000 -shapecode_3_rad=0.314020 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=2.216713 -shapecode_3_r=0.000000 -shapecode_3_g=1.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=tx=0+1*sin(q4); -shape_3_per_frame2=textured=if(below(.5,tx),0,1); -shape_3_per_frame3=tex_ang=tex_ang+1*sin(time*.12*q6); -shape_3_per_frame4=ang=ang+1*sin(time*.65); -shape_3_per_frame5=x=.5-.3*sin(time*.54); -shape_3_per_frame6=y=.5+.3*sin(time*.23); -per_frame_1=vol_att=(treb_att*.25)+(mid_att*.25)+(bass_att*.25+.5*sin(vol))/vol; -per_frame_2=vol=bass+treb+mid; -per_frame_3=new_bass=(bass*.25+.5*sin(bass_att*.25)); -per_frame_4=new_treb=(treb*.25+.5*sin(treb_att*.25)); -per_frame_5=new_mid=(mid*.25+.4*sin(mid_att*.25)); -per_frame_6=bass_c=q1-1*sin(bass_att&time*.54); -per_frame_7=treb_c=q2-1*sin(treb_att&time*.44); -per_frame_8=mid_c=q3-1*sin(mid_att&time*.24); -per_frame_9=vol_c=q4-1*sin(vol_att&time*.64); -per_frame_10=q1=sin(bass-new_bass&time*.63); -per_frame_11=q2=sin(treb-new_treb&time*.43); -per_frame_12=q3=sin(mid-new_mid&time*.23); -per_frame_13=q4=sin(vol&time*.65); -per_frame_14=q5=bass_c; -per_frame_15=q6=treb_c; -per_frame_16=q7=mid_c; -per_frame_17=q8=vol_c; -per_frame_18= -per_frame_19= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.950000 -fVideoEchoZoom=0.999607 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=5.830096 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000100 -fShader=0.000000 -zoom=1.020484 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.999944 -sy=0.999904 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.400000 -ob_size=0.049900 -ob_r=0.110000 -ob_g=0.500000 -ob_b=1.000000 -ob_a=0.400000 -ib_size=0.055000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=0.640000 -nMotionVectorsY=4.800000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.700000 -mv_g=0.350000 -mv_b=0.500000 -mv_a=0.000000 -per_frame_1=vol_att=bass_att+treb_Att+mid_att; -per_frame_2=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_3=treb_thresh=above(treb_att,treb_thresh)*2+ -per_frame_4=(1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*0.96+1.3); -per_frame_5=mid_thresh=above(mid_att,mid_thresh)*2+ -per_frame_6=(1-above(mid_mid_att,mid_thresh))*((mid_thresh-1.3)*0.96+1.3); -per_frame_7=vol_thresh=bass_thresh+treb_thresh+mid_thresh; -per_frame_8=treb_effect=max(max(treb,treb_Att),treb_thresh); -per_frame_9=bass_effect=max(max(Bass,bass_Att),bass_thresh); -per_frame_10=mid_effect=max(max(mid,mid_att),mid_thresh); -per_frame_11=vol_effect=bass_effect+treb_effect+mid_effect; -per_frame_12=react=vol; -per_frame_13=new_bass=if(above(react,bass_effect),bass&bass_att,bass_effect+bass_thresh); -per_frame_14=new_treb=if(above(react,treb_effect),treb&treb_att,treb_Effect+treb_thresh); -per_frame_15=new_mid=if(above(react,mid_effect),mid&mid_Att,mid_effect+mid_thresh); -per_frame_16=new_vol=new_bass+new_treb+new_mid+.04; -per_frame_17=change=bnot(1); -per_frame_18=q1=new_bass; -per_frame_19=q2=new_treb; -per_frame_20=q3=new_mid; -per_frame_21=q4=new_vol; -per_frame_22=q5=if(above(q2,q3),above(q1,q3),-above(q1,q3)); -per_frame_23=q6=if(above(q1,q3),above(q2,q4),-above(q2,q3)); -per_frame_24=q7=if(above(q5,q6),q5,-q6);; -per_frame_25=q8=if(above(q6,q7),q6,-q7);; -per_frame_26= -per_frame_27= -per_frame_28= -per_frame_29= -per_frame_30=red=1*sin(time*1*q1); -per_frame_31=blue=1*sin(time*2*q2); -per_frame_32=green=1*sin(time*3*q3); -per_frame_33=wave_R=red-.2*sin(above(q1,q2)); -per_frame_34=wave_b=blue-.9*sin(Above(q1,q3)); -per_frame_35=wave_g=green-.5*sin(above(q3,q2));; -per_frame_36=ob_r=blue; -per_frame_37=ob_b=green; -per_frame_38=ob_g=red; -per_pixel_1=change=if(above(q1*q2,q3*q1),effect,effect0+.2+Rad*siN(q6-x+(.2*sin(q3)+x*sin(q7)))); -per_pixel_2=effect0=if(above(q1,q3),zoom,zoom-.1); -per_pixel_3=effect=if(above(q2,q3),zoom,zoom-.1); -per_pixel_4=change2=if(above(q1*q3,q4*q1),effect-.1,effect0-.1+rad*sin(q2-x+(.2*sin(q2)))); -per_pixel_5=change3=change-change2; -per_pixel_6=change4=change0-change+change2; -per_pixel_7=effect2=if(above(change,q1),if(above(change,q4),zoom+.3-rad,change), -per_pixel_8=if(above(change,q3),-zoom+.3-rad,change2))+.2; -per_pixel_9=zoom=if(above(change3,change4),if(above(chang2,change3),if(above(change,change2) -per_pixel_10=,effect,effect2),effect0),zoom); -per_pixel_11=rot = -ang*.05*zoom; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Che - Return Of The King.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Che - Return Of The King.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Che - Return Of The King.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Che - Return Of The King.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.999000 -fVideoEchoZoom=1.000498 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000416 -fWaveScale=0.591236 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.000000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000158 -fShader=1.000000 -zoom=1.000200 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.030301 -sy=1.020100 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.900000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.150000 -ob_r=0.000000 -ob_g=0.200000 -ob_b=0.400000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.150000 -ib_b=0.550000 -ib_a=1.000000 -nMotionVectorsX=19.199995 -nMotionVectorsY=14.400000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.500000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=wave_r = 0.150*( 0.30*sin(0.875*time) + 0.20*sin(0.315*time) ); -per_frame_2=wave_g = 0.850*( 0.10*sin(0.200*time) + 0.10*sin(1.025*time) ); -per_frame_3=wave_b = 0.250*( 0.90*sin(0.410*time) + 0.60*sin(0.150*time) ); -per_pixel_1=dx=.01*sin((20+10*sin(q1*1.5))*(y+.2*sin(q1*.7)))*bass; -per_pixel_2=dy=.01*sin((20+10*sin(q1))*(x+.2*sin(q1*.77)))*bass; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Che - The Piper.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Che - The Piper.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Che - The Piper.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Che - The Piper.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=1.000498 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000416 -fWaveScale=0.998162 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.000000 -fModWaveAlphaEnd=0.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000100 -fShader=1.000000 -zoom=0.970700 -rot=0.020000 -cx=0.350000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.072134 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.150000 -ob_r=0.000000 -ob_g=0.200000 -ob_b=0.400000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.150000 -ib_b=0.550000 -ib_a=1.000000 -nMotionVectorsX=19.199995 -nMotionVectorsY=14.400000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.500000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=wave_r = 0.150*(0.30*sin(0.875*time) + 0.20*sin(0.315*time) ); -per_frame_2=wave_g = 0.150*(0.10*sin(0.200*time) + 0.10*sin(1.025*time) ); -per_frame_3=wave_b = 0.150*(0.50*sin(0.410*time) + 0.60*sin(0.150*time) ); -per_pixel_1=dx=.01*sin((20+10*sin(q1*1.5))*(y+.2*sin(q1*.7)))*bass*3; -per_pixel_2=dy=.01*sin((20+10*sin(q1))*(x+.2*sin(q1*.77)))*bass*2; -per_pixel_3=sy = sy + 0.01 * bass_att; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion - Figure Eight.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion - Figure Eight.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion - Figure Eight.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion - Figure Eight.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.000000 -fDecay=0.985000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.640223 -fWaveSmoothing=0.270000 -fWaveParam=0.600000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.040100 -rot=0.400000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.499900 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=3.200000 -nMotionVectorsY=3.000001 -mv_l=3.950000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.700000 -per_frame_1=dx = dx - .001; -per_frame_2=dy = dy - .001; -per_frame_3=warp = 0; -per_frame_4=wave_r = wave_r + .5*sin(time*.666); -per_frame_5=wave_g = wave_g + .5*sin(time*.777); -per_frame_6=wave_b = wave_b + .5*sin(time*.888); -per_frame_7=wave_r = wave_r + 0.5*sin(1.047*time); -per_frame_8=wave_g = wave_g - 0.5*cos(0.835*time); -per_frame_9=wave_b = wave_b + 0.5*cos(1.011*time); -per_frame_10=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_11=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_12=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_13=mv_a=mid_residual; -per_frame_14=mv_x=rand(30); -per_frame_15=mv_y=rand(30); -per_frame_16=mv_r=wave_b; -per_frame_17=mv_b=wave_g; -per_frame_18=mv_g=wave_r; -per_pixel_1=dx = .01*atan((rad)/.1*sin((x*y)*20+time*5)); -per_pixel_2=zoom = zoom + rad*.05; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000001 -fDecay=0.999000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.254857 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=2.448629 -fWarpScale=67.165291 -fZoomExponent=0.132909 -fShader=1.000000 -zoom=0.970590 -rot=0.000000 -cx=2.000000 -cy=0.500000 -dx=0.020000 -dy=0.000000 -warp=0.029800 -sx=1.000000 -sy=1.010000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=1.000000 -wave_y=0.500000 -ob_size=0.300000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=1.000000 -ib_a=0.000000 -nMotionVectorsX=8.000000 -nMotionVectorsY=1.920000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.500000 -per_frame_1=dx =dx -0.0005; -per_frame_2=dy = dy-0.0035; -per_frame_3=mv_l = 3000; -per_frame_4=mv_r = 0.5 + 0.499*sin(time*1.12); -per_frame_4=mv_g = 0.5 + 0.123*cos(time*1.83); -per_frame_5=mv_b = 0.4 + 0.79*cos(time*0.45); -per_frame_6=bass_effect = max(max(bass,bass_att)-1.3,0); -per_frame_7=decay = if(above(bass_effect,0),0.96,0.996); -per_frame_8=wave_x = 0.6+0.3*sin(time*0.724); -per_frame_9=warp = warp + (2*sin(0.75*time)); -per_frame_10=wrap_s = wrap_s +0.5*sin(0.1*time); -per_frame_9=wave_r = 0.5 + (sin(time/2) - cos(time*0.22))/2; -per_frame_10=wave_g = 0.5 - sin(time*0.877)/2; -per_frame_11=wave_b = 0.5 - cos(time)/2; -per_frame_13=dx = dx + dx_residual; -per_frame_14=dy = dy + dy_residual; -per_frame_15=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_16=dx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_17=dy_residual = equal(bass_thresh,2)*0.012*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.599179 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=3.072695 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.410000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=bass_on=if(above(bass_att,1.3),1,0); -per_frame_3=treb_on=if(above(treb_att,1.3),1,0); -per_frame_4=state = 1 + bass; -per_frame_5=wave_r = wave_r + 0.25*(0.6*sin(0.784*time) + 0.4*sin(0.986*time))*state; -per_frame_6=wave_g = wave_g + 0.25*(0.6*sin(0.671*time) + 0.4*sin(1.164*time))*(4-state); -per_frame_7=wave_b = wave_b + 0.25*(0.6*sin(1.423*time) + 0.4*sin(0.687*time))*(4/state); -per_frame_8=wave_y=if(equal(state,1),wave_y+rand(10)*.1*sin(time*3),wave_y); -per_frame_9=bass_effect = if(above(bass_att,1.4),pow(1.1,bass_att),1); -per_frame_10=treb_effect = if(above(treb_att,1.4),pow(0.97,treb_att),1); -per_frame_11=net_effect = if(above(bass_att,0.8*treb_att),bass_effect,treb_effect); -per_frame_12=zoom = 0.99 * net_effect; -per_frame_13=rot = 0.03 * net_effect * sin(time); -per_frame_14=wave_size=6*state + 3; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.976000 -fVideoEchoZoom=1.028414 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.818016 -fWaveScale=1.028415 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995700 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000206 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.424100 -sx=1.000000 -sy=1.000000 -wave_r=0.200000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.060000 -ob_r=0.800000 -ob_g=0.300000 -ob_b=0.800000 -ob_a=1.000000 -ib_size=0.050000 -ib_r=0.200000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=old_bass_flop=bass_flop; -per_frame_2=old_treb_flop=treb_flop; -per_frame_3=old_mid_flop=mid_flop; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_15=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_16=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_17=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.0035); -per_frame_18=entropy=if(bass_changed*mid_changed*treb_changed,(1+bass_flop+treb_flop+mid_flop)*(1+rand(3)),entropy); -per_frame_19=q1=mid_residual; -per_frame_20=q2=bass_residual; -per_frame_21=q3=treb_residual; -per_frame_22=q4=sin(pulse); -per_frame_23=q5=cos(pulse*(.5+.1*entropy)); -per_frame_24=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_25=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q8=entropy; -per_frame_27=wave_r=wave_r+wave_r*sin(q4+q5); -per_frame_28=wave_b=wave_b+wave_b*q2*sin(q3); -per_frame_29=wave_g=wave_g+wave_g*q2; -per_frame_30=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_31=ob_bob_b+ob_b*sin(q2+q3*2.14); -per_frame_32=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_33=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_34=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_35=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_36=wave_mystery=.5*q6; -per_frame_37=warp=0; -per_frame_38=ob_size = 0.070 + (bass+mid)/24 + bass_att/30; -per_frame_39=ib_size = ob_size / 4; -per_pixel_1=zoom=zoom+.10*sin(q4+time+ang+rad); -per_pixel_2=rot=if(above(bnot(1*q4),bnot(1*q3*.24)),rot*sin(rad*sin(q4*.54)),-rot*sin(rad*cos(q4*. -per_pixel_3=34)))*Sin(Bass*.43)*sin(time*.13)*sin(q4*.54); -per_pixel_4=sx=sx+.2*sqrt(sin(x))*sin(q3)*sin(q4*.42)*sin(q1*.65); -per_pixel_5=sy=sy-.2*sqrt(sin(y))*cos(q3*q1)*Sin(above(q3,q3+.4)*.54)*sin(q4*above(q3,q2)*.54); -per_pixel_6=dx=rot*sin(q4+q3)*Y*sin(above(q2,q4*.12))*x*sin(q3*.53)*sin(q5*.43); -per_pixel_7=dy=-rot*sin(q3)*x*Sin(above(q3,q5)*.53)*y*sin(above(q4,q1)*-.12)*sin(above(q1,q3)*.23);; -per_pixel_8=cx = cx + 4 * sin(0.128 * q3); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Jess - Trying To Trap A Twister.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Jess - Trying To Trap A Twister.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Jess - Trying To Trap A Twister.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Jess - Trying To Trap A Twister.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.993000 -fVideoEchoZoom=0.996620 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.264366 -fWaveScale=0.264076 -fWaveSmoothing=0.720000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.300000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.061520 -sy=1.061520 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=1.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=1.000000 -ib_a=1.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=entropy=if(bnot(entropy),2,if(equal(pulse,-9.42),1+rand(3),entropy)); -per_frame_3=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_4=bass_changed=abs(bass_flop-equal(bass_thresh,2)); -per_frame_5=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_6=treb_changed=abs(treb_flop-equal(treb_thresh,2)); -per_frame_7=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_8=mid_changed=abs(mid_flop-equal(mid_thresh,2)); -per_frame_9=bass_residual = bass_changed*sin(pulse*bass_thresh*.2*entropy) + bnot(bass_changed)*bass_residual; -per_frame_10=treb_residual = treb_changed*sin(pulse*treb_thresh*.2*entropy) + bnot(treb_changed)*treb_residual; -per_frame_11=mid_residual = mid_changed*sin(pulse*mid_thresh*.2*entropy) + bnot(mid_changed)*mid_residual; -per_frame_12=pulse=if(above(abs(pulse),9.42),-9.42,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.01); -per_frame_13=q1=mid_residual; -per_frame_14=q2=bass_residual; -per_frame_15=q3=treb_residual; -per_frame_16=q4=sin(pulse); -per_frame_17=q5=cos(pulse); -per_frame_18=wave_mystery=-.2+.2*q4; -per_frame_19=wave_r=wave_r+.5*bass_residual; -per_frame_20=zoom=zoom-.0035*q1; -per_frame_21=decay=decay+.003*sin(pulse); -per_pixel_1=anti_rad=(1-rad); -per_pixel_2=dx=if(below(sin(rad*10*q5),abs(q5)),.02*q1,.025*q2); -per_pixel_3=dy=dy-cos(anti_rad*10*q3-rad*10*q5+rad*10*q4)*.05; -per_pixel_4=zoom=zoom+(dy-1)*(dx-1)*q1*.07; -per_pixel_5=rot=rot+atan(anti_rad*3.14*q3)*abs(zoom-1.2)*above(q2,0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - 3D Shapes Demo 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - 3D Shapes Demo 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - 3D Shapes Demo 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - 3D Shapes Demo 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,291 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.463735 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=t8=3.14159265; -wave_0_init3=t5 = 1; -wave_0_per_frame1=rotx = rotx+bass; -wave_0_per_frame2=roty = roty+mid; -wave_0_per_frame3=rotz = rotz+treb; -wave_0_per_frame4=//rotx =0; -wave_0_per_frame5=//roty =0; -wave_0_per_frame6=//rotz =0; -wave_0_per_frame7= -wave_0_per_frame8=//convert rotation values from degrees to radians -wave_0_per_frame9=t1= t8*rotx/180; -wave_0_per_frame10=t2 = t8*roty/180; -wave_0_per_frame11=t3 = t8*rotz/180; -wave_0_per_frame12= -wave_0_per_point1=//Define 3D Shape -wave_0_per_point2= -wave_0_per_point3=//Torus -wave_0_per_point4=x0 = (1+value1)*sin(2*t8*sample); -wave_0_per_point5=y0 = (1+value1)*cos(2*t8*sample); -wave_0_per_point6=x1 = 0.5*sin(32*t8*sample)*y0+y0; -wave_0_per_point7=y1 = 0.5*sin(32*t8*sample)*x0+x0; -wave_0_per_point8=z1= 0.5*cos(32*t8*sample); -wave_0_per_point9= -wave_0_per_point10=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_0_per_point11=y2 = y1*cos(t1)-z1*sin(t1); -wave_0_per_point12=z2 = y1*sin(t1)+z1*cos(t1); -wave_0_per_point13=x2 = z2*sin(t2)+x1*cos(t2); -wave_0_per_point14=z3 = z2*cos(t2)-x1*sin(t2); -wave_0_per_point15=x3 = x2*cos(t3)-y2*sin(t3); -wave_0_per_point16=y3 = y2*cos(t3)+x2*sin(t3); -wave_0_per_point17=//move resulting shape in 3d space -wave_0_per_point18=x4 = x3; -wave_0_per_point19=y4 = y3; -wave_0_per_point20=z4 = z3+2; -wave_0_per_point21=//draw 3d shape in 2d -wave_0_per_point22=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_0_per_point23=y=0.5+0.5*(y4/(1+z4*0.5)); -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.463735 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=t8=3.14159265; -wave_1_init3=t5 = 1; -wave_1_per_frame1=rotx = rotx+bass; -wave_1_per_frame2=roty = roty+mid; -wave_1_per_frame3=rotz = rotz+treb; -wave_1_per_frame4=//rotx = 0; -wave_1_per_frame5=//roty =0; -wave_1_per_frame6=//rotz = 0; -wave_1_per_frame7= -wave_1_per_frame8=//convert rotation values from degrees to radians -wave_1_per_frame9=t1= t8*rotx/180; -wave_1_per_frame10=t2 = t8*roty/180; -wave_1_per_frame11=t3 = t8*rotz/180; -wave_1_per_frame12= -wave_1_per_frame13=t4 = 3*sin(time+0.66*t8); -wave_1_per_frame14=t5 = 10+8*cos(time+0.66*t8); -wave_1_per_frame15= -wave_1_per_frame16=b = 0.5-0.4*cos(time+0.66*t8); -wave_1_per_frame17=g = 0.5-0.4*sin(time+0.66*t8); -wave_1_per_point1=//Define 3D Shape -wave_1_per_point2= -wave_1_per_point3=//Sphere -wave_1_per_point4=x1 = (1+value1)*sin(t8*sample)*sin(16*t8*sample); -wave_1_per_point5=y1 = (1+value1)*cos(t8*sample); -wave_1_per_point6=z1= (1+value1)*sin(t8*sample)*cos(16*t8*sample); -wave_1_per_point7= -wave_1_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_1_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_1_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_1_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_1_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_1_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_1_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_1_per_point15=//move resulting shape in 3d space -wave_1_per_point16=x4 = x3+t4; -wave_1_per_point17=y4 = y3; -wave_1_per_point18=z4 = z3+t5; -wave_1_per_point19=//draw 3d shape in 2d -wave_1_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_1_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_1_per_point22= -wave_1_per_point23=r = g+value1; -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.463735 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=t8=3.14159265; -wave_2_init3=t5 = 1; -wave_2_per_frame1=rotx = rotx+bass; -wave_2_per_frame2=roty = roty+mid; -wave_2_per_frame3=rotz = rotz+treb; -wave_2_per_frame4=//rotx = 0; -wave_2_per_frame5=//roty =0; -wave_2_per_frame6=//rotz = 0; -wave_2_per_frame7= -wave_2_per_frame8=//convert rotation values from degrees to radians -wave_2_per_frame9=t1= t8*rotx/180; -wave_2_per_frame10=t2 = t8*roty/180; -wave_2_per_frame11=t3 = t8*rotz/180; -wave_2_per_frame12= -wave_2_per_frame13=t4 = 3*sin(time+1.33*t8); -wave_2_per_frame14=t5 = 10+8*cos(time+1.33*t8); -wave_2_per_frame15= -wave_2_per_frame16=r = 0.5-0.4*cos(time+1.33*t8); -wave_2_per_frame17=b = 0.5-0.4*sin(time+1.33*t8); -wave_2_per_point1=//Define 3D Shape -wave_2_per_point2= -wave_2_per_point3=//Cube -wave_2_per_point4=x0 = if(below(sample*12,1),sample*12, if(below(sample*12,2),1, if(below(sample*12,3),abs(sample*12-3), if(below(sample*12,6),0, if(below(sample*12,8),1, if(below(sample*12,9),abs(sample*12-9), if(below(sample*12,10),0, if(below(sample*12,11),sample*12-10,1)))))))); -wave_2_per_point5=y0 = if(below(sample*12,1),0, if(below(sample*12,2),sample*12-1, if(below(sample*12,3),1, if(below(sample*12,4),abs(sample*12-4), if(below(sample*12,5),0, if(below(sample*12,7),1, if(below(sample*12,9),0, if(below(sample*12,10),sample*12-9, if(below(sample*12,11),1,abs(sample*12-12)))))))))); -wave_2_per_point6=z0 = if(below(sample*12,4),0, if(below(sample*12,5),sample*12-4, if(below(sample*12,6),abs(sample*12-6), if(below(sample*12,7),sample*12-6, if(below(sample*12,8),abs(sample*12-8),1))))); -wave_2_per_point7=x1 = 0.5-x0+if(below(sin(sample*12*3.1415),0),value1,0); -wave_2_per_point8=y1 = 0.5-y0+if(below(cos((sample*12-1.5)*3.1415),0),value1,0); -wave_2_per_point9=z1 = 0.5-z0+if(below(sample*12,4),0,if(below(sample*12,8),value1,0)); -wave_2_per_point10= -wave_2_per_point11=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_2_per_point12=y2 = y1*cos(t1)-z1*sin(t1); -wave_2_per_point13=z2 = y1*sin(t1)+z1*cos(t1); -wave_2_per_point14=x2 = z2*sin(t2)+x1*cos(t2); -wave_2_per_point15=z3 = z2*cos(t2)-x1*sin(t2); -wave_2_per_point16=x3 = x2*cos(t3)-y2*sin(t3); -wave_2_per_point17=y3 = y2*cos(t3)+x2*sin(t3); -wave_2_per_point18=//move resulting shape in 3d space -wave_2_per_point19=x4 = x3+t4; -wave_2_per_point20=y4 = y3; -wave_2_per_point21=z4 = z3+t5; -wave_2_per_point22=//draw 3d shape in 2d -wave_2_per_point23=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_2_per_point24=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_2_per_point25= -wave_2_per_point26=g = b+value1; -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=wave_a=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - 3D Shapes Demo.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - 3D Shapes Demo.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - 3D Shapes Demo.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - 3D Shapes Demo.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,296 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.463735 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=t8=3.14159265; -wave_0_init3=t5 = 1; -wave_0_per_frame1=rotx = rotx+bass; -wave_0_per_frame2=roty = roty+mid; -wave_0_per_frame3=rotz = rotz+treb; -wave_0_per_frame4=//rotx = 0; -wave_0_per_frame5=//roty =0; -wave_0_per_frame6=//rotz = 0; -wave_0_per_frame7= -wave_0_per_frame8=//convert rotation values from degrees to radians -wave_0_per_frame9=t1= t8*rotx/180; -wave_0_per_frame10=t2 = t8*roty/180; -wave_0_per_frame11=t3 = t8*rotz/180; -wave_0_per_frame12= -wave_0_per_frame13=t4 = 3*sin(time); -wave_0_per_frame14=t5 = 10+8*cos(time); -wave_0_per_frame15= -wave_0_per_frame16=g = 0.5-0.4*cos(time); -wave_0_per_frame17=r = 0.5-0.4*sin(time); -wave_0_per_point1=//Define 3D Shape -wave_0_per_point2= -wave_0_per_point3=//Spiral -wave_0_per_point4=x1 = 0.5*sin(8*sample); -wave_0_per_point5=y1 = 2*(sample-0.5)-value1; -wave_0_per_point6=z1= 0.5*cos(8*sample); -wave_0_per_point7= -wave_0_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_0_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_0_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_0_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_0_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_0_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_0_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_0_per_point15=//move resulting shape in 3d space -wave_0_per_point16=x4 =x3 + t4; -wave_0_per_point17=y4 = y3; -wave_0_per_point18=z4 = z3+t5; -wave_0_per_point19=//draw 3d shape in 2d -wave_0_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_0_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_0_per_point22=//x=(0.5)*sin(8*sample*t8); -wave_0_per_point23=b= r+value1; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.463735 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=t8=3.14159265; -wave_1_init3=t5 = 1; -wave_1_per_frame1=rotx = rotx+bass; -wave_1_per_frame2=roty = roty+mid; -wave_1_per_frame3=rotz = rotz+treb; -wave_1_per_frame4=//rotx = 0; -wave_1_per_frame5=//roty =0; -wave_1_per_frame6=//rotz = 0; -wave_1_per_frame7= -wave_1_per_frame8=//convert rotation values from degrees to radians -wave_1_per_frame9=t1= t8*rotx/180; -wave_1_per_frame10=t2 = t8*roty/180; -wave_1_per_frame11=t3 = t8*rotz/180; -wave_1_per_frame12= -wave_1_per_frame13=t4 = 3*sin(time+0.66*t8); -wave_1_per_frame14=t5 = 10+8*cos(time+0.66*t8); -wave_1_per_frame15= -wave_1_per_frame16=b = 0.5-0.4*cos(time+0.66*t8); -wave_1_per_frame17=g = 0.5-0.4*sin(time+0.66*t8); -wave_1_per_point1=//Define 3D Shape -wave_1_per_point2= -wave_1_per_point3=//Sphere -wave_1_per_point4=x1 = (1+value1)*sin(t8*sample)*sin(16*t8*sample); -wave_1_per_point5=y1 = (1+value1)*cos(t8*sample); -wave_1_per_point6=z1= (1+value1)*sin(t8*sample)*cos(16*t8*sample); -wave_1_per_point7= -wave_1_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_1_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_1_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_1_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_1_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_1_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_1_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_1_per_point15=//move resulting shape in 3d space -wave_1_per_point16=x4 = x3+t4; -wave_1_per_point17=y4 = y3; -wave_1_per_point18=z4 = z3+t5; -wave_1_per_point19=//draw 3d shape in 2d -wave_1_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_1_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_1_per_point22= -wave_1_per_point23=r = g+value1; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.463735 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=t8=3.14159265; -wave_2_init3=t5 = 1; -wave_2_per_frame1=rotx = rotx+bass; -wave_2_per_frame2=roty = roty+mid; -wave_2_per_frame3=rotz = rotz+treb; -wave_2_per_frame4=//rotx = 0; -wave_2_per_frame5=//roty =0; -wave_2_per_frame6=//rotz = 0; -wave_2_per_frame7= -wave_2_per_frame8=//convert rotation values from degrees to radians -wave_2_per_frame9=t1= t8*rotx/180; -wave_2_per_frame10=t2 = t8*roty/180; -wave_2_per_frame11=t3 = t8*rotz/180; -wave_2_per_frame12= -wave_2_per_frame13=t4 = 3*sin(time+1.33*t8); -wave_2_per_frame14=t5 = 10+8*cos(time+1.33*t8); -wave_2_per_frame15= -wave_2_per_frame16=r = 0.5-0.4*cos(time+1.33*t8); -wave_2_per_frame17=b = 0.5-0.4*sin(time+1.33*t8); -wave_2_per_point1=//Define 3D Shape -wave_2_per_point2= -wave_2_per_point3=//Cube -wave_2_per_point4=x0 = if(below(sample*12,1),sample*12, if(below(sample*12,2),1, if(below(sample*12,3),abs(sample*12-3), if(below(sample*12,6),0, if(below(sample*12,8),1, if(below(sample*12,9),abs(sample*12-9), if(below(sample*12,10),0, if(below(sample*12,11),sample*12-10,1)))))))); -wave_2_per_point5=y0 = if(below(sample*12,1),0, if(below(sample*12,2),sample*12-1, if(below(sample*12,3),1, if(below(sample*12,4),abs(sample*12-4), if(below(sample*12,5),0, if(below(sample*12,7),1, if(below(sample*12,9),0, if(below(sample*12,10),sample*12-9, if(below(sample*12,11),1,abs(sample*12-12)))))))))); -wave_2_per_point6=z0 = if(below(sample*12,4),0, if(below(sample*12,5),sample*12-4, if(below(sample*12,6),abs(sample*12-6), if(below(sample*12,7),sample*12-6, if(below(sample*12,8),abs(sample*12-8),1))))); -wave_2_per_point7=x1 = 0.5-x0+if(below(sin(sample*12*3.1415),0),value1,0); -wave_2_per_point8=y1 = 0.5-y0+if(below(cos((sample*12-1.5)*3.1415),0),value1,0); -wave_2_per_point9=z1 = 0.5-z0+if(below(sample*12,4),0,if(below(sample*12,8),value1,0)); -wave_2_per_point10= -wave_2_per_point11=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_2_per_point12=y2 = y1*cos(t1)-z1*sin(t1); -wave_2_per_point13=z2 = y1*sin(t1)+z1*cos(t1); -wave_2_per_point14=x2 = z2*sin(t2)+x1*cos(t2); -wave_2_per_point15=z3 = z2*cos(t2)-x1*sin(t2); -wave_2_per_point16=x3 = x2*cos(t3)-y2*sin(t3); -wave_2_per_point17=y3 = y2*cos(t3)+x2*sin(t3); -wave_2_per_point18=//move resulting shape in 3d space -wave_2_per_point19=x4 = x3+t4; -wave_2_per_point20=y4 = y3; -wave_2_per_point21=z4 = z3+t5; -wave_2_per_point22=//draw 3d shape in 2d -wave_2_per_point23=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_2_per_point24=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_2_per_point25= -wave_2_per_point26=g = b+value1; -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=wave_a=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb 2 Peacock (Bmelgren's Comp.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb 2 Peacock (Bmelgren's Comp.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb 2 Peacock (Bmelgren's Comp.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb 2 Peacock (Bmelgren's Comp.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=0.999000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bMotionVectorsOn=1 -bRedBlueStereo=0 -nMotionVectorsX=64 -nMotionVectorsY=1 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.115204 -fWaveScale=1.106638 -fWaveSmoothing=0.000000 -fWaveParam=-0.420000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.042592 -fShader=0.000000 -zoom=1.000000 -rot=-0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.914340 -sy=0.951466 -wave_r=0.400000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -per_frame_1=warp=warp/bass; -per_frame_2=dx=-0.0005; -per_frame_3=dy=-0.0005; -per_frame_4=x_wave_x = 0.5+0.3*sin(bass+treb+mid); -per_frame_5=wave_r = 1 + sin(-x_wave_x*6.28); -per_frame_6=wave_g = abs(sin(2*x_wave_x*6.28)); -per_frame_7=wave_b = sin(x_wave_x*6.28); -per_frame_8=treb_effect = if(above(treb_att,1.4),pow(0.99,treb_att),1); -per_frame_9=net_effect = if(above(bass_att,0.8*treb_att),1,treb_effect); -per_frame_10=zoom = net_effect*bass_att; -per_frame_11=rot = rot + rot_residual*.5; -per_frame_12=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_13=shift = (tan(time*7)) -0.05; -per_frame_14=shift = if(above(shift,0),0,if(below(shift,-0.1),-0.1,shift)); -per_frame_15=rot_residual = if(equal(bass_thresh,2),shift,rot_residual); -per_pixel_1=rot = rot + if(equal(sin(ang), 1), rot, sin(1-rad)/2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=0.975000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=64 -nMotionVectorsY=1 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.108925 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.400000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -per_frame_1=warp=0; -per_frame_2=dx=-0.0005; -per_frame_3=dy=-0.0005; -per_frame_4=wave_x = 0.5+0.3*sin(bass+treb+mid); -per_frame_5=wave_r = 1 + sin(-wave_x*6.28); -per_frame_6=wave_g = abs(sin(2*wave_x*6.28)); -per_frame_7=wave_b = sin(wave_x*6.28); -per_frame_8=treb_effect = if(above(treb_att,1.4),pow(0.99,treb_att),1); -per_frame_9=net_effect = if(above(bass_att,0.8*treb_att),1,treb_effect); -per_frame_10=zoom = net_effect*1.065; -per_frame_11=rot = rot + rot_residual; -per_frame_12=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_13=shift = (tan(time*7)) -0.05; -per_frame_14=shift = if(above(shift,0),0,if(below(shift,-0.1),-0.1,shift)); -per_frame_15=rot_residual = if(equal(bass_thresh,2),shift,rot_residual); -per_pixel_1=rot = rot + if(equal(sin(ang), 0), rot, sin(1-rad)/2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Digital Flame.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Digital Flame.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Digital Flame.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Digital Flame.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.369700 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=53.523884 -fWarpScale=0.408391 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.699900 -wave_g=0.600000 -wave_b=0.800000 -wave_x=0.000000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=q1 = (bass_att + mid_att + treb_att) /3; -per_frame_2=q2 = time + 1000; -per_frame_3=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.4)*0.95+1.4); -per_frame_4=treb_thresh = above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.5)*0.85+1.2); -per_frame_5=bass_on = above(bass_thresh,1.9); -per_frame_6=treb_on = above(treb_thresh,1.9); -per_frame_7=swapcolour = bass_on - treb_on; -per_frame_8=red_aim = if(equal(swapcolour,1),1,if(equal(swapcolour,0),0.9,0.7)); -per_frame_9=green_aim = if(equal(swapcolour,1),0.7,if(equal(swapcolour,0),0.3,0.6)); -per_frame_10=blue_aim = if(equal(swapcolour,1),0,if(equal(swapcolour,0),0.2,0.8)); -per_frame_11=red = red + (red_aim - red)*0.5; -per_frame_12=green = green + (green_aim - green)*0.5; -per_frame_13=blue = blue + (blue_aim - blue)*0.5; -per_frame_14=wave_r = red; -per_frame_15=wave_g = green; -per_frame_16=wave_b = blue; -per_pixel_1=dy = -0.1*(q1-1)*log(2-(abs(y*2 - 1.8))); -per_pixel_2=dy = below(dy,0.02)*dy - 0.02; -per_pixel_3=dy = dy + 0.01*(sin((x*q2*0.483) + (y*q2*1.238)) + sin((x*q2*1.612) + (y*q2*0.648))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Dynamic Borders 1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Dynamic Borders 1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Dynamic Borders 1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Dynamic Borders 1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.700000 -fDecay=0.990000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.634243 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999990 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.380000 -ob_size=0.020000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.050000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.100000 -per_frame_1=warp = 0; -per_frame_2= -per_frame_3=ib_r = ib_r + 0.10*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_4=ib_g = ib_g + 0.10*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_5=ib_b = ib_b + 0.10*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_6=temp = 0.12*tan(0.3*(mid+bass)); -per_frame_7=ib_a = if(below(temp,0.4),temp,0.4); -per_frame_8=ob_size = ob_size - 0.01; -per_frame_9=ob_size = ob_size + 0.15*sin(0.5*bass_att); -per_frame_10=q1 = (cx*2-1) + 0.62*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_11=q2 = (cy*2-1) + 0.62*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_12=q3 = (cx*2-1) + 0.62*( 0.60*sin(0.174*-time) + 0.40*sin(0.364*time) ); -per_frame_13=q4 = (cy*2-1) + 0.62*( 0.60*sin(0.234*time) + 0.40*sin(0.271*-time) ); -per_frame_14=decay = decay - 0.01*equal(frame%5,0); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -per_pixel_15=dx = dx*1.5; -per_pixel_16=dy = dy*1.5; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Framed Geometry.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Framed Geometry.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Framed Geometry.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Framed Geometry.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.990000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.369711 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.800000 -ob_size=0.500000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.010000 -ib_size=0.500000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.010000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.122860 -mv_dy=0.400769 -mv_l=0.055000 -mv_r=0.068206 -mv_g=0.020766 -mv_b=0.516542 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.463735 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=t8=3.14159265; -wave_0_init3=t5 = 1; -wave_0_per_frame1=rotx = rotx+bass; -wave_0_per_frame2=roty = roty+mid; -wave_0_per_frame3=rotz = rotz+treb; -wave_0_per_frame4=//rotx = 0; -wave_0_per_frame5=//roty =0; -wave_0_per_frame6=//rotz = 0; -wave_0_per_frame7= -wave_0_per_frame8=//convert rotation values from degrees to radians -wave_0_per_frame9=t1= t8*rotx/180; -wave_0_per_frame10=t2 = t8*roty/180; -wave_0_per_frame11=t3 = t8*rotz/180; -wave_0_per_frame12= -wave_0_per_frame13=t4 = 4*sin(q1); -wave_0_per_frame14=t5 = 10+8*cos(q1); -wave_0_per_frame15= -wave_0_per_frame16=g = 0.5-0.3*cos(time); -wave_0_per_frame17=r = 0.5-0.3*sin(time); -wave_0_per_point1=//Define 3D Shape -wave_0_per_point2= -wave_0_per_point3=//Spiral -wave_0_per_point4=x1 = 0.5*sin(8*t8*sample); -wave_0_per_point5=y1 = 2*(sample-0.5)-value1; -wave_0_per_point6=z1= 0.5*cos(8*t8*sample); -wave_0_per_point7= -wave_0_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_0_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_0_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_0_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_0_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_0_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_0_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_0_per_point15=//move resulting shape in 3d space -wave_0_per_point16=x4 = x3+t4; -wave_0_per_point17=y4 = y3; -wave_0_per_point18=z4 = z3+t5; -wave_0_per_point19=//draw 3d shape in 2d -wave_0_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_0_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_0_per_point22= -wave_0_per_point23=b= r+5*value1; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.463735 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=t8=3.14159265; -wave_1_init3=t5 = 1; -wave_1_per_frame1=rotx = rotx+bass; -wave_1_per_frame2=roty = roty+mid; -wave_1_per_frame3=rotz = rotz+treb; -wave_1_per_frame4=//rotx = 0; -wave_1_per_frame5=//roty =0; -wave_1_per_frame6=//rotz = 0; -wave_1_per_frame7= -wave_1_per_frame8=//convert rotation values from degrees to radians -wave_1_per_frame9=t1= t8*rotx/180; -wave_1_per_frame10=t2 = t8*roty/180; -wave_1_per_frame11=t3 = t8*rotz/180; -wave_1_per_frame12= -wave_1_per_frame13=t4 = 4*sin(q1+0.66*t8); -wave_1_per_frame14=t5 = 10+8*cos(q1+0.66*t8); -wave_1_per_frame15= -wave_1_per_frame16=b = 0.5-0.3*cos(time+0.66*t8); -wave_1_per_frame17=g = 0.5-0.3*sin(time+0.66*t8); -wave_1_per_point1=//Define 3D Shape -wave_1_per_point2= -wave_1_per_point3=//Sphere -wave_1_per_point4=x0 = sin(2*t8*sample); -wave_1_per_point5=y0 = cos(2*t8*sample); -wave_1_per_point6=x1 = (1+value1)*sin(12*t8*sample)*y0; -wave_1_per_point7=y1 = (1+value1)*sin(12*t8*sample)*x0; -wave_1_per_point8=z1= (1+value1)*cos(12*t8*sample); -wave_1_per_point9= -wave_1_per_point10= -wave_1_per_point11=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_1_per_point12=y2 = y1*cos(t1)-z1*sin(t1); -wave_1_per_point13=z2 = y1*sin(t1)+z1*cos(t1); -wave_1_per_point14=x2 = z2*sin(t2)+x1*cos(t2); -wave_1_per_point15=z3 = z2*cos(t2)-x1*sin(t2); -wave_1_per_point16=x3 = x2*cos(t3)-y2*sin(t3); -wave_1_per_point17=y3 = y2*cos(t3)+x2*sin(t3); -wave_1_per_point18=//move resulting shape in 3d space -wave_1_per_point19=x4 = x3+t4; -wave_1_per_point20=y4 = y3; -wave_1_per_point21=z4 = z3+t5; -wave_1_per_point22=//draw 3d shape in 2d -wave_1_per_point23=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_1_per_point24=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_1_per_point25= -wave_1_per_point26=r = g+5*value1; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.463735 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=t8=3.14159265; -wave_2_init3=t5 = 1; -wave_2_per_frame1=rotx = rotx+bass; -wave_2_per_frame2=roty = roty+mid; -wave_2_per_frame3=rotz = rotz+treb; -wave_2_per_frame4=//rotx = 0; -wave_2_per_frame5=//roty =0; -wave_2_per_frame6=//rotz = 0; -wave_2_per_frame7= -wave_2_per_frame8=//convert rotation values from degrees to radians -wave_2_per_frame9=t1= t8*rotx/180; -wave_2_per_frame10=t2 = t8*roty/180; -wave_2_per_frame11=t3 = t8*rotz/180; -wave_2_per_frame12= -wave_2_per_frame13=t4 = 4*sin(q1+1.33*t8); -wave_2_per_frame14=t5 = 10+8*cos(q1+1.33*t8); -wave_2_per_frame15= -wave_2_per_frame16=r = 0.5-0.3*cos(time+1.33*t8); -wave_2_per_frame17=b = 0.5-0.3*sin(time+1.33*t8); -wave_2_per_point1=//Define 3D Shape -wave_2_per_point2= -wave_2_per_point3=//Cube -wave_2_per_point4=x0 = if(below(sample*12,1),sample*12, if(below(sample*12,2),1, if(below(sample*12,3),abs(sample*12-3), if(below(sample*12,6),0, if(below(sample*12,8),1, if(below(sample*12,9),abs(sample*12-9), if(below(sample*12,10),0, if(below(sample*12,11),sample*12-10,1)))))))); -wave_2_per_point5=y0 = if(below(sample*12,1),0, if(below(sample*12,2),sample*12-1, if(below(sample*12,3),1, if(below(sample*12,4),abs(sample*12-4), if(below(sample*12,5),0, if(below(sample*12,7),1, if(below(sample*12,9),0, if(below(sample*12,10),sample*12-9, if(below(sample*12,11),1,abs(sample*12-12)))))))))); -wave_2_per_point6=z0 = if(below(sample*12,4),0, if(below(sample*12,5),sample*12-4, if(below(sample*12,6),abs(sample*12-6), if(below(sample*12,7),sample*12-6, if(below(sample*12,8),abs(sample*12-8),1))))); -wave_2_per_point7=x1 = 0.5-x0+if(below(sin(sample*12*3.1415),0),value1,0); -wave_2_per_point8=y1 = 0.5-y0+if(below(cos((sample*12-1.5)*3.1415),0),value1,0); -wave_2_per_point9=z1 = 0.5-z0+if(below(sample*12,4),0,if(below(sample*12,8),value1,0)); -wave_2_per_point10= -wave_2_per_point11=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_2_per_point12=y2 = y1*cos(t1)-z1*sin(t1); -wave_2_per_point13=z2 = y1*sin(t1)+z1*cos(t1); -wave_2_per_point14=x2 = z2*sin(t2)+x1*cos(t2); -wave_2_per_point15=z3 = z2*cos(t2)-x1*sin(t2); -wave_2_per_point16=x3 = x2*cos(t3)-y2*sin(t3); -wave_2_per_point17=y3 = y2*cos(t3)+x2*sin(t3); -wave_2_per_point18=//move resulting shape in 3d space -wave_2_per_point19=x4 = x3+t4; -wave_2_per_point20=y4 = y3; -wave_2_per_point21=z4 = z3+t5; -wave_2_per_point22=//draw 3d shape in 2d -wave_2_per_point23=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_2_per_point24=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_2_per_point25= -wave_2_per_point26=g = b+5*value1; -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=volume = 0.3*(bass+mid); -per_frame_3=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_4=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_5=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_6=peakbass_att = max(bass_att,peakbass_att); -per_frame_7=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_8=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_9=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_10=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_11=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_12=dir = if(equal(abs(dir),1),dir,1); -per_frame_13=dir = if(equal(beatcount,beat),0-dir,dir); -per_frame_14=beatcount = if(above(beatcount,rand(10)+2),1,beatcount+beat); -per_frame_15=movement = movement+(dir/fps)*0.5*3.1415/beatrate; -per_frame_16=q1 = movement; -per_frame_17=monitor = beat; -per_pixel_1=zoom = zoom-0.001+0.06*max(abs(y-0.5)-0.3,0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & Illusion - Spiral Movement.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & Illusion - Spiral Movement.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & Illusion - Spiral Movement.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & Illusion - Spiral Movement.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.504218 -fWaveSmoothing=0.750000 -fWaveParam=0.240000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=9.860800 -fWarpScale=16.217400 -fZoomExponent=1.503744 -fShader=0.000000 -zoom=1.020100 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.819544 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.200000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.060000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=dx=-0.0005; -per_frame_2=dy=-0.0005; -per_frame_3=vol = (bass+mid+att)/6; -per_frame_4=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_5=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_6=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_7=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_8=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_9=xpos = xpos + 0.001*xspeed; -per_frame_10=wave_x = xpos + 0.5; -per_frame_11=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_12=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_13=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_14=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_15=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_16=ypos = ypos + 0.001*yspeed; -per_frame_17=wave_y = ypos + 0.5; -per_frame_18=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_19=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_20=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_21=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_22=cx = cx + 0.410*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_23=cy = cy + 0.410*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_24=wave_mystery = wave_mystery + 0.15*( 0.60*sin(0.629*time) + 0.40*sin(1.826*time) ); -per_frame_25=warp = warp*vol; -per_frame_26=zoom = zoom - 0.02*zoom*bass_att; -per_frame_27=zoom_exp = 1.5*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_28=ob_a = 1 - 2*vol; -per_frame_29=monitor = zoom_exp; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Interwoven (Nightmare Weft Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Interwoven (Nightmare Weft Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Interwoven (Nightmare Weft Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Interwoven (Nightmare Weft Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.816695 -fVideoEchoAlpha=0.400000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=1 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.498315 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.950000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=31.199999 -nMotionVectorsY=2.280001 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=2.500000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.800000 -mv_a=0.100000 -per_frame_1=warp=0; -per_frame_2= -per_frame_3=framethird = frame%3; -per_frame_4= -per_frame_5=x1 = 0.5 + 0.15*sin(0.416*time) + 0.15*sin(0.832*time) + 0.1*sin(1.324*time); -per_frame_6=x2 = 0.5 + 0.15*sin(0.341*time) + 0.15*sin(0.768*time) + 0.1*sin(1.523*time); -per_frame_7=x3 = 0.5 + 0.15*sin(0.287*time) + 0.15*sin(0.913*time) + 0.1*sin(1.142*time); -per_frame_8=r1 = 0.5 + 0.15*sin(0.512*time) + 0.15*sin(0.943*time) + 0.1*sin(1.024*time); -per_frame_9=r2 = 0.5 + 0.15*sin(0.483*time) + 0.15*sin(0.879*time) + 0.1*sin(1.423*time); -per_frame_10=r3 = 0.5 + 0.15*sin(0.531*time) + 0.15*sin(0.671*time) + 0.1*sin(1.442*time); -per_frame_11=g1 = 0.5 + 0.15*sin(0.248*time) + 0.15*sin(0.829*time) + 0.1*sin(1.623*time); -per_frame_12=g2 = 0.5 + 0.15*sin(0.461*time) + 0.15*sin(0.699*time) + 0.1*sin(1.254*time); -per_frame_13=g3 = 0.5 + 0.15*sin(0.397*time) + 0.15*sin(0.768*time) + 0.1*sin(1.157*time); -per_frame_14=b1 = 0.5 + 0.15*sin(0.211*time) + 0.15*sin(0.652*time) + 0.1*sin(1.865*time); -per_frame_15=b2 = 0.5 + 0.15*sin(0.333*time) + 0.15*sin(0.978*time) + 0.1*sin(1.359*time); -per_frame_16=b3 = 0.5 + 0.15*sin(0.475*time) + 0.15*sin(0.791*time) + 0.1*sin(1.011*time); -per_frame_17=wave_x = if(equal(framethird,0),x1,if(equal(framethird,1),x2,x3)); -per_frame_18=wave_r = if(equal(framethird,0),r1,if(equal(framethird,1),r2,r3)); -per_frame_19=wave_g = if(equal(framethird,0),g1,if(equal(framethird,1),g2,g3)); -per_frame_20=wave_b = if(equal(framethird,0),b1,if(equal(framethird,1),b2,b3)); -per_frame_21= -per_frame_22=volume = 0.3*(bass+mid); -per_frame_23=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_24=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_25=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_26=peakbass_att = max(bass_att,peakbass_att); -per_frame_27=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_28=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_29=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.99 + (1-above(time - lastbeat, 2*beatrate))*0.998); -per_frame_30=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_31=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_32=dx = if(beat,1-2*rand(2),0); -per_frame_33=ob_a = if(beat,0,0.65); -per_frame_34=mv_a = if(beat,1,0.05); -per_pixel_1=dy = 0.004 + 0.0005*sin(10*x+0.459*time) + 0.0005*sin(14*x+0.325*time) + 0.0005*sin(1.231*time); -per_pixel_2=//dx = dx + 0.0001*sin(9*y+0.612*time) + 0.0001*sin(13*y+0.429*time) + 0.0001*sin(1.027*time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & Rovastar - Altars of Madness (Mad Ocean Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & Rovastar - Altars of Madness (Mad Ocean Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & Rovastar - Altars of Madness (Mad Ocean Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & Rovastar - Altars of Madness (Mad Ocean Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.660126 -fWaveSmoothing=0.000000 -fWaveParam=0.300000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.150000 -mv_g=0.450000 -mv_b=0.650000 -mv_a=0.200000 -per_frame_1=warp=0; -per_frame_2=ib_a =0.2*bass; -per_frame_3=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_4=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.522)); -per_frame_5=wave_g = wave_g + 0.4*sin(time*1.731); -per_frame_6=decay = decay - equal(frame%100,0)*0.1; -per_frame_7=vol = 0.167*(bass+mid); -per_frame_8=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_9=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_10=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_11=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_12=xpos = xpos + 0.001*xspeed; -per_frame_13=wave_x = 1.5*xpos + 0.5; -per_frame_14=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_15=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_16=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_17=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_18=ypos = ypos + 0.001*yspeed; -per_frame_19=wave_y = 1.5*ypos + 0.5; -per_frame_20=zoom = .995; -per_frame_21=wave_x = if(frame%2,1-wave_x,wave_x); -per_frame_22=wave_y = if(frame%2,1-wave_y,wave_y); -per_frame_23=wave_r = if(frame%2,wave_r,wave_g); -per_frame_24=wave_g = if(frame%2,wave_g,wave_b); -per_frame_25=wave_b = if(frame%2,wave_b,wave_r); -per_frame_26=monitor = green; -per_pixel_1=dx=dx+0.008*sin((y*2-1)*(48+12*sin(0.412*time)))+0.008*sin(((y+sin(time*0.163))*2-1)*(3+sin(0.241*time))); -per_pixel_2=dy=dy+0.008*cos((x*2-1)*(64+18*sin(0.376*time)))+0.008*cos(((x+sin(time*0.282))*2-1)*(3+sin(0.349*time))); -per_frame_init_1=q8=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. Killer Death Bunny Remix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. Killer Death Bunny Remix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. Killer Death Bunny Remix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. Killer Death Bunny Remix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,364 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.334693 -fWaveSmoothing=0.750000 -fWaveParam=-0.219900 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.300000 -zoom=0.999900 -rot=0.100000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.800000 -ib_size=0.005000 -ib_r=0.400000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.700000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=0.800000 -wavecode_0_b=0.300000 -wavecode_0_a=1.000000 -wave_0_per_point1=n=sample*6.283; -wave_0_per_point2= -wave_0_per_point3=xp=sin(n); -wave_0_per_point4=yp=cos(n); -wave_0_per_point5= -wave_0_per_point6=tm=q3 - sample; -wave_0_per_point7= -wave_0_per_point8=xof=sin(tm) * sin(tm*3) * 0.4 + 0.5; -wave_0_per_point9=yof=cos(tm*1.3) * sin(tm*5.4) * 0.4 + 0.5; -wave_0_per_point10= -wave_0_per_point11= -wave_0_per_point12=x= xof; -wave_0_per_point13=y= (1-yof); -wave_0_per_point14= -wave_0_per_point15=a=1-sample; -wave_0_per_point16= -wave_0_per_point17= -wave_0_per_point18= -wave_0_per_point19= -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=0.700000 -wavecode_1_b=0.200000 -wavecode_1_a=1.000000 -wave_1_per_point1=n=sample*6.283; -wave_1_per_point2=n2=(sample-q8 - time*0.1)*6; -wave_1_per_point3= -wave_1_per_point4=xp=sin(n); -wave_1_per_point5=yp=cos(n); -wave_1_per_point6= -wave_1_per_point7=tm=q8 - sample; -wave_1_per_point8= -wave_1_per_point9=tx= sin(n2*13)*sin(n2*5) * sample * 0.05; -wave_1_per_point10=ty= cos(n2*13)*sin(n2*7) * sample * 0.05; -wave_1_per_point11= -wave_1_per_point12=xof=sin(tm) * sin(tm*3) * 0.4 + 0.5 + tx; -wave_1_per_point13=yof=cos(tm*1.3) * sin(tm*5.4) * 0.4 + 0.5 + ty; -wave_1_per_point14= -wave_1_per_point15=xran=(rand(10) - 5) * 0.0005; xran=xran*sample; -wave_1_per_point16=yran=(rand(10) - 5) * 0.0005; yran=yran*sample; -wave_1_per_point17= -wave_1_per_point18=x= xof + xran; -wave_1_per_point19=y= (1-yof) + yran; -wave_1_per_point20= -wave_1_per_point21=a=(1-sample); -wave_1_per_point22=g=g*(1-sample); -wave_1_per_point23=b=b*(1-sample) -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=0.780000 -wavecode_2_b=0.200000 -wavecode_2_a=1.000000 -wave_2_per_point1=n=sample*6.283; -wave_2_per_point2=n2=(sample-q8 - time*0.1)*6; -wave_2_per_point3= -wave_2_per_point4=xp=sin(n); -wave_2_per_point5=yp=cos(n); -wave_2_per_point6= -wave_2_per_point7=tm=q8 - sample; -wave_2_per_point8= -wave_2_per_point9=tx= sin(n2*13)*sin(n2*5) * sample * 0.05; -wave_2_per_point10=ty= cos(n2*13)*sin(n2*7) * sample * 0.05; -wave_2_per_point11= -wave_2_per_point12=xof=sin(tm) * sin(tm*3) * 0.4 + 0.5 + tx; -wave_2_per_point13=yof=cos(tm*1.3) * sin(tm*5.4) * 0.4 + 0.5 + ty; -wave_2_per_point14= -wave_2_per_point15=xran=(rand(10) - 5) * 0.0005; xran=xran*sample; -wave_2_per_point16=yran=(rand(10) - 5) * 0.0005; yran=yran*sample; -wave_2_per_point17= -wave_2_per_point18=x= xof + xran; -wave_2_per_point19=y= (1-yof) + yran; -wave_2_per_point20= -wave_2_per_point21=a=(1-sample); -wave_2_per_point22=g=g*(1-sample); -wave_2_per_point23=b=b*(1-sample) -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_point1=xs=sin(sample*6.28); -wave_3_per_point2=ys=cos(sample*6.28); -wave_3_per_point3=xs=xs*0.7 + 0.5; -wave_3_per_point4=ys=ys*0.7 + 0.5; -wave_3_per_point5=xs=min(xs,0.958); -wave_3_per_point6=xs=max(xs,0.042); -wave_3_per_point7=ys=min(ys,0.988); -wave_3_per_point8=ys=max(ys,0.012); -wave_3_per_point9=x=xs;y=ys; -wave_3_per_point10= -wave_3_per_point11=n2=abs((sample*6.283)-3.1415); -wave_3_per_point12= -wave_3_per_point13=r=sin(n2+time)*0.5+0.5; -wave_3_per_point14=g=sin(n2+2.1+time)*0.5+0.5; -wave_3_per_point15=b=sin(n2+4.2+time)*0.5+0.5; -wave_3_per_point16= -wave_3_per_point17= -wave_3_per_point18=a=a * above(sin(n2*9+q8*2), sin(time) ) -shapecode_0_enabled=1 -shapecode_0_sides=5 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.110462 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=0.500000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.500000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shape_0_per_frame1=x=q1; -shape_0_per_frame2=y=1-q2; -shape_0_per_frame3=ang=time -shapecode_1_enabled=1 -shapecode_1_sides=5 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.030000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=0.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shape_1_per_frame1=x=q1; -shape_1_per_frame2=y=1-q2; -shape_1_per_frame3=ang=time -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_3=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.722)); -per_frame_4=wave_g = wave_g + 0.4*sin(time*1.931); -per_frame_5=wave_r = 0.2125*wave_r + 0.7154*wave_g + 0.0721*wave_b; -per_frame_6=wave_g = wave_r; -per_frame_7=wave_b = wave_r; -per_frame_8=vol = 0.167*(bass+mid); -per_frame_9=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_10=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_11=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_12=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_13=xpos = xpos + 0.001*xspeed; -per_frame_14=wave_x = 1.25*xpos + 0.5; -per_frame_15=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_16=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_17=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_18=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_19=ypos = ypos + 0.001*yspeed; -per_frame_20=wave_y = 1.25*ypos + 0.5; -per_frame_21=dx = dx + dx_residual; -per_frame_22=dy = dy + dy_residual; -per_frame_23=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_24=dx_residual = equal(bass_thresh,2)*0.003*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_25=dy_residual = equal(bass_thresh,2)*0.001*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; -per_frame_26=rot = 0.1; -per_frame_27= -per_frame_28=vol=(bass+mid+treb)*0.25; -per_frame_29=vol=vol*vol; -per_frame_30=mtime=mtime + vol*0.01; -per_frame_31=q8=mtime; -per_frame_32= -per_frame_33= -per_frame_34=q1=sin(mtime) * sin(mtime*3) * 0.4 + 0.5; -per_frame_35=q2=cos(mtime*1.3) * sin(mtime*5.4) * 0.4 + 0.5; -per_frame_36= -per_frame_37= -per_frame_38= -per_frame_39=ib_r = tan(time); -per_frame_40=ib_r = min(1, max(ib_r,0)); -per_frame_41= -per_frame_42=ib_g = tan(time+2.1); -per_frame_43=ib_g = min(1, max(ib_g,0)); -per_frame_44= -per_frame_45=ib_b = tan(time+4.2); -per_frame_46=ib_b = min(1, max(ib_b,0)); -per_frame_47= -per_frame_48=q3 = 10+8*(0.6*sin(0.223*time) + 0.4*sin(0.153*time)); -per_frame_49=q4 = 1/q3; -per_frame_50=q5 = 0.5*sign(xpos); -per_frame_51=q6 = 0.5*sign(ypos); -per_frame_52= -per_frame_53=monitor=q4 -per_frame_54= -per_frame_55= -per_pixel_1=cx = ((0&(x*q3-q5))+q5)*q4; -per_pixel_2=cy = ((0&(y*q3-q6))+q6)*q4; -per_pixel_3=newx = q1-x; -per_pixel_4=newy = q2-y; -per_pixel_5=newrad = sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2; -per_pixel_6=newzoom = pow(1.05 + 0.03*newrad, pow(0.01+sin(newrad*newrad), newrad*2-1)); -per_pixel_7=dx = (newx)*newzoom - newx; -per_pixel_8=dy = (newy)*newzoom - newy; -per_pixel_9=dx =dx*0.1; -per_pixel_10=dy=dy*0.1; -per_pixel_11=rot = 2*newrad*(0.5*(0.5-rad)+0.1); -per_pixel_12=rot=rot*sin(time)*0.2; -per_pixel_13=//sx=-1 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.995000 -fVideoEchoZoom=1.000224 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.003100 -fWaveScale=1.004873 -fWaveSmoothing=0.000000 -fWaveParam=-1.000000 -fModWaveAlphaStart=1.010000 -fModWaveAlphaEnd=1.010000 -fWarpAnimSpeed=0.999994 -fWarpScale=1.002083 -fZoomExponent=1.001830 -fShader=1.000000 -zoom=0.995048 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.010000 -dy=0.010000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.050000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=1.000000 -nMotionVectorsY=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=volume = 0.3*(bass+mid+att); -per_frame_2=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_3=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_4=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_5=peakbass_att = max(bass_att,peakbass_att); -per_frame_6=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_7=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_8=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_9=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_10=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_11=mode = if(beat,rand(4),mode); -per_frame_12=q1 = ((time*20)%50)*0.08; -per_frame_13=q2 = 1 - below(mode,2)*2; -per_frame_14=q3 = 1 - 2*(mode%2); -per_frame_15=wave_x = 1-below(mode,2); -per_frame_16=wave_mystery = (frame%2)*(2*(1-equal(mode%3,0))-1); -per_frame_17=wave_r=if(below(frame%6,3),bass*0.5,0); -per_frame_18=wave_b=0.9+sin(time)*0.1; -per_frame_19=wave_g=if(above(frame%6,2),bass*0.5,0); -per_pixel_1=dx = dx*pow(-1,0&(13+q1 - 5*(q2*y)))*min(bass,1.2); -per_pixel_2=dy = dy*pow(-1,0&(13+q1 - 5*(q3*x)))*min(bass,1.2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.999996 -fWaveSmoothing=0.750000 -fWaveParam=-0.499900 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999900 -rot=0.100000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.800000 -wave_g=0.200000 -wave_b=0.200000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.500000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_3=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.522)); -per_frame_4=wave_g = wave_g + 0.4*sin(time*1.731); -per_frame_5=ob_r = above(bass_att,bass)*(bass_att-bass)*4; -per_frame_6=volume = 0.3*(bass+mid+att); -per_frame_7=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_8=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_9=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_10=peakbass_att = max(bass_att,peakbass_att); -per_frame_11=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_12=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_13=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_14=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_15=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_16=beatcounter = beatcounter + beat; -per_frame_17=mode = if(beat*equal(beatcounter%2,0),1-mode,mode); -per_frame_18=mode2 = if(beat,(mode2 + rand(7) + 1)%8,mode2); -per_frame_19=mode3 = if(beat,(mode3 + rand(7) + 1)%8,mode3); -per_frame_20=q1 = 2*mode-1; -per_frame_21=q2 = mode2 + 2; -per_frame_22=q3 = 1/q2; -per_frame_23=q4 = mode3 + 2; -per_frame_24=q5 = 1/q4; -per_frame_25=wave_x = (rand(q2)+0.5)*q3; -per_frame_26=wave_y = (rand(q4)+0.5)*q5; -per_frame_27=decay = decay - 0.1*equal(frame%50,0); -per_pixel_1=cx = ((0&(x*q2-0.5))+0.5)*q3; -per_pixel_2=cy = ((0&(y*q4-0.5))+0.5)*q5; -per_pixel_3=rot = rot*pow(-1,(0&(x*q2-0.5)) + (0&(y*q4-0.5)))*q1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.300000 -fWaveScale=1.170000 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=1.025000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.290770 -sx=1.000000 -sy=1.000000 -wave_r=0.800000 -wave_g=0.500000 -wave_b=0.300000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.01*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%6,0); -per_frame_7=left = 0.5 + 0.25*(sin(0.555*time) + sin(1.111*time)); -per_frame_8=right = 0.5 + 0.25*(sin(0.333*time) + sin(1.222*time)); -per_frame_9=centrex = (left+right)/2; -per_frame_10=distx = 0.1 + (abs(centrex-left)+abs(centrex-right))/2; -per_frame_11=q1 = centrex + distx; -per_frame_12=q2 = centrex - distx; -per_frame_13=wave_x = centrex; -per_frame_14=top = 0.5 + 0.25*(sin(0.888*time) + sin(0.999*time)); -per_frame_15=bottom = 0.5 + 0.25*(sin(0.444*time) + sin(1.333*time)); -per_frame_16=centrey = (top+bottom)/2; -per_frame_17=disty = 0.1 + (abs(centrey-top)+abs(centrey-bottom))/2; -per_frame_18=q3 = centrey + disty; -per_frame_19=q4 = centrey - disty; -per_frame_20=wave_y = 1-centrey; -per_pixel_1=rot=rot+0.16*sin(time*-3.3+rad*11)*(1.3-rad); -per_pixel_2=dx = if(above(x,q1), 1,dx); -per_pixel_3=dx = if(below(x,q2), -1,dx); -per_pixel_4=dy = if(above(y,q3), 1,dy); -per_pixel_5=dy = if(below(y,q4), -1,dy); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Mstress & Darius - Pursuing The Sunset.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Mstress & Darius - Pursuing The Sunset.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Mstress & Darius - Pursuing The Sunset.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Mstress & Darius - Pursuing The Sunset.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,279 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.168096 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.003300 -fWaveScale=0.572643 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.240000 -fModWaveAlphaEnd=1.300001 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999998 -fShader=0.000000 -zoom=1.000509 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000022 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.035000 -ob_r=0.340000 -ob_g=0.340000 -ob_b=0.340000 -ob_a=0.000000 -ib_size=0.020000 -ib_r=0.340000 -ib_g=0.340000 -ib_b=0.340000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.898000 -mv_dy=-0.927998 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.700000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=43 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.124757 -wavecode_0_smoothing=0.770000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=t8 = 0.5 + 0.5*sin(time*143.21); -wave_0_per_frame1=r = .5+.1*sin(time*4);//min(1,max(0,(bass-1))); -wave_0_per_frame2=b = 0;// + 0.5*sin(time*1.561 + 2); -wave_0_per_frame3=g = .3+.1*sin(time*3);//0.5 + 0.5*sin(time*1.213 + 4); -wave_0_per_frame4=t1 = 0; -wave_0_per_frame5=t8 = .5; -wave_0_per_point1=//x = t8 + value1*0.7; -wave_0_per_point2=//y = 0.5 + value2*0.9 ; -wave_0_per_point3=//t1 = t1 + 0.01; -wave_0_per_point4=//b = x; -wave_0_per_point5=//a = 0.5 + 0.5*sin(time + t1*67); -wave_0_per_point6=//a = a*a*a; -wave_0_per_point7=//x=.5+.4*sin(time)*sample; -wave_0_per_point8=//y =.5+.4*sin(time)*bass; -wave_0_per_point9=x =sample; -wave_0_per_point10=y=.519;//*sample;//3e; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=b = 1;//.8*bass; -wave_1_per_point2=r=0; -wave_1_per_point3=g=.3; -wave_1_per_point4=x=1*sin((sample*5)); -wave_1_per_point5=y=.5+.2*(value1*2); -wave_1_per_point6=a = value2*1000; -wave_1_per_point7=y =if(above(y,.51),.51,y); -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.300000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = .5+.3*sin(time*2); -shape_0_per_frame2=y = .5+.3*sin(time*1); -shape_0_per_frame3=ang = sin(time*9); -shape_0_per_frame4=a = 1; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.730000 -shapecode_1_y=0.670000 -shapecode_1_rad=0.220000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.763267 -shapecode_1_r=0.740000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.640000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.180001 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=rad = rad +.004*bass; -shape_1_per_frame2=r = .1+.7*bass; -shape_1_per_frame3=g = .1+.5*mid; -shape_1_per_frame4=b = .1+.6*treb; -shape_1_per_frame5=//x = .5+.35*sin(time*.4); -shape_1_per_frame6=//y = .5+.2*cos(sin(time)*1); -shape_1_per_frame7= -shape_1_per_frame8=x = x + .02*sin(time*2); -shape_1_per_frame9=y = y + .01*sin(time*4); -shape_1_per_frame10= -shape_1_per_frame11=r2 = r2+.001*bass; -shape_1_per_frame12=g2 = g2+.3+.21*mid; -shape_1_per_frame13=b2 = b2+.21*treb; -shape_1_per_frame14= -shapecode_2_enabled=0 -shapecode_2_sides=32 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.390000 -shapecode_2_y=0.340000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=0.610000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.520000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=rad = rad +.04*bass; -shape_2_per_frame2=r = .1+.7*bass; -shape_2_per_frame3=g = .1+.5*mid; -shape_2_per_frame4=b = .1+.6*treb; -shape_2_per_frame5= -shape_2_per_frame6=b = .1+.6*treb; -shape_2_per_frame7=x = .5+.2*-1*sin(time); -shape_2_per_frame8=y = .5+.2*cos(sin(time)+3); -shape_2_per_frame9=r2 = r2+.1*bass; -shape_2_per_frame10=g2 = 1;//+.1*mid; -shape_2_per_frame11=b2 = b2+.16*treb; -shapecode_3_enabled=1 -shapecode_3_sides=3 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.000000 -shapecode_3_rad=0.304785 -shapecode_3_ang=1.822124 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -shape_3_per_frame1=rad = rad +.044*bass; -shape_3_per_frame2=r = .1+.7*bass; -shape_3_per_frame3=g = .1+.5*mid; -shape_3_per_frame4=b = .1+.6*treb; -shape_3_per_frame5=//x = .5+.2*sin(time); -shape_3_per_frame6=//y = .5+.2*cos(sin(time)*1); -shape_3_per_frame7= -shape_3_per_frame8=r2 = r2+.001*bass; -shape_3_per_frame9=g2 = g2+.3+.21*mid; -shape_3_per_frame10=b2 = b2+.21*treb; -shape_3_per_frame11= -shape_3_per_frame12=ang=ang-.3*sin(time*.2) -per_frame_1=decay=.99; -per_pixel_1=DY =dy-.004*below(y,.47)*(rad+.1)*bass;//*(1-below(y,.50)*above(y,.479)); -per_pixel_2=zoom=zoom+above(y,.49)*.1; -per_pixel_3=sx = sy-below(y,.40)*.001; -per_pixel_4=dx=dx+.01*sin(time*.2); -per_pixel_5=rot=rot+.051*below(y,.47);//*(1-below(y,.49)*above(y,.47)); -per_pixel_6=cx=int(x*16)/16; -per_pixel_7=cy=int(y*16)/16; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Mstress & Juppy - Dancer.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Mstress & Juppy - Dancer.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Mstress & Juppy - Dancer.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Mstress & Juppy - Dancer.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,403 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=0.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=1.000000 -wave_y=1.000000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.300000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=3.000000 -nMotionVectorsY=2.000000 -mv_dx=0.020000 -mv_dy=-0.020000 -mv_l=0.150000 -mv_r=0.490000 -mv_g=0.480000 -mv_b=0.300001 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=16 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.0000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=dim =1; //Dancer dimensions -wave_0_per_point2=xpos=0;//Dancer x position variation -wave_0_per_point3=ypos=0;//Dancer y position variation -wave_0_per_point4= -wave_0_per_point5= -wave_0_per_point6= -wave_0_per_point7=//Position Stabilization -wave_0_per_point8=xpos=xpos+(1-dim)/2; -wave_0_per_point9=ypos=ypos+(1-dim)/2; -wave_0_per_point10= -wave_0_per_point11=meanbass = 0.01*(meanbass*99+bass); -wave_0_per_point12=meantreb = 0.01*(meantreb*99+treb); -wave_0_per_point13=meanmid = 0.01*(meanmid*99+mid); -wave_0_per_point14=bassdiff = (bass - meanbass)*15; -wave_0_per_point15=trebdiff = (treb - meantreb)*15; -wave_0_per_point16=middiff = (mid - meanmid)*15; -wave_0_per_point17=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_0_per_point18=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_0_per_point19=mi = min(above(middiff,0)*middiff*.005,.11); -wave_0_per_point20= -wave_0_per_point21=mi2_prg = mi2_prg+mi; -wave_0_per_point22=gam = abs(gam-above(mi2_prg,5)); -wave_0_per_point23=mi2_prg= if(above(mi2_prg,5),0,mi2_prg); -wave_0_per_point24= -wave_0_per_point25=s = sample *15; -wave_0_per_point26=//Gambe -wave_0_per_point27=x= if(equal(int(s),1),.4,.4); -wave_0_per_point28=y= if(equal(int(s),1),.2+((ba+tr)*.5)*gam,.2+((ba+tr)*.5)*gam); -wave_0_per_point29= -wave_0_per_point30=x= if(equal(int(s),2),.5+sin(ba*100)*.03,x); -wave_0_per_point31=y= if(equal(int(s),2),.4,y); -wave_0_per_point32= -wave_0_per_point33=x= if(equal(int(s),3),.6,x); -wave_0_per_point34=y= if(equal(int(s),3),.2+((ba+tr)*.5)*(1-gam),y); -wave_0_per_point35= -wave_0_per_point36=x= if(equal(int(s),4),.5+sin(ba*100)*.03,x); -wave_0_per_point37=y= if(equal(int(s),4),.4,y); -wave_0_per_point38= -wave_0_per_point39=//Corpo -wave_0_per_point40=x= if(equal(int(s),5),.5,x); -wave_0_per_point41=y= if(equal(int(s),5),.6,y); -wave_0_per_point42= -wave_0_per_point43=//Braccia -wave_0_per_point44=x= if(equal(int(s),6),.4-mi*.23,x); -wave_0_per_point45=y= if(equal(int(s),6),.5+mi,y); -wave_0_per_point46= -wave_0_per_point47=x= if(equal(int(s),7),.5,x); -wave_0_per_point48=y= if(equal(int(s),7),.6,y); -wave_0_per_point49= -wave_0_per_point50=x= if(equal(int(s),8),.6+tr*.23,x); -wave_0_per_point51=y= if(equal(int(s),8),.5+tr,y); -wave_0_per_point52= -wave_0_per_point53=x= if(equal(int(s),9),.5,x); -wave_0_per_point54=y= if(equal(int(s),9),.6,y); -wave_0_per_point55= -wave_0_per_point56=//Testa -wave_0_per_point57=x= if(equal(int(s),10),.5,x); -wave_0_per_point58=y= if(equal(int(s),10),.62,y); -wave_0_per_point59= -wave_0_per_point60=x= if(equal(int(s),11),.47-ba*.23,x); -wave_0_per_point61=y= if(equal(int(s),11),.62,y); -wave_0_per_point62=x= if(equal(int(s),12),.47-ba*.23,x); -wave_0_per_point63=y= if(equal(int(s),12),.67+ba*.23,y); -wave_0_per_point64= -wave_0_per_point65=x= if(equal(int(s),13),.53+ba*.23,x); -wave_0_per_point66=y= if(equal(int(s),13),.67+ba*.23,y); -wave_0_per_point67= -wave_0_per_point68=x= if(equal(int(s),14),.53+ba*.23,x); -wave_0_per_point69=y= if(equal(int(s),14),.62,y); -wave_0_per_point70= -wave_0_per_point71=x= if(equal(int(s),15),.50,x); -wave_0_per_point72=y= if(equal(int(s),15),.62,y); -wave_0_per_point73= -wave_0_per_point74=x=x*dim+xpos; -wave_0_per_point75=y=y*dim+ypos; -wave_0_per_point76= -wave_0_per_point77=mi_prg= if(above(mi_prg,5),0,mi_prg+mi*.1); -wave_0_per_point78=ba_prg= if(above(ba_prg,5),0,ba_prg+ba*.1); -wave_0_per_point79=tr_prg= if(above(tr_prg,5),0,tr_prg+tr*.1); -wave_0_per_point80= -wave_0_per_point81=hm=sample+mi2_prg; -wave_0_per_point82=ht=sample+tr_prg; -wave_0_per_point83=hb=sample+ba_prg; -wave_0_per_point84= -wave_0_per_point85=r=hm; -wave_0_per_point86=g=ht; -wave_0_per_point87=b=hb; -wave_0_per_point88=a=.8; -wavecode_1_enabled=0 -wavecode_1_samples=16 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=1 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_frame1= -wave_2_per_frame2=rx=atan2(q2,sqr(q3)+sqr(q4))/4+q3/2; -wave_2_per_frame3=ry=atan2(q2,q4); -wave_2_per_frame4=rz=0; -wave_2_per_frame5= -wave_2_per_frame6=t1=sin(rx);t2=cos(rx); -wave_2_per_frame7=t3=sin(ry);t4=cos(ry); -wave_2_per_frame8=t5=sin(rz);t6=cos(rz); -wave_2_per_point1=sample=sample*q1*134; -wave_2_per_point2=x1=sin(sample*543)*2+q2; -wave_2_per_point3=y1=cos(sample*4232)*2+q3; -wave_2_per_point4=z1=sin(sample*90)*2+q4; -wave_2_per_point5= -wave_2_per_point6=x2=x1*t4-z1*t3;z2=x1*t3+z1*t4; -wave_2_per_point7=y2=y1*t2-z2*t1;z3=y1*t1+z2*t2+1; -wave_2_per_point8=x3=x2*t6-y2*t5;y3=x2*t5+y2*t6; -wave_2_per_point9=z3=if(above(z3,.1),.5/z3,0); -wave_2_per_point10=x=if(z3,x3*z3,x)+.5; -wave_2_per_point11=y=if(z3,-y3*z3,y)+.5; -wave_2_per_point12=a=z3*.8; -wavecode_3_enabled=0 -wavecode_3_samples=142 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_frame1= -wave_3_per_frame2=rx=atan2(q2,sqr(q3)+sqr(q4))/4+q3/2; -wave_3_per_frame3=ry=atan2(q2,q4); -wave_3_per_frame4=rz=0; -wave_3_per_frame5=ry1=ry1+bass_att*.2; -wave_3_per_frame6=t1=sin(rx);t2=cos(rx); -wave_3_per_frame7=t3=sin(ry);t4=cos(ry); -wave_3_per_frame8=t5=sin(rz);t6=cos(rz); -wave_3_per_frame9=t7=sin(ry1);t8=cos(ry1); -wave_3_per_frame10= -wave_3_per_point1=cp=bnot(cp); -wave_3_per_point2=r=sample*q1*10; -wave_3_per_point3=i1=(sample*6)%2; -wave_3_per_point4=rt=if(cp,.7,.2); -wave_3_per_point5=sample=sample*q1*.5; -wave_3_per_point6= -wave_3_per_point7=x1=sin(r)*rt; -wave_3_per_point8=z1=cos(r)*rt; -wave_3_per_point9=y1=-.5; -wave_3_per_point10=x2=x1*t8-z1*t7;z2=x1*t7+z1*t8; -wave_3_per_point11=x1=x2+q2; -wave_3_per_point12=y1=y1+q3; -wave_3_per_point13=z1=z2+q4; -wave_3_per_point14=x2=x1*t4-z1*t3;z2=x1*t3+z1*t4; -wave_3_per_point15=y2=y1*t2-z2*t1;z3=y1*t1+z2*t2+1.4; -wave_3_per_point16=x3=x2*t6-y2*t5;y3=x2*t5+y2*t6; -wave_3_per_point17=z3=if(above(z3,.1),.5/z3,0); -wave_3_per_point18=x=if(z3,x3*z3,x)+.5; -wave_3_per_point19=y=if(z3,-y3*z3,y)+.5; -wave_3_per_point20=hu=sample+cos(time/q1)*q1; -wave_3_per_point21=r=sin(hu)*.5+.5; -wave_3_per_point22=g=sin(hu+q1*.33)*.5+.5; -wave_3_per_point23=b=sin(hu+q1*.66)*.5+.5; -wave_3_per_point24=a=z3*.8; -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.840000 -shapecode_0_y=0.740000 -shapecode_0_rad=0.289992 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.361327 -shapecode_0_r=0.100000 -shapecode_0_g=0.500000 -shapecode_0_b=0.500000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.100000 -shapecode_0_g2=0.500000 -shapecode_0_b2=0.400000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.040000 -shape_0_per_frame1=temp1 = 0.01*(temp1*99+bass); -shape_0_per_frame2=temp2 = (bass - temp1)*15; -shape_0_per_frame3=temp3 = min(above(temp2,0)*temp2*.005,.11); -shape_0_per_frame4= -shape_0_per_frame5=temp4= temp4+temp3; -shape_0_per_frame6= -shape_0_per_frame7=tex_ang =-temp4; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.150000 -shapecode_1_y=0.730000 -shapecode_1_rad=0.511334 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.388689 -shapecode_1_r=0.600000 -shapecode_1_g=0.600000 -shapecode_1_b=0.200000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.600000 -shapecode_1_g2=0.600000 -shapecode_1_b2=0.210000 -shapecode_1_a2=0.899999 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.070000 -shape_1_per_frame1=meanbass = 0.01*(meanbass*99+bass); -shape_1_per_frame2=bassdiff = (bass - meanbass)*15; -shape_1_per_frame3=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -shape_1_per_frame4= -shape_1_per_frame5= -shape_1_per_frame6=ba_prg= ba_prg+ba; -shape_1_per_frame7= -shape_1_per_frame8=tex_ang =-ba_prg; -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.000000 -shapecode_2_rad=0.559238 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=meanbass = 0.01*(meanbass*99+bass); -shape_2_per_frame2=meantreb = 0.01*(meantreb*99+treb); -shape_2_per_frame3=meanmid = 0.01*(meanmid*99+mid); -shape_2_per_frame4=bassdiff = (bass - meanbass)*15; -shape_2_per_frame5=trebdiff = (treb - meantreb)*15; -shape_2_per_frame6=middiff = (mid - meanmid)*15; -shape_2_per_frame7=bassdiff = above(bassdiff,0)*bassdiff; -shape_2_per_frame8=trebdiff = above(trebdiff,0)*trebdiff; -shape_2_per_frame9=middiff = above(middiff,0)*middiff; -shape_2_per_frame10= -shape_2_per_frame11=g = min(1,max(0,0.2*trebdiff)); -shape_2_per_frame12=r = min(1,max(0,0.2*middiff)); -shape_2_per_frame13=b = min(1,max(0,0.2*bassdiff)); -shape_2_per_frame14=g2 = min(1,max(0,0.2*trebdiff)); -shape_2_per_frame15=r2 = min(1,max(0,0.2*middiff)); -shape_2_per_frame16=b2 = min(1,max(0,0.2*bassdiff)); -shape_2_per_frame17=border_g = .4+min(.6,max(0,0.1*trebdiff)); -shape_2_per_frame18=border_r = .4+min(.6,max(0,0.1*middiff)); -shape_2_per_frame19=border_b = .4+min(.6,max(0,0.1*bassdiff)); -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q1=acos(-1)*2; -per_frame_1=decay=.30; -per_frame_2= -per_frame_3=meanmid = 0.01*(meanmid*99+mid); -per_frame_4=middiff = (mid - meanmid)*15; -per_frame_5=mi = min(above(middiff,0)*middiff*.005,.11); -per_frame_6= -per_frame_7=mi_prg = mi_prg+mi; -per_frame_8=gam = abs(gam-above(mi_prg,.5)); -per_frame_9=mi_prg= if(above(mi_prg,.5),0,mi_prg); -per_frame_10=q1=gam; -per_frame_11=monitor =mi_prg; -per_pixel_1= -per_pixel_2=ylim=.8; -per_pixel_3= -per_pixel_4=sx = sy-below(y,ylim)*.001; -per_pixel_5=dx=dx+.01*bass*(1-q1*2)*below(y,ylim); -per_pixel_6=rot=rot+.051*below(y,ylim); -per_pixel_7=cx=int(x*16)/16; -per_pixel_8=cy=int(y*16)/16; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,673 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=0.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=1.000000 -wave_y=1.000000 -ob_size=0.500000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.500000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=3.000000 -nMotionVectorsY=2.000000 -mv_dx=0.020000 -mv_dy=-0.020000 -mv_l=0.150000 -mv_r=0.490000 -mv_g=0.480000 -mv_b=0.300001 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=16 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=meanbass = 0.01*(meanbass*99+bass_att); -wave_0_per_point2=meantreb = 0.01*(meantreb*99+treb_att); -wave_0_per_point3=meanmid = 0.01*(meanmid*99+mid_att); -wave_0_per_point4=bassdiff = (bass_att - meanbass)*15; -wave_0_per_point5=trebdiff = (treb_att - meantreb)*15; -wave_0_per_point6=middiff = (mid_att - meanmid)*15; -wave_0_per_point7=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_0_per_point8=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_0_per_point9=mi = min(above(middiff,0)*middiff*.005,.11); -wave_0_per_point10=baprg=baprg+ba*.3; -wave_0_per_point11=trprg=trprg+tr*.2; -wave_0_per_point12=miprg=miprg+tr*.2; -wave_0_per_point13= -wave_0_per_point14= -wave_0_per_point15=dim =.5+.4*sin(miprg); //Dancer dimensions -wave_0_per_point16=xpos=0+.3*sin(baprg);//Dancer x position variation -wave_0_per_point17=ypos=0+.2*sin(trprg);//Dancer y position variation -wave_0_per_point18= -wave_0_per_point19= -wave_0_per_point20= -wave_0_per_point21=//Position Stabilization -wave_0_per_point22=xpos=xpos+(1-dim)/2; -wave_0_per_point23=ypos=ypos+(1-dim)/2; -wave_0_per_point24= -wave_0_per_point25=meanbass = 0.01*(meanbass*99+bass); -wave_0_per_point26=meantreb = 0.01*(meantreb*99+treb); -wave_0_per_point27=meanmid = 0.01*(meanmid*99+mid); -wave_0_per_point28=bassdiff = (bass - meanbass)*15; -wave_0_per_point29=trebdiff = (treb - meantreb)*15; -wave_0_per_point30=middiff = (mid - meanmid)*15; -wave_0_per_point31=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_0_per_point32=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_0_per_point33=mi = min(above(middiff,0)*middiff*.005,.11); -wave_0_per_point34= -wave_0_per_point35=mi2_prg = mi2_prg+mi; -wave_0_per_point36=gam = abs(gam-above(mi2_prg,5)); -wave_0_per_point37=mi2_prg= if(above(mi2_prg,5),0,mi2_prg); -wave_0_per_point38= -wave_0_per_point39=s = sample *15; -wave_0_per_point40=//Gambe -wave_0_per_point41=x= if(equal(int(s),1),.4,.4); -wave_0_per_point42=y= if(equal(int(s),1),.2+((ba+tr)*.5)*gam,.2+((ba+tr)*.5)*gam); -wave_0_per_point43= -wave_0_per_point44=x= if(equal(int(s),2),.5+sin(ba*100)*.03,x); -wave_0_per_point45=y= if(equal(int(s),2),.4,y); -wave_0_per_point46= -wave_0_per_point47=x= if(equal(int(s),3),.6,x); -wave_0_per_point48=y= if(equal(int(s),3),.2+((ba+tr)*.5)*(1-gam),y); -wave_0_per_point49= -wave_0_per_point50=x= if(equal(int(s),4),.5+sin(ba*100)*.03,x); -wave_0_per_point51=y= if(equal(int(s),4),.4,y); -wave_0_per_point52= -wave_0_per_point53=//Corpo -wave_0_per_point54=x= if(equal(int(s),5),.5,x); -wave_0_per_point55=y= if(equal(int(s),5),.6,y); -wave_0_per_point56= -wave_0_per_point57=//Braccia -wave_0_per_point58=x= if(equal(int(s),6),.4-mi*.23,x); -wave_0_per_point59=y= if(equal(int(s),6),.5+mi,y); -wave_0_per_point60= -wave_0_per_point61=x= if(equal(int(s),7),.5,x); -wave_0_per_point62=y= if(equal(int(s),7),.6,y); -wave_0_per_point63= -wave_0_per_point64=x= if(equal(int(s),8),.6+tr*.23,x); -wave_0_per_point65=y= if(equal(int(s),8),.5+tr,y); -wave_0_per_point66= -wave_0_per_point67=x= if(equal(int(s),9),.5,x); -wave_0_per_point68=y= if(equal(int(s),9),.6,y); -wave_0_per_point69= -wave_0_per_point70=//Testa -wave_0_per_point71=x= if(equal(int(s),10),.5,x); -wave_0_per_point72=y= if(equal(int(s),10),.62,y); -wave_0_per_point73= -wave_0_per_point74=x= if(equal(int(s),11),.47-ba*.23,x); -wave_0_per_point75=y= if(equal(int(s),11),.62,y); -wave_0_per_point76=x= if(equal(int(s),12),.47-ba*.23,x); -wave_0_per_point77=y= if(equal(int(s),12),.67+ba*.23,y); -wave_0_per_point78= -wave_0_per_point79=x= if(equal(int(s),13),.53+ba*.23,x); -wave_0_per_point80=y= if(equal(int(s),13),.67+ba*.23,y); -wave_0_per_point81= -wave_0_per_point82=x= if(equal(int(s),14),.53+ba*.23,x); -wave_0_per_point83=y= if(equal(int(s),14),.62,y); -wave_0_per_point84= -wave_0_per_point85=x= if(equal(int(s),15),.50,x); -wave_0_per_point86=y= if(equal(int(s),15),.62,y); -wave_0_per_point87= -wave_0_per_point88=x=x*dim+xpos; -wave_0_per_point89=y=y*dim+ypos; -wave_0_per_point90= -wave_0_per_point91=mi_prg= if(above(mi_prg,5),0,mi_prg+mi*.1); -wave_0_per_point92=ba_prg= if(above(ba_prg,5),0,ba_prg+ba*.1); -wave_0_per_point93=tr_prg= if(above(tr_prg,5),0,tr_prg+tr*.1); -wave_0_per_point94= -wave_0_per_point95=hm=sample+mi2_prg; -wave_0_per_point96=ht=sample+tr_prg; -wave_0_per_point97=hb=sample+ba_prg; -wave_0_per_point98= -wave_0_per_point99=r=hm; -wave_0_per_point100=g=ht; -wave_0_per_point101=b=hb; -wave_0_per_point102=a=.8; -wavecode_1_enabled=1 -wavecode_1_samples=16 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=meanbass = 0.01*(meanbass*99+bass_att); -wave_1_per_point2=meantreb = 0.01*(meantreb*99+treb_att); -wave_1_per_point3=meanmid = 0.01*(meanmid*99+mid_att); -wave_1_per_point4=bassdiff = (bass_att - meanbass)*15; -wave_1_per_point5=trebdiff = (treb_att - meantreb)*15; -wave_1_per_point6=middiff = (mid_att - meanmid)*15; -wave_1_per_point7=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_1_per_point8=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_1_per_point9=mi = min(above(middiff,0)*middiff*.005,.11); -wave_1_per_point10=baprg=baprg+ba*.4; -wave_1_per_point11=trprg=trprg+tr*.1; -wave_1_per_point12=miprg=miprg+tr*.3; -wave_1_per_point13= -wave_1_per_point14= -wave_1_per_point15=dim =.5+.3*sin(baprg); //Dancer dimensions -wave_1_per_point16=xpos=0+.3*sin(trprg);//Dancer x position variation -wave_1_per_point17=ypos=0+.2*sin(miprg);//Dancer y position variation -wave_1_per_point18= -wave_1_per_point19= -wave_1_per_point20= -wave_1_per_point21=//Position Stabilization -wave_1_per_point22=xpos=xpos+(1-dim)/2; -wave_1_per_point23=ypos=ypos+(1-dim)/2; -wave_1_per_point24= -wave_1_per_point25=meanbass = 0.01*(meanbass*99+bass); -wave_1_per_point26=meantreb = 0.01*(meantreb*99+treb); -wave_1_per_point27=meanmid = 0.01*(meanmid*99+mid); -wave_1_per_point28=bassdiff = (bass - meanbass)*15; -wave_1_per_point29=trebdiff = (treb - meantreb)*15; -wave_1_per_point30=middiff = (mid - meanmid)*15; -wave_1_per_point31=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_1_per_point32=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_1_per_point33=mi = min(above(middiff,0)*middiff*.005,.11); -wave_1_per_point34= -wave_1_per_point35=mi2_prg = mi2_prg+mi; -wave_1_per_point36=gam = abs(gam-above(mi2_prg,5)); -wave_1_per_point37=mi2_prg= if(above(mi2_prg,5),0,mi2_prg); -wave_1_per_point38= -wave_1_per_point39=s = sample *15; -wave_1_per_point40=//Gambe -wave_1_per_point41=x= if(equal(int(s),1),.4,.4); -wave_1_per_point42=y= if(equal(int(s),1),.2+((ba+tr)*.5)*gam,.2+((ba+tr)*.5)*gam); -wave_1_per_point43= -wave_1_per_point44=x= if(equal(int(s),2),.5+sin(ba*100)*.03,x); -wave_1_per_point45=y= if(equal(int(s),2),.4,y); -wave_1_per_point46= -wave_1_per_point47=x= if(equal(int(s),3),.6,x); -wave_1_per_point48=y= if(equal(int(s),3),.2+((ba+tr)*.5)*(1-gam),y); -wave_1_per_point49= -wave_1_per_point50=x= if(equal(int(s),4),.5+sin(ba*100)*.03,x); -wave_1_per_point51=y= if(equal(int(s),4),.4,y); -wave_1_per_point52= -wave_1_per_point53=//Corpo -wave_1_per_point54=x= if(equal(int(s),5),.5,x); -wave_1_per_point55=y= if(equal(int(s),5),.6,y); -wave_1_per_point56= -wave_1_per_point57=//Braccia -wave_1_per_point58=x= if(equal(int(s),6),.4-mi*.23,x); -wave_1_per_point59=y= if(equal(int(s),6),.5+mi,y); -wave_1_per_point60= -wave_1_per_point61=x= if(equal(int(s),7),.5,x); -wave_1_per_point62=y= if(equal(int(s),7),.6,y); -wave_1_per_point63= -wave_1_per_point64=x= if(equal(int(s),8),.6+tr*.23,x); -wave_1_per_point65=y= if(equal(int(s),8),.5+tr,y); -wave_1_per_point66= -wave_1_per_point67=x= if(equal(int(s),9),.5,x); -wave_1_per_point68=y= if(equal(int(s),9),.6,y); -wave_1_per_point69= -wave_1_per_point70=//Testa -wave_1_per_point71=x= if(equal(int(s),10),.5,x); -wave_1_per_point72=y= if(equal(int(s),10),.62,y); -wave_1_per_point73= -wave_1_per_point74=x= if(equal(int(s),11),.47-ba*.23,x); -wave_1_per_point75=y= if(equal(int(s),11),.62,y); -wave_1_per_point76=x= if(equal(int(s),12),.47-ba*.23,x); -wave_1_per_point77=y= if(equal(int(s),12),.67+ba*.23,y); -wave_1_per_point78= -wave_1_per_point79=x= if(equal(int(s),13),.53+ba*.23,x); -wave_1_per_point80=y= if(equal(int(s),13),.67+ba*.23,y); -wave_1_per_point81= -wave_1_per_point82=x= if(equal(int(s),14),.53+ba*.23,x); -wave_1_per_point83=y= if(equal(int(s),14),.62,y); -wave_1_per_point84= -wave_1_per_point85=x= if(equal(int(s),15),.50,x); -wave_1_per_point86=y= if(equal(int(s),15),.62,y); -wave_1_per_point87= -wave_1_per_point88=x=x*dim+xpos; -wave_1_per_point89=y=y*dim+ypos; -wave_1_per_point90= -wave_1_per_point91=mi_prg= if(above(mi_prg,5),0,mi_prg+mi*.1); -wave_1_per_point92=ba_prg= if(above(ba_prg,5),0,ba_prg+ba*.1); -wave_1_per_point93=tr_prg= if(above(tr_prg,5),0,tr_prg+tr*.1); -wave_1_per_point94= -wave_1_per_point95=hm=sample+mi2_prg; -wave_1_per_point96=ht=sample+tr_prg; -wave_1_per_point97=hb=sample+ba_prg; -wave_1_per_point98= -wave_1_per_point99=r=hm; -wave_1_per_point100=g=ht; -wave_1_per_point101=b=hb; -wave_1_per_point102=a=.8; -wavecode_2_enabled=1 -wavecode_2_samples=16 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=meanbass = 0.01*(meanbass*99+bass); -wave_2_per_point2=meantreb = 0.01*(meantreb*99+treb); -wave_2_per_point3=meanmid = 0.01*(meanmid*99+mid); -wave_2_per_point4=bassdiff = (bass - meanbass)*15; -wave_2_per_point5=trebdiff = (treb - meantreb)*15; -wave_2_per_point6=middiff = (mid - meanmid)*15; -wave_2_per_point7=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_2_per_point8=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_2_per_point9=mi = min(above(middiff,0)*middiff*.005,.11); -wave_2_per_point10=baprg=baprg+ba*.1; -wave_2_per_point11=trprg=trprg+tr*.24; -wave_2_per_point12=miprg=miprg+tr*.3; -wave_2_per_point13= -wave_2_per_point14= -wave_2_per_point15=dim =.5+.3*sin(miprg); //Dancer dimensions -wave_2_per_point16=xpos=0+.3*sin(trprg);//Dancer x position variation -wave_2_per_point17=ypos=0+.2*sin(baprg);//Dancer y position variation -wave_2_per_point18= -wave_2_per_point19= -wave_2_per_point20= -wave_2_per_point21=//Position Stabilization -wave_2_per_point22=xpos=xpos+(1-dim)/2; -wave_2_per_point23=ypos=ypos+(1-dim)/2; -wave_2_per_point24= -wave_2_per_point25=meanbass = 0.01*(meanbass*99+bass); -wave_2_per_point26=meantreb = 0.01*(meantreb*99+treb); -wave_2_per_point27=meanmid = 0.01*(meanmid*99+mid); -wave_2_per_point28=bassdiff = (bass - meanbass)*15; -wave_2_per_point29=trebdiff = (treb - meantreb)*15; -wave_2_per_point30=middiff = (mid - meanmid)*15; -wave_2_per_point31=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_2_per_point32=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_2_per_point33=mi = min(above(middiff,0)*middiff*.005,.11); -wave_2_per_point34= -wave_2_per_point35=mi2_prg = mi2_prg+mi; -wave_2_per_point36=gam = abs(gam-above(mi2_prg,5)); -wave_2_per_point37=mi2_prg= if(above(mi2_prg,5),0,mi2_prg); -wave_2_per_point38= -wave_2_per_point39=s = sample *15; -wave_2_per_point40=//Gambe -wave_2_per_point41=x= if(equal(int(s),1),.4,.4); -wave_2_per_point42=y= if(equal(int(s),1),.2+((ba+tr)*.5)*gam,.2+((ba+tr)*.5)*gam); -wave_2_per_point43= -wave_2_per_point44=x= if(equal(int(s),2),.5+sin(ba*100)*.03,x); -wave_2_per_point45=y= if(equal(int(s),2),.4,y); -wave_2_per_point46= -wave_2_per_point47=x= if(equal(int(s),3),.6,x); -wave_2_per_point48=y= if(equal(int(s),3),.2+((ba+tr)*.5)*(1-gam),y); -wave_2_per_point49= -wave_2_per_point50=x= if(equal(int(s),4),.5+sin(ba*100)*.03,x); -wave_2_per_point51=y= if(equal(int(s),4),.4,y); -wave_2_per_point52= -wave_2_per_point53=//Corpo -wave_2_per_point54=x= if(equal(int(s),5),.5,x); -wave_2_per_point55=y= if(equal(int(s),5),.6,y); -wave_2_per_point56= -wave_2_per_point57=//Braccia -wave_2_per_point58=x= if(equal(int(s),6),.4-mi*.23,x); -wave_2_per_point59=y= if(equal(int(s),6),.5+mi,y); -wave_2_per_point60= -wave_2_per_point61=x= if(equal(int(s),7),.5,x); -wave_2_per_point62=y= if(equal(int(s),7),.6,y); -wave_2_per_point63= -wave_2_per_point64=x= if(equal(int(s),8),.6+tr*.23,x); -wave_2_per_point65=y= if(equal(int(s),8),.5+tr,y); -wave_2_per_point66= -wave_2_per_point67=x= if(equal(int(s),9),.5,x); -wave_2_per_point68=y= if(equal(int(s),9),.6,y); -wave_2_per_point69= -wave_2_per_point70=//Testa -wave_2_per_point71=x= if(equal(int(s),10),.5,x); -wave_2_per_point72=y= if(equal(int(s),10),.62,y); -wave_2_per_point73= -wave_2_per_point74=x= if(equal(int(s),11),.47-ba*.23,x); -wave_2_per_point75=y= if(equal(int(s),11),.62,y); -wave_2_per_point76=x= if(equal(int(s),12),.47-ba*.23,x); -wave_2_per_point77=y= if(equal(int(s),12),.67+ba*.23,y); -wave_2_per_point78= -wave_2_per_point79=x= if(equal(int(s),13),.53+ba*.23,x); -wave_2_per_point80=y= if(equal(int(s),13),.67+ba*.23,y); -wave_2_per_point81= -wave_2_per_point82=x= if(equal(int(s),14),.53+ba*.23,x); -wave_2_per_point83=y= if(equal(int(s),14),.62,y); -wave_2_per_point84= -wave_2_per_point85=x= if(equal(int(s),15),.50,x); -wave_2_per_point86=y= if(equal(int(s),15),.62,y); -wave_2_per_point87= -wave_2_per_point88=x=x*dim+xpos; -wave_2_per_point89=y=y*dim+ypos; -wave_2_per_point90= -wave_2_per_point91=mi_prg= if(above(mi_prg,5),0,mi_prg+mi*.1); -wave_2_per_point92=ba_prg= if(above(ba_prg,5),0,ba_prg+ba*.1); -wave_2_per_point93=tr_prg= if(above(tr_prg,5),0,tr_prg+tr*.1); -wave_2_per_point94= -wave_2_per_point95=hm=sample+mi2_prg; -wave_2_per_point96=ht=sample+tr_prg; -wave_2_per_point97=hb=sample+ba_prg; -wave_2_per_point98= -wave_2_per_point99=r=hm; -wave_2_per_point100=g=ht; -wave_2_per_point101=b=hb; -wave_2_per_point102=a=.8; -wavecode_3_enabled=1 -wavecode_3_samples=16 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_frame1= -wave_3_per_frame2=rx=at -wave_3_per_point1=meanbass = 0.01*(meanbass*99+bass); -wave_3_per_point2=meantreb = 0.01*(meantreb*99+treb); -wave_3_per_point3=meanmid = 0.01*(meanmid*99+mid); -wave_3_per_point4=bassdiff = (bass - meanbass)*15; -wave_3_per_point5=trebdiff = (treb - meantreb)*15; -wave_3_per_point6=middiff = (mid - meanmid)*15; -wave_3_per_point7=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_3_per_point8=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_3_per_point9=mi = min(above(middiff,0)*middiff*.005,.11); -wave_3_per_point10=baprg=baprg+ba*.26; -wave_3_per_point11=trprg=trprg+tr*.34; -wave_3_per_point12=miprg=miprg+tr*.125; -wave_3_per_point13= -wave_3_per_point14= -wave_3_per_point15=dim =.5+.4*sin(trprg); //Dancer dimensions -wave_3_per_point16=xpos=0+.3*sin(baprg);//Dancer x position variation -wave_3_per_point17=ypos=0+.2*sin(miprg);//Dancer y position variation -wave_3_per_point18= -wave_3_per_point19= -wave_3_per_point20= -wave_3_per_point21=//Position Stabilization -wave_3_per_point22=xpos=xpos+(1-dim)/2; -wave_3_per_point23=ypos=ypos+(1-dim)/2; -wave_3_per_point24= -wave_3_per_point25=meanbass = 0.01*(meanbass*99+bass); -wave_3_per_point26=meantreb = 0.01*(meantreb*99+treb); -wave_3_per_point27=meanmid = 0.01*(meanmid*99+mid); -wave_3_per_point28=bassdiff = (bass - meanbass)*15; -wave_3_per_point29=trebdiff = (treb - meantreb)*15; -wave_3_per_point30=middiff = (mid - meanmid)*15; -wave_3_per_point31=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -wave_3_per_point32=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -wave_3_per_point33=mi = min(above(middiff,0)*middiff*.005,.11); -wave_3_per_point34= -wave_3_per_point35=mi2_prg = mi2_prg+mi; -wave_3_per_point36=gam = abs(gam-above(mi2_prg,5)); -wave_3_per_point37=mi2_prg= if(above(mi2_prg,5),0,mi2_prg); -wave_3_per_point38= -wave_3_per_point39=s = sample *15; -wave_3_per_point40=//Gambe -wave_3_per_point41=x= if(equal(int(s),1),.4,.4); -wave_3_per_point42=y= if(equal(int(s),1),.2+((ba+tr)*.5)*gam,.2+((ba+tr)*.5)*gam); -wave_3_per_point43= -wave_3_per_point44=x= if(equal(int(s),2),.5+sin(ba*100)*.03,x); -wave_3_per_point45=y= if(equal(int(s),2),.4,y); -wave_3_per_point46= -wave_3_per_point47=x= if(equal(int(s),3),.6,x); -wave_3_per_point48=y= if(equal(int(s),3),.2+((ba+tr)*.5)*(1-gam),y); -wave_3_per_point49= -wave_3_per_point50=x= if(equal(int(s),4),.5+sin(ba*100)*.03,x); -wave_3_per_point51=y= if(equal(int(s),4),.4,y); -wave_3_per_point52= -wave_3_per_point53=//Corpo -wave_3_per_point54=x= if(equal(int(s),5),.5,x); -wave_3_per_point55=y= if(equal(int(s),5),.6,y); -wave_3_per_point56= -wave_3_per_point57=//Braccia -wave_3_per_point58=x= if(equal(int(s),6),.4-mi*.23,x); -wave_3_per_point59=y= if(equal(int(s),6),.5+mi,y); -wave_3_per_point60= -wave_3_per_point61=x= if(equal(int(s),7),.5,x); -wave_3_per_point62=y= if(equal(int(s),7),.6,y); -wave_3_per_point63= -wave_3_per_point64=x= if(equal(int(s),8),.6+tr*.23,x); -wave_3_per_point65=y= if(equal(int(s),8),.5+tr,y); -wave_3_per_point66= -wave_3_per_point67=x= if(equal(int(s),9),.5,x); -wave_3_per_point68=y= if(equal(int(s),9),.6,y); -wave_3_per_point69= -wave_3_per_point70=//Testa -wave_3_per_point71=x= if(equal(int(s),10),.5,x); -wave_3_per_point72=y= if(equal(int(s),10),.62,y); -wave_3_per_point73= -wave_3_per_point74=x= if(equal(int(s),11),.47-ba*.23,x); -wave_3_per_point75=y= if(equal(int(s),11),.62,y); -wave_3_per_point76=x= if(equal(int(s),12),.47-ba*.23,x); -wave_3_per_point77=y= if(equal(int(s),12),.67+ba*.23,y); -wave_3_per_point78= -wave_3_per_point79=x= if(equal(int(s),13),.53+ba*.23,x); -wave_3_per_point80=y= if(equal(int(s),13),.67+ba*.23,y); -wave_3_per_point81= -wave_3_per_point82=x= if(equal(int(s),14),.53+ba*.23,x); -wave_3_per_point83=y= if(equal(int(s),14),.62,y); -wave_3_per_point84= -wave_3_per_point85=x= if(equal(int(s),15),.50,x); -wave_3_per_point86=y= if(equal(int(s),15),.62,y); -wave_3_per_point87= -wave_3_per_point88=x=x*dim+xpos; -wave_3_per_point89=y=y*dim+ypos; -wave_3_per_point90= -wave_3_per_point91=mi_prg= if(above(mi_prg,5),0,mi_prg+mi*.1); -wave_3_per_point92=ba_prg= if(above(ba_prg,5),0,ba_prg+ba*.1); -wave_3_per_point93=tr_prg= if(above(tr_prg,5),0,tr_prg+tr*.1); -wave_3_per_point94= -wave_3_per_point95=hm=sample+mi2_prg; -wave_3_per_point96=ht=sample+tr_prg; -wave_3_per_point97=hb=sample+ba_prg; -wave_3_per_point98= -wave_3_per_point99=r=hm; -wave_3_per_point100=g=ht; -wave_3_per_point101=b=hb; -wave_3_per_point102=a=.8; -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.840000 -shapecode_0_y=0.740000 -shapecode_0_rad=0.289992 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.321291 -shapecode_0_r=0.100000 -shapecode_0_g=0.500000 -shapecode_0_b=0.500000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.100000 -shapecode_0_g2=0.500000 -shapecode_0_b2=0.400000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=meantreb = 0.01*(meantreb*99+treb); -shape_0_per_frame2=trebdiff = (treb - meantreb)*15; -shape_0_per_frame3=tr = min(above(trebdiff,0)*trebdiff*.005,.11); -shape_0_per_frame4= -shape_0_per_frame5=tr_prg= tr_prg+tr; -shape_0_per_frame6= -shape_0_per_frame7=tex_ang =-tr_prg; -shapecode_1_enabled=0 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.150000 -shapecode_1_y=0.730000 -shapecode_1_rad=0.511334 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.361326 -shapecode_1_r=0.600000 -shapecode_1_g=0.600000 -shapecode_1_b=0.200000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.600000 -shapecode_1_g2=0.600000 -shapecode_1_b2=0.210000 -shapecode_1_a2=0.899999 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=meanbass = 0.01*(meanbass*99+bass); -shape_1_per_frame2=bassdiff = (bass - meanbass)*15; -shape_1_per_frame3=ba = min(above(bassdiff,0)*bassdiff*.005,.11); -shape_1_per_frame4= -shape_1_per_frame5= -shape_1_per_frame6=ba_prg= ba_prg+ba; -shape_1_per_frame7= -shape_1_per_frame8=tex_ang =-ba_prg; -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q1=acos(-1)*2; -per_frame_1=decay=.30; -per_frame_2= -per_frame_3=meanmid = 0.01*(meanmid*99+mid); -per_frame_4=middiff = (mid - meanmid)*15; -per_frame_5=mi = min(above(middiff,0)*middiff*.005,.11); -per_frame_6= -per_frame_7=mi_prg = mi_prg+mi; -per_frame_8=gam = abs(gam-above(mi_prg,.5)); -per_frame_9=mi_prg= if(above(mi_prg,.5),0,mi_prg); -per_frame_10=miprg=miprg+mi; -per_frame_11=q1=gam; -per_frame_12=monitor =mi_prg; -per_frame_13= -per_frame_14= -per_frame_15=//Thanks to krash for beat detection (modified) -per_frame_16=volume = 0.3*bass+mid; -per_frame_17=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_18=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_19=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_20=runmeanbass =(runmeanbass*2 + bass_att)/3; -per_frame_21=peakbass_att = max(bass_att,peakbass_att); -per_frame_22=beat = above(volume,0.8)*above(bass_att,runmeanbass*1.1)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_23=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_24=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_25=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_26=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_27= -per_frame_28=echo_zoom =pow(1/(1.8+1.5*sin(miprg)),.5); -per_frame_29=monitor=echo_zoom; -per_frame_30=//oldecho = echo_zoom; -per_pixel_1= -per_pixel_2= -per_pixel_3= -per_pixel_4=DY =dy-.004*below(y,1)*(rad+.1)*bass;//*(1-below(y,.50)*above(y,.479)); -per_pixel_5=//zoom=zoom+above(y,.49)*.1; -per_pixel_6=sx = sy-below(y,1)*.001; -per_pixel_7=dx=dx+.01*bass*(1-q1*2);//sin(bass*.2); -per_pixel_8=rot=rot+.051*below(y,1);//*(1-below(y,.49)*above(y,.47)); -per_pixel_9=cx=int(x*16)/16; -per_pixel_10=cy=int(y*16)/16; Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/M.tga and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/M.tga differ diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/nil - Can't Stop the Blithering.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/nil - Can't Stop the Blithering.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/nil - Can't Stop the Blithering.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/nil - Can't Stop the Blithering.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.992000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=4 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.096512 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.000000 -fModWaveAlphaEnd=0.780000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.473261 -fShader=0.000000 -zoom=0.869963 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.002000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=1.024000 -nMotionVectorsY=1.008003 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.600000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=q1=zoom; -per_frame_2=wave_mystery=sin(3.654*time)*sin(2.765*time); -per_frame_3=wave_b=sin(bass); -per_frame_4=wave_r=sin(treb); -per_frame_5=wave_g=sin(mid); -per_frame_6=zoom=(bass+q1)/2.2; -per_frame_7=rot=sin(time*sin(q1))*.1; -per_pixel_1=zoom=zoom+abs(sin(ang)*.2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/nil - Can't Stop the Cramming.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/nil - Can't Stop the Cramming.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/nil - Can't Stop the Cramming.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/nil - Can't Stop the Cramming.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.992000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=4 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.096512 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.000000 -fModWaveAlphaEnd=0.780000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.473261 -fShader=0.000000 -zoom=0.869963 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.002000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=1.024000 -nMotionVectorsY=1.008003 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.600000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=q1=zoom; -per_frame_2=wave_mystery=sin(3.654*time)*sin(2.765*time); -per_frame_3=wave_r=sin(bass); -per_frame_4=wave_g=sin(treb); -per_frame_5=wave_b=sin(mid); -per_frame_6=zoom=(bass+q1)/2.2; -per_pixel_1=zoom=zoom+abs(sin(ang)*.2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/nil - Cid and Lucy.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/nil - Cid and Lucy.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/nil - Cid and Lucy.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/nil - Cid and Lucy.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.022740 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=3.072695 -fShader=0.000000 -zoom=0.999837 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=12.023998 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r=sin(time*bass_att*sin(time*1.543)); -per_frame_2=wave_g=sin(time*1.6432*mid_att*sin(time*1.721)); -per_frame_3=wave_b=sin(time*1.37563*treb_att*sin(time*1.666)); -per_pixel_1=rot=abs(sin(ang*cos(time)*sin(time*1.8232)*.09)); -per_pixel_2=zoom=zoom+sin(rad*sin(time)*sin(time*1.562543)*.3)+.1; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/presets/phat_CloseIncouneters.milk projectm-3.1.0/src/libprojectM/presets/phat_CloseIncouneters.milk --- projectm-2.2.0~git28bb9/src/libprojectM/presets/phat_CloseIncouneters.milk 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/presets/phat_CloseIncouneters.milk 1970-01-01 00:00:00.000000000 +0000 @@ -1,270 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.210000 -fDecay=0.500000 -fVideoEchoZoom=1.001828 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.625316 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.880000 -fModWaveAlphaEnd=1.980000 -fWarpAnimSpeed=0.010284 -fWarpScale=0.010000 -fZoomExponent=0.010000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.988286 -sy=0.953205 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.800000 -ob_b=0.700000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.300000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=256 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=1 -wavecode_0_scaling=100.000000 -wavecode_0_smoothing=0.900000 -wavecode_0_r=0.000000 -wavecode_0_g=0.700000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=x=cos(time)*0.1; -wave_0_per_point2=y=sin(time)*0.1 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=81.954445 -wavecode_1_smoothing=1.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_frame1=wave_x=1; -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=16 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.738907 -shapecode_0_ang=3.141592 -shapecode_0_tex_ang=0.188496 -shapecode_0_tex_zoom=0.931011 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang=sin(time)*6; -shape_0_per_frame2=var=0.12-(above(bass,0.8)*0.2); -shape_0_per_frame3= -shape_0_per_frame4=//x=sin(time/3)/10; -shape_0_per_frame5=//y=cos(time/3)/10; -shape_0_per_frame6=g=sin(time/10)*0.1; -shape_0_per_frame7=r=cos(time/12)*0.2; -shape_0_per_frame8=b=sin(time/15)*0.3; -shape_0_per_frame9=g2=cos(time/15)*0.3; -shape_0_per_frame10=r2=sin(time/20)*0.1; -shape_0_per_frame11=b2=cos(time/10)*0.2; -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=1 -shapecode_1_thickOutline=1 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.414899 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.628318 -shapecode_1_tex_zoom=5.582129 -shapecode_1_r=0.360000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.200000 -shapecode_1_b2=0.600000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=ang=cos(time)*6; -shape_1_per_frame2=sides=20-((bass+mid+treb)/3)*15; -shape_1_per_frame3=x=cos(time/2)*0.3+0.5; -shape_1_per_frame4=y=sin(time/2)*0.3+0.5; -shape_1_per_frame5=r=sin(time/5)*0.8; -shape_1_per_frame6=g=sin(time/5)*0.879; -shape_1_per_frame7=b=cos(time/5)*.567; -shape_1_per_frame8=r2=sin(time/5)*0.8; -shape_1_per_frame9=g2=cos(time/5)*0.879; -shape_1_per_frame10=b2=cos(time/5)*567; -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.203211 -shapecode_2_ang=5.026548 -shapecode_2_tex_ang=0.628319 -shapecode_2_tex_zoom=0.189467 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=mv_x=64;mv_y=48; -per_frame_init_2=nut=0; -per_frame_init_3=stp=0;stq=0; -per_frame_init_4=rtp=0;rtq=0; -per_frame_init_5=wvr=0; -per_frame_init_6=decay=0; -per_frame_init_7=dcsp=0 -per_frame_init_8= -per_frame_1=decay=0.97; -per_frame_2=zoom=-.999; -per_frame_3=rot=sin(time/10)*0.3; -per_frame_4=ib_b=((sin(time/10))+0.5*0.5)+0.3; -per_frame_5=ib_g=((cos(time/7)*0.3)+0.5*0.5)+0.3; -per_frame_6=ib_r=((sin(time/8)*0.3)+0.5*0.5)+0.3; -per_frame_7=ob_b=(sin((time/8)+0.9)+0.5*0.5)+0.5; -per_frame_8=ob_g=sin((time/10)+0.1); -per_frame_9=ob_r=(cos(time/7))+0.3; -per_frame_10= -per_pixel_1=xtc=sin(time/10); -per_pixel_2= -per_pixel_3=speed=40-above(bass,0.9)*15; -per_pixel_4=speed=speed+xtc; -per_pixel_5= -per_pixel_6= -per_pixel_7=acid=x*sin(time/10); -per_pixel_8=morphine=y*cos(time/10); -per_pixel_9= -per_pixel_10=dmt=above((treb*treb*treb/3),2.5)*.01; -per_pixel_11=saliva=above(treb,0.9)*.01; -per_pixel_12= -per_pixel_13=cx=dmt*(rad)*0.1; -per_pixel_14=cy=saliva*(rad)*0.1; -per_pixel_15= -per_pixel_16=dx=sin(y*speed)*0.01; -per_pixel_17=dy=cos(x*speed)*0.01; -per_pixel_18= -per_pixel_19=zoom=cos(x*(sin(time/10)*0.1))+(y*(cos(time/10)*0.1)); -per_pixel_20= -per_pixel_21=warp=-2*(((sin(time/2)*0.5+0.5)*3)*x)+(((cos(time/2)*0.5+0.5)*3)*y) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/presets/phat_CloseIncounetersV2.milk projectm-3.1.0/src/libprojectM/presets/phat_CloseIncounetersV2.milk --- projectm-2.2.0~git28bb9/src/libprojectM/presets/phat_CloseIncounetersV2.milk 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/presets/phat_CloseIncounetersV2.milk 1970-01-01 00:00:00.000000000 +0000 @@ -1,270 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.210000 -fDecay=0.500000 -fVideoEchoZoom=1.001828 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.625316 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.880000 -fModWaveAlphaEnd=1.980000 -fWarpAnimSpeed=0.010284 -fWarpScale=0.010000 -fZoomExponent=0.010000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.988286 -sy=0.953205 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.800000 -ob_b=0.700000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.300000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=256 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=1 -wavecode_0_scaling=100.000000 -wavecode_0_smoothing=0.900000 -wavecode_0_r=0.000000 -wavecode_0_g=0.700000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=x=cos(time)*0.1; -wave_0_per_point2=y=sin(time)*0.1 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=81.954445 -wavecode_1_smoothing=1.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_frame1=wave_x=1; -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=16 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.738907 -shapecode_0_ang=3.141592 -shapecode_0_tex_ang=0.188496 -shapecode_0_tex_zoom=0.931011 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang=sin(time)*6; -shape_0_per_frame2=var=0.12-(above(bass,0.8)*0.2); -shape_0_per_frame3= -shape_0_per_frame4=//x=sin(time/3)/10; -shape_0_per_frame5=//y=cos(time/3)/10; -shape_0_per_frame6=g=sin(time/10)*0.1; -shape_0_per_frame7=r=cos(time/12)*0.2; -shape_0_per_frame8=b=sin(time/15)*0.3; -shape_0_per_frame9=g2=cos(time/15)*0.3; -shape_0_per_frame10=r2=sin(time/20)*0.1; -shape_0_per_frame11=b2=cos(time/10)*0.2; -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=1 -shapecode_1_thickOutline=1 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.414899 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.628318 -shapecode_1_tex_zoom=5.582129 -shapecode_1_r=0.360000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.200000 -shapecode_1_b2=0.600000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=ang=cos(time)*6; -shape_1_per_frame2=sides=20-((bass+mid+treb)/3)*15; -shape_1_per_frame3=x=cos(time/2)*0.3+0.5; -shape_1_per_frame4=y=sin(time/2)*0.3+0.5; -shape_1_per_frame5=r=sin(time/5)*0.8; -shape_1_per_frame6=g=sin(time/5)*0.879; -shape_1_per_frame7=b=cos(time/5)*.567; -shape_1_per_frame8=r2=sin(time/5)*0.8; -shape_1_per_frame9=g2=cos(time/5)*0.879; -shape_1_per_frame10=b2=cos(time/5)*567; -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.203211 -shapecode_2_ang=5.026548 -shapecode_2_tex_ang=0.628319 -shapecode_2_tex_zoom=0.189467 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=mv_x=64;mv_y=48; -per_frame_init_2=nut=0; -per_frame_init_3=stp=0;stq=0; -per_frame_init_4=rtp=0;rtq=0; -per_frame_init_5=wvr=0; -per_frame_init_6=decay=0; -per_frame_init_7=dcsp=0 -per_frame_init_8= -per_frame_1=decay=0.98; -per_frame_2=zoom=-.999; -per_frame_3=//rot=sin(time/10)*0.3; -per_frame_4=ib_b=((sin(time/10))+0.5*0.5)+0.3; -per_frame_5=ib_g=((cos(time/7)*0.3)+0.5*0.5)+0.3; -per_frame_6=ib_r=((sin(time/8)*0.3)+0.5*0.5)+0.3; -per_frame_7=ob_b=(sin((time/8)+0.9)+0.5*0.5)+0.5; -per_frame_8=ob_g=sin((time/10)+0.1); -per_frame_9=ob_r=(cos(time/7))+0.3; -per_frame_10= -per_pixel_1=xtc=sin(time); -per_pixel_2= -per_pixel_3=speed=40-above(bass,0.9)*15; -per_pixel_4=speed=speed+xtc; -per_pixel_5= -per_pixel_6= -per_pixel_7=acid=x*sin(time/10); -per_pixel_8=morphine=y*cos(time/10); -per_pixel_9= -per_pixel_10=dmt=above((treb*treb*treb/3),2.5)*.01; -per_pixel_11=saliva=above(treb,0.9)*.01; -per_pixel_12= -per_pixel_13=cx=dmt*(rad)*0.1; -per_pixel_14=cy=saliva*(rad)*0.1; -per_pixel_15= -per_pixel_16=dx=sin(y*speed)*0.01; -per_pixel_17=dy=cos(x*speed)*0.01; -per_pixel_18= -per_pixel_19=zoom=cos(x*(sin(time/10)*0.1))+(y*(cos(time/10)*0.1)); -per_pixel_20= -per_pixel_21=warp=-5*(((sin(time/2)*0.5+0.5)*3)*x)+(((cos(time/2)*0.5+0.5)*3)*y) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Eo.S._Algorithm.milk projectm-3.1.0/src/libprojectM/presets/Phat_Eo.S._Algorithm.milk --- projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Eo.S._Algorithm.milk 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/presets/Phat_Eo.S._Algorithm.milk 1970-01-01 00:00:00.000000000 +0000 @@ -1,348 +0,0 @@ -[preset00] -fRating=0.000000 -fGammaAdj=1.000000 -fDecay=0.925000 -fVideoEchoZoom=1.001829 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=2.850136 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=38.400002 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.800001 -mv_r=0.440000 -mv_g=0.650000 -mv_b=0.810000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=basstime=basstime+(bass*bass); -wave_0_per_frame2=t1=basstime*0.003; -wave_0_per_frame3= -wave_0_per_point1=//plot x,y,z to point on circle -wave_0_per_point2=smp=sample*6.283; -wave_0_per_point3=xp=sin(smp )*0.20; -wave_0_per_point4=yp=cos(smp )*0.20; -wave_0_per_point5=zp=0; -wave_0_per_point6= -wave_0_per_point7= -wave_0_per_point8=//alter shape; -wave_0_per_point9=angy=sin(sample*6.28*4 +t1 )*6.28; -wave_0_per_point10=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point11=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point12=xp=xq; -wave_0_per_point13=zp=zq; -wave_0_per_point14= -wave_0_per_point15= -wave_0_per_point16=//rotate on y axis; -wave_0_per_point17=angy=t1*0.1; -wave_0_per_point18=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point19=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point20=xp=xq; -wave_0_per_point21=zp=zq; -wave_0_per_point22= -wave_0_per_point23=//rotate on x axis -wave_0_per_point24=axs1 = sin(t1*0.15) + 1.6; -wave_0_per_point25=yq= yp*cos(axs1) - zp*sin(axs1); -wave_0_per_point26=zq= yp*sin(axs1) + zp*cos(axs1); -wave_0_per_point27=yp=yq; -wave_0_per_point28=zp=zq; -wave_0_per_point29= -wave_0_per_point30=//rotate on y axis again -wave_0_per_point31=axs2 = sin(t1*0.1)*3.3; -wave_0_per_point32=xq=xp*cos(axs2) - zp*sin(axs2); -wave_0_per_point33=zq=xp*sin(axs2) + zp*cos(axs2); -wave_0_per_point34=xp=xq; -wave_0_per_point35=zp=zq; -wave_0_per_point36= -wave_0_per_point37=//stretch y axis to compensate for aspect ratio -wave_0_per_point38=yp=yp*1.2; -wave_0_per_point39= -wave_0_per_point40=//push forward into viewpace -wave_0_per_point41=zp=zp+2.1; -wave_0_per_point42= -wave_0_per_point43=//project x,y,z into screenspace -wave_0_per_point44=xs=xp/zp; -wave_0_per_point45=ys=yp/zp; -wave_0_per_point46= -wave_0_per_point47=//center 0,0 in middle of screen -wave_0_per_point48=x=xs+0.5+q4; -wave_0_per_point49=y=ys+0.5+q5; -wave_0_per_point50= -wave_0_per_point51=r=1-q1; -wave_0_per_point52=g=1-q2; -wave_0_per_point53=b=1-q3; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=23 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.700000 -shapecode_0_rad=0.154930 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.010000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=y=bass_att*0.5+0.2; -shape_0_per_frame2=x=cos(time*2)*0.5+0.5; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.801999 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=3.141593 -shapecode_1_tex_zoom=0.550335 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//ang = ang + (bass*.2) + (time*.4); -shape_1_per_frame2=//rad=1.781+(bass*0.025); -shape_1_per_frame3=ang=above(0.5,treb_att)*.063; -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.900000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.010000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=x = sin(time*5) * .4 + .5; -shape_2_per_frame2=y=treb_att*0.5; -shape_2_per_frame3= -shape_2_per_frame4=pow( (bass*.15),2); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.033004 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.010000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x=.5+(bass*0.07); -per_frame_1=wave_a = 0; -per_frame_2= -per_frame_3=ib_r=tan(time*2); -per_frame_4=ib_r=min(ib_r,1); -per_frame_5=ib_r=max(ib_r,0); -per_frame_6=ib_g=tan(time*2+2.1); -per_frame_7=ib_g=min(ib_g,1); -per_frame_8=ib_g=max(ib_g,0); -per_frame_9=ib_b=tan(time*2+4.2); -per_frame_10=ib_b=min(ib_b,1); -per_frame_11=ib_b=max(ib_b,0); -per_frame_12=//ib_r=1-ib_r; -per_frame_13=//ib_g=1-ib_g; -per_frame_14=//ib_b=1-ib_b; -per_frame_15= -per_frame_16=ob_r=ib_r-0.5; -per_frame_17=ob_g=ib_g-0.5; -per_frame_18=ob_b=ib_b-0.5; -per_frame_19=q1=ib_r; -per_frame_20=q2=ib_g; -per_frame_21=q3=ib_b; -per_frame_22= -per_frame_23= -per_frame_24= -per_frame_25=decay = 1; -per_frame_26= -per_frame_27= -per_frame_28=//echo_orient=((bass_att+mid_att+treb_att)/3)*3; -per_frame_29=//solarize=above(0.5,bass); -per_frame_30=//darken=above(0.4,treb); -per_frame_31= -per_frame_32=musictime=musictime+(mid*mid*mid)*0.01; -per_frame_33= -per_frame_34=xpos=sin(musictime*0.4)*0.2; -per_frame_35=ypos=sin(musictime*0.4)*0.2; -per_frame_36=q4=xpos; -per_frame_37=q5=ypos -per_frame_38= -per_pixel_1=//flip= (-2 * above(sin(time),-0.9) )+1; -per_pixel_2=//var=(bass+mid+treb)/3; -per_pixel_3=//rot=((ang&rad/rad)/(var*20))/10; -per_pixel_4=//sx=.99-(var*0.01); -per_pixel_5=//cx=var*0.1*(ang/12); -per_pixel_6=//sy=sx; -per_pixel_7= -per_pixel_8=zoom=-.96-(bass*0.03); -per_pixel_9= -per_pixel_10=//cx=0.5+q4; -per_pixel_11=//cy=0.5-q5; -per_pixel_12=rd=sqrt( sqr( (x-0.5-q4)*2) + sqr( (y-0.5+q5)*1.5 ) ); -per_pixel_13=//zm=(1.1-(rd/4)); -per_pixel_14=zm=1; -per_pixel_15= -per_pixel_16=ag=atan( (y-0.5+q5)/(x-0.5-q4) ); -per_pixel_17=star=sin(rd/5)*(2-rd); -per_pixel_18=zm=zm+star/20; -per_pixel_19=sx=zm; -per_pixel_20=sy=zm; -per_pixel_21=rot=above(rd,0.7)/(rd+7)*(bass_att*0.1)/rd; -per_pixel_22=dx=sin(y*140)*(bass*0.005)*sin(ag); -per_pixel_23=dy=cos(x*140)*(bass*0.005)*cos(ag); -per_pixel_24= -per_pixel_25= -per_pixel_26= -per_pixel_27=sect_a=if ( below(x,0.333), 1, 0 ); -per_pixel_28=sect_b=if ( below(x,0.666), 1, 0 ); -per_pixel_29=sect_b=if ( above(x,0.333), sect_b, 0 ); -per_pixel_30=sect_c=if ( above(x,0.666), 1, 0 ); -per_pixel_31= -per_pixel_32=cy_a=( bass_att)*q1 + 0.5 +rd-ag; -per_pixel_33=cy_b=( bass_att)*q2 - 1.2 +ag; -per_pixel_34=cy_c=( bass_att)*q3 + 0.5 +rd-ag; -per_pixel_35= -per_pixel_36=cx=(sect_a*0.166 + sect_b*0.5 + sect_c*0.833)*rd; -per_pixel_37=cy=(sect_a/cy_a + sect_b/cy_b + sect_c/cy_c)*rd; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Eo.S. - our own personal demon.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Eo.S. - our own personal demon.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Eo.S. - our own personal demon.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Eo.S. - our own personal demon.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,345 +0,0 @@ -[preset00] -fRating=0.000000 -fGammaAdj=1.000000 -fDecay=0.925000 -fVideoEchoZoom=1.001829 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=2.850136 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=38.400002 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.800001 -mv_r=0.440000 -mv_g=0.650000 -mv_b=0.810000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=basstime=basstime+(bass*bass); -wave_0_per_frame2=t1=basstime*0.003; -wave_0_per_frame3= -wave_0_per_point1=//plot x,y,z to point on circle -wave_0_per_point2=smp=sample*6.283; -wave_0_per_point3=xp=sin(smp )*0.05; -wave_0_per_point4=yp=cos(smp )*0.05; -wave_0_per_point5=zp=0; -wave_0_per_point6= -wave_0_per_point7= -wave_0_per_point8=//alter shape; -wave_0_per_point9=angy=sin(sample*6.28*4 +t1 )*6.28; -wave_0_per_point10=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point11=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point12=xp=xq; -wave_0_per_point13=zp=zq; -wave_0_per_point14= -wave_0_per_point15= -wave_0_per_point16=//rotate on y axis; -wave_0_per_point17=angy=t1*0.1; -wave_0_per_point18=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point19=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point20=xp=xq; -wave_0_per_point21=zp=zq; -wave_0_per_point22= -wave_0_per_point23=//rotate on x axis -wave_0_per_point24=axs1 = sin(t1*0.15) + 1.6; -wave_0_per_point25=yq= yp*cos(axs1) - zp*sin(axs1); -wave_0_per_point26=zq= yp*sin(axs1) + zp*cos(axs1); -wave_0_per_point27=yp=yq; -wave_0_per_point28=zp=zq; -wave_0_per_point29= -wave_0_per_point30=//rotate on y axis again -wave_0_per_point31=axs2 = sin(t1*0.1)*3.3; -wave_0_per_point32=xq=xp*cos(axs2) - zp*sin(axs2); -wave_0_per_point33=zq=xp*sin(axs2) + zp*cos(axs2); -wave_0_per_point34=xp=xq; -wave_0_per_point35=zp=zq; -wave_0_per_point36= -wave_0_per_point37=//stretch y axis to compensate for aspect ratio -wave_0_per_point38=yp=yp*1.2; -wave_0_per_point39= -wave_0_per_point40=//push forward into viewpace -wave_0_per_point41=zp=zp+2.1; -wave_0_per_point42= -wave_0_per_point43=//project x,y,z into screenspace -wave_0_per_point44=xs=xp/zp; -wave_0_per_point45=ys=yp/zp; -wave_0_per_point46= -wave_0_per_point47=//center 0,0 in middle of screen -wave_0_per_point48=x=xs+0.5+q4; -wave_0_per_point49=y=ys+0.5+q5; -wave_0_per_point50= -wave_0_per_point51=r=1-q1; -wave_0_per_point52=g=1-q2; -wave_0_per_point53=b=1-q3; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=23 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.700000 -shapecode_0_rad=0.154930 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.010000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=y=bass_att*0.5+0.2; -shape_0_per_frame2=x=cos(time*2)*0.5+0.5; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.801999 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=3.141593 -shapecode_1_tex_zoom=0.572684 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//ang = ang + (bass*.2) + (time*.4); -shape_1_per_frame2=//rad=1.781+(bass*0.025); -shape_1_per_frame3=ang=above(0.5,treb_att)*.063; -shapecode_2_enabled=0 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.900000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.010000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=x = sin(time*5) * .4 + .5; -shape_2_per_frame2=y=treb_att*0.5; -shape_2_per_frame3= -shape_2_per_frame4=pow( (bass*.15),2); -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.033004 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.010000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x=.5+(bass*0.07); -per_frame_1=wave_a = 0; -per_frame_2= -per_frame_3= -per_frame_4= -per_frame_5=//Thanks to Zylot for rainbow generator -per_frame_6=counter1 = if(equal(counter2,1),if(equal(counter1,1),0,counter1+.2),1); -per_frame_7=counter2 = if(equal(counter1,1),if(equal(counter2,1),0,counter2+.2),1); -per_frame_8=cdelay1 = if(equal(cdelay2,1),1,if(equal(colorcounter%2,1),if(equal(counter1,1),2 ,0), if(equal(counter2,1),2,0))); -per_frame_9=cdelay2 = if(equal(cdelay1,2),1,0); -per_frame_10=colorcounter = if(above(colorcounter,7),0,if(equal(cdelay1,1),colorcounter+1,colorcounter)); -per_frame_11=ib_r = .5*if(equal(colorcounter,1),1, if(equal(colorcounter,2),1, if(equal(colorcounter,3),1, if(equal(colorcounter,4),sin(counter2+2.1), if(equal(colorcounter,5),0, if(equal(colorcounter,6),0,sin(counter1))))))); -per_frame_12=ib_g = .5*if(equal(colorcounter,1),0, if(equal(colorcounter,2),sin(counter2*.5), if(equal(colorcounter,3),sin((counter1+1.75)*.4), if(equal(colorcounter,4),1, if(equal(colorcounter,5),1, if(equal(colorcounter,6),sin(counter2+2),0)))))); -per_frame_13=ib_b = if(equal(colorcounter,1),sin(counter1+2.1), if(equal(colorcounter,2),0, if(equal(colorcounter,3),0, if(equal(colorcounter,4),0, if(equal(colorcounter,5),sin(counter1), if(equal(colorcounter,6),1,1)))))); -per_frame_14= -per_frame_15=ib_r=tan(time*1); -per_frame_16=ib_r=min(ib_r,1); -per_frame_17=ib_r=max(ib_r,0); -per_frame_18=ib_g=tan(time*1+2.1); -per_frame_19=ib_g=min(ib_g,1); -per_frame_20=ib_g=max(ib_g,0); -per_frame_21=ib_b=tan(time*1+4.2); -per_frame_22=ib_b=min(ib_b,1); -per_frame_23=ib_b=max(ib_b,0); -per_frame_24= -per_frame_25=ob_r=ib_r-0.5; -per_frame_26=ob_g=ib_g-0.5; -per_frame_27=ob_b=ib_b-0.5; -per_frame_28=q1=ib_r; -per_frame_29=q2=ib_g; -per_frame_30=q3=ib_b; -per_frame_31= -per_frame_32= -per_frame_33= -per_frame_34=decay = 0.9999; -per_frame_35= -per_frame_36= -per_frame_37=//echo_orient=((bass_att+mid_att+treb_att)/3)*3; -per_frame_38=//solarize=above(0.5,bass); -per_frame_39=//darken=above(0.4,treb); -per_frame_40= -per_frame_41=musictime=musictime+(mid*mid*mid)*0.02; -per_frame_42= -per_frame_43=xpos=sin(musictime*0.6)*0.6; -per_frame_44=ypos=sin(musictime*0.4)*0.6; -per_frame_45=q4=xpos; -per_frame_46=q5=ypos; -per_frame_47= -per_frame_48=zoom=.98 + min(bass,1)*0.04 -per_frame_49= -per_pixel_1=//flip= (-2 * above(sin(time),-0.9) )+1; -per_pixel_2=//var=(bass+mid+treb)/3; -per_pixel_3=//rot=((ang&rad/rad)/(var*20))/10; -per_pixel_4=//sx=.99-(var*0.01); -per_pixel_5=//cx=var*0.1*(ang/12); -per_pixel_6=//sy=sx; -per_pixel_7= -per_pixel_8=//zoom=-1; -per_pixel_9=sx=-1+(bass*0.2); -per_pixel_10=sy=-1-(treb*0.2); -per_pixel_11= -per_pixel_12=cx=0.5+q4; -per_pixel_13=cy=0.5-q5; -per_pixel_14=rd=sqrt( sqr( (x-0.5-q4)*2) + sqr( (y-0.5+q5)*1.5 ) ); -per_pixel_15=//zm=(1.1-(rd/4)); -per_pixel_16=zm=.98; -per_pixel_17= -per_pixel_18=ag=atan( (y-0.5+q5)/(x-0.5-q4) ); -per_pixel_19=star=sin(ag*6+time)*((2-rd)-ag)/5; -per_pixel_20=zm=zm+star/20; -per_pixel_21=sx=zm; -per_pixel_22=sy=zm; -per_pixel_23=//rot=above(rd,0.7)*(rd-0.7)*sin(time*0.3) diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Eo.S_shoot_em_up.milk projectm-3.1.0/src/libprojectM/presets/Phat_Eo.S_shoot_em_up.milk --- projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Eo.S_shoot_em_up.milk 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/presets/Phat_Eo.S_shoot_em_up.milk 1970-01-01 00:00:00.000000000 +0000 @@ -1,395 +0,0 @@ -[preset00] -fRating=1.000000 -fGammaAdj=1.420000 -fDecay=0.960000 -fVideoEchoZoom=0.996623 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.011726 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.010284 -fWarpScale=0.010000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.400000 -wave_b=0.300000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.110000 -ob_g=0.000000 -ob_b=0.100000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=3.000000 -nMotionVectorsY=2.000000 -mv_dx=0.020000 -mv_dy=-0.020000 -mv_l=0.150000 -mv_r=0.490000 -mv_g=0.480000 -mv_b=0.300001 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=1 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=0.800000 -wavecode_0_b=0.100000 -wavecode_0_a=1.000000 -wave_0_per_point1=n=sample*6.28; -wave_0_per_point2= -wave_0_per_point3=xp=sin(n)*.3; -wave_0_per_point4=yp=cos(n)*.3; -wave_0_per_point5=zp=0; -wave_0_per_point6= -wave_0_per_point7=scale=tan(n*(sin(time/10)*10))*.5+.5; -wave_0_per_point8=scale=min(scale,(.5+(bass*.5))); -wave_0_per_point9=scale=max(scale,-.5); -wave_0_per_point10= -wave_0_per_point11=xp=xp*scale; -wave_0_per_point12=yp=yp*scale; -wave_0_per_point13= -wave_0_per_point14=zp=max(0.5-min(abs(scale),0.5)*2,0); -wave_0_per_point15= -wave_0_per_point16=zp=pow(1-zp,2)*0.25; -wave_0_per_point17= -wave_0_per_point18=//rotate on x axis -wave_0_per_point19=ang=time*0.5; -wave_0_per_point20=xq=xp; -wave_0_per_point21=yq=yp*sin(ang) + zp*cos(ang); -wave_0_per_point22=zq=yp*cos(ang) - zp*sin(ang); -wave_0_per_point23= -wave_0_per_point24=//rotate on y axis -wave_0_per_point25=ang=time; -wave_0_per_point26=xp=xq*sin(ang) + zq*cos(ang); -wave_0_per_point27=yp=yq; -wave_0_per_point28=zp=xq*cos(ang) - zq*sin(ang); -wave_0_per_point29= -wave_0_per_point30= -wave_0_per_point31=//push forward into viewspace -wave_0_per_point32=zp=zp+1.1; -wave_0_per_point33= -wave_0_per_point34=//project into screenspace -wave_0_per_point35=xs=xp/zp; -wave_0_per_point36=ys=yp/zp; -wave_0_per_point37= -wave_0_per_point38= -wave_0_per_point39=x=xs+.5; -wave_0_per_point40=y=ys*1.3+.5; -wave_0_per_point41= -wave_0_per_point42=r=(sin(time)*.5+.5)*.5; -wave_0_per_point43=g=(cos(time/2)*.5+.5)*.8; -wave_0_per_point44=b=tan(time); -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=1 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=1 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=n=sample*6.28; -wave_1_per_point2=xp=sin(n*32+n)*.07; -wave_1_per_point3=yp=cos(n*32+n)*.07; -wave_1_per_point4=zp=0; -wave_1_per_point5= -wave_1_per_point6=//rotate on y during waveform draw -wave_1_per_point7=ang=n*0.5; -wave_1_per_point8=xr=xp*sin(ang) + zp*cos(ang); -wave_1_per_point9=yr=yp; -wave_1_per_point10=zr=xp*cos(ang) - zp*sin(ang); -wave_1_per_point11=zr=zr-0.3; -wave_1_per_point12= -wave_1_per_point13= -wave_1_per_point14=//rotate on x axis -wave_1_per_point15=ang=time*0.5; -wave_1_per_point16=xq=xr; -wave_1_per_point17=yq=yr*sin(ang) + zr*cos(ang); -wave_1_per_point18=zq=yr*cos(ang) - zr*sin(ang); -wave_1_per_point19= -wave_1_per_point20=//rotate on y axis -wave_1_per_point21=ang=time; -wave_1_per_point22=xp=xq*sin(ang) + zq*cos(ang); -wave_1_per_point23=yp=yq; -wave_1_per_point24=zp=xq*cos(ang) - zq*sin(ang); -wave_1_per_point25= -wave_1_per_point26= -wave_1_per_point27=//push forward into viewspace -wave_1_per_point28=zp=zp+1.1; -wave_1_per_point29= -wave_1_per_point30=//project into screenspace -wave_1_per_point31=xs=xp/zp; -wave_1_per_point32=ys=yp/zp; -wave_1_per_point33= -wave_1_per_point34= -wave_1_per_point35=x=xs+.5; -wave_1_per_point36=y=ys*1.3+.5; -wave_1_per_point37= -wave_1_per_point38=g=(cos(time)*.5+.5)*.5; -wave_1_per_point39=b=(sin(time/2)*.5+.5)*.8; -wave_1_per_point40=r=tan(time); -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=1 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=n=sample*6.28; -wave_2_per_point2=xp=sin(n*32)*.03; -wave_2_per_point3=yp=cos(n*32)*.03; -wave_2_per_point4=zp=0; -wave_2_per_point5= -wave_2_per_point6=scale=sin(n*32*6)*0.5+0.5; -wave_2_per_point7=scale=scale*(sin(n*6)*0.5+0.5); -wave_2_per_point8=scale=scale*mid_att*mid_att*0.5; -wave_2_per_point9=xp=xp*(1+scale); -wave_2_per_point10=yp=yp*(1+scale); -wave_2_per_point11= -wave_2_per_point12=//rotate on y during waveform draw -wave_2_per_point13=ang=n*0.5; -wave_2_per_point14=xr=xp*sin(ang) + zp*cos(ang); -wave_2_per_point15=yr=yp; -wave_2_per_point16=zr=xp*cos(ang) - zp*sin(ang); -wave_2_per_point17=xr=xr+0.11; -wave_2_per_point18= -wave_2_per_point19=//orbit rotation -wave_2_per_point20=ang=time*4; -wave_2_per_point21=xp=xr*sin(ang) + zr*cos(ang); -wave_2_per_point22=yp=yr; -wave_2_per_point23=zp=xr*cos(ang) - zr*sin(ang); -wave_2_per_point24= -wave_2_per_point25= -wave_2_per_point26= -wave_2_per_point27= -wave_2_per_point28=zp=zp-0.3; -wave_2_per_point29= -wave_2_per_point30= -wave_2_per_point31=//rotate on x axis -wave_2_per_point32=ang=time*0.5; -wave_2_per_point33=xq=xp; -wave_2_per_point34=yq=yp*sin(ang) + zp*cos(ang); -wave_2_per_point35=zq=yp*cos(ang) - zp*sin(ang); -wave_2_per_point36= -wave_2_per_point37=//rotate on y axis -wave_2_per_point38=ang=time; -wave_2_per_point39=xp=xq*sin(ang) + zq*cos(ang); -wave_2_per_point40=yp=yq; -wave_2_per_point41=zp=xq*cos(ang) - zq*sin(ang); -wave_2_per_point42= -wave_2_per_point43= -wave_2_per_point44=//push forward into viewspace -wave_2_per_point45=zp=zp+1.1; -wave_2_per_point46= -wave_2_per_point47=//project into screenspace -wave_2_per_point48=xs=xp/zp; -wave_2_per_point49=ys=yp/zp; -wave_2_per_point50= -wave_2_per_point51= -wave_2_per_point52=x=xs+.5; -wave_2_per_point53=y=ys*1.3+.5; -wave_2_per_point54= -wave_2_per_point55=g=(cos(time)*.5+.5)*.5; -wave_2_per_point56=r=(cos(time/2)*.5+.5)*.8; -wave_2_per_point57=b=tan(time); -wavecode_3_enabled=1 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=1 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=1 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=0.300000 -wavecode_3_g=0.700000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_point1=n=sample*6.28; -wave_3_per_point2=ends=sin(sample*3.1415); -wave_3_per_point3=xp=value1*4*ends; -wave_3_per_point4=yp=value2*4*ends; -wave_3_per_point5=zp=-0.23 + sample*0.3; -wave_3_per_point6= -wave_3_per_point7=//rotate on x axis -wave_3_per_point8=ang=time*0.5; -wave_3_per_point9=xq=xp; -wave_3_per_point10=yq=yp*sin(ang) + zp*cos(ang); -wave_3_per_point11=zq=yp*cos(ang) - zp*sin(ang); -wave_3_per_point12= -wave_3_per_point13=//rotate on y axis -wave_3_per_point14=ang=time; -wave_3_per_point15=xp=xq*sin(ang) + zq*cos(ang); -wave_3_per_point16=yp=yq; -wave_3_per_point17=zp=xq*cos(ang) - zq*sin(ang); -wave_3_per_point18= -wave_3_per_point19= -wave_3_per_point20=//push forward into viewspace -wave_3_per_point21=zp=zp+1.1; -wave_3_per_point22= -wave_3_per_point23=//project into screenspace -wave_3_per_point24=xs=xp/zp; -wave_3_per_point25=ys=yp/zp; -wave_3_per_point26= -wave_3_per_point27= -wave_3_per_point28=x=xs+.5; -wave_3_per_point29=y=ys*1.3+.5; -wave_3_per_point30= -wave_3_per_point31=a=max(treb-1,0)*2 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=mv_x=64;mv_y=48; -per_frame_init_2=nut=0; -per_frame_init_3=stp=0;stq=0; -per_frame_init_4=rtp=0;rtq=0; -per_frame_init_5=wvr=0; -per_frame_init_6=decay=0; -per_frame_init_7=dcsp=0 -per_frame_init_8= -per_frame_1=decay=0.97; -per_frame_2=zoom=1.000; -per_frame_3=sx=1.005; -per_frame_4=sy=1.001 -per_frame_5= -per_frame_6= -per_frame_7= -per_frame_8= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Rovastar_Eo.S. spiral_faces.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Rovastar_Eo.S. spiral_faces.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Rovastar_Eo.S. spiral_faces.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Rovastar_Eo.S. spiral_faces.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,345 +0,0 @@ -[preset00] -fRating=0.000000 -fGammaAdj=1.000000 -fDecay=0.925000 -fVideoEchoZoom=1.001829 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=2.850136 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=38.400002 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.800001 -mv_r=0.440000 -mv_g=0.650000 -mv_b=0.810000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=basstime=basstime+(bass*bass); -wave_0_per_frame2=t1=basstime*0.003; -wave_0_per_frame3= -wave_0_per_point1=//plot x,y,z to point on circle -wave_0_per_point2=smp=sample*6.283; -wave_0_per_point3=xp=sin(smp )*0.20; -wave_0_per_point4=yp=cos(smp )*0.20; -wave_0_per_point5=zp=0; -wave_0_per_point6= -wave_0_per_point7= -wave_0_per_point8=//alter shape; -wave_0_per_point9=angy=sin(sample*6.28*4 +t1 )*6.28; -wave_0_per_point10=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point11=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point12=xp=xq; -wave_0_per_point13=zp=zq; -wave_0_per_point14= -wave_0_per_point15= -wave_0_per_point16=//rotate on y axis; -wave_0_per_point17=angy=t1*0.1; -wave_0_per_point18=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point19=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point20=xp=xq; -wave_0_per_point21=zp=zq; -wave_0_per_point22= -wave_0_per_point23=//rotate on x axis -wave_0_per_point24=axs1 = sin(t1*0.15) + 1.6; -wave_0_per_point25=yq= yp*cos(axs1) - zp*sin(axs1); -wave_0_per_point26=zq= yp*sin(axs1) + zp*cos(axs1); -wave_0_per_point27=yp=yq; -wave_0_per_point28=zp=zq; -wave_0_per_point29= -wave_0_per_point30=//rotate on y axis again -wave_0_per_point31=axs2 = sin(t1*0.1)*3.3; -wave_0_per_point32=xq=xp*cos(axs2) - zp*sin(axs2); -wave_0_per_point33=zq=xp*sin(axs2) + zp*cos(axs2); -wave_0_per_point34=xp=xq; -wave_0_per_point35=zp=zq; -wave_0_per_point36= -wave_0_per_point37=//stretch y axis to compensate for aspect ratio -wave_0_per_point38=yp=yp*1.2; -wave_0_per_point39= -wave_0_per_point40=//push forward into viewpace -wave_0_per_point41=zp=zp+2.1; -wave_0_per_point42= -wave_0_per_point43=//project x,y,z into screenspace -wave_0_per_point44=xs=xp/zp; -wave_0_per_point45=ys=yp/zp; -wave_0_per_point46= -wave_0_per_point47=//center 0,0 in middle of screen -wave_0_per_point48=x=xs+0.5+q4; -wave_0_per_point49=y=ys+0.5+q5; -wave_0_per_point50= -wave_0_per_point51=r=1-q1; -wave_0_per_point52=g=1-q2; -wave_0_per_point53=b=1-q3; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=23 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.700000 -shapecode_0_rad=0.154930 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.010000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=y=bass_att*0.5+0.2; -shape_0_per_frame2=x=cos(time*2)*0.5+0.5; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.801999 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=3.141593 -shapecode_1_tex_zoom=0.572684 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//ang = ang + (bass*.2) + (time*.4); -shape_1_per_frame2=//rad=1.781+(bass*0.025); -shape_1_per_frame3=ang=above(0.5,treb_att)*.063; -shapecode_2_enabled=0 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.900000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.010000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=x = sin(time*5) * .4 + .5; -shape_2_per_frame2=y=treb_att*0.5; -shape_2_per_frame3= -shape_2_per_frame4=pow( (bass*.15),2); -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.033004 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.010000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x=.5+(bass*0.07); -per_frame_1=wave_a = 0; -per_frame_2= -per_frame_3= -per_frame_4= -per_frame_5=//Thanks to Zylot for rainbow generator -per_frame_6=counter1 = if(equal(counter2,1),if(equal(counter1,1),0,counter1+.2),1); -per_frame_7=counter2 = if(equal(counter1,1),if(equal(counter2,1),0,counter2+.2),1); -per_frame_8=cdelay1 = if(equal(cdelay2,1),1,if(equal(colorcounter%2,1),if(equal(counter1,1),2 ,0), if(equal(counter2,1),2,0))); -per_frame_9=cdelay2 = if(equal(cdelay1,2),1,0); -per_frame_10=colorcounter = if(above(colorcounter,7),0,if(equal(cdelay1,1),colorcounter+1,colorcounter)); -per_frame_11=ib_r = .5*if(equal(colorcounter,1),1, if(equal(colorcounter,2),1, if(equal(colorcounter,3),1, if(equal(colorcounter,4),sin(counter2+2.1), if(equal(colorcounter,5),0, if(equal(colorcounter,6),0,sin(counter1))))))); -per_frame_12=ib_g = .5*if(equal(colorcounter,1),0, if(equal(colorcounter,2),sin(counter2*.5), if(equal(colorcounter,3),sin((counter1+1.75)*.4), if(equal(colorcounter,4),1, if(equal(colorcounter,5),1, if(equal(colorcounter,6),sin(counter2+2),0)))))); -per_frame_13=ib_b = if(equal(colorcounter,1),sin(counter1+2.1), if(equal(colorcounter,2),0, if(equal(colorcounter,3),0, if(equal(colorcounter,4),0, if(equal(colorcounter,5),sin(counter1), if(equal(colorcounter,6),1,1)))))); -per_frame_14= -per_frame_15= -per_frame_16= -per_frame_17=//ob_r=ib_r-0.5; -per_frame_18=//ob_g=ib_g-0.5; -per_frame_19=//ob_b=ib_b-0.5; -per_frame_20=q1=ib_r; -per_frame_21=q2=ib_g; -per_frame_22=q3=ib_b; -per_frame_23= -per_frame_24= -per_frame_25= -per_frame_26=decay = 1; -per_frame_27= -per_frame_28= -per_frame_29=//echo_orient=((bass_att+mid_att+treb_att)/3)*3; -per_frame_30=//solarize=above(0.5,bass); -per_frame_31=//darken=above(0.4,treb); -per_frame_32= -per_frame_33=musictime=musictime+(mid*mid*mid)*0.02; -per_frame_34= -per_frame_35=xpos=sin(musictime*0.6)*0.3; -per_frame_36=ypos=sin(musictime*0.4)*0.3; -per_frame_37=q4=xpos; -per_frame_38=q5=ypos; -per_frame_39= -per_frame_40=ob_r = 0.3 - 0.3*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_41=ob_g = 0.6- 0.4*sin(time*2.924); -per_frame_42=ob_b = 0.35 - 0.3*cos(time*0.816); -per_frame_43=// = cx - 0.1*sin(time*0.342); -per_frame_44=// = cy + 0.1*sin(time*0.433); -per_frame_45=//warp =0; -per_frame_46=ib_size = 0.02; -per_frame_47=ib_r = ib_r + 0.5*sin(time*3.034); -per_frame_48=ib_g = ib_g + 0.5*sin(time*2.547); -per_frame_49=ib_b = ib_b - 0.5*sin(time*1.431); -per_pixel_1=//flip= (-2 * above(sin(time),-0.9) )+1; -per_pixel_2=//var=(bass+mid+treb)/3; -per_pixel_3=//rot=((ang&rad/rad)/(var*20))/10; -per_pixel_4=//sx=.99-(var*0.01); -per_pixel_5=//cx=var*0.1*(ang/12); -per_pixel_6=//sy=sx; -per_pixel_7= -per_pixel_8=zoom=.99; -per_pixel_9= -per_pixel_10=cx=0.5+q4; -per_pixel_11=cy=0.5-q5; -per_pixel_12=rd=sqrt( sqr( (x-0.5-q4)*2) + sqr( (y-0.5+q5)*1.5 ) ); -per_pixel_13=//zm=(1.1-(rd/4)); -per_pixel_14=zm=.99; -per_pixel_15= -per_pixel_16=ag=atan( (y-0.5+q5)/(x-0.5-q4) ); -per_pixel_17=star=sin(ag/5)*(2-rd); -per_pixel_18=zm=zm+star/20; -per_pixel_19=sx=zm; -per_pixel_20=sy=zm; -per_pixel_21=//rot=above(rd,0.7)/(rd+7)*(bass_att*0.1)/rd; -per_pixel_22=dx=sin(y*100)*(bass*0.005)*ag/(rd*5); -per_pixel_23=dy=cos(x*100)*(bass*0.005)*ag/(rd*5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Rovastar - What_does_your_soul_look_like.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Rovastar - What_does_your_soul_look_like.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Rovastar - What_does_your_soul_look_like.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Rovastar - What_does_your_soul_look_like.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=1.605000 -fWaveSmoothing=0.700000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.064000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=0.990099 -sy=0.990099 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=13 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.555908 -shapecode_0_ang=1.696460 -shapecode_0_tex_ang=1.633629 -shapecode_0_tex_zoom=1.160965 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.100000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//r = 0.5+0.25*sin(time*0.567)+0.25*sin(time*0.673); -shape_0_per_frame2=//b = 0.5+0.25*sin(time*0.617)+0.25*sin(time*0.493); -shape_0_per_frame3=//= 0.5+0.25*sin(time*0.771)+0.25*sin(time*0.317); -shape_0_per_frame4=//2 = 0.5+0.25*sin(time*0.417)+0.25*sin(time*0.773); -shape_0_per_frame5=//b2 = 0.5+0.25*sin(time*0.663)+0.25*sin(time*0.893); -shape_0_per_frame6=//g2 = 0.5+0.25*sin(time*0.317)+0.25*sin(time*0.327); -shape_0_per_frame7=//ang = q1; -shape_0_per_frame8=//x = 0.5 + 0.1*sin(q1*1.432)+0.1*sin(q1*0.342); -shape_0_per_frame9=//y= 0.5 + 0.1*sin(q1*1.311)+0.1*sin(q1*0.394); -shape_0_per_frame10=a=sin(time)*0.5+0.5; -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.232284 -shapecode_1_ang=2.324779 -shapecode_1_tex_ang=4.712390 -shapecode_1_tex_zoom=0.236264 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.500000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.100000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//r = 0.5+0.25*sin(time*0.567)+0.25*sin(time*0.673); -shape_1_per_frame2=//b = 0.5+0.25*sin(time*0.617)+0.25*sin(time*0.493); -shape_1_per_frame3=//= 0.5+0.25*sin(time*0.771)+0.25*sin(time*0.317); -shape_1_per_frame4=//2 = 0.5+0.25*sin(time*0.417)+0.25*sin(time*0.773); -shape_1_per_frame5=//b2 = 0.5+0.25*sin(time*0.663)+0.25*sin(time*0.893); -shape_1_per_frame6=//g2 = 0.5+0.25*sin(time*0.317)+0.25*sin(time*0.327); -shape_1_per_frame7=ang = q1 + 3.1415; -shape_1_per_frame8=//x = 0.5 + 0.1*sin(q1*1.432)+0.1*sin(q1*0.342); -shape_1_per_frame9=//y= 0.5 + 0.1*sin(q1*1.311)+0.1*sin(q1*0.394); -shapecode_2_enabled=0 -shapecode_2_sides=3 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.503257 -shapecode_2_ang=1.696460 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.741923 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.500000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.500000 -shapecode_2_border_r=0.000000 -shapecode_2_border_g=0.500000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=//r = 0.5+0.25*sin(time*0.567)+0.25*sin(time*0.673); -shape_2_per_frame2=//b = 0.5+0.25*sin(time*0.617)+0.25*sin(time*0.493); -shape_2_per_frame3=//= 0.5+0.25*sin(time*0.771)+0.25*sin(time*0.317); -shape_2_per_frame4=//2 = 0.5+0.25*sin(time*0.417)+0.25*sin(time*0.773); -shape_2_per_frame5=//b2 = 0.5+0.25*sin(time*0.663)+0.25*sin(time*0.893); -shape_2_per_frame6=//g2 = 0.5+0.25*sin(time*0.317)+0.25*sin(time*0.327); -shape_2_per_frame7=ang = q1+ 3.1415*0.5; -shape_2_per_frame8=x = 0.5 + 0.1*sin(q1*1.432)+0.1*sin(q1*0.342); -shape_2_per_frame9=y= 0.5 + 0.1*sin(q1*1.311)+0.1*sin(q1*0.394); -shapecode_3_enabled=0 -shapecode_3_sides=3 -shapecode_3_additive=0 -shapecode_3_thickOutline=1 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.503257 -shapecode_3_ang=1.696460 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.671653 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=0.500000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.500000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=//r = 0.5+0.25*sin(time*0.567)+0.25*sin(time*0.673); -shape_3_per_frame2=//b = 0.5+0.25*sin(time*0.617)+0.25*sin(time*0.493); -shape_3_per_frame3=//= 0.5+0.25*sin(time*0.771)+0.25*sin(time*0.317); -shape_3_per_frame4=//2 = 0.5+0.25*sin(time*0.417)+0.25*sin(time*0.773); -shape_3_per_frame5=//b2 = 0.5+0.25*sin(time*0.663)+0.25*sin(time*0.893); -shape_3_per_frame6=//g2 = 0.5+0.25*sin(time*0.317)+0.25*sin(time*0.327); -shape_3_per_frame7=ang = q1 - 3.1415*0.5; -shape_3_per_frame8=x = 0.5 + 0.1*sin(q1*1.432)+0.1*sin(q1*0.342); -shape_3_per_frame9=y= 0.5 + 0.1*sin(q1*1.311)+0.1*sin(q1*0.394); -per_frame_1=ib_r = 0.5 + (5.499*( 0.60*sin(0.933*time/3) + 0.40*sin(1.045*time/3) )); -per_frame_2=ib_g = 0.5 + (5*( 0.60*sin(0.900*time/3) + 0.40*sin(0.956*time/3) )); -per_frame_3=ib_b = 0.5 + (5.499*( 0.60*sin(0.910*time/3) + 0.40*sin(0.920*time/3) )); -per_frame_4=wave_a=0; -per_frame_5=decay =1; -per_frame_6=zoom =1; -per_frame_7=rot=0; -per_frame_8=warp=0; -per_frame_9=q1 = oldq1+0.005*(bass+bass_att+(bass*bass_att)-1); -per_frame_10=oldq1 = below(q1,30000)*q1; -per_frame_11=monitor =q1; -per_pixel_1=//dx=0.003*(bass*bass+bass_att)*sin((sin(sqrt(4)-rad))*5+(rad*5*sin(q1)))*y*ang; -per_pixel_2=//dy=0.003*(bass*bass+bass_att)*cos((sin(sqrt(4)-rad))*5+(-rad*5*sin(q1)))*x*rad*ang; -per_pixel_3= -per_pixel_4=rot=(sin(time/2)*x)/(atan(time*2)/(ang/3)/x); -per_pixel_5=warp=(sin(time*9)*y)/(atan(time/2)/rad/y) diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Zylot_Eo.S._Krash I_hope_someone_will_see_this_triping_v2b.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Zylot_Eo.S._Krash I_hope_someone_will_see_this_triping_v2b.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Phat_Zylot_Eo.S._Krash I_hope_someone_will_see_this_triping_v2b.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Phat_Zylot_Eo.S._Krash I_hope_someone_will_see_this_triping_v2b.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,351 +0,0 @@ -[preset00] -fRating=0.000000 -fGammaAdj=1.000000 -fDecay=0.925000 -fVideoEchoZoom=1.001829 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=2.850136 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=63.936001 -nMotionVectorsY=47.952000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.200000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=basstime=basstime+(bass*bass); -wave_0_per_frame2=t1=basstime*0.003; -wave_0_per_frame3= -wave_0_per_point1=//plot x,y,z to point on circle -wave_0_per_point2=smp=sample*6.283; -wave_0_per_point3=xp=sin(smp )*0.05; -wave_0_per_point4=yp=cos(smp )*0.05; -wave_0_per_point5=zp=0; -wave_0_per_point6= -wave_0_per_point7= -wave_0_per_point8=//alter shape; -wave_0_per_point9=angy=sin(sample*6.28*4 +t1 )*6.28; -wave_0_per_point10=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point11=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point12=xp=xq; -wave_0_per_point13=zp=zq; -wave_0_per_point14= -wave_0_per_point15= -wave_0_per_point16=//rotate on y axis; -wave_0_per_point17=angy=t1*0.1; -wave_0_per_point18=xq=xp*cos(angy) - zp*sin(angy); -wave_0_per_point19=zq=xp*sin(angy) + zp*cos(angy); -wave_0_per_point20=xp=xq; -wave_0_per_point21=zp=zq; -wave_0_per_point22= -wave_0_per_point23=//rotate on x axis -wave_0_per_point24=axs1 = sin(t1*0.15) + 1.6; -wave_0_per_point25=yq= yp*cos(axs1) - zp*sin(axs1); -wave_0_per_point26=zq= yp*sin(axs1) + zp*cos(axs1); -wave_0_per_point27=yp=yq; -wave_0_per_point28=zp=zq; -wave_0_per_point29= -wave_0_per_point30=//rotate on y axis again -wave_0_per_point31=axs2 = sin(t1*0.1)*3.3; -wave_0_per_point32=xq=xp*cos(axs2) - zp*sin(axs2); -wave_0_per_point33=zq=xp*sin(axs2) + zp*cos(axs2); -wave_0_per_point34=xp=xq; -wave_0_per_point35=zp=zq; -wave_0_per_point36= -wave_0_per_point37=//stretch y axis to compensate for aspect ratio -wave_0_per_point38=yp=yp*1.2; -wave_0_per_point39= -wave_0_per_point40=//push forward into viewpace -wave_0_per_point41=zp=zp+2.1; -wave_0_per_point42= -wave_0_per_point43=//project x,y,z into screenspace -wave_0_per_point44=xs=xp/zp; -wave_0_per_point45=ys=yp/zp; -wave_0_per_point46= -wave_0_per_point47=//center 0,0 in middle of screen -wave_0_per_point48=x=xs+0.5+q4; -wave_0_per_point49=y=ys+0.5+q5; -wave_0_per_point50= -wave_0_per_point51=r=1-q1; -wave_0_per_point52=g=1-q2; -wave_0_per_point53=b=1-q3; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=23 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.700000 -shapecode_0_rad=0.154930 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.010000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=y=bass_att*0.5+0.2; -shape_0_per_frame2=x=cos(time*2)*0.5+0.5; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.801999 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=3.141593 -shapecode_1_tex_zoom=0.572684 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//ang = ang + (bass*.2) + (time*.4); -shape_1_per_frame2=//rad=1.781+(bass*0.025); -shape_1_per_frame3=ang=above(0.5,treb_att)*.063; -shapecode_2_enabled=0 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.900000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=0.010000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=x = sin(time*5) * .4 + .5; -shape_2_per_frame2=y=treb_att*0.5; -shape_2_per_frame3= -shape_2_per_frame4=pow( (bass*.15),2); -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.033004 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.010000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x=.5+(bass*0.07); -per_frame_1=wave_a = 0; -per_frame_2= -per_frame_3= -per_frame_4= -per_frame_5=//Thanks to Zylot for rainbow generator -per_frame_6=counter1 = if(equal(counter2,1),if(equal(counter1,1),0,counter1+.2),1); -per_frame_7=counter2 = if(equal(counter1,1),if(equal(counter2,1),0,counter2+.2),1); -per_frame_8=cdelay1 = if(equal(cdelay2,1),1,if(equal(colorcounter%2,1),if(equal(counter1,1),2 ,0), if(equal(counter2,1),2,0))); -per_frame_9=cdelay2 = if(equal(cdelay1,2),1,0); -per_frame_10=colorcounter = if(above(colorcounter,7),0,if(equal(cdelay1,1),colorcounter+1,colorcounter)); -per_frame_11=ib_r = .5*if(equal(colorcounter,1),1, if(equal(colorcounter,2),1, if(equal(colorcounter,3),1, if(equal(colorcounter,4),sin(counter2+2.1), if(equal(colorcounter,5),0, if(equal(colorcounter,6),0,sin(counter1))))))); -per_frame_12=ib_g = .5*if(equal(colorcounter,1),0, if(equal(colorcounter,2),sin(counter2*.5), if(equal(colorcounter,3),sin((counter1+1.75)*.4), if(equal(colorcounter,4),1, if(equal(colorcounter,5),1, if(equal(colorcounter,6),sin(counter2+2),0)))))); -per_frame_13=ib_b = if(equal(colorcounter,1),sin(counter1+2.1), if(equal(colorcounter,2),0, if(equal(colorcounter,3),0, if(equal(colorcounter,4),0, if(equal(colorcounter,5),sin(counter1), if(equal(colorcounter,6),1,1)))))); -per_frame_14= -per_frame_15= -per_frame_16= -per_frame_17=ob_r=ib_r-0.5; -per_frame_18=ob_g=ib_g-0.5; -per_frame_19=ob_b=ib_b-0.5; -per_frame_20=q1=ib_r; -per_frame_21=q2=ib_g; -per_frame_22=q3=ib_b; -per_frame_23= -per_frame_24= -per_frame_25= -per_frame_26=decay = 0.9999; -per_frame_27= -per_frame_28= -per_frame_29=//echo_orient=((bass_att+mid_att+treb_att)/3)*3; -per_frame_30=//solarize=above(0.5,bass); -per_frame_31=//darken=above(0.4,treb); -per_frame_32= -per_frame_33=musictime=musictime+(mid*mid*mid)*0.02; -per_frame_34= -per_frame_35=xpos=sin(musictime*0.6)*0.6; -per_frame_36=ypos=sin(musictime*0.4)*0.6; -per_frame_37=q4=xpos; -per_frame_38=q5=ypos; -per_frame_39= -per_frame_40= -per_frame_41= -per_frame_42=//beatdetect -per_frame_43=volume = 0.3*(bass+mid+att); -per_frame_44=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_45=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_46=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_47=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_48=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.5*(beatrate + time - lastbeat),beatrate),beatrate),0.1); -per_frame_49=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_50=lastbeat = if(beat,time,lastbeat); -per_frame_51=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_52= -per_frame_53=mybeat=if(beat,mybeat+1,mybeat); -per_frame_54=mybeat=if(above(mybeat,3),0,mybeat); -per_frame_55=echo_orient=mybeat; -per_pixel_1=//flip= (-2 * above(sin(time),-0.9) )+1; -per_pixel_2=//var=(bass+mid+treb)/3; -per_pixel_3=//rot=((ang&rad/rad)/(var*20))/10; -per_pixel_4=//sx=.99-(var*0.01); -per_pixel_5=//cx=var*0.1*(ang/12); -per_pixel_6=//sy=sx; -per_pixel_7= -per_pixel_8=//zoom=-1; -per_pixel_9=sx=-1+(bass*0.2); -per_pixel_10=sy=-1-(treb*0.2); -per_pixel_11= -per_pixel_12=cx=0.5+q4; -per_pixel_13=cy=0.5-q5; -per_pixel_14=rd=sqrt( sqr( (x-0.5-q4)*2) + sqr( (y-0.5+q5)*1.5 ) ); -per_pixel_15=//zm=(1.1-(rd/4)); -per_pixel_16=zm=.994; -per_pixel_17= -per_pixel_18=ag=atan( (y-0.5+q5)/(x-0.5-q4) ); -per_pixel_19=star=sin(ag*6+time)*((2-rd)-ag)/5; -per_pixel_20=zm=zm+star/20; -per_pixel_21=sx=zm; -per_pixel_22=sy=zm; -per_pixel_23=//rot=above(rd,0.7)*(rd-0.7)*sin(time*0.3) diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Pithlit & Illusion - Symetric pattern.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Pithlit & Illusion - Symetric pattern.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Pithlit & Illusion - Symetric pattern.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Pithlit & Illusion - Symetric pattern.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -[preset00] -fRating=3.500000 -fGammaAdj=1.000000 -fDecay=0.999000 -fVideoEchoZoom=0.999500 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=4.712706 -fWaveSmoothing=0.900000 -fWaveParam=1.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.203507 -fShader=0.000000 -zoom=1.074096 -rot=1.000000 -cx=2.000000 -cy=-1.000000 -dx=-0.980000 -dy=1.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.250000 -wave_b=0.000000 -wave_x=0.000000 -wave_y=0.000000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.400000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.950000 -mv_g=0.800000 -mv_b=0.700000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=1 -shapecode_0_thickOutline=1 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.200000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=mv_r = 0.7-bass_att; -per_frame_5=mv_b = 0.6-treb_att; -per_frame_6=mv_g = 0.5-mid_att; -per_frame_7=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.539*time) ); -per_frame_8=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); -per_pixel_1=pre_zoom=zoom-.07*acos(y*2-1)*sin(time*1.2*q1)*zoom-.07*acos(x*2-1)*sin(time*1.1*q1); -per_pixel_2=zoom=if(above(abs(zoom-1),.04),pre_zoom,.99); -per_pixel_3=rot=if(above(abs(zoom-1),2),-.4+.2*q1,0); Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/project.tga and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/project.tga differ diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Reenen Geiss - Triple Feedback.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Reenen Geiss - Triple Feedback.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Reenen Geiss - Triple Feedback.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Reenen Geiss - Triple Feedback.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,312 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.311600 -fWaveScale=1.228910 -fWaveSmoothing=0.000000 -fWaveParam=0.200000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.459526 -fWarpScale=2.006761 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999902 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.460478 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.006500 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=6.650134 -shapecode_0_ang=3.644249 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.075238 -shapecode_0_r=0.500000 -shapecode_0_g=0.500000 -shapecode_0_b=1.000000 -shapecode_0_a=0.550000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_init1=t1 = rand(100)*0.01; -shape_0_init2=t2 = rand(100)*0.01; -shape_0_per_frame1=rate = fps/(fps+1/3); -shape_0_per_frame2=beat = above(bass,bassthresh); -shape_0_per_frame3=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.3)*rate+1.3); -shape_0_per_frame4=poly = if(beat,rand(30)+6,poly); -shape_0_per_frame5=sides = poly; -shape_0_per_frame6= -shape_0_per_frame7=te = te + max(bass/fps/3,0.003); -shape_0_per_frame8=x = 0.5+0.45*sin(te*1.87)+0.07*sin(time*0.6); -shape_0_per_frame9=y = 0.5+0.35*cos(te*1.87)+0.07*sin(time*1.3); -shape_0_per_frame10=ang = 3*sin(-te*1.67) + 3*cos(te*0.4); -shape_0_per_frame11=rad = rad * (0.9 + 0.2*t2); -shape_0_per_frame12=r = min(1,max(0,r + 0.4*sin(time*0.517 + 1))); -shape_0_per_frame13=g = min(1,max(0,g + 0.4*sin(time*0.491 + 2))); -shape_0_per_frame14=b = min(1,max(0,b + 0.4*sin(time*0.532 + 4))); -shape_0_per_frame15=r2 = min(1,max(0,r2 + 0.4*sin(time*0.457 + 3))); -shape_0_per_frame16=g2 = min(1,max(0,g2 + 0.4*sin(time*0.437 + 5))); -shape_0_per_frame17=b2 = min(1,max(0,b2 + 0.4*sin(time*0.484 + 6))); -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=1 -shapecode_1_thickOutline=1 -shapecode_1_textured=1 -shapecode_1_x=0.370000 -shapecode_1_y=0.490000 -shapecode_1_rad=0.749999 -shapecode_1_ang=3.644249 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_init1=t1 = rand(100)*0.01; -shape_1_init2=t2 = rand(100)*0.01; -shape_1_init3=te = 1; -shape_1_init4=poly = 4; -shape_1_per_frame1=rate = fps/(fps+1/2); -shape_1_per_frame2=beat = above(bass,bassthresh); -shape_1_per_frame3=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.5)*rate+1.5); -shape_1_per_frame4=ran = rand(8)+4; -shape_1_per_frame5=poly = if(beat,if(equal(ran,poly),poly+1,ran),poly); -shape_1_per_frame6=//poly = if(above(poly,8),4,poly); -shape_1_per_frame7=sides = poly; -shape_1_per_frame8= -shape_1_per_frame9=rate2 = fps/(fps+10); -shape_1_per_frame10=out = (1-beat)*rate2*out + beat; -shape_1_per_frame11=border_a = out; -shape_1_per_frame12=te = bass/fps/2 + te; -shape_1_per_frame13=x = x + 0.056*sin(te*1.67); -shape_1_per_frame14=y = y + 0.043*sin(te*1.23); -shape_1_per_frame15=ang = 3*sin(-te*0.67) + 3*cos(te*0.4); -shape_1_per_frame16=rad = rad * (0.9 + 0.2*t2) - 0.1*sin(te*1.51);; -shape_1_per_frame17=r = min(1,max(0,r + 0.3*sin(time*0.427 + 1))); -shape_1_per_frame18=g = min(1,max(0,g + 0.3*sin(time*0.401 + 2))); -shape_1_per_frame19=b = min(1,max(0,b + 0.3*sin(time*0.452 + 4))); -shape_1_per_frame20=r2 = min(1,max(0,r2 + 0.3*sin(time*0.417 + 3))); -shape_1_per_frame21=g2 = min(1,max(0,g2 + 0.3*sin(time*0.457 + 5))); -shape_1_per_frame22=b2 = min(1,max(0,b2 + 0.3*sin(time*0.434 + 6))); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=1 -shapecode_2_thickOutline=1 -shapecode_2_textured=1 -shapecode_2_x=0.670000 -shapecode_2_y=0.430000 -shapecode_2_rad=0.749999 -shapecode_2_ang=4.209736 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=0.000000 -shape_2_init1=t1 = rand(100)*0.01; -shape_2_init2=t2 = rand(100)*0.01; -shape_2_init3=te = 1; -shape_2_init4=poly = 5; -shape_2_per_frame1=rate = fps/(fps+1/2); -shape_2_per_frame2=beat = above(mid,bassthresh); -shape_2_per_frame3=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.6)*rate+1.6); -shape_2_per_frame4=ran = rand(8)+4; -shape_2_per_frame5=poly = if(beat,if(equal(ran,poly),poly+1,ran),poly); -shape_2_per_frame6=//poly = if(above(poly,8),4,poly); -shape_2_per_frame7=sides = poly; -shape_2_per_frame8= -shape_2_per_frame9=rate2 = fps/(fps+10); -shape_2_per_frame10=out = (1-beat)*rate2*out + beat; -shape_2_per_frame11=border_a = out; -shape_2_per_frame12= -shape_2_per_frame13=te = mid/fps/2 + te; -shape_2_per_frame14=x = x + 0.05*sin(te*1.17); -shape_2_per_frame15=y = y + 0.05*sin(te*1.83); -shape_2_per_frame16=ang = 3*sin(te*0.5)+2*sin(te*1.1)+4*sin(te*0.3); -shape_2_per_frame17=rad = rad * (0.9 + 0.2*t2) + 0.1*sin(te*1.3); -shape_2_per_frame18=r = min(1,max(0,r + 0.3*sin(time*0.417 + 1))); -shape_2_per_frame19=g = min(1,max(0,g + 0.3*sin(time*0.391 + 2))); -shape_2_per_frame20=b = min(1,max(0,b + 0.3*sin(time*0.432 + 4))); -shape_2_per_frame21=r2 = min(1,max(0,r2 + 0.3*sin(time*0.457 + 3))); -shape_2_per_frame22=g2 = min(1,max(0,g2 + 0.3*sin(time*0.437 + 5))); -shape_2_per_frame23=b2 = min(1,max(0,b2 + 0.3*sin(time*0.484 + 6))); -shapecode_3_enabled=1 -shapecode_3_sides=3 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.265151 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.100000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=0.500000 -shapecode_3_border_g=0.500000 -shapecode_3_border_b=0.500000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=rate = fps/(fps+1/2); -shape_3_per_frame2= -shape_3_per_frame3=ang = time*0.5; -shape_3_per_frame4=vol = (bass_att+mid_att+treb_att)/6; -shape_3_per_frame5=te = vol/fps + te; -shape_3_per_frame6=x = x + 0.2*sin(te*1.14); -shape_3_per_frame7=y = y + 0.2*sin(te*0.96+2); -shape_3_per_frame8= -shape_3_per_frame9=beat = above(vol*1.5,bassthresh); -shape_3_per_frame10=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.4)*rate+1.4); -shape_3_per_frame11=poly = if(beat,rand(5)+3,poly); -shape_3_per_frame12=poly = if(equal(poly,7),rand(50)+7,poly); -shape_3_per_frame13=sides = poly; -shape_3_per_frame14=rad = rad-log(poly)/100; -per_frame_1=//This Preset is based on Geiss - Feedback and Geiss - Feedback 2 -per_frame_2= -per_frame_3=//Ever since Geiss made those presets I've made slight changes -per_frame_4=//to them and saved them. They were so cool, I used to watch -per_frame_5=//them for hours. This preset is then one that flowed from -per_frame_6=//changing and tweaking those. -per_frame_7= -per_frame_8=//Almost everything is changed, but the one shape, (shape 4) -per_frame_9=//feeding back into the two bigger ones (shape 2 and 3) is -per_frame_10=//obtained from the Feedback presets. -per_frame_11= -per_frame_12=//I've added a 4th shape (shape 1) that is the big 'filter' -per_frame_13=//to change colours etc. It is also textured, so thats why -per_frame_14=//the 'triple' feedback is for. -per_frame_15= -per_frame_16=//Shapes 3 and 2 can have their borders displayed in a strobe -per_frame_17=//like fashion on beats. They also change amount of sides. -per_frame_18= -per_frame_19=//-Reenen diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Reenen Geiss - Triple Feedback_phat+eos_edit.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Reenen Geiss - Triple Feedback_phat+eos_edit.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Reenen Geiss - Triple Feedback_phat+eos_edit.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Reenen Geiss - Triple Feedback_phat+eos_edit.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,320 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.900000 -fVideoEchoZoom=0.999999 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=6 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.311600 -fWaveScale=1.228910 -fWaveSmoothing=0.000000 -fWaveParam=0.200000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.459526 -fWarpScale=2.006761 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999902 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=-1.000000 -warp=0.010000 -sx=0.999998 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=6.650134 -shapecode_0_ang=3.644249 -shapecode_0_tex_ang=3.141593 -shapecode_0_tex_zoom=0.068793 -shapecode_0_r=0.500000 -shapecode_0_g=0.500000 -shapecode_0_b=1.000000 -shapecode_0_a=0.550000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_init1=t1 = rand(100)*0.01; -shape_0_init2=t2 = rand(100)*0.01; -shape_0_per_frame1=rate = fps/(fps+1/3); -shape_0_per_frame2=beat = above(bass,bassthresh); -shape_0_per_frame3=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.3)*rate+1.3); -shape_0_per_frame4=poly = if(beat,rand(30)+6,poly); -shape_0_per_frame5=sides = poly; -shape_0_per_frame6= -shape_0_per_frame7=te = te + max(bass/fps/3,0.003); -shape_0_per_frame8=x = 0.5+0.45*sin(te*1.87)+0.07*sin(time*0.6); -shape_0_per_frame9=y = 0.5+0.35*cos(te*1.87)+0.07*sin(time*1.3); -shape_0_per_frame10=ang = 3*sin(-te*1.67) + 3*cos(te*0.4); -shape_0_per_frame11=rad = rad * (0.9 + 0.2*t2); -shape_0_per_frame12=r = min(1,max(0,r + 0.4*sin(time*0.517 + 1))); -shape_0_per_frame13=g = min(1,max(0,g + 0.4*sin(time*0.491 + 2))); -shape_0_per_frame14=b = min(1,max(0,b + 0.4*sin(time*0.532 + 4))); -shape_0_per_frame15=r2 = min(1,max(0,r2 + 0.4*sin(time*0.457 + 3))); -shape_0_per_frame16=g2 = min(1,max(0,g2 + 0.4*sin(time*0.437 + 5))); -shape_0_per_frame17=b2 = min(1,max(0,b2 + 0.4*sin(time*0.484 + 6))); -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=1 -shapecode_1_thickOutline=1 -shapecode_1_textured=1 -shapecode_1_x=0.370000 -shapecode_1_y=0.490000 -shapecode_1_rad=0.749999 -shapecode_1_ang=3.644249 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_init1=t1 = rand(100)*0.01; -shape_1_init2=t2 = rand(100)*0.01; -shape_1_init3=te = 1; -shape_1_init4=poly = 4; -shape_1_per_frame1= -shape_1_per_frame2=rate = fps/(fps+1/2); -shape_1_per_frame3=beat = above(bass,bassthresh); -shape_1_per_frame4=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.5)*rate+1.5); -shape_1_per_frame5=ran = rand(8)+4; -shape_1_per_frame6=poly = if(beat,if(equal(ran,poly),poly+1,ran),poly); -shape_1_per_frame7=//poly = if(above(poly,8),4,poly); -shape_1_per_frame8=sides = poly; -shape_1_per_frame9= -shape_1_per_frame10=rate2 = fps/(fps+10); -shape_1_per_frame11=out = (1-beat)*rate2*out + beat; -shape_1_per_frame12=border_a = out; -shape_1_per_frame13=te = bass/fps/2 + te; -shape_1_per_frame14=x = x + 0.056*sin(te*1.67); -shape_1_per_frame15=y = y + 0.043*sin(te*1.23); -shape_1_per_frame16=ang = 3*sin(-te*0.67) + 3*cos(te*0.4); -shape_1_per_frame17=rad = rad * (0.9 + 0.2*t2) - 0.1*sin(te*1.51);; -shape_1_per_frame18=r = min(1,max(0,r + 0.3*sin(time*0.427 + 1))); -shape_1_per_frame19=g = min(1,max(0,g + 0.3*sin(time*0.401 + 2))); -shape_1_per_frame20=b = min(1,max(0,b + 0.3*sin(time*0.452 + 4))); -shape_1_per_frame21=r2 = min(1,max(0,r2 + 0.3*sin(time*0.417 + 3))); -shape_1_per_frame22=g2 = min(1,max(0,g2 + 0.3*sin(time*0.457 + 5))); -shape_1_per_frame23=b2 = min(1,max(0,b2 + 0.3*sin(time*0.434 + 6))); -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_textured=1 -shapecode_2_x=0.670000 -shapecode_2_y=0.430000 -shapecode_2_rad=0.331672 -shapecode_2_ang=4.209736 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=0.000000 -shape_2_init1=t1 = rand(100)*0.01; -shape_2_init2=t2 = rand(100)*0.01; -shape_2_init3=te = 1; -shape_2_init4=poly = 5; -shape_2_per_frame1=rate = fps/(fps+1/2); -shape_2_per_frame2=beat = above(mid,bassthresh); -shape_2_per_frame3=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.6)*rate+1.6); -shape_2_per_frame4=ran = rand(8)+4; -shape_2_per_frame5=poly = if(beat,if(equal(ran,poly),poly+1,ran),poly); -shape_2_per_frame6=//poly = if(above(poly,8),4,poly); -shape_2_per_frame7=sides = poly; -shape_2_per_frame8= -shape_2_per_frame9=rate2 = fps/(fps+10); -shape_2_per_frame10=out = (1-beat)*rate2*out + beat; -shape_2_per_frame11=border_a = out; -shape_2_per_frame12= -shape_2_per_frame13=te = mid/fps/2 + te; -shape_2_per_frame14=x = x + 0.05*sin(te*1.17); -shape_2_per_frame15=y = y + 0.05*sin(te*1.83); -shape_2_per_frame16=ang = 3*sin(te*0.5)+2*sin(te*1.1)+4*sin(te*0.3); -shape_2_per_frame17=rad = rad * (0.9 + 0.2*t2) + 0.1*sin(te*1.3); -shape_2_per_frame18=r = min(1,max(0,r + 0.3*sin(time*0.417 + 1))); -shape_2_per_frame19=g = min(1,max(0,g + 0.3*sin(time*0.391 + 2))); -shape_2_per_frame20=b = min(1,max(0,b + 0.3*sin(time*0.432 + 4))); -shape_2_per_frame21=r2 = min(1,max(0,r2 + 0.3*sin(time*0.457 + 3))); -shape_2_per_frame22=g2 = min(1,max(0,g2 + 0.3*sin(time*0.437 + 5))); -shape_2_per_frame23=b2 = min(1,max(0,b2 + 0.3*sin(time*0.484 + 6))); -shapecode_3_enabled=1 -shapecode_3_sides=3 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.265151 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.100000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=0.500000 -shapecode_3_border_g=0.500000 -shapecode_3_border_b=0.500000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=rate = fps/(fps+1/2); -shape_3_per_frame2= -shape_3_per_frame3=ang = time*0.5; -shape_3_per_frame4=vol = (bass_att+mid_att+treb_att)/6; -shape_3_per_frame5=te = vol/fps + te; -shape_3_per_frame6=x = x + 0.2*sin(te*1.14); -shape_3_per_frame7=y = y + 0.2*sin(te*0.96+2); -shape_3_per_frame8= -shape_3_per_frame9=beat = above(vol*1.5,bassthresh); -shape_3_per_frame10=bassthresh = beat*4 + (1-beat)*((bassthresh - 1.4)*rate+1.4); -shape_3_per_frame11=poly = if(beat,rand(5)+3,poly); -shape_3_per_frame12=poly = if(equal(poly,7),rand(50)+7,poly); -shape_3_per_frame13=sides = poly; -shape_3_per_frame14=rad = rad-log(poly)/100; -shape_3_per_frame15= -shape_3_per_frame16=a=pow(vol*2,2); -shape_3_per_frame17=border_a=a; -shape_3_per_frame18=rad=rad*0.7+a*0.015 -per_frame_1=//This Preset is based on Geiss - Feedback and Geiss - Feedback 2 -per_frame_2= -per_frame_3=//Ever since Geiss made those presets I've made slight changes -per_frame_4=//to them and saved them. They were so cool, I used to watch -per_frame_5=//them for hours. This preset is then one that flowed from -per_frame_6=//changing and tweaking those. -per_frame_7= -per_frame_8=//Almost everything is changed, but the one shape, (shape 4) -per_frame_9=//feeding back into the two bigger ones (shape 2 and 3) is -per_frame_10=//obtained from the Feedback presets. -per_frame_11= -per_frame_12=//I've added a 4th shape (shape 1) that is the big 'filter' -per_frame_13=//to change colours etc. It is also textured, so thats why -per_frame_14=//the 'triple' feedback is for. -per_frame_15= -per_frame_16=//Shapes 3 and 2 can have their borders displayed in a strobe -per_frame_17=//like fashion on beats. They also change amount of sides. -per_frame_18= -per_frame_19=//-Reenen -per_frame_20= -per_frame_21=zoom=1.05; -per_frame_22=decay=0.85 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Reenen - phoenix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Reenen - phoenix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Reenen - phoenix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Reenen - phoenix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.999607 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.053452 -fWaveScale=0.811409 -fWaveSmoothing=0.720000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.000000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.608037 -fWarpScale=1.220618 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.009520 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.591235 -sx=0.970590 -sy=1.000000 -wave_r=0.700000 -wave_g=0.100000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.240000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=vol = (bass*5 + mid * 3 + treb*2)/20; -per_frame_2=wave_g = wave_g + vol/10 + 0.1*sin(3.21*time); -per_frame_3=wave_r = wave_r + vol/10; -per_frame_4=wave_b = vol/10; -per_frame_5=dy = dy - vol/30 + 0.0015*sin(0.56*time); -per_frame_6=sx = sx - vol/50; -per_frame_7=wave_x = wave_x + vol/50; -per_pixel_1=q1 = above(0.5,y); -per_pixel_2=q2 = bor(above(x,0.55),above(0.45,x)); -per_pixel_3=q3 = (pow(rad+0.95,4)-1)*0.1*(y+0.1); -per_pixel_4=rot = if(bor(q1,q2),q3,rot); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Aderrasi - Clockwork Organism.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Aderrasi - Clockwork Organism.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Aderrasi - Clockwork Organism.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Aderrasi - Clockwork Organism.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.220183 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=1 -bInvert=1 -fWaveAlpha=0.785805 -fWaveScale=0.837543 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.500000 -ob_g=0.100000 -ob_b=0.200000 -ob_a=0.100000 -ib_size=0.017000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.35*sin(4*time) + 0.15*sin(2.5*time); -per_frame_2=wave_g = wave_g + 0.35*sin(3.7*time) + 0.15*sin(2.11*time); -per_frame_3=wave_b = wave_b + 0.35*sin(3.84*time) + 0.15*sin(2.3*time); -per_frame_4=ib_r = wave_r; -per_frame_5=ib_g = wave_g; -per_frame_6=ib_b = wave_b; -per_frame_7=dx = dx + dx_r; -per_frame_8=dy = dy + dy_r; -per_frame_9=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_frame_10=dx_r = above(thresh,2)*0.015*sin(rad*5*time)+(1-equal(thresh,2))*dx_r; -per_frame_11=dy_r = above(thresh,2)*0.015*sin(ang*6*time)+(1-equal(thresh,2))*dy_r; -per_frame_12=q1 = dx_r*1000; -per_frame_13=q2 = dx_y*1000; -per_frame_14=monitor = dx_r; -per_frame_15=bass_test = bass+1.3*bass_att; -per_frame_16=q8 = if(above(bass_test,2.5),bass_test,0.5*bass_test); -per_pixel_1=//dx = dx + q1*0.01975*pow(rad,x*x)*sin(time); -per_pixel_2=//dy = dy + q2*0.01975*pow(rad,x*x)*cos(time); -per_pixel_3=zoom = zoom - 0.125*pow(rad,x*7)*cos(ang*6); -per_pixel_4=//rot = rot - 0.25*(0.75*sin(1.25*time)*pow(rad,x)*sin(1.45*time))*q1*q2; -per_pixel_5=rot = (zoom-1)+0.07*(q8); -per_frame_init_1=dx_r=1; -per_frame_init_2=dy_r=1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.640100 -fWaveSmoothing=0.270000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.010000 -fShader=0.000000 -zoom=0.998531 -rot=0.002000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.960000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.900000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=32 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.200000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.400000 -shapecode_0_a=0.500000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.200000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang = time*0.4;; -shape_0_per_frame2=x = 0.5 + 0.3*cos(time*1.23) + 0.03*cos(time*0.7); -shape_0_per_frame3=y = 0.5 + 0.3*sin(time*1.43) + 0.03*sin(time*0.7); -shape_0_per_frame4=r =0.5 + 0.5*sin(q8*0.613 + 1); -shape_0_per_frame5=g = 0.5 + 0.5*sin(q8*0.763 + 2); -shape_0_per_frame6=b = 0.5 + 0.5*sin(q8*0.771 + 5); -shape_0_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.635 + 4); -shape_0_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.616+ 1); -shape_0_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.538 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=32 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.200000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.500000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.200000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shape_1_per_frame1=ang = time*0.4;; -shape_1_per_frame2=x = 0.5 + 0.3*cos(time*1.104) + 0.03*cos(time*0.7); -shape_1_per_frame3=y = 0.5 + 0.3*sin(time*1.27) + 0.03*sin(time*0.7); -shape_1_per_frame4=r =0.5 + 0.5*sin(q8*0.613 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(q8*0.763 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(q8*0.771 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.635 + 4); -shape_1_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.616+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.538 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.200000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.500000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.200000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=ang = time*0.4;; -shape_2_per_frame2=x = 0.5 + 0.3*cos(time*1.23) + 0.03*cos(time*0.9); -shape_2_per_frame3=y = 0.5 + 0.3*sin(time*1.18) + 0.03*sin(time*0.9); -shape_2_per_frame4=r =0.5 + 0.5*sin(q8*0.413 + 1); -shape_2_per_frame5=g = 0.5 + 0.5*sin(q8*0.363 + 2); -shape_2_per_frame6=b = 0.5 + 0.5*sin(q8*0.871 + 5); -shape_2_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.835 + 4); -shape_2_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.686+ 1); -shape_2_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.938 + 3); -shape_2_per_frame10=sides = 360; -per_frame_init_1=q8=0; -per_frame_1=q8 =oldq8+ 0.001*(pow(1.2*bass+0.4*bass_att+0.2*treb+0.2*treb_att+0.2*mid+0.2*mid_att,6)/fps) +0.1/fps; -per_frame_2=oldq8 = q8; -per_frame_3=ob_r = 0.3 - 0.3*(0.5*sin(q8*0.701)+ 0.3*cos(q8*0.438)); -per_frame_4=ob_g = 0.6- 0.4*sin(q8*2.924); -per_frame_5=ob_b = 0.35 - 0.3*cos(q8*0.816); -per_frame_6=warp =0; -per_frame_7=ib_size = 0.02; -per_frame_8=ib_r = ib_r + 0.5*sin(q8*3.034); -per_frame_9=ib_g = ib_g + 0.5*sin(q8*2.547); -per_frame_10=ib_b = ib_b - 0.5*sin(q8*1.431); -per_frame_11=ib_r =0; -per_frame_12=ib_g =0; -per_frame_13=ib_b =0; -per_frame_14=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_15=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_16=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_17=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_18=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_19=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_20=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_21=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_22=lastbeat = if(beat,time,lastbeat); -per_frame_23=mybeat = if(beat,mybeat+1,mybeat); -per_frame_24=mybeat = if(above(mybeat,7),0,mybeat); -per_frame_25=mybeat2 = if(equal(mybeat,1),1,0); -per_frame_26=q7 = if(beat*mybeat2,0.001+0.0001*rand(40),oldq7); -per_frame_27=oldq7=q7; -per_frame_28=q6 = if(beat*mybeat2,0.001+0.0001*rand(40),oldq6); -per_frame_29=oldq6=q6; -per_frame_30=q5= if(beat*mybeat2,0.001+0.0001*rand(40),oldq5); -per_frame_31=oldq5=q5; -per_frame_32=q4 = if(beat*mybeat2,0.001+0.0001*rand(40),oldq4); -per_frame_33=oldq4=q4; -per_frame_34=Flag = If(beat*mybeat2,if(Rand(2)-1,1,0),oldFlag); -per_frame_35=oldflag = flag; -per_frame_36=Ratio = If(Beat*mybeat2,100+rand(60),oldRatio); -per_frame_37=OldRatio = Ratio; -per_frame_38=q3 = if(beat*mybeat2,if(flag,ratio,0.75*ratio),oldq3); -per_frame_39=oldq3=q3; -per_frame_40=q2 = if(beat*mybeat2,if(flag,0.75*ratio,ratio),oldq2); -per_frame_41=oldq2=q2; -per_frame_42=solarize = beat;; -per_pixel_1=box=(0.7*sqrt(2)-rad)+0.8*abs(x*3-0.4*sin(q1))%2 + 0.8*abs(y*3+0.4*sin(q1))%2; -per_pixel_2=q1 = 8.3+(sin(x+0.137*q8)-cos(y+0.213*q8)); -per_pixel_3=zoom = if(above(box,1),q1*.1,zoom); -per_pixel_4=rot = if(above(box,1),0.1*rad+sin(0.385*q8),rot); -per_pixel_5=dx=if(above(box,1),dx,q4*sin((y-0.5)*q3)+q5*sin((y-0.5)*q2)); -per_pixel_6=dy=if(above(box,1),dy,q6*cos((x-0.5)*q2)+q7*cos((x-0.5)*q3)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.640100 -fWaveSmoothing=0.270000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.010000 -fShader=0.000000 -zoom=0.998531 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.960000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.900000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.230000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.250000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=ob_r = 0.7 - 0.3*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=ob_g = 0.5- 0.4*sin(time*5.924); -per_frame_3=ob_b = 0.45 - 0.3*cos(time*0.816); -per_frame_4=warp =0; -per_frame_5=volume = 0.08*(bass_att+3*bass+mid+mid_att); -per_frame_6=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_7=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_8=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_9=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_10=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_11=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_12=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_13=lastbeat = if(beat,time,lastbeat); -per_frame_14=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_15=q5 = if(beat,0.1*rand(1000),oldq5); -per_frame_16=oldq5 = q5; -per_frame_17=q3 = if(beat,0.1*rand(1000),oldq3); -per_frame_18=oldq3 = q3; -per_frame_19=ib_size = 0.02; -per_frame_20=ib_r = ib_r + 0.5*sin(time*2.424); -per_frame_21=ib_g = ib_g + 0.5*sin(time*2.247); -per_frame_22=ib_b = ib_b - 0.5*sin(time*1.131); -per_frame_23=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)) + 1/(fps*5); -per_frame_24=oldq8 = q8; -per_pixel_1=box=abs(x*2-0.4*sin(q3))%2 + abs(y*2+0.4*sin(q5))%2; -per_pixel_2=q1 = 4.05+(sin(x+0.237*time)-cos(y+0.513*time)); -per_pixel_3=zoom = if(above(box,1),q1*.1,zoom); -per_pixel_4=rot = if(above(box,1),sin(0.885*q8),0); -per_pixel_5=dx = if(above(box,1),sin(0.542*time),0.005*sin((y*2-1)*48)+0.001*tan((y*2-1)*64)); -per_pixel_6=dy= if(above(box,1),sin(0.581*time),((1+abs(sin(q8)))*0.001)*cos((x*2-1)*48)+0.001*tan((x*2-1)*48)); -per_pixel_7=zoomexp = if(above(box,1),3,1); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,244 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.299910 -fWaveSmoothing=0.630000 -fWaveParam=0.300000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.203212 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=0.787566 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -shape_0_per_frame2=dx_r = equal(thresh,2)*0.004*sin(5*time)+(1-equal(thresh,2))*dx_r; -shape_0_per_frame3=dy_r = equal(thresh,2)*0.004*sin(6*time)+(1-equal(thresh,2))*dy_r; -shape_0_per_frame4=//tex_zoom = 0.8 -0.01*thresh; -shape_0_per_frame5=fdx = 1.1* dx_r; -shape_0_per_frame6=fdy = 1.1* dy_r; -shape_0_per_frame7=x = x+0.1*(fdx + if (above(bass,1.35), 31*dx_r, 0)); -shape_0_per_frame8=y = y+0.01*(if (above(bass,1.3), 0, y)); -shape_0_per_frame9= -shape_0_per_frame10= -shape_0_per_frame11= -shape_0_per_frame12=tex_zoom = 0.8-0.0001*pow((bass+bass_att),5)-0.01*(bass+bass_att); -shape_0_per_frame13=//tex_ang = bass; -shape_0_per_frame14=//x = x +0.01*sin(time); -shape_0_per_frame15=//tex_ang = 0.1*bass; -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.730000 -shapecode_1_rad=0.221671 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=2.448624 -shapecode_1_r=1.000000 -shapecode_1_g=0.500000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=0.500000 -shapecode_1_b2=1.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=ang = 2*3.1415*sin(0.541*time); -shape_1_per_frame2=tex_ang = ang; -shape_1_per_frame3=x = 0.5 + 0.3*cos(time*0.74); -shape_1_per_frame4=y = 0.5 - 0.34*sin(time*0.894); -shapecode_2_enabled=1 -shapecode_2_sides=5 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.230000 -shapecode_2_rad=0.221671 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.220186 -shapecode_2_r=0.500000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.500000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=ang = 3.1415*2*sin(time*0.274); -shape_2_per_frame2=tex_ang = ang; -shape_2_per_frame3=x = 0.5+0.3*sin(time*0.5317); -shape_2_per_frame4=y = 0.5+0.35*sin(time*0.6121); -shapecode_3_enabled=1 -shapecode_3_sides=3 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.300000 -shapecode_3_y=0.730000 -shapecode_3_rad=0.221671 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.970586 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=ang = 3.1415*2*cos(time*0.314); -shape_3_per_frame2=tex_ang = ang; -shape_3_per_frame3=x = 0.5-0.3*sin(time*0.7117); -shape_3_per_frame4=y = 0.5-0.36*cos(time*0.5621); -per_frame_init_1=q8=0; -per_frame_1=warp=0; -per_frame_2=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_3=oldq8 = q8; -per_frame_4=wave_r = 0.5+0.5*sin(1.123*q8); -per_frame_5=wave_g = 0.5+0.5*sin(q8*1.576); -per_frame_6=wave_b = 0.5+0.5*cos(q8*1.465); -per_frame_7=ib_a =0.2*bass; -per_pixel_1=dx=dx+0.008*sin((y*2-1)*meshx)+0.008*sin((y*2-1)*meshx*1.3333); -per_pixel_2=dy=dy+0.008*cos((x*2-1)*meshx*1.3333)+0.008*cos((x*2-1)*meshx); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,225 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.235590 -fWaveSmoothing=0.630000 -fWaveParam=-0.200000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.400000 -mv_dx=0.000000 -mv_dy=-0.100000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q8=0; -per_frame_1=warp=0; -per_frame_2=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_3=oldq8 = q8; -per_frame_4=wave_r = 0.5+0.5*sin(1.123*q8); -per_frame_5=wave_g = 0.5+0.5*sin(q8*1.576); -per_frame_6=wave_b = 0.5+0.5*cos(q8*1.465); -per_frame_7=ib_r = wave_b; -per_frame_8=ib_b=wave_g; -per_frame_9=ib_g=wave_r; -per_frame_10=ib_a =1; -per_frame_11=wave_x = 0.5 + 0.32*sin(q8*0.3); -per_frame_12=wave_y = 0.5 - 0.24*cos(q8*0.2); -per_frame_13=ob_size = 0.005 - above(bass,2)*0.005; -per_pixel_1=dx=dx+0.008*sin((y*2-1)*meshx); -per_pixel_2=dy=dy+0.008*cos((x*2-1)*meshx*1.333); -per_pixel_3=dx=dx+0.008*sin((y*2-1)*meshx*1.333); -per_pixel_4=dy=dy+0.008*cos((x*2-1)*meshx); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.199252 -fWaveSmoothing=0.630000 -fWaveParam=0.300000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q8=0; -per_frame_1=warp=0; -per_frame_2=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_3=oldq8 = q8; -per_frame_4=wave_r = 0.5+0.5*sin(1.123*q8); -per_frame_5=wave_g = 0.5+0.5*sin(q8*1.576); -per_frame_6=wave_b = 0.5+0.5*cos(q8*1.465); -per_frame_7=ib_a =0.2*bass; -per_pixel_1=dx=dx+0.008*sin((y*2-1)*meshx)+0.008*sin((y*2-1)*meshx*1.3333); -per_pixel_2=dy=dy+0.008*cos((x*2-1)*meshx*1.3333)+0.008*cos((x*2-1)*meshx); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,221 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.199252 -fWaveSmoothing=0.630000 -fWaveParam=0.300000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q8=0; -per_frame_1=warp=0; -per_frame_2=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_3=oldq8 = q8; -per_frame_4=wave_r = 0.5+0.5*sin(1.123*q8); -per_frame_5=wave_g = 0.5+0.5*sin(q8*1.576); -per_frame_6=wave_b = 0.5+0.5*cos(q8*1.465); -per_frame_7=ib_a =0.2*bass; -per_frame_8=q2 = q8; -per_frame_9=q1 = 0.1*q8; -per_pixel_1=dx=dx+0.008*sin((y*2-1)*meshx)+0.008*sin((y*2-1)*meshx*1.333); -per_pixel_2=dy=dy+0.008*cos((x*2-1)*meshx*2.6667)-0.008*cos((x*2-1)*meshx); -per_pixel_3=rot=rot+0.01*sin(rad*(9.5 + 5.5*sin(q8*0.1623)) + q2*1.3 + q1*1.31); -per_pixel_4=zoom=zoom+0.01*sin(ang*6 + rad*(5.5 + 1.5*sin(q8*0.13)) + q2*1.63 + q1); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - A Million Miles from Earth.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - A Million Miles from Earth.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - A Million Miles from Earth.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - A Million Miles from Earth.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.438649 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.976000 -ob_size=0.005000 -ob_r=0.400000 -ob_g=0.300000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.600000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = 0.5 + 0.3*sin(time*0.894); -per_frame_3=wave_g = 0.53 + 0.33*sin(time*1.14); -per_frame_4=wave_b = 0.2 + 0.1*(1-bass); -per_frame_5=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_frame_6=dx_r = equal(thresh,2)*0.004*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_7=dy_r = equal(thresh,2)*0.004*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_8=zoom = zoom -0.01*thresh; -per_frame_9=dx = 1.1* dx_r; -per_frame_10=dy = 1.1* dy_r; -per_frame_11=dx = dx + if (above(bass,1.35), 31*dx_r, 0); -per_frame_12=dy = if (above(bass,1.3), 0, dy); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.438649 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.963000 -ob_size=0.005000 -ob_r=0.400000 -ob_g=0.300000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.600000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = 0.5 + 0.3*sin(time*0.894); -per_frame_3=wave_g = 0.53 + 0.33*sin(time*1.14); -per_frame_4=wave_b = 0.2 + 0.1*(1-bass); -per_frame_5=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_frame_6=dx_r = equal(thresh,2)*0.002*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_7=dy_r = equal(thresh,2)*0.002*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_8=zoom = zoom -0.01*thresh; -per_frame_9=dx = 1.1* dx_r; -per_frame_10=dy = 1.1* dy_r; -per_frame_11=dx = dx + if (above(bass,1.3), 21*dx_r, 0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=11.940000 -fWaveScale=1.599182 -fWaveSmoothing=0.700000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=1.001000 -fShader=0.000000 -zoom=1.007000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.400000 -wave_b=0.650000 -wave_x=0.010000 -wave_y=0.000000 -ob_size=0.005000 -ob_r=0.300000 -ob_g=0.500000 -ob_b=0.300000 -ob_a=0.700000 -ib_size=0.005000 -ib_r=0.450000 -ib_g=0.350000 -ib_b=0.350000 -ib_a=0.300000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_b = wave_b - 0.200*( 0.60*sin(1.823*time) + 0.40*sin(0.916*time) ); -per_frame_2=wave_r = wave_r + 0.500*( 0.60*sin(1.900*time) + 0.40*sin(1.023*time) ); -per_frame_3=wave_g = wave_g + 0.500*( 0.60*sin(1.1*time) + 0.40*sin(0.949*time) ); -per_frame_4=decay = decay - 0.03*equal(frame%30,0); -per_frame_5=treb_effect = max(max(treb,treb_att)-1.25,0); -per_frame_6=mid_effect= max(max(mid,mid_att)-1.25,0); -per_frame_7=ob_size = ob_size + 0.005*treb_effect; -per_frame_8=ib_size = ib_size + 0.005*mid_effect; -per_frame_9=ob_g = ob_g -0.2* treb_effect +0.2* mid_effect; -per_frame_10=ib_g = ib_g + 0.2*mid_effect+ 0.2*treb_effect; -per_frame_11=ib_b = ib_b - 0.2*mid_effect+ 0.2*treb_effect; -per_frame_12=ok_to_change = if(above(time,beat_time+5),1,0); -per_frame_13=bass_effect = max(bass, bass_att)-1; -per_frame_14=beat_time = if(above(bass_effect,0.5), if(ok_to_change,time,beat_time),beat_time); -per_frame_15=effect = if(equal(time,beat_time),effect+rand(3)+1,effect); -per_frame_16=effect = if(above(effect,3),effect-4,effect); -per_frame_17=bass_effect = max(max(bass,bass_att)-1.34,0); -per_frame_18=q1 = effect; -per_frame_19=q2 = bass_effect; -per_frame_20=wave_x = if(equal(q1,0),0.01,if(equal(q1,1),0.99,if(equal(q1,2),0.01,0.99))); -per_frame_21=wave_mystery = if(equal(q1,0),1,if(equal(q1,1),1,if(equal(q1,2),0,0))); -per_frame_22=monitor = q1; -per_frame_23=zoom = if(equal(q1,0),0.4*x,if(equal(q1,1),0.4*(1-x),if(equal(q1,2),0.4*y,0.4*(1-y)))) + 0.6 - 0.13*(min(q2,0.3)); -per_pixel_1=zoom = if(equal(q1,0),0.4*x,if(equal(q1,1),0.4*(1-x),if(equal(q1,2),0.4*y,0.4*(1-y)))) + 0.6 - 0.13*(min(q2,0.3)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.935000 -fVideoEchoZoom=1.006595 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=100.000000 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.489000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_2=bass_residual = equal(bass_thresh,2)*sin(time*bass_thresh*.1) + (1-equal(bass_thresh,2))*bass_residual; -per_frame_3=mid_thresh = above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*0.96+1.3); -per_frame_4=mid_residual = equal(mid_thresh,2)*sin(time*bass_thresh*.1) + (1-equal(mid_thresh,2))*mid_residual; -per_frame_5=q1=.75+.2*bass_residual; -per_frame_6=q2=.25+.2*mid_residual; -per_frame_7=wave_g = wave_g*bass_residual; -per_frame_8=wave_b =wave_b*mid_residual; -per_frame_9=wave_r = wave_r + .5*sin(time*bass_residual*mid_residual*.4); -per_frame_10=rot=rot+.3*sin(time*mid_residual); -per_pixel_1=sy= if(below(y,q1),if(above(y,q2),pow(log(abs(ang)*time),3)/4,q1+.25),q2+.75); -per_pixel_2=zoom = 1 + sin(rad)/10*cos((y-.5+rad)*10*sin(time)); -per_pixel_3=rot=rot+if(bnot(below(y,q1)*above(y,q2)),0,sin(time/2)*.1); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Attacking Freedom.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Attacking Freedom.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Attacking Freedom.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Attacking Freedom.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.960000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=1 -bInvert=1 -fWaveAlpha=1.000000 -fWaveScale=0.224562 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.199900 -wave_b=0.700000 -wave_x=0.600000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.030000 -ob_g=0.150000 -ob_b=0.250000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.100000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.010000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.700000 -mv_b=1.000000 -mv_a=0.500000 -per_frame_1=warp=0; -per_frame_2=mv_g = mv_g + 0.1*(0.6*sin(time*0.763) + 0.4*sin(time*1.231)); -per_frame_3=mv_b = mv_b + 0.2*(0.6*sin(time*0.695) + 0.4*sin(time*0.367)); -per_frame_4=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)) + 1/(fps*5); -per_frame_5=oldq8 = q8; -per_frame_6=wave_x = 0.1*sin(q8*1.0677) + 0.5; -per_frame_7=wave_y = 0.1*sin(q8*1.1931) + 0.5; -per_frame_8=q1 = wave_x; -per_frame_9=q2 = 1-wave_y; -per_frame_10=cx = wave_x; -per_frame_11=cy = 1-wave_y; -per_pixel_1=newx = x - q1; -per_pixel_2=newy = y - q2; -per_pixel_3=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_4=newzoom = pow(0.996, pow(0.01+sin(newrad*newrad), newrad*2-1)); -per_pixel_5=dx = (newx)*newzoom - newx; -per_pixel_6=dy = (newy)*newzoom - newy; -per_pixel_7=rot = -0.1*newrad*(0.5*rad+0.1); -per_pixel_8=zoom = 1+newzoom*0.3; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=8.311065 -fWaveSmoothing=0.606000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.000000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.134784 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.599182 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.200000 -shapecode_0_g2=0.200000 -shapecode_0_b2=0.200000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = q3; -shape_0_per_frame2=y = 1- q4; -shape_0_per_frame3=r = 0.5 + 0.49*sin(time*0.467); -shape_0_per_frame4=b = 0.5 + 0.49*sin(time*0.568); -shape_0_per_frame5=g = 0.5 + 0.49*sin(time*0.669); -shape_0_per_frame6=r2 = 0.1*(bass+bass_att); -shape_0_per_frame7=b2 = r2; -shape_0_per_frame8=g2 = r2; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp = 0; -per_frame_2= -per_frame_3=wave_g = 0.5 + 0.5*sin(time*2.13); -per_frame_4=wave_b = 0.5 + 0.5*sin(0.89*time); -per_frame_5=wave_r = 0.2 + 0.2*sin(time*1.113); -per_frame_6=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_7=movement = if(above(movement,10000), 0, movement); -per_frame_8= -per_frame_9=q3 = 0.5+0.1*sin(movement); -per_frame_10=q4 = 0.5-0.1*cos(0.781*movement); -per_frame_11= -per_frame_12=wave_x = q3; -per_frame_13=wave_y = 1-q4; -per_frame_14=decay = 0.995; -per_frame_15=//decay = 1.0; -per_pixel_1=newx =x- q3; -per_pixel_2=newy =y- q4; -per_pixel_3=newang = atan2(newx,newy); -per_pixel_4=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_5=rot = rot + 0.1*sin(newang*20); -per_pixel_6=zoom = 1.0+0.1*abs(sin(newang*4)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.931011 -fWaveSmoothing=0.630000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=11.360000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.750000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.444842 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.200000 -shapecode_0_r2=0.200000 -shapecode_0_g2=0.300000 -shapecode_0_b2=0.200000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = 0.5 + 0.3*sin(time*0.9521); -shape_0_per_frame2=y = 0.5+0.3*sin(time*0.782); -shape_0_per_frame3=b = 0.2 + 0.199*sin(time*0.462); -shape_0_per_frame4=g = 0.2 + 0.199*sin(time*0.3462); -shape_0_per_frame5=r = 0.9 + 0.099*sin(time*0.2786); -shape_0_per_frame6=r2 = 0.2 + 0.199*sin(time*0.3162); -shape_0_per_frame7=g2 = 0.2 + 0.199*sin(time*0.29462); -shape_0_per_frame8=b2 = 0.2 + 0.199*sin(time*0.4042); -shape_0_per_frame9=//a1=q2; -shape_0_per_frame10=//a2 = q2; -shape_0_per_frame11=additive = if(q4,(q4-1)*equal(q3,0),bnot(equal(q3,0))); -shape_0_per_frame12=textured = bnot(equal(q3,0)); -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.444842 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.200000 -shapecode_1_r2=0.200000 -shapecode_1_g2=0.300000 -shapecode_1_b2=0.200000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=x = 0.5 + 0.3*sin(time*0.8521); -shape_1_per_frame2=y = 0.5+0.3*sin(time*0.67682); -shape_1_per_frame3=b = 0.2 + 0.199*sin(time*0.3462); -shape_1_per_frame4=g = 0.2 + 0.199*sin(time*0.462); -shape_1_per_frame5=r = 0.9 + 0.099*sin(time*0.3786); -shape_1_per_frame6=r2 = 0.2 + 0.199*sin(time*0.4162); -shape_1_per_frame7=g2 = 0.2 + 0.199*sin(time*0.39462); -shape_1_per_frame8=b2 = 0.2 + 0.199*sin(time*0.3042); -shape_1_per_frame9=additive = if(q4,(q4-1)*equal(q3,1),bnot(equal(q3,1))); -shape_1_per_frame10=textured = bnot(equal(q3,1)); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.444842 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.200000 -shapecode_2_r2=0.200000 -shapecode_2_g2=0.300000 -shapecode_2_b2=0.200000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=x = 0.5 + 0.3*sin(time*0.7721); -shape_2_per_frame2=y = 0.5+0.3*sin(time*0.823); -shape_2_per_frame3=b = 0.2 + 0.199*sin(time*0.652); -shape_2_per_frame4=g = 0.2 + 0.199*sin(time*0.4162); -shape_2_per_frame5=r = 0.9 + 0.099*sin(time*0.1786); -shape_2_per_frame6=r2 = 0.2 + 0.199*sin(time*0.1862); -shape_2_per_frame7=g2 = 0.2 + 0.199*sin(time*0.442); -shape_2_per_frame8=b2 = 0.2 + 0.199*sin(time*0.382); -shape_2_per_frame9=//a = q2; -shape_2_per_frame10=//a2 = q2; -shape_2_per_frame11=additive = if(q4,(q4-1)*equal(q3,2),bnot(equal(q3,2))); -shape_2_per_frame12=textured = bnot(equal(q3,2)); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.444842 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=0.200000 -shapecode_3_r2=0.200000 -shapecode_3_g2=0.300000 -shapecode_3_b2=0.200000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x = 0.5 + 0.3*sin(time*0.621); -shape_3_per_frame2=y = 0.5+0.3*sin(time*0.693); -shape_3_per_frame3=b = 0.2 + 0.199*sin(time*0.3862); -shape_3_per_frame4=g = 0.2 + 0.199*sin(time*0.449); -shape_3_per_frame5=r = 0.9 + 0.099*sin(time*0.3521); -shape_3_per_frame6=r2 = 0.2 + 0.199*sin(time*0.5252); -shape_3_per_frame7=g2 = 0.2 + 0.199*sin(time*0.3085); -shape_3_per_frame8=b2 = 0.2 + 0.199*sin(time*0.4111); -shape_3_per_frame9=//a = q2; -shape_3_per_frame10=//a2 = q2; -shape_3_per_frame11=additive = if(q4,(q4-1)*equal(q3,3),bnot(equal(q3,3))); -shape_3_per_frame12=textured = bnot(equal(q3,3)); -per_frame_init_1=q4 = int(rand(3)); -per_frame_init_2=q5 = 2+int(rand(3))*(1/3); -per_frame_init_3=q6 = 2+int(rand(3))*(1/3); -per_frame_init_4=q7 = 2+int(rand(3))*(1/3); -per_frame_init_5=q8 = 2+int(rand(3))*(1/3); -per_frame_1=warp=0; -per_frame_2=ib_a =0.2*bass; -per_frame_3=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_4=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_5=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_6=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_7=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_8=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_9=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_10=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_11=lastbeat = if(beat,time,lastbeat); -per_frame_12=countertime = if(beat,time,countertime); -per_frame_13=counter =-1*pow(min((time-countertime-1.5),0),9); -per_frame_14=beatcounter = if(beat, Beatcounter+1, beatcounter); -per_frame_15=wave_a = 0; -per_frame_16=ib_r=0.1+0.0999*sin(time*0.4251); -per_frame_17=ib_b=0.1+0.0999*sin(time*0.351); -per_frame_18=ib_g=0.1+0.0999*sin(time*0.543); -per_frame_19=ob_a =bnot(beat); -per_frame_20=q2 = beat; -per_frame_21=q3 = beatcounter%4; -per_frame_22=monitor = q4; -per_frame_23=decay =if(q4,1,0.98); -per_frame_24=q1 =20/fps; -per_pixel_1=dx= dx+q1*0.005*sin((y-0.5)*meshx*q7) +q1*0.005*sin((y-0.5)*meshx*q4); -per_pixel_2=dy=dy+q1*0.0025*cos((x-0.5)*meshx*q6)+ q1*0.0025*cos((x-0.5)*meshx*q5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.840000 -fDecay=0.900000 -fVideoEchoZoom=2.215847 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.130388 -fWaveSmoothing=0.540000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=1.000000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.4)*0.85+1.4); -per_frame_2=treb_thresh = above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.5)*0.75+1.5); -per_frame_3=bass_on = above(bass_thresh,1.8); -per_frame_4=treb_on = above(treb_thresh,1.9); -per_frame_5=swapcolour = bass_on - treb_on; -per_frame_6=red_aim = if(equal(swapcolour,1),1,if(equal(swapcolour,0),1,0)); -per_frame_7=green_aim = if(equal(swapcolour,1),0,if(equal(swapcolour,0),0.5,0.25)); -per_frame_8=blue_aim = if(equal(swapcolour,1),0,if(equal(swapcolour,0),0,1)); -per_frame_9=red = red + (red_aim - red)*if(equal(swapcolour,1),0.65,0.45); -per_frame_10=green = green + (green_aim - green)*0.5; -per_frame_11=blue = blue + (blue_aim - blue)*if(equal(swapcolour,1),0.45,0.65); -per_frame_12=wave_r = red; -per_frame_13=wave_g = green; -per_frame_14=wave_b = blue; -per_pixel_1=dx = if(above(x,0.5),sin(0.5-x)/15, log10(1/x)/45); -per_pixel_2=xrot = if(above(rad,0.4),cos(rad*2*x)/25+sin(pow(ang,5))/25,cos(1-rad)/25+2*sin(-rad)/25); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.840000 -fDecay=0.900000 -fVideoEchoZoom=2.215847 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.130388 -fWaveSmoothing=0.540000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=1.000000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.4)*0.85+1.4); -per_frame_2=treb_thresh = above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.5)*0.75+1.5); -per_frame_3=bass_on = above(bass_thresh,1.8); -per_frame_4=treb_on = above(treb_thresh,1.9); -per_frame_5=swapcolour = bass_on - treb_on; -per_frame_6=red_aim = if(equal(swapcolour,1),1,if(equal(swapcolour,0),1,0)); -per_frame_7=green_aim = if(equal(swapcolour,1),0,if(equal(swapcolour,0),0.5,0.25)); -per_frame_8=blue_aim = if(equal(swapcolour,1),0,if(equal(swapcolour,0),0,1)); -per_frame_9=red = red + (red_aim - red)*if(equal(swapcolour,1),0.65,0.45); -per_frame_10=green = green + (green_aim - green)*0.5; -per_frame_11=blue = blue + (blue_aim - blue)*if(equal(swapcolour,1),0.45,0.65); -per_frame_12=wave_r = red; -per_frame_13=wave_g = green; -per_frame_14=wave_b = blue; -per_pixel_1=dy = if(above(y,0.5),sin(0.5-y)/10, log10(1/y)/35); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,225 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.369668 -fWaveScale=2.608790 -fWaveSmoothing=0.500000 -fWaveParam=0.350000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=3.600000 -fShader=0.000000 -zoom=1.004000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.309000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=8.000000 -nMotionVectorsY=4.320000 -mv_dx=-0.136000 -mv_dy=-0.012000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.330038 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.691150 -shapecode_0_tex_zoom=2.283879 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=tex_zoom = tex_zoom - 0.025 + 0.05*(bass+bass_att); -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=//zoom = zoom + 0.023*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=//rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%200,0); -per_frame_7=warp=0; -per_frame_8=decay = 0.970; -per_frame_9=zoom =1; -per_frame_10=rot=0; -per_pixel_1=//dy=dy+0.05*sin((y*2-1)*48+(y*2-1)*64); -per_pixel_2=//dy=dy-0.05*cos((x*2-1)*64+(x*2-1)*48); -per_pixel_3=//dx=dx+0.005*sin((y*2-1)*48+(y*2-1)*64); -per_pixel_4=//dx=dx-0.005*cos((x*2-1)*64+(x*2-1)*48); -per_pixel_5= -per_pixel_6=dx = 0.005*sin((tan(1-rad))*(90+bass+bass_att)+((ang)*18)); -per_pixel_7=dy = -0.005*sin((tan(1-rad))*(90+bass+bass_att)+((-ang)*18)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,242 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.900000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.893664 -fWaveSmoothing=0.600000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.995000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.002000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.330038 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = q1; -shape_0_per_frame2=y = 1- q2; -shape_0_per_frame3=r = 0.5 + 0.49*sin(time*0.467); -shape_0_per_frame4=b = 0.5 + 0.49*sin(time*0.568); -shape_0_per_frame5=g = 0.5 + 0.49*sin(time*0.669); -shape_0_per_frame6=r2 = 0.1*(bass+bass_att); -shape_0_per_frame7=b2 = r2; -shape_0_per_frame8=g2 = r2; -shape_0_per_frame9=rad = r2 + 0.2; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_r = wave_r + 0.200*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.200*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.200*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=warp=0; -per_frame_5=zoom =1; -per_frame_6=rot=0; -per_frame_7=decay =0.985; -per_frame_8=//decay =1; -per_frame_9= -per_frame_10=ib_r = 0.666 - 0.333*sin(time*1.234); -per_frame_11=ib_g = 0.666+0.333*sin(time*2.123); -per_frame_12=ib_b = 0.01+0.1*treb; -per_frame_13= -per_frame_14=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_15=movement = if(above(movement,10000), 0, movement); -per_frame_16= -per_frame_17=q1 = 0.5+0.1*sin(movement); -per_frame_18=q2 = 0.5-0.1*cos(0.781*movement); -per_frame_19=q3 = (35+15*sin(time*0.3426)+0.8*bass); -per_frame_20=wave_x = q1; -per_frame_21=wave_y = 1- q2; -per_pixel_1=newx =x- q1; -per_pixel_2=newy =y- q2; -per_pixel_3=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_4=dy=0.007*sin((1.3-newrad)*(1.3-newrad)*(q3)); -per_pixel_5=dx=-0.007*cos((1.3-newrad)*(1.3-newrad)*(q3)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Decreasing Dreams (Increasing Memory Mix) .milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Decreasing Dreams (Increasing Memory Mix) .milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Decreasing Dreams (Increasing Memory Mix) .milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Decreasing Dreams (Increasing Memory Mix) .milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,254 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.900000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=1.204525 -fWaveSmoothing=0.600000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.995000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_r = wave_r + 0.200*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.200*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.200*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=warp=0; -per_frame_5=zoom =1; -per_frame_6=rot=0; -per_frame_7=decay =0.97; -per_frame_8=//decay =1; -per_frame_9=wave_r = 0.5 + 0.45*( 0.6*sin(1.517*time) + 0.4*mid_effect ); -per_frame_10=wave_b = 0.5 + 0.45*( 0.6*sin(1.088*time) + 0.4*bass_effect ); -per_frame_11=wave_g = 0.5 + 0.45*( 0.6*sin(1.037*time) + 0.4*treb_effect ); -per_frame_12=volume = 0.3*(bass+mid+att); -per_frame_13=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_14=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_15=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_16=peakbass_att = max(bass_att,peakbass_att); -per_frame_17=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_18=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_19=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_20=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_21=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_22=//counter = if(beat,counter+rand(10),counter); -per_frame_23=//counter = if(above(counter,10000),0,counter); -per_frame_24=test1 = if(beat,0.001*(rand(20)-10),test1); -per_frame_25=test2 = if(beat,rand(79),test2); -per_frame_26=test3 = if(beat,0.001*(rand(20)-10),test3); -per_frame_27=test4 = if(beat,rand(79),test4); -per_frame_28= -per_frame_29=q1 =test1; -per_frame_30=q2 =test2; -per_frame_31=q3 =test3; -per_frame_32=q4 =test4; -per_frame_33= -per_frame_34=//q1 = 0.001*((counter%20)-10); //multiply amount for dx -per_frame_35=//q2 = (counter%79); //angle amount for dy -per_frame_36=//counter2 = if(beat,counter2+rand(10),counter2); -per_frame_37=//counter2 = if(above(counter2,10000),0,counter2); -per_frame_38=//q3 = 0.001*((counter2%20)-10); //multiply amount for dy -per_frame_39=//q4 = (counter2%79); //angle amount for dy -per_frame_40=monitor = test; -per_frame_41=zoom = 1.02; -per_pixel_1=//dx=q1*0.001*sin(ang*q2); -per_pixel_2=//dy=q3*0.001*cos(ang*q4); -per_pixel_3=//velocity = 150; -per_pixel_4=dy=q1*sin((1.3-rad)*(1.3-rad)*q2); -per_pixel_5=dx=q3*cos((1.3-rad)*(1.3-rad)*q4); -per_pixel_6= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Explosive Minds.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Explosive Minds.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Explosive Minds.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Explosive Minds.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999608 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.011046 -fWaveSmoothing=0.750000 -fWaveParam=-0.420000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.900000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=1.280000 -nMotionVectorsY=1.248000 -mv_dx=-0.060000 -mv_dy=-0.026000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = bass_att*.3; -per_frame_3=wave_g = treb_att*.3; -per_frame_4=wave_b = mid_att*.3; -per_frame_5=ob_r = 0.5+0.5*sin(time*5.12); -per_frame_6=ob_b = 0.5+0.5*sin(time*6.112); -per_frame_7=ob_g = 0.5+0.5*sin(time*7.212); -per_frame_8=q1 = zoom + pow((bass+bass_att),3)*.005-.02; -per_pixel_1=zoom =q1+ rad*sin(ang*25)*.05; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Eye On Reality (Mega 3 Mix)_phat_edit.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Eye On Reality (Mega 3 Mix)_phat_edit.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Eye On Reality (Mega 3 Mix)_phat_edit.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Eye On Reality (Mega 3 Mix)_phat_edit.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,258 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.996627 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=1 -fWaveAlpha=3.300000 -fWaveScale=0.032546 -fWaveSmoothing=0.000000 -fWaveParam=-0.660000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=1.025000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.290770 -sx=1.000000 -sy=1.000000 -wave_r=0.800000 -wave_g=0.500000 -wave_b=0.300000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.330038 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.200000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = q7; -shape_0_per_frame2=y = 1-q8; -shape_0_per_frame3= -shape_0_per_frame4=ang=bass; -shape_0_per_frame5=r = 0.5+ 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -shape_0_per_frame6=g = 0.5 + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -shape_0_per_frame7=b = 0.5 + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -shape_0_per_frame8=r2 = 0.5+ 0.400*( 0.60*sin(0.873*time) + 0.40*sin(1.124*time) ); -shape_0_per_frame9=g2 = 0.5 + 0.400*( 0.60*sin(0.947*time) + 0.40*sin(0.978*time) ); -shape_0_per_frame10=b2 = 0.5 + 0.400*( 0.60*sin(0.889*time) + 0.40*sin(0.868*time) ); -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.081954 -shapecode_1_ang=5.026548 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=2.063783 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=x = q7; -shape_1_per_frame2=y = 1-q8; -shape_1_per_frame3= -shape_1_per_frame4= -shape_1_per_frame5=r = 0.5+ 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -shape_1_per_frame6=g = 0.5 + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -shape_1_per_frame7=b = 0.5 + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -shape_1_per_frame8=r2 = 0.5+ 0.400*( 0.60*sin(0.873*time) + 0.40*sin(1.124*time) ); -shape_1_per_frame9=g2 = 0.5 + 0.400*( 0.60*sin(0.947*time) + 0.40*sin(0.978*time) ); -shape_1_per_frame10=b2 = 0.5 + 0.400*( 0.60*sin(0.889*time) + 0.40*sin(0.868*time) ); -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=q6 =oldq6+ 0.005*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_2=oldq6 = q6; -per_frame_3=left = 0.5 + 0.25*(sin(0.555*q6) + sin(1.111*q6)); -per_frame_4=right = 0.5 + 0.25*(sin(0.333*q6) + sin(1.222*q6)); -per_frame_5=centrex = (left+right)/2; -per_frame_6=distx = 0.1 + (abs(centrex-left)+abs(centrex-right))/2; -per_frame_7=q1 = centrex + distx; -per_frame_8=q2 = centrex - distx; -per_frame_9=wave_x = centrex; -per_frame_10=top = 0.5 + 0.25*(sin(0.888*time) + sin(0.999*time)); -per_frame_11=bottom = 0.5 + 0.25*(sin(0.444*time) + sin(1.333*time)); -per_frame_12=centrey = (top+bottom)/2; -per_frame_13=disty = 0.1 + (abs(centrey-top)+abs(centrey-bottom))/2; -per_frame_14=q3 = centrey + disty; -per_frame_15=q4 = centrey - disty; -per_frame_16=wave_y = 1-centrey; -per_frame_17=warp=0; -per_frame_18=monitor = zoom; -per_frame_19=zoom = 1; -per_frame_20=q7 = centrex; -per_frame_21=q8 = centrey; -per_frame_22=wave_a = 0; -per_frame_23=dx = 0; -per_frame_24=dy =0; -per_pixel_1=newx = x-q7; -per_pixel_2=newy = y-q8; -per_pixel_3=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_4=newang = atan2(newx,newy); -per_pixel_5=newzoom = pow(0.999 + 0.05*sin((q4)*(newang+q3)), pow(sin(newrad*newrad), newrad)); -per_pixel_6=rot=rot+0.16*sin(q6*-3.3+newrad*11)*(1.3-newrad); -per_pixel_7=zoom=zoom+0.04*sin(q6*1.2+newang*6.28*3); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Forgotten Moon.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Forgotten Moon.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Forgotten Moon.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Forgotten Moon.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=8 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.015199 -fWaveSmoothing=0.630000 -fWaveParam=-0.340000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.100000 -wave_y=0.860000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=ib_r = 0.5+0.5*sin(time); -per_frame_3=ib_g = 0.5+0.5*sin(time*1.576); -per_frame_4=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_5=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_6=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_7=q8 =oldq8+ 0.0002*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=oldq8 = q8; -per_pixel_1=dx = 0.01*sin(100*y+q8/y); -per_pixel_2=dy = 0.01*sin(100*x+q8/x); -per_frame_init_1=q8=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=4.574798 -fWaveSmoothing=0.750000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=9.860800 -fWarpScale=16.217400 -fZoomExponent=1.503744 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.999999 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=1.000000 -ob_a=1.000000 -ib_size=0.040000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.002000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.150375 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = 0.5 + 0.05*sin(q1*0.456); -shape_0_per_frame2=y = 0.5 + 0.05*sin(q1*0.56); -shape_0_per_frame3=tex_zoom = tex_zoom + 0.5*sin(q1*0.345); -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q4 = 0.249+0.5*(rand(100)*0.01); -per_frame_init_2=q5 = 0.249+0.5*(rand(100)*0.01); -per_frame_init_3=q6 = 0.249+0.5*(rand(100)*0.01); -per_frame_1=wave_a =0; -per_frame_2=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_3=movement = if(above(movement,10000), 0, movement); -per_frame_4=ob_b = q4+0.25*sin(movement*3.816); -per_frame_5=ob_g = q4+0.25*sin(movement*0.744); -per_frame_6=ob_r = q4+0.25*sin(movement*0.707); -per_frame_7=wrap = above(bass+bass_att,3); -per_frame_8=decay=1; -per_frame_9=rot=0; -per_frame_10=zoom =0.98; -per_frame_11=mv_r = 0; -per_frame_12=mv_g = 0; -per_frame_13=mv_b =0; -per_frame_14=mv_dy = 0.03*sin(movement*0.34); -per_frame_15=mv_dx = 0.035*(sin(movement*0.217)+cos(movement*0.413)+sin(movement*0.311)); -per_frame_16=warp=0; -per_frame_17=dx =0.01*sin(movement*5); -per_frame_18=dy =0.0005*(bass+bass_att); -per_pixel_1=myy = y-(0.250025); -per_pixel_2=myx = x-0.5; -per_pixel_3=dx =dx+ 2*(2*myx*myy); -per_pixel_4=dy =dy+ 2*((myy*myy) - (myx*myx)); -per_pixel_5= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Focused Childhood Mix ).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Focused Childhood Mix ).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Focused Childhood Mix ).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Focused Childhood Mix ).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,248 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.073891 -fWaveSmoothing=0.750000 -fWaveParam=-0.480000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=9.860800 -fWarpScale=16.217400 -fZoomExponent=1.503744 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.999999 -sx=1.000000 -sy=1.000000 -wave_r=0.900000 -wave_g=0.200000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=1.000000 -ob_g=0.100000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.537415 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.725085 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp = 0; -per_frame_2=volume = 0.3*(bass+mid+att); -per_frame_3=xamptarg = if(equal(frame%15,0),min(0.25*volume*(60*bass_att/fps),0.5),xamptarg); -per_frame_4=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_5=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_6=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_7=xpos = xpos + 0.001*xspeed; -per_frame_8=yamptarg = if(equal(frame%15,0),min(0.15*volume*(60*treb_att/fps),0.5),yamptarg); -per_frame_9=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_10=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_11=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_12=ypos = ypos + 0.001*yspeed; -per_frame_13=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_14=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_15=meanbass_att = 0.1*(meanbass_att*(bass_att)); -per_frame_16=peakbass_att = max((bass_att),peakbass_att); -per_frame_17=beat = above(volume,0.8)*below(peakbass_att - (bass_att), 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_18=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_19=peakbass_att = beat*(bass_att) + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_20=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_21=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_22=wave_x = xpos + 0.5; -per_frame_23=wave_y = 1-(ypos + 0.5); -per_frame_24=wave_r = 0.5 + 0.499*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_25=wave_g = 0.5 + 0.499*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_26=wave_b = 0.5 + 0.499*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_27=q1 = wave_x; -per_frame_28=q2 = ypos+0.5; -per_frame_29=movement =movement + 0.4*(((bass+bass_att + 0.1*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_30=movement = if(above(movement,10000), 0, movement); -per_frame_31=q8 = movement; -per_frame_32=ib_size = ib_size + (beat); -per_frame_33=ib_r = beat*rand(100)*0.01; -per_frame_34=ib_g = beat*rand(100)*0.01; -per_frame_35=ib_b = beat*rand(100)*0.01; -per_frame_36=zoom =1.3 + 0.5*sin(movement*0.821); -per_frame_37=wrap = 1-beat; -per_pixel_1=myx = x-(q1); -per_pixel_2=myy = y-q2+0.1; -per_pixel_3=dx = 3.5*sin(q8*0.567)*(2*myy*myx); -per_pixel_4=dy = 3.5*sin(q8*0.567)*((myy*myy) - (myx*myx)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Fractal Havok Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Fractal Havok Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Fractal Havok Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Fractal Havok Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,233 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=4.574798 -fWaveSmoothing=0.750000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=9.860800 -fWarpScale=16.217400 -fZoomExponent=1.503744 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.999999 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=1.000000 -ob_a=1.000000 -ib_size=0.040000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.600000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.150375 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = 0.5 + 0.05*sin(q1*0.456); -shape_0_per_frame2=y = 0.5 + 0.05*sin(q1*0.56); -shape_0_per_frame3=tex_zoom = tex_zoom + 0.5*sin(q1*0.345); -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=q4 = 0.249+0.5*(rand(100)*0.01); -per_frame_init_2=q5 = 0.249+0.5*(rand(100)*0.01); -per_frame_init_3=q6 = 0.249+0.5*(rand(100)*0.01); -per_frame_1=mv_r = 0.5 + 0.499*(0.60*sin(3.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=mv_g = 0.5+ 0.499*(0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=mv_b = 0.5 + 0.499*(0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=wave_a =0; -per_frame_5=warp=0; -per_frame_6=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_7=movement = if(above(movement,10000), 0, movement); -per_frame_8=rot =-0.04+ 0.01*(sin(movement*0.696)+cos(movement*0.463)+sin(movement*0.365)); -per_frame_9=cx = 0 + 0.1*(sin(movement*0.247)+cos(movement*0.373)+sin(movement*0.187)); -per_frame_10=cy = 0 + 0.1*(sin(movement*0.317)+cos(movement*0.209)+sin(movement*0.109)); -per_frame_11=ob_b = q4+0.25*sin(movement*3.816); -per_frame_12=ob_g = q4+0.25*sin(movement*0.744); -per_frame_13=ob_r = q4+0.25*sin(movement*0.707); -per_frame_14=wrap = below(bass+bass_att,3); -per_frame_15=zoom = 0.99 + 0.0035*(sin(movement*0.217)+cos(movement*0.413)+sin(movement*0.311)); -per_frame_16=q1 = movement; -per_pixel_1=myy = y-(0.250025); -per_pixel_2=myx = x-0.095; -per_pixel_3=dx = 2*(2*myx*myy); -per_pixel_4=dy = 2*((myy*myy) - (myx*myx)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,263 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.180933 -fWaveSmoothing=0.750000 -fWaveParam=-0.200000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=9.860800 -fWarpScale=16.217400 -fZoomExponent=1.503744 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.999999 -sx=1.000000 -sy=1.000000 -wave_r=0.900000 -wave_g=0.200000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=1.000000 -ob_g=0.100000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.537415 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.725085 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp = 0; -per_frame_2=volume = 0.3*(bass+mid+att); -per_frame_3=xamptarg = if(equal(frame%15,0),min(0.25*volume*bass_att,0.5),xamptarg); -per_frame_4=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_5=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_6=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_7=xpos = xpos + 0.001*xspeed; -per_frame_8=yamptarg = if(equal(frame%15,0),min(0.15*volume*treb_att,0.5),yamptarg); -per_frame_9=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_10=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_11=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_12=ypos = ypos + 0.001*yspeed; -per_frame_13=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_14=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_15=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_16=peakbass_att = max(bass_att,peakbass_att); -per_frame_17=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_18=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_19=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.95 + (1-above(time - lastbeat, 2*beatrate))*0.995); -per_frame_20=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_21=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_22=wave_x = xpos + 0.5; -per_frame_23=wave_y = 1-(ypos + 0.5); -per_frame_24=wave_r = 0.5 + 0.499*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_25=wave_g = 0.5 + 0.499*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_26=wave_b = 0.5 + 0.499*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_27=wave_mystery = -0.17 + 0.03*(0.6*sin(0.637*time) + 0.4*sin(0.949*time)); -per_frame_28=mv_r = if(beat, 1, ib_r); -per_frame_29=mv_b = if(beat, wave_b, ib_b); -per_frame_30=//mv_a = if(beat, 0.1, ib_a); -per_frame_31=//ib_a = 0.015; -per_frame_32=q3 = wave_mystery; -per_frame_33=q1 = wave_x; -per_frame_34=q2 = 1-wave_y; -per_frame_35=q2 = ypos+0.5; -per_frame_36=warp=0; -per_frame_37= -per_frame_38=//q2 = 1-(ypos + 0.5); -per_frame_39=//q1 = 0.5; -per_frame_40=//q2=0.5; -per_frame_41=ob_r = 1-wave_g; -per_frame_42=ob_b = 1-wave_r; -per_frame_43=ob_g = 1-wave_b; -per_frame_44= -per_frame_45=monitor = wave_y; -per_frame_46=movement =movement + 0.4*(((bass+bass_att + 0.1*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_47=movement = if(above(movement,10000), 0, movement); -per_frame_48=rot =1*sin(movement); -per_frame_49=cx = wave_x; -per_frame_50=cy = y_pos+0.5; -per_frame_51= -per_frame_52=q8 = movement; -per_pixel_1=myy = x-q1; -per_pixel_2=myx = y-q2+0.1; -per_pixel_3=dx = 3*sin(q8*0.675)*(2*myx*myy); -per_pixel_4=dy = 3*sin(q8*0.675)*((myx*myx) - (myy*myy)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Frozen Rapture .milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Frozen Rapture .milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Frozen Rapture .milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Frozen Rapture .milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,276 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.900000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=1.447717 -fWaveSmoothing=0.600000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.995000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.002000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.400000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.330038 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = q1; -shape_0_per_frame2=y = 1- q2; -shape_0_per_frame3=r = 0.5 + 0.49*sin(time*1.467); -shape_0_per_frame4=b = 0.5 + 0.49*sin(time*0.768); -shape_0_per_frame5=g = 0.5 + 0.49*sin(time*0.559); -shape_0_per_frame6=r2 = 0.1*(bass+bass_att); -shape_0_per_frame7=b2 = r2; -shape_0_per_frame8=g2 = r2; -shape_0_per_frame9=rad = r2 + 0.2; -shape_0_per_frame10=ang = time*0.35; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.330038 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=r = 0.5 + 0.49*sin(time*0.467); -shape_1_per_frame2=b = 0.5 + 0.49*sin(time*0.568); -shape_1_per_frame3=g = 0.5 + 0.49*sin(time*0.669); -shape_1_per_frame4=r2 = 0.1*(bass+bass_att); -shape_1_per_frame5=b2 = r2; -shape_1_per_frame6=g2 = r2; -shape_1_per_frame7=rad = r2; -shape_1_per_frame8=x = q1+0.15*sin(time*0.85); -shape_1_per_frame9=y = 1-q2-0.2*cos(time*0.85); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.330038 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=r = 0.5 + 0.49*sin(time*0.467); -shape_2_per_frame2=b = 0.5 + 0.49*sin(time*0.568); -shape_2_per_frame3=g = 0.5 + 0.49*sin(time*0.669); -shape_2_per_frame4=r2 = 0.1*(bass+bass_att); -shape_2_per_frame5=b2 = r2; -shape_2_per_frame6=g2 = r2; -shape_2_per_frame7=rad = r2; -shape_2_per_frame8=x = q1+0.15*sin(time*0.85+2.07); -shape_2_per_frame9=y = 1-q2-0.2*cos(time*0.85+2.07); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.330038 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x = q1; -shape_3_per_frame2=y = 1- q2; -shape_3_per_frame3=r = 0.5 + 0.49*sin(time*0.467); -shape_3_per_frame4=b = 0.5 + 0.49*sin(time*0.568); -shape_3_per_frame5=g = 0.5 + 0.49*sin(time*0.669); -shape_3_per_frame6=r2 = 0.1*(bass+bass_att); -shape_3_per_frame7=b2 = r2; -shape_3_per_frame8=g2 = r2; -shape_3_per_frame9=rad = r2; -shape_3_per_frame10=x = q1+0.15*sin(time*0.85+4.14); -shape_3_per_frame11=y = 1-q2-0.2*cos(time*0.85+4.14); -per_frame_1=wave_r = wave_r + 0.250*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.480*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.370*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=warp=0; -per_frame_5=zoom =1; -per_frame_6=rot=0; -per_frame_7=decay =1; -per_frame_8=ib_r = 0.16 + 0.15*sin(time*0.783); -per_frame_9=ib_g = 0.16 + 0.15*sin(time*0.895); -per_frame_10=ib_b = 0.75 +0.24*sin(time*1.134); -per_frame_11=ib_size = 0.005*above(bass+bass_att,2.8); -per_frame_12=ib_size =0; -per_frame_13=mv_r = ib_r; -per_frame_14=mv_b = ib_b; -per_frame_15=mv_g = ib_g; -per_frame_16= -per_frame_17=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_18=movement = if(above(movement,10000), 0, movement); -per_frame_19= -per_frame_20=q1 = 0.5+0.2*sin(movement); -per_frame_21=q2 = 0.5-0.2*cos(0.781*movement); -per_frame_22=q3 = movement; -per_frame_23=wave_x = q1; -per_frame_24=wave_y = 1-q2; -per_frame_25= -per_pixel_1=newx =x- q1; -per_pixel_2=newy =y- q2; -per_pixel_3=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_4=effect = sqrt(2)-newrad; -per_pixel_5=dy=0.01*cos(pow((effect),3)*8); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Future Speakers.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Future Speakers.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Future Speakers.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Future Speakers.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,280 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.900000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=1.447717 -fWaveSmoothing=0.600000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.995000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.002000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.400000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.330038 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = q1; -shape_0_per_frame2=y = 1- q2; -shape_0_per_frame3=r = 0.5 + 0.49*sin(time*1.467); -shape_0_per_frame4=b = 0.5 + 0.49*sin(time*0.768); -shape_0_per_frame5=g = 0.5 + 0.49*sin(time*0.559); -shape_0_per_frame6=r2 = 0.1*(bass+bass_att); -shape_0_per_frame7=b2 = r2; -shape_0_per_frame8=g2 = r2; -shape_0_per_frame9=rad = r2 + 0.2; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.330038 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=r = 0.5 + 0.49*sin(time*0.467); -shape_1_per_frame2=b = 0.5 + 0.49*sin(time*0.568); -shape_1_per_frame3=g = 0.5 + 0.49*sin(time*0.669); -shape_1_per_frame4=r2 = 0.1*(bass+bass_att); -shape_1_per_frame5=b2 = r2; -shape_1_per_frame6=g2 = r2; -shape_1_per_frame7=rad = r2 + 0.2; -shape_1_per_frame8=x = q1+0.3*sin(time*0.85); -shape_1_per_frame9=y = 1-q2-0.4*cos(time*0.85); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.330038 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=r = 0.5 + 0.49*sin(time*0.467); -shape_2_per_frame2=b = 0.5 + 0.49*sin(time*0.568); -shape_2_per_frame3=g = 0.5 + 0.49*sin(time*0.669); -shape_2_per_frame4=r2 = 0.1*(bass+bass_att); -shape_2_per_frame5=b2 = r2; -shape_2_per_frame6=g2 = r2; -shape_2_per_frame7=rad = r2 + 0.2; -shape_2_per_frame8=x = q1+0.3*sin(time*0.85+2.07); -shape_2_per_frame9=y = 1-q2-0.4*cos(time*0.85+2.07); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.330038 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x = q1; -shape_3_per_frame2=y = 1- q2; -shape_3_per_frame3=r = 0.5 + 0.49*sin(time*0.467); -shape_3_per_frame4=b = 0.5 + 0.49*sin(time*0.568); -shape_3_per_frame5=g = 0.5 + 0.49*sin(time*0.669); -shape_3_per_frame6=r2 = 0.1*(bass+bass_att); -shape_3_per_frame7=b2 = r2; -shape_3_per_frame8=g2 = r2; -shape_3_per_frame9=rad = r2 + 0.2; -shape_3_per_frame10=x = q1+0.3*sin(time*0.85+4.14); -shape_3_per_frame11=y = 1-q2-0.4*cos(time*0.85+4.14); -per_frame_1=wave_r = wave_r + 0.250*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.480*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.370*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=warp=0; -per_frame_5=zoom =1; -per_frame_6=rot=0; -per_frame_7=decay =1; -per_frame_8=ib_r = 0.16 + 0.15*sin(time*0.783); -per_frame_9=ib_g = 0.16 + 0.15*sin(time*0.895); -per_frame_10=ib_b = 0.75 +0.24*sin(time*1.134); -per_frame_11=ib_size = 0.005*above(bass+bass_att,2.8); -per_frame_12=ib_size =0; -per_frame_13=mv_r = ib_r; -per_frame_14=mv_b = ib_b; -per_frame_15=mv_g = ib_g; -per_frame_16= -per_frame_17=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_18=movement = if(above(movement,10000), 0, movement); -per_frame_19= -per_frame_20=q1 = 0.5+0.2*sin(movement); -per_frame_21=q2 = 0.5-0.2*cos(0.781*movement); -per_frame_22=q3 = movement; -per_frame_23=wave_x = q1; -per_frame_24=wave_y = 1-q2; -per_frame_25= -per_pixel_1=newx =x- q1; -per_pixel_2=newy =y- q2; -per_pixel_3=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_4=newang = atan2(newx,newy); -per_pixel_5=//effect = ((1-newrad)*(1-newrad))*(0.0*((0.9+0.2*sin(q3*0.23))*y)*((0.9+0.2*sin(q3*0.197))*x)); -per_pixel_6=effect = sqrt(2)-newrad; -per_pixel_7=effect2 = newang; -per_pixel_8=//effect = sqrt(2)-rad; -per_pixel_9=zoom=0.9-(0.1*bass)*cos(pow((effect),3)*8*(bass_att+1)); -per_pixel_10= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000158 -fWaveScale=0.669541 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=2.000000 -fModWaveAlphaEnd=2.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010100 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.000000 -wave_y=0.000000 -ob_size=0.015000 -ob_r=0.230000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.650000 -ib_a=0.400000 -nMotionVectorsX=12.256001 -nMotionVectorsY=9.288002 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp =0; -per_frame_2=wave_x=0.4+0.1*mid; -per_frame_3=wave_y=0.4+0.1*bass; -per_frame_4=wave_r=bass; -per_frame_5=wave_g=mid; -per_frame_6=wave_b=treb; -per_frame_7=madbass=max(max(bass,bass_att)-1.3,0); -per_frame_8=madtreb=max(max(treb,treb_att)-1.3,0); -per_frame_9=zoom = zoom -1.1* madbass+0.00; -per_frame_10=ib_a = if(above(bass,1.2),0.7,0); -per_frame_11=ob_r = if(above(treb,1.2),0.3,0.1); -per_frame_12=mv_x =48; -per_frame_13=mv_y= 3.25; -per_frame_14=mv_r = 1-bass_att; -per_frame_15=mv_b = 1-treb_att; -per_frame_16=mv_g = 1-mid_att; -per_frame_17=bass_effect=max(max(bass,bass_att)-0.8,0); -per_frame_18=q1 = if(above(bass_effect,0),0.45+bass_effect,0); -per_pixel_1=rot=if(below(rad,q1),0.05*bass_factor+sin(time*.3+ang*8+(sqrt(2)-rad*7.5))*.063,rot); -per_pixel_2=zoom=if(below(rad,q1),-0.05*bass_factor+1-.23*(1-rad)*sin(time*.3+ang*8+rad*7.5),zoom); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=3.500000 -fGammaAdj=1.000000 -fDecay=0.999000 -fVideoEchoZoom=0.999600 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.005730 -fWaveScale=0.023445 -fWaveSmoothing=0.000000 -fWaveParam=-0.480000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999500 -rot=0.200000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.510000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.500000 -ib_g=0.400000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_l=0.055000 -mv_r=0.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.915*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.025*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.810*time) + 0.40*sin(0.950*time) ); -per_frame_4=mv_r= wave_r + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(0.750*time) ); -per_frame_5=mv_g= wave_g + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.950*time) ); -per_frame_6=mv_b= wave_b + 0.350*( 0.60*sin(0.775*time) + 0.40*sin(1.025*time) ); -per_frame_7=ib_r=1-min(bass*0.5,1); -per_frame_8=ib_b=1-min(treb*0.5,1); -per_frame_9=ib_g=1-min(mid*0.5,1); -per_frame_10=ob_r=1-min(mid_att*0.5,1); -per_frame_11=ob_b=1-min(bass_att*0.5,1); -per_frame_12=ob_g=1-min(treb_att*0.5,1); -per_frame_13=bass_effect = min(max(max(bass,bass_effect)-1.3,0),0.5); -per_frame_14=ib_size = ib_size+ bass_effect; -per_frame_15=wave_mystery = wave_mystery + 0.4*bass_effect; -per_frame_16=mv_l = mv_l + 0.5*bass_effect; -per_frame_17=q1 = bass_effect; -per_pixel_1=zoom =0.9- sin(time + ang*2)*0.02; -per_pixel_2=zoom=zoom+(q1)*0.1; -per_pixel_3=rot = rot + 0.1*q1*(3.14-ang); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.500000 -fGammaAdj=1.000000 -fDecay=0.999000 -fVideoEchoZoom=0.999600 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.005730 -fWaveScale=0.535239 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=1.489999 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999500 -rot=0.200000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=3.200000 -nMotionVectorsY=1.440000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.915*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(1.025*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.810*time) + 0.40*sin(0.950*time) ); -per_frame_4=mv_r= wave_r + 0.350*( 0.60*sin(0.900*time) + 0.40*sin(0.750*time) ); -per_frame_5=mv_g= wave_g + 0.350*( 0.60*sin(0.825*time) + 0.40*sin(0.950*time) ); -per_frame_6=mv_b= wave_b + 0.350*( 0.60*sin(0.775*time) + 0.40*sin(1.025*time) ); -per_frame_7=ib_r=min(bass*0.5,1); -per_frame_8=ib_b=min(treb*0.5,1); -per_frame_9=ib_g=min(mid*0.5,1); -per_frame_10=ob_r=1-min(mid_att*0.5,1); -per_frame_11=ob_b=1-min(bass_att*0.5,1); -per_frame_12=ob_g=1-min(treb_att*0.5,1); -per_pixel_1=zoom =0.9- sin(time + ang*2)*0.02; -per_pixel_2=zoom=zoom+(bass_att-1.0)*0.115; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.994000 -fDecay=0.981000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.634243 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.550000 -wave_g=0.550000 -wave_b=0.550000 -wave_x=0.500000 -wave_y=0.360000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.016000 -mv_dx=0.000000 -mv_dy=-0.100000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.700000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.40*( 0.60*sin(1.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.40*( 0.60*sin(1.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.40*( 0.60*sin(1.714*time) + 0.40*sin(1.011*time) ); -per_frame_4=q8 = oldq8+if(above(bass+bass_att,2.8),q8+0.005*pow((bass+bass_att),5),0); -per_frame_5=oldq8 = q8; -per_frame_6=q7 =0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_7=q1 = 0.62*( 0.60*sin(0.374*q8) + 0.40*sin(0.294*q8) ); -per_frame_8=q2 = 0.62*( 0.60*sin(0.393*q8) + 0.40*sin(0.223*q8) ); -per_frame_9=q3 = 0.62*( 0.60*sin(0.174*-q8) + 0.40*sin(0.364*q8) ); -per_frame_10=q4 = 0.62*( 0.60*sin(0.234*q8) + 0.40*sin(0.271*-q8) ); -per_frame_11=echo_zoom = 1+ q7; -per_frame_12=zoom = 1+q7; -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008*sin(q8)/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -per_pixel_15=rot = -0.01*rad*sin(q8); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=1.000154 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.010000 -fWaveSmoothing=0.100000 -fWaveParam=-0.472000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.972366 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.510000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=q8 = oldq8+min(if(above(bass+bass_att,2.8),q8+0.025*pow((bass+bass_att-1.5),5),0),1); -per_frame_5=oldq8 = q8; -per_frame_6=q8 = q8 + 0.1*time; -per_frame_7=q1 = 0.62*( 0.60*sin(0.374*q8) + 0.40*sin(0.294*q8) ); -per_frame_8=q2 = 0.62*( 0.60*sin(0.393*q8) + 0.40*sin(0.223*q8) ); -per_frame_9=q3 = 0.62*( 0.60*sin(0.174*-q8) + 0.40*sin(0.364*q8) ); -per_frame_10=q4 = 0.62*( 0.60*sin(0.234*q8) + 0.40*sin(0.271*-q8) ); -per_frame_11=mv_x = 1.25; -per_frame_12=mv_y = 1.25; -per_frame_13=mv_a =1; -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008*sin(q8)/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -per_pixel_15=rot = -0.01*rad*sin(q8); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.994000 -fDecay=0.900000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=1 -fWaveAlpha=1.000000 -fWaveScale=1.553027 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.150000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=q8 = oldq8+if(above(bass+bass_att,2.8),q8+0.005*pow((bass+bass_att),5),0); -per_frame_5=oldq8 = q8; -per_frame_6=q1 = 0.62*( 0.60*sin(0.374*q8) + 0.40*sin(0.294*q8) ); -per_frame_7=q2 = 0.62*( 0.60*sin(0.393*q8) + 0.40*sin(0.223*q8) ); -per_frame_8=q3 = 0.62*( 0.60*sin(0.174*-q8) + 0.40*sin(0.364*q8) ); -per_frame_9=q4 = 0.62*( 0.60*sin(0.234*q8) + 0.40*sin(0.271*-q8) ); -per_frame_10=zoom = 1+ 0.06*abs(sin(q8*1.123)); -per_frame_11=decay = 0.8+0.2*sin(q8*0.334); -per_frame_12= -per_frame_13=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_14=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_15=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_16=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_17=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_18=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_19=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_20=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_21=lastbeat = if(beat,time,lastbeat); -per_frame_22=countertime = if(beat,time,countertime); -per_frame_23=counter =-pow(min((time-countertime-1.5),0),9); -per_frame_24=q7 = min(time-countertime,1); -per_frame_25=q5=oldq5+0.04*counter; -per_frame_26=oldq5=q5; -per_frame_27=q6 = beat; -per_frame_28=echo_zoom = beat*abs(100*sin(3.13*q8)); -per_frame_29=echo_alpha = beat*0.5; -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008*sin(q8)/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -per_pixel_15=rot =0.01*rad*sin(q8*0.781); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Twisted Truth Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Twisted Truth Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Twisted Truth Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Twisted Truth Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.994000 -fDecay=0.965000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.634243 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.380000 -ob_size=0.005000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.470000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.016000 -mv_dx=0.000000 -mv_dy=-0.100000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.700000 -mv_a=0.500000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=//q8 = oldq8+min(if(above(bass+bass_att,2.8),q8+0.025*pow((bass+bass_att-2),5),0),1); -per_frame_5=//oldq8 = q8; -per_frame_6=//q8 = q8 + time*0.1; -per_frame_7=q8 =oldq8+ 0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=oldq8 = q8; -per_frame_9=monitor = q8; -per_frame_10=q1 = 0.62*( 0.60*sin(0.374*q8) + 0.40*sin(0.294*q8) ); -per_frame_11=q2 = 0.62*( 0.60*sin(0.393*q8) + 0.40*sin(0.223*q8) ); -per_frame_12=q3 = 0.62*( 0.60*sin(0.174*-q8) + 0.40*sin(0.364*q8) ); -per_frame_13=q4 = 0.62*( 0.60*sin(0.234*q8) + 0.40*sin(0.271*-q8) ); -per_frame_14=ob_r = wave_r; -per_frame_15=ob_g = wave_g; -per_frame_16=ob_b = wave_b; -per_frame_17=mv_r = wave_r; -per_frame_18=mv_b = wave_b; -per_frame_19=mv_g = wave_g; -per_frame_20=ib_a = abs(sin(q8*0.9141)); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Souls Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Souls Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Souls Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Souls Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.993000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.608039 -fWaveScale=0.634243 -fWaveSmoothing=0.100000 -fWaveParam=0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.360000 -ob_size=0.010000 -ob_r=1.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.015000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.150000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.400000 -per_frame_1=ob_r = 0.7 - 0.3*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=ob_g = 0.5- 0.48*sin(time*1.324); -per_frame_3=ob_b = 0.5 - 0.48*cos(time*1.316); -per_frame_4=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_5=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_6=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_7=mv_r = wave_r; -per_frame_8=mv_b = wave_b; -per_frame_9=mv_g = wave_g; -per_frame_10=q8 = oldq8+if(above(bass+bass_att,2.8),q8+0.005*pow((bass+bass_att),5),0); -per_frame_11=oldq8 = q8; -per_frame_12=monitor = sin(q8); -per_frame_13=q1 = 0.62*( 0.60*sin(0.374*q8) + 0.40*sin(0.294*q8) ); -per_frame_14=q2 = 0.62*( 0.60*sin(0.393*q8) + 0.40*sin(0.223*q8) ); -per_frame_15=q3 = 0.62*( 0.60*sin(0.174*-q8) + 0.40*sin(0.364*q8) ); -per_frame_16=q4 = 0.62*( 0.60*sin(0.234*q8) + 0.40*sin(0.271*-q8) ); -per_frame_17=//zoom = zoom+ 0.06*abs(sin(q8)); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008*sin(q8)/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); -per_pixel_15=//rot = -0.01*rad*sin(q8); -per_pixel_16=rot =0+abs(3* dx) - abs(3*dy); -per_pixel_17=zoom =1+abs(3* dx) - abs(3*dy); -per_pixel_18=zoomexp = 1 + abs((300* dx) - (300*dy)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Hurricane Nightmare.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Hurricane Nightmare.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Hurricane Nightmare.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Hurricane Nightmare.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.300000 -fWaveScale=0.881381 -fWaveSmoothing=0.500000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=3.600000 -fShader=0.000000 -zoom=1.021087 -rot=-0.160000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.309000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.470000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.750000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=q8 = oldq8+if(above(bass+bass_att,1.8),q8+0.0005*pow((bass+bass_att-1),9),0); -per_frame_5=oldq8 = q8; -per_frame_6=monitor = q8; -per_frame_7=zoom = zoom + 0.023*( 0.60*sin(0.339*q8) + 0.40*sin(0.276*q8) ); -per_frame_8=rot = rot + 0.030*( 0.60*sin(0.381*q8) + 0.40*sin(0.579*q8) ); -per_frame_9=//decay = decay - 0.02*equal(frame%40,0); -per_frame_10=mv_r = wave_r; -per_frame_11=mv_b = wave_b; -per_frame_12=mv_g = wave_g; -per_frame_13=mv_x = 1.25; -per_frame_14=mv_y = 1.25; -per_frame_15=mv_dx = 0.1*sin(1.1*time); -per_frame_16=mv_dy = 0.1*cos(1.112*time); -per_pixel_1=rot=rot+1/(10*(rad+0.2+0.1*sin(q8))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.998000 -fDecay=0.960000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=1 -bInvert=1 -fWaveAlpha=1.334524 -fWaveScale=1.981000 -fWaveSmoothing=0.600000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.064000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=q8 = oldq8+if(above(bass+bass_att,2.8),q8+0.001*pow((bass+bass_att-2),8),0); -per_frame_5=oldq8 = q8; -per_frame_6=monitor = q8; -per_frame_7=zoom = zoom + 0.013*( 0.60*sin(0.339*q8) + 0.40*sin(0.276*q8) ); -per_frame_8=rot = rot + 0.040*( 0.60*sin(0.381*q8) + 0.40*sin(0.579*q8) ); -per_pixel_1=zoom = zoom + (x*2-1)*(0.08+0.15*sin(q8*0.321)) + (y*2-1)*(0.08+0.15*cos(q8*0.321)); -per_pixel_2=sx=sx-(zoom-1)*0.1; -per_pixel_3=sy=sy-(zoom-1)*0.1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Notions Of Tonality.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Notions Of Tonality.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Notions Of Tonality.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Notions Of Tonality.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.700000 -fDecay=0.970000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.013089 -fWaveSmoothing=0.100000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.004960 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000156 -sx=0.999666 -sy=0.999900 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.380000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=63.936001 -nMotionVectorsY=47.952000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.400000 -mv_r=0.700000 -mv_g=0.400000 -mv_b=0.500000 -mv_a=1.000000 -per_frame_1=mv_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=mv_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=mv_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time)); -per_frame_4=q1 = (cx*2-1) + 0.62*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_5=q2 = (cy*2-1) + 0.62*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_6=q3 = (cx*2-1) + 0.62*( 0.60*sin(0.174*-time) + 0.40*sin(0.364*time) ); -per_frame_7=q4 = (cy*2-1) + 0.62*( 0.60*sin(0.234*time) + 0.40*sin(0.271*-time) ); -per_frame_8=decay = decay - 0.01*equal(frame%5,0); -per_frame_9=cy = cy + 0.1*sin(time*0.245); -per_frame_10=cx = cx + 0.1*cos(time*0341); -per_frame_11=wave_mystery = 2; -per_frame_12=mv_l = 2*max(max(bass,bass_att)-1.2,0); -per_pixel_1=du = x*2-1 - q1; -per_pixel_2=dv = y*2-1 - q2; -per_pixel_3=dist = sqrt(du*du+dv*dv); -per_pixel_4=ang2 = atan2(du,dv); -per_pixel_5=mult = 0.008/(dist+0.4); -per_pixel_6=dx = mult*sin(ang2-1.5); -per_pixel_7=dy = mult*cos(ang2-1.5); -per_pixel_8=du = x*2-1 - q3; -per_pixel_9=dv = y*2-1 - q4; -per_pixel_10=dist = sqrt(du*du+dv*dv); -per_pixel_11=ang2 = atan2(du,dv); -per_pixel_12=mult = 0.008/(dist+0.4); -per_pixel_13=dx = dx + mult*sin(ang2+1.5); -per_pixel_14=dy = dy + mult*cos(ang2+1.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.964000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.695686 -fWaveSmoothing=0.450000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.020000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.076000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.100000 -ob_g=0.200000 -ob_b=0.400000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=3.008000 -nMotionVectorsY=48.000000 -mv_l=2.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=bass_effect = min(max(max(bass,bass_att)-1.3,0),1); -per_frame_3=treb_effect = min(max(max(treb,treb_att)-1.3,0),1); -per_frame_4=mid_effect = min(max(max(mid,mid_att)-1.3,0),1); -per_frame_5=wave_r = wave_r + 0.4*( 0.6*sin(1.517*time) + 0.4*mid_effect ); -per_frame_6=wave_b = wave_b + 0.4*( 0.6*sin(1.088*time) + 0.4*bass_effect ); -per_frame_7=wave_g = wave_g + 0.4*( 0.6*sin(1.037*time) + 0.4*treb_effect ); -per_frame_8=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_9=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_10=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_11=ob_r = 1-wave_b; -per_frame_12=ob_g = wave_r; -per_frame_13=ob_b = 1-wave_g; -per_frame_14=q1=cos((0.91*time) + sin(time*0.324)); -per_frame_15=q2=time + 0.3*sin((time*0.47) - cos(time*0.216)); -per_pixel_1=rot=rot+0.08*sin(rad*23.5 + q2*1.3 + q1*1.31); -per_pixel_2=zoom=zoom+0.05*sin(ang*4 + pow((sqrt(2)-rad),13*rad) + q2*1.63 + q1) - 0.05; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Octotrip.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Octotrip.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Octotrip.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Octotrip.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.695686 -fWaveSmoothing=0.450000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.020000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.076000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.100000 -ob_g=0.200000 -ob_b=0.400000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=3.008000 -nMotionVectorsY=48.000000 -mv_l=2.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp =0; -per_frame_2=bass_effect = min(max(max(bass,bass_att)-1.3,0),1); -per_frame_3=treb_effect = min(max(max(treb,treb_att)-1.3,0),1); -per_frame_4=mid_effect = min(max(max(mid,mid_att)-1.3,0),1); -per_frame_5=wave_r = wave_r + 0.4*( 0.6*sin(1.517*time) + 0.4*mid_effect ); -per_frame_6=wave_b = wave_b + 0.4*( 0.6*sin(1.088*time) + 0.4*bass_effect ); -per_frame_7=wave_g = wave_g + 0.4*( 0.6*sin(1.037*time) + 0.4*treb_effect ); -per_frame_8=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_9=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_10=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_11=ib_r = wave_g; -per_frame_12=ib_g = 1-wave_r; -per_frame_13=ib_b = wave_b; -per_frame_14=ob_r = 1-wave_b; -per_frame_15=ob_g = wave_r; -per_frame_16=ob_b = 1-wave_g; -per_frame_17=ib_size = 0.02*bass_effect; -per_frame_18=q1=cos((0.91*time) + sin(time*0.324)); -per_frame_19=q2=time + 0.3*sin((time*0.47) - cos(time*0.216)); -per_pixel_1=rot=rot+0.05*sin(rad*13.5 + q2*1.3 + q1*1.31); -per_pixel_2=zoom=zoom+0.05*sin(ang*10.0 + rad*7.5 + q2*1.63 + q1) - 0.05; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,240 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.695686 -fWaveSmoothing=0.450000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.020000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.076000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.100000 -ob_g=0.200000 -ob_b=0.400000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=3.008000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=2.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp =0; -per_frame_2=bass_effect = min(max(max(bass,bass_att)-1.3,0),1); -per_frame_3=treb_effect = min(max(max(treb,treb_att)-1.3,0),1); -per_frame_4=mid_effect = min(max(max(mid,mid_att)-1.3,0),1); -per_frame_5=wave_r = wave_r + 0.4*( 0.6*sin(1.517*time) + 0.4*mid_effect ); -per_frame_6=wave_b = wave_b + 0.4*( 0.6*sin(1.088*time) + 0.4*bass_effect ); -per_frame_7=wave_g = wave_g + 0.4*( 0.6*sin(1.037*time) + 0.4*treb_effect ); -per_frame_8=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_9=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_10=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_11=ib_r = wave_g; -per_frame_12=ib_g = 1-wave_r; -per_frame_13=ib_b = wave_b; -per_frame_14=ob_r = 1-wave_b; -per_frame_15=ob_g = wave_r; -per_frame_16=ob_b = 1-wave_g; -per_frame_17=ib_size = 0.02*bass_effect; -per_frame_18=q1=cos((0.91*time) + sin(time*0.324)); -per_frame_19=q2=time + 0.3*sin((time*0.47) - cos(time*0.216)); -per_frame_20=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_21=movement = if(above(movement,10000), 0, movement); -per_frame_22= -per_frame_23=q3 = 0.5+0.15*sin(movement); -per_frame_24=q4 = 0.5-0.15*cos(0.781*movement); -per_frame_25= -per_frame_26=wave_x = q3; -per_frame_27=wave_y = 1-q4; -per_pixel_1=newx =x- q3; -per_pixel_2=newy =y- q4; -per_pixel_3=newang = atan2(newx,newy); -per_pixel_4=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_5=rot=0+0.05*sin(newrad*13.5 + q2*1.3 + q1*1.31); -per_pixel_6=zoom=zoom+0.05*sin(newang*10.0 + newrad*7.5 + q2*1.63 + q1)-0.05; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Surface (Vectrip Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Surface (Vectrip Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Geiss - Surface (Vectrip Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Geiss - Surface (Vectrip Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.700000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=4 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=2.706706 -fWaveScale=0.234487 -fWaveSmoothing=0.100000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.014000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.029439 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=0.530000 -mv_g=0.700000 -mv_b=0.330000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_5=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_6=dx = dx + 0.01*( 0.60*sin(0.173*time) + 0.40*sin(0.223*time) ); -per_frame_7=vol = (bass+mid+att)/6; -per_frame_8=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_9=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_10=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_11=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_12=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_13=xpos = xpos + 0.001*xspeed; -per_frame_14=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_15=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_16=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_17=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_18=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_19=ypos = ypos + 0.001*yspeed; -per_frame_20=mv_x_speed = 4; -per_frame_21=mv_y_speed = 4; -per_frame_22=mv_x_range = 0.49; -per_frame_23=mv_y_range = 0.049; -per_frame_24=mv_x_amount = 20; -per_frame_25=mv_y_amount = 2.25; -per_frame_26=mv_x = mv_x_amount +mv_x_range + mv_x_range*sin(mv_x_speed*ypos+(sin(time*0.964)-0.5*cos(time*0.256))); -per_frame_27=mv_y = mv_y_amount + mv_y_range+ mv_y_range*sin(mv_y_speed*xpos-(cos(time*1.345)-0.5*cos(time*0.331))); -per_frame_28=mv_b = mv_b + 0.2*sin(time*0.771); -per_frame_29=mv_r = mv_r + 0.25*cos(time*1.701); -per_frame_30=mv_g = mv_g + 0.3*cos(time*0.601); -per_frame_31=mv_l = 10+6*min((0.5*bass+0.5*bass_att),2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=11.940000 -fWaveScale=1.599182 -fWaveSmoothing=0.700000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=1.001000 -fShader=0.000000 -zoom=1.007000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.700000 -wave_g=0.300000 -wave_b=0.300000 -wave_x=0.000000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.400000 -ob_g=0.300000 -ob_b=0.000000 -ob_a=0.700000 -ib_size=0.005000 -ib_r=0.650000 -ib_g=0.050000 -ib_b=0.450000 -ib_a=0.300000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.200*( 0.60*sin(0.823*time) + 0.40*sin(0.916*time) ); -per_frame_2=wave_g = wave_g + 0.500*( 0.60*sin(0.900*time) + 0.40*sin(1.023*time) ); -per_frame_3=wave_b = wave_b + 0.500*( 0.60*sin(0.808*time) + 0.40*sin(0.949*time) ); -per_frame_4=decay = decay - 0.03*equal(frame%30,0); -per_frame_5=treb_effect = max(max(treb,treb_att)-1.25,0); -per_frame_6=mid_effect= max(max(mid,mid_att)-1.25,0); -per_frame_7=ob_size = ob_size + 0.005*treb_effect; -per_frame_8=ib_size = ib_size + 0.005*mid_effect; -per_frame_9=ob_r = ob_r -0.2* treb_effect +0.2* mid_effect; -per_frame_10=ib_g = ib_g + 0.2*mid_effect- 0.2*treb_effect; -per_pixel_1=ok_to_change = if(above(time,beat_time+5),1,0); -per_pixel_2=bass_effect = max(bass, bass_att)-1; -per_pixel_3=beat_time = if(above(bass_effect,0.5), if(ok_to_change,time,beat_time),beat_time); -per_pixel_4=effect = if(equal(time,beat_time),abs(effect-1),effect); -per_pixel_5=bass_effect = max(max(bass,bass_att)-1.34,0); -per_pixel_6=zoom = if(above(effect,0),0.4*x,0.4*y) +0.6 -0.13*(min(bass_effect,0.3)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.640100 -fWaveSmoothing=0.270000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.010000 -fShader=0.000000 -zoom=0.998531 -rot=0.002000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.960000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.900000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=48.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=ob_r = 0.3 - 0.3*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=ob_g = 0.6- 0.4*sin(time*2.924); -per_frame_3=ob_b = 0.35 - 0.3*cos(time*0.816); -per_frame_4=cx = cx - 0.1*sin(time*0.342); -per_frame_5=cy = cy + 0.1*sin(time*0.433); -per_frame_6=warp =0; -per_frame_7=ib_size = 0.02; -per_frame_8=ib_r = ib_r + 0.5*sin(time*3.034); -per_frame_9=ib_g = ib_g + 0.5*sin(time*2.547); -per_frame_10=ib_b = ib_b - 0.5*sin(time*1.431); -per_frame_11=dx = dx -0.008*sin(time*0.23); -per_frame_12=dy = dy - 0.008*sin(time*0.2); -per_pixel_1=box=(1-rad)+0.5*abs(x*3-0.4*sin(q1))%2 + 0.5*abs(y*3+0.4*sin(q1))%2; -per_pixel_2=q1 = 8.05+(sin(x+0.137*time)-cos(y+0.213*time)); -per_pixel_3=zoom = if(above(box,1),q1*.1,zoom); -per_pixel_4=rot = if(above(box,1),1*sin(0.385*time),rot); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=7.014853 -fWaveScale=0.010000 -fWaveSmoothing=0.270000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.010000 -fShader=0.000000 -zoom=0.998531 -rot=0.002000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.100000 -wave_y=0.900000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.900000 -ob_b=0.200000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=63.936001 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=0.630000 -mv_g=0.200000 -mv_b=0.300000 -mv_a=0.000000 -per_frame_1=ob_r = 0.4 - 0.3*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_2=ob_g = 0.5 - 0.46*sin(time*1.724); -per_frame_3=ob_b = 0.65 - 0.3*cos(time*1.816); -per_frame_4=warp =0; -per_frame_5=ib_size = 0.025; -per_frame_6=ib_r = ib_r + 0.5*(0.6*sin(time*3.034)+0.4*cos(time*2.14)); -per_frame_7=ib_g = ib_g + 0.5*(0.6*sin(time*3.147)+0.4*cos(time*2.015)); -per_frame_8=ib_b = ib_b - 0.5*(0.6*sin(time*3.431)+0.4*cos(time*1.842)); -per_frame_9=dx = dx -0.003*(0.6*sin(time*0.234) + 0.4*cos(time*0.437)); -per_frame_10=dy = dy - 0.003*(0.7*sin(time*0.213) + 0.3*cos(time*0.315)); -per_frame_11=volume = 0.15*(bass+bass_att+treb+treb_att+mid+mid_att); -per_frame_12=xamptarg = if(equal(frame%15,0),min(0.5*volume*bass_att,0.5),xamptarg); -per_frame_13=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_14=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_15=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_16=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_17=xpos = xpos + 0.001*xspeed; -per_frame_18=q2 = xpos; -per_frame_19=yamptarg = if(equal(frame%15,0),min(0.3*volume*treb_att,0.5),yamptarg); -per_frame_20=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_21=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_22=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_23=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_24=ypos = ypos + 0.001*yspeed; -per_frame_25=q4 = ypos; -per_frame_26=bass_effect = max(max(bass,bass_att)-1.2,0); -per_frame_27=echo_zoom = 1.32 + 0.3*(0.59*sin(q4+time*0.865) + 0.41*cos(q2+time*1.192)) + 0.05*bass_effect; -per_frame_28=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_29=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_30=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_31=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_32=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_33=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_34=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_35=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_36=lastbeat = if(beat,time,lastbeat); -per_frame_37=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_38=mode = (mode+beat*(rand(3)+1))%4; -per_frame_39=echo_orient = mode; -per_frame_40=wave_a = 0; -per_frame_41=q6 = beat; -per_pixel_1=box =0.5+0.8*(2*x%4+2*y%2); -per_pixel_2=q1 = 8.05+0.3*(sin(pow(x,3)+0.177*time)-cos(pow(y,3)+0.223*time)); -per_pixel_3=q7 = above(box,1); -per_pixel_4=zoom = if(q7,(q1*.1) + q6*6 ,zoom); -per_pixel_5=rot = if(q7,0.63*sin(0.5*rad+0.385*time + 0.12*sin(0.67*time) + 0.1*q4 + 0.12*q2 +q6*50),rot); -per_pixel_6=cx = cx - 0.05*sin(rad+2*q4); -per_pixel_7=cy = cy + 0.04*sin(((0.5*sqrt(2))-rad)-2*q2); -per_pixel_8=sx = if(q7,sx+q6*18,sx); -per_pixel_9=sy = if(q7,sy+q6*18,sy); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.973000 -fVideoEchoZoom=1.047463 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=1 -bSolarize=1 -bInvert=1 -fWaveAlpha=0.900000 -fWaveScale=2.905229 -fWaveSmoothing=0.600000 -fWaveParam=-0.300000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=0.999835 -fShader=0.000000 -zoom=0.999682 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.100*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.100*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=mv_r = wave_r; -per_frame_5=mv_b = wave_b; -per_frame_6=mv_g = wave_g; -per_frame_7=q1 = 0.05*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=//q1 = 0.6*(bass+bass_att); -per_frame_9=mv_a = if(above(bass-1.2,1),1,bass-1.2); -per_frame_10=echo_zoom = 1+q1; -per_pixel_1=zoom = 1.01 + rad*0.15*q1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Hyperspace.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Hyperspace.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Hyperspace.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Hyperspace.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.973000 -fVideoEchoZoom=1.047463 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.900000 -fWaveScale=2.905229 -fWaveSmoothing=0.600000 -fWaveParam=-0.300000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=0.999835 -fShader=0.000000 -zoom=0.999682 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=1.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.100*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.100*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=mv_r = wave_r; -per_frame_5=mv_b = wave_b; -per_frame_6=mv_g = wave_g; -per_frame_7=q1 = 0.05*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=//q1 = 0.6*(bass+bass_att); -per_frame_9=mv_a = if(above(bass-1.2,1),1,bass-1.2); -per_pixel_1=zoom = 1.01 + rad*0.15*q1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999514 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.591236 -fWaveSmoothing=0.000000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.010000 -fShader=0.000000 -zoom=1.000300 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.400000 -wave_g=1.000000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=1.000000 -ob_size=0.005000 -ob_r=1.000000 -ob_g=1.000000 -ob_b=0.410000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=2.879900 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=3.000000 -mv_r=0.000000 -mv_g=0.700000 -mv_b=1.000000 -mv_a=0.400000 -per_frame_1=zoom=zoom+0.028*(bass+bass_att) -0.05; -per_frame_2=rot=rot+0.10*sin(time); -per_frame_3=mv_r=0.5 +0.5*sin(time*1.23); -per_frame_4=mv_b=0.5 + 0.5*sin(time*1.26); -per_frame_5=mv_g=0.5+ 0.5*sin(time*1.19); -per_frame_6=wave_g=wave_g*+.20*sin(time*.13); -per_frame_7=wave_r=wave_r+.13*sin(time); -per_frame_8=wave_b=wave_b*sin(time); -per_frame_9=wave_x=wave_x-.5*sin(time*.13); -per_frame_10=ob_a = if(above(mid+treb,2.6),1,0); -per_frame_11=ob_r = 0.5 + 0.4*sin(time*2.87); -per_frame_12=ob_b = 0.5 + 0.4*sin(time*2.914); -per_frame_13=ob_g = 0.5 + 0.4*sin(time*2.768); -per_frame_14=mv_y = 3.25; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,253 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=0.018000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.621747 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=1.884956 -shapecode_0_tex_zoom=0.424973 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=0.700000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.600000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//tex_zoom = 0.05*q6; -shape_0_per_frame2=a =1; -shape_0_per_frame3=a1=1; -shape_0_per_frame4=//tex_zoom =0.1; -shape_0_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_0_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_0_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521); -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.621747 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=1.884956 -shapecode_1_tex_zoom=0.424973 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.700000 -shapecode_1_r2=0.700000 -shapecode_1_g2=0.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//tex_zoom = 0.05*q6; -shape_1_per_frame2=a =1; -shape_1_per_frame3=a1=1; -shape_1_per_frame4=//tex_zoom =0.1; -shape_1_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_1_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_1_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.521); -shapecode_2_enabled=1 -shapecode_2_sides=3 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.621747 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=1.884956 -shapecode_2_tex_zoom=0.424973 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.700000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.600000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=//tex_zoom = 0.05*q6; -shape_2_per_frame2=a =1; -shape_2_per_frame3=a1=1; -shape_2_per_frame4=//tex_zoom =0.1; -shape_2_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_2_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_2_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=1 -shapecode_3_textured=1 -shapecode_3_x=0.900000 -shapecode_3_y=0.900000 -shapecode_3_rad=0.181670 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=0.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=x = 0.5 +0.4*sin(0.1*q8); -shape_3_per_frame2=y = 0.5+0.4*sin(q7*0.19653); -shape_3_per_frame3=textured =1; -per_frame_init_1=q8 =0; -per_frame_init_2=q7=0; -per_frame_1=wave_r = 0.5+ 0.2*(bass-1); -per_frame_2=wave_g = 0.5+ 0.2*(mid-1.2); -per_frame_3=wave_b = 0.5+ 0.2*(treb-.5); -per_frame_4=warp =0; -per_frame_5=ob_r = 1-wave_r; -per_frame_6=ob_g = 1-wave_g; -per_frame_7=ob_b = 1-wave_b; -per_frame_8=ib_r = 0.75 + 0.25*sin(time*0.4123); -per_frame_9=ib_g = 0.25 + 0.25*cos(time*0.87); -per_frame_10=ib_b = 0.5+0.5*sin(1.23*time); -per_frame_11=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_12=oldq8 = q8; -per_frame_13=q7 =oldq7+ 0.001*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,7)/fps); -per_frame_14=oldq7 = q7; -per_frame_15=wave_a =0; -per_frame_16=dy = 0.5 + 0.01*(sin(0.786*q7)); -per_frame_17=dx = 0.1*sin(1.143*q8); -per_frame_18=q6 = 15+0.1*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_pixel_1=//dx=dx+0.5*sin((y-0.5)*128); -per_pixel_2=dy=dy+0.008*cos((x-0.5 - 0.1*sin(q7))*(q6)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,261 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=1 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=0.018000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.153926 -mv_g=0.153926 -mv_b=0.714137 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.621747 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=1.884956 -shapecode_0_tex_zoom=0.424973 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.600000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//tex_zoom = 0.05*q6; -shape_0_per_frame2=a =1; -shape_0_per_frame3=a1=1; -shape_0_per_frame4=//tex_zoom =0.1; -shape_0_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_0_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_0_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.05*sin(time); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.621747 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=1.884956 -shapecode_1_tex_zoom=0.424973 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=0.600000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//tex_zoom = 0.05*q6; -shape_1_per_frame2=a =1; -shape_1_per_frame3=a1=1; -shape_1_per_frame4=//tex_zoom =0.1; -shape_1_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_1_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_1_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.1*sin(time); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.621747 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=1.884956 -shapecode_2_tex_zoom=0.424973 -shapecode_2_r=0.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.600000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=//tex_zoom = 0.05*q6; -shape_2_per_frame2=a =1; -shape_2_per_frame3=a1=1; -shape_2_per_frame4=//tex_zoom =0.1; -shape_2_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_2_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_2_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.15*sin(time); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=1.621747 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=1.884956 -shapecode_3_tex_zoom=0.424973 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=0.600000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=//tex_zoom = 0.05*q6; -shape_3_per_frame2=a =1; -shape_3_per_frame3=a1=1; -shape_3_per_frame4=//tex_zoom =0.1; -shape_3_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_3_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_3_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.2*sin(time);; -per_frame_init_1=q8 =0; -per_frame_init_2=q7=0; -per_frame_1=wave_r = 0.5+ 0.2*(bass-1); -per_frame_2=wave_g = 0.5+ 0.2*(mid-1.2); -per_frame_3=wave_b = 0.5+ 0.2*(treb-.5); -per_frame_4=warp =0; -per_frame_5=ob_r = 1-wave_r; -per_frame_6=ob_g = 1-wave_g; -per_frame_7=ob_b = 1-wave_b; -per_frame_8=ib_r = 0.75 + 0.25*sin(time*0.4123); -per_frame_9=ib_g = 0.25 + 0.25*cos(time*0.87); -per_frame_10=ib_b = 0.5+0.5*sin(1.23*time); -per_frame_11=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_12=oldq8 = q8; -per_frame_13=q7 =oldq7+ 0.001*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,7)/fps); -per_frame_14=oldq7 = q7; -per_frame_15=wave_a =0; -per_frame_16=dy = 0.5 + 0.01*(sin(0.786*q7)); -per_frame_17=dx = 0.1*sin(1.143*q8); -per_frame_18=q6 = 15+0.1*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_19=//q7 =0; -per_frame_20=invert = 1+sin(q8); -per_frame_21=monitor = q8; -per_frame_22=invert =int(1 + sin(0.01*q8)); -per_pixel_1=//dx=dx+0.5*sin((y-0.5)*128); -per_pixel_2=dy=dy+0.008*cos((x-0.5 - 0.1*sin(q7))*(q6)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,259 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=0.018000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.621747 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=1.884956 -shapecode_0_tex_zoom=0.424973 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.600000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//tex_zoom = 0.05*q6; -shape_0_per_frame2=a =1; -shape_0_per_frame3=a1=1; -shape_0_per_frame4=//tex_zoom =0.1; -shape_0_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_0_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_0_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.05*sin(time); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.621747 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=1.884956 -shapecode_1_tex_zoom=0.424973 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=0.600000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//tex_zoom = 0.05*q6; -shape_1_per_frame2=a =1; -shape_1_per_frame3=a1=1; -shape_1_per_frame4=//tex_zoom =0.1; -shape_1_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_1_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_1_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.1*sin(time); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.621747 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=1.884956 -shapecode_2_tex_zoom=0.449770 -shapecode_2_r=0.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.600000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=//tex_zoom = 0.05*q6; -shape_2_per_frame2=a =1; -shape_2_per_frame3=a1=1; -shape_2_per_frame4=//tex_zoom =0.1; -shape_2_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_2_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_2_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.15*sin(time); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=1.621747 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=1.884956 -shapecode_3_tex_zoom=0.424973 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=0.600000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=//tex_zoom = 0.05*q6; -shape_3_per_frame2=a =1; -shape_3_per_frame3=a1=1; -shape_3_per_frame4=//tex_zoom =0.1; -shape_3_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_3_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_3_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.2*sin(time);; -per_frame_init_1=q8 =0; -per_frame_init_2=q7=0; -per_frame_1=wave_r = 0.5+ 0.2*(bass-1); -per_frame_2=wave_g = 0.5+ 0.2*(mid-1.2); -per_frame_3=wave_b = 0.5+ 0.2*(treb-.5); -per_frame_4=warp =0; -per_frame_5=ob_r = 1-wave_r; -per_frame_6=ob_g = 1-wave_g; -per_frame_7=ob_b = 1-wave_b; -per_frame_8=ib_r = 0.75 + 0.25*sin(time*0.4123); -per_frame_9=ib_g = 0.25 + 0.25*cos(time*0.87); -per_frame_10=ib_b = 0.5+0.5*sin(1.23*time); -per_frame_11=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_12=oldq8 = q8; -per_frame_13=q7 =oldq7+ 0.001*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,7)/fps); -per_frame_14=oldq7 = q7; -per_frame_15=wave_a =0; -per_frame_16=dy = 0.5 + 0.01*(sin(0.786*q7)); -per_frame_17=dx = 0.1*sin(1.143*q8); -per_frame_18=q6 = 15+0.1*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_19=//q7 =0; -per_frame_20=decay =0.1; -per_pixel_1=//dx=dx+0.5*sin((y-0.5)*128); -per_pixel_2=dy=dy+0.008*cos((x-0.5 - 0.1*sin(q7))*(q6)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,257 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=0.018000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.621747 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=1.884956 -shapecode_0_tex_zoom=0.424973 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=0.700000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.600000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//tex_zoom = 0.05*q6; -shape_0_per_frame2=a =1; -shape_0_per_frame3=a1=1; -shape_0_per_frame4=//tex_zoom =0.1; -shape_0_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_0_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_0_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.621747 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=1.884956 -shapecode_1_tex_zoom=0.424973 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.700000 -shapecode_1_r2=1.000000 -shapecode_1_g2=0.600000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//tex_zoom = 0.05*q6; -shape_1_per_frame2=a =1; -shape_1_per_frame3=a1=1; -shape_1_per_frame4=//tex_zoom =0.1; -shape_1_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_1_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_1_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.621747 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=1.884956 -shapecode_2_tex_zoom=0.424973 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.700000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.600000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=//tex_zoom = 0.05*q6; -shape_2_per_frame2=a =1; -shape_2_per_frame3=a1=1; -shape_2_per_frame4=//tex_zoom =0.1; -shape_2_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_2_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_2_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=1.621747 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=1.884956 -shapecode_3_tex_zoom=0.424973 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=0.700000 -shapecode_3_r2=1.000000 -shapecode_3_g2=0.600000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=//tex_zoom = 0.05*q6; -shape_3_per_frame2=a =1; -shape_3_per_frame3=a1=1; -shape_3_per_frame4=//tex_zoom =0.1; -shape_3_per_frame5=x = 0.5 + 0.1*sin(q7*0.986); -shape_3_per_frame6=y = 0.5 + 0.1*sin(q7*0.846); -shape_3_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521); -per_frame_init_1=q8 =0; -per_frame_init_2=q7=0; -per_frame_1=wave_r = 0.5+ 0.2*(bass-1); -per_frame_2=wave_g = 0.5+ 0.2*(mid-1.2); -per_frame_3=wave_b = 0.5+ 0.2*(treb-.5); -per_frame_4=warp =0; -per_frame_5=ob_r = 1-wave_r; -per_frame_6=ob_g = 1-wave_g; -per_frame_7=ob_b = 1-wave_b; -per_frame_8=ib_r = 0.75 + 0.25*sin(time*0.4123); -per_frame_9=ib_g = 0.25 + 0.25*cos(time*0.87); -per_frame_10=ib_b = 0.5+0.5*sin(1.23*time); -per_frame_11=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_12=oldq8 = q8; -per_frame_13=q7 =oldq7+ 0.001*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,7)/fps); -per_frame_14=oldq7 = q7; -per_frame_15=wave_a =0; -per_frame_16=dy = 0.5 + 0.01*(sin(0.786*q7)); -per_frame_17=dx = 0.1*sin(1.143*q8); -per_frame_18=q6 = 15+0.1*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_pixel_1=//dx=dx+0.5*sin((y-0.5)*128); -per_pixel_2=dy=dy+0.008*cos((x-0.5 - 0.1*sin(q7))*(q6)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=0.018000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.015000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=1.621747 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=1.884956 -shapecode_0_tex_zoom=0.424973 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=0.600000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//tex_zoom = 0.05*q6; -shape_0_per_frame2=a =1; -shape_0_per_frame3=a1=1; -shape_0_per_frame4=//tex_zoom =0.1; -shape_0_per_frame5=x = 0.5 + 0.1*sin(q7*0.986)+0.01; -shape_0_per_frame6=y = 0.5 + 0.1*sin(q7*0.846)+0.01;; -shape_0_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.05*sin(time); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=1.621747 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=1.884956 -shapecode_1_tex_zoom=0.424973 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=0.600000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//tex_zoom = 0.05*q6; -shape_1_per_frame2=a =1; -shape_1_per_frame3=a1=1; -shape_1_per_frame4=//tex_zoom =0.1; -shape_1_per_frame5=x = 0.5 + 0.1*sin(q7*0.986)+0.02; -shape_1_per_frame6=y = 0.5 + 0.1*sin(q7*0.846)+ 0.02; -shape_1_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.1*sin(time); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=1.621747 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=1.884956 -shapecode_2_tex_zoom=0.424973 -shapecode_2_r=0.000000 -shapecode_2_g=1.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.600000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=//tex_zoom = 0.05*q6; -shape_2_per_frame2=a =1; -shape_2_per_frame3=a1=1; -shape_2_per_frame4=//tex_zoom =0.1; -shape_2_per_frame5=x = 0.5 + 0.1*sin(q7*0.986)+0.03; -shape_2_per_frame6=y = 0.5 + 0.1*sin(q7*0.846)+0.03; -shape_2_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.15*sin(time); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=1.621747 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=1.884956 -shapecode_3_tex_zoom=0.424973 -shapecode_3_r=0.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=0.600000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=//tex_zoom = 0.05*q6; -shape_3_per_frame2=a =1; -shape_3_per_frame3=a1=1; -shape_3_per_frame4=//tex_zoom =0.1; -shape_3_per_frame5=x = 0.5 + 0.1*sin(q7*0.986) +0.04; -shape_3_per_frame6=y = 0.5 + 0.1*sin(q7*0.846) +0.04; -shape_3_per_frame7=tex_ang = 3.1515 + 3.1415*sin(q7*0.4521) +0.2*sin(time);; -per_frame_init_1=q8 =0; -per_frame_init_2=q7=0; -per_frame_1=wave_r = 0.5+ 0.2*(bass-1); -per_frame_2=wave_g = 0.5+ 0.2*(mid-1.2); -per_frame_3=wave_b = 0.5+ 0.2*(treb-.5); -per_frame_4=warp =0; -per_frame_5=ob_r = 1-wave_r; -per_frame_6=ob_g = 1-wave_g; -per_frame_7=ob_b = 1-wave_b; -per_frame_8=ib_r = 0.75 + 0.25*sin(time*0.4123); -per_frame_9=ib_g = 0.25 + 0.25*cos(time*0.87); -per_frame_10=ib_b = 0.5+0.5*sin(1.23*time); -per_frame_11=q8 = oldq8 +0.003*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_12=oldq8 = q8; -per_frame_13=q7 =oldq7+ 0.001*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,7)/fps); -per_frame_14=oldq7 = q7; -per_frame_15=wave_a =0; -per_frame_16=dy = 0.5 + 0.01*(sin(0.786*q7)); -per_frame_17=dx = 0.1*sin(1.143*q8); -per_frame_18=q6 = 15+0.1*(((pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,3)/fps) + (pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,2)/fps) +(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att)/fps)); -per_frame_19=//q7 =0; -per_frame_20=decay =0.2; -per_frame_21=decay =0.1*(bass_att+bass); -per_pixel_1=//dx=dx+0.5*sin((y-0.5)*128); -per_pixel_2=dy=dy+0.008*cos((x-0.5 - 0.1*sin(q7))*(q6)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,209 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.500000 -fDecay=1.000000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.621810 -fWaveSmoothing=0.558000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.870000 -fModWaveAlphaEnd=1.289900 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.700000 -wave_g=0.700000 -wave_b=0.700000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=12.799995 -nMotionVectorsY=2.879900 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=3.000000 -mv_r=0.000000 -mv_g=0.700000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=x=x+0.5+0.008*sin((y*2-1)*48)+0.008*sin((y*2-1)*64); -wave_2_per_point2=y=y+0.5+0.008*cos((x*2-1)*64)+0.008*cos((x*2-1)*48); -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.193000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.040000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.900000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.400000 -shape_0_per_frame1=sides = 40*q7; -shape_0_per_frame2=sides = 9; -shape_0_per_frame3=ang = q8*3.4; -shape_0_per_frame4=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_0_per_frame5=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_0_per_frame6=r = 0.5 + 0.5*sin(time*0.713 + 1); -shape_0_per_frame7=g = 0.5 + 0.5*sin(time*0.563 + 2); -shape_0_per_frame8=b = 0.5 + 0.5*sin(time*0.654 + 5); -shape_0_per_frame9=r2 = 0.5 + 0.5*sin(time*0.885 + 4); -shape_0_per_frame10=g2 = 0.5 + 0.5*sin(time*0.556+ 1); -shape_0_per_frame11=b2 = 0.5 + 0.5*sin(time*0.638 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.340000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.040000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.900000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.400000 -shape_1_per_frame1=sides = 3; -shape_1_per_frame2=ang = q8*2.15; -shape_1_per_frame3=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_1_per_frame4=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_1_per_frame5=r = 0.5 - 0.5*sin(time*1.43 + 1); -shape_1_per_frame6=g = 0.5 - 0.5*sin(time*0.583 + 2); -shape_1_per_frame7=b = 0.5 - 0.5*sin(time*0.751 + 5); -shape_1_per_frame8=r2 = 0.5 + 0.5*sin(time*2.845 + 4); -shape_1_per_frame9=g2 = 0.5 + 0.5*sin(time*0.756+ 1); -shape_1_per_frame10=b2 = 0.5 + 0.5*sin(time*0.688 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.350000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.040000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.300000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.400000 -shape_2_per_frame1=sides = 360; -shape_2_per_frame2=ang = q8*1.4; -shape_2_per_frame3=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_2_per_frame4=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_2_per_frame5=r = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_2_per_frame6=g = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_2_per_frame7=b = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_2_per_frame8=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_2_per_frame9=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_2_per_frame10=b2 = 0.5 + 0.5*sin(q8*0.638 + 3); -per_frame_1=wave_r = wave_r + 0.3*( 0.60*sin(0.633*time) + 0.40*sin(0.845*time) ); -per_frame_2=wave_g = wave_g + 0.3*( 0.60*sin(0.370*time) + 0.40*sin(0.656*time) ); -per_frame_3=wave_b = wave_b + 0.3*( 0.60*sin(0.740*time) + 0.40*sin(0.520*time) ); -per_frame_4=//zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=//rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%50,0); -per_frame_7=q8 =oldq8+ 0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=oldq8 = q8; -per_frame_9=q7 =0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_10=zoom=zoom+(q7)*0.01; -per_frame_11=q1 = 0.5 + 0.2*cos(q8*0.87); -per_frame_12=q2 = 0.5 + 0.2*sin(q8*0.87); -per_pixel_1=dx=dx+0.003*sin((y*2-1)*64)+0.001*sin((y*2-1)*96); -per_pixel_2=dy=dy+0.004*cos((x*2-1)*64)+0.002*cos((x*2-1)*96); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Kalideostars.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Kalideostars.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Kalideostars.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Kalideostars.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,210 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.500000 -fDecay=1.000000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.621810 -fWaveSmoothing=0.558000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.870000 -fModWaveAlphaEnd=1.289900 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.004000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.700000 -wave_g=0.700000 -wave_b=0.700000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=28.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=x=x+0.5+0.008*sin((y*2-1)*48)+0.008*sin((y*2-1)*64); -wave_2_per_point2=y=y+0.5+0.008*cos((x*2-1)*64)+0.008*cos((x*2-1)*48); -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.193000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.040000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.900000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.400000 -shape_0_per_frame1=sides = 40*q7; -shape_0_per_frame2=sides = 9; -shape_0_per_frame3=ang = q8*3.4; -shape_0_per_frame4=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_0_per_frame5=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_0_per_frame6=r = 0.5 + 0.5*sin(time*0.713 + 1); -shape_0_per_frame7=g = 0.5 + 0.5*sin(time*0.563 + 2); -shape_0_per_frame8=b = 0.5 + 0.5*sin(time*0.654 + 5); -shape_0_per_frame9=r2 = 0.5 + 0.5*sin(time*0.885 + 4); -shape_0_per_frame10=g2 = 0.5 + 0.5*sin(time*0.556+ 1); -shape_0_per_frame11=b2 = 0.5 + 0.5*sin(time*0.638 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.340000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.040000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.900000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.400000 -shape_1_per_frame1=sides = 3; -shape_1_per_frame2=ang = q8*2.15; -shape_1_per_frame3=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_1_per_frame4=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_1_per_frame5=r = 0.5 - 0.5*sin(time*1.43 + 1); -shape_1_per_frame6=g = 0.5 - 0.5*sin(time*0.583 + 2); -shape_1_per_frame7=b = 0.5 - 0.5*sin(time*0.751 + 5); -shape_1_per_frame8=r2 = 0.5 + 0.5*sin(time*2.845 + 4); -shape_1_per_frame9=g2 = 0.5 + 0.5*sin(time*0.756+ 1); -shape_1_per_frame10=b2 = 0.5 + 0.5*sin(time*0.688 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.350000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.040000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.300000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.400000 -shape_2_per_frame1=sides = 360; -shape_2_per_frame2=ang = q8*1.4; -shape_2_per_frame3=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_2_per_frame4=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_2_per_frame5=r = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_2_per_frame6=g = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_2_per_frame7=b = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_2_per_frame8=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_2_per_frame9=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_2_per_frame10=b2 = 0.5 + 0.5*sin(q8*0.638 + 3); -per_frame_1=wave_r = wave_r + 0.3*( 0.60*sin(0.633*time) + 0.40*sin(0.845*time) ); -per_frame_2=wave_g = wave_g + 0.3*( 0.60*sin(0.370*time) + 0.40*sin(0.656*time) ); -per_frame_3=wave_b = wave_b + 0.3*( 0.60*sin(0.740*time) + 0.40*sin(0.520*time) ); -per_frame_4=//zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=//rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%50,0); -per_frame_7=q8 =oldq8+ 0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=oldq8 = q8; -per_frame_9=q7 =0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_10=zoom=1+(q7)*0.01; -per_frame_11=q1 = 0.5 + 0.2*cos(q8*0.87); -per_frame_12=q2 = 0.5 + 0.2*sin(q8*0.87); -per_frame_13=wave_a =0; -per_pixel_1=//dx=dx+0.008*sin((y*2-1)*48)+0.008*sin((y*2-1)*64); -per_pixel_2=//dy=dy+0.008*cos((x*2-1)*64)+0.008*cos((x*2-1)*48); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,210 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.994000 -fDecay=1.000000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.621810 -fWaveSmoothing=0.558000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.870000 -fModWaveAlphaEnd=1.289900 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000012 -rot=0.100000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.700000 -wave_g=0.700000 -wave_b=0.700000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=28.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=x=x+0.5+0.008*sin((y*2-1)*48)+0.008*sin((y*2-1)*64); -wave_2_per_point2=y=y+0.5+0.008*cos((x*2-1)*64)+0.008*cos((x*2-1)*48); -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.193000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.040000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.900000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.400000 -shape_0_per_frame1=sides = 40*q7; -shape_0_per_frame2=sides = 9; -shape_0_per_frame3=ang = q8*3.4; -shape_0_per_frame4=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_0_per_frame5=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_0_per_frame6=r = 0.5 + 0.5*sin(time*0.713 + 1); -shape_0_per_frame7=g = 0.5 + 0.5*sin(time*0.563 + 2); -shape_0_per_frame8=b = 0.5 + 0.5*sin(time*0.654 + 5); -shape_0_per_frame9=r2 = 0.5 + 0.5*sin(time*0.885 + 4); -shape_0_per_frame10=g2 = 0.5 + 0.5*sin(time*0.556+ 1); -shape_0_per_frame11=b2 = 0.5 + 0.5*sin(time*0.638 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.340000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.040000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.900000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.400000 -shape_1_per_frame1=sides = 3; -shape_1_per_frame2=ang = q8*2.15; -shape_1_per_frame3=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_1_per_frame4=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_1_per_frame5=r = 0.5 - 0.5*sin(time*1.43 + 1); -shape_1_per_frame6=g = 0.5 - 0.5*sin(time*0.583 + 2); -shape_1_per_frame7=b = 0.5 - 0.5*sin(time*0.751 + 5); -shape_1_per_frame8=r2 = 0.5 + 0.5*sin(time*2.845 + 4); -shape_1_per_frame9=g2 = 0.5 + 0.5*sin(time*0.756+ 1); -shape_1_per_frame10=b2 = 0.5 + 0.5*sin(time*0.688 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.350000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.040000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.300000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.400000 -shape_2_per_frame1=sides = 360; -shape_2_per_frame2=ang = q8*1.4; -shape_2_per_frame3=x = 0.5 + 0.18*cos(q8*0.5) + 0.03*cos(time*0.7); -shape_2_per_frame4=y = 0.5 + 0.18*sin(q8*0.5) + 0.03*sin(time*0.7); -shape_2_per_frame5=r = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_2_per_frame6=g = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_2_per_frame7=b = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_2_per_frame8=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_2_per_frame9=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_2_per_frame10=b2 = 0.5 + 0.5*sin(q8*0.638 + 3); -per_frame_1=wave_r = wave_r + 0.3*( 0.60*sin(0.633*time) + 0.40*sin(0.845*time) ); -per_frame_2=wave_g = wave_g + 0.3*( 0.60*sin(0.370*time) + 0.40*sin(0.656*time) ); -per_frame_3=wave_b = wave_b + 0.3*( 0.60*sin(0.740*time) + 0.40*sin(0.520*time) ); -per_frame_4=//zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=//rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=decay = decay - 0.01*equal(frame%50,0); -per_frame_7=q8 =oldq8+ 0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_8=oldq8 = q8; -per_frame_9=q7 =0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_10=zoom=1+(q7)*0.01; -per_frame_11=q1 = 0.5 + 0.2*cos(q8*0.87); -per_frame_12=q2 = 0.5 + 0.2*sin(q8*0.87); -per_frame_13=wave_a =0; -per_pixel_1=//dx=dx+0.008*sin((y*2-1)*48)+0.008*sin((y*2-1)*64); -per_pixel_2=//dy=dy+0.008*cos((x*2-1)*64)+0.008*cos((x*2-1)*48); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.950000 -fVideoEchoZoom=0.455629 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=1 -fWaveAlpha=0.001000 -fWaveScale=0.993020 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=53.523743 -fWarpScale=0.274296 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.999900 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.450000 -ob_r=1.000000 -ob_g=0.900000 -ob_b=0.000000 -ob_a=0.014000 -ib_size=0.250000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=0.940000 -ib_a=0.050000 -nMotionVectorsX=63.936001 -nMotionVectorsY=47.952000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.200000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.120000 -per_frame_1=q1 = min((2*bass_att + mid_att + treb_att) *0.33,2); -per_frame_2=q2 = time*10 + 5*(bass + mid + treb); -per_frame_3=wave_g = 0.2 + 0.2*sin(time*1.672); -per_frame_4=wave_r = 0.5 + 0.2*cos((time+frame)*1.34); -per_frame_5=wave_b = 0.6 + 0.2*sin(time*0.934); -per_pixel_1=inside = if (below(abs(x-0.5),0.5),if (below(abs(y-0.5),0.25),1,0),0); -per_pixel_2=outsidex = if(below(abs(16*x%2),0.25),0,1); -per_pixel_3=outsidey = if(below(abs(12*y%2),0.25),0,1); -per_pixel_4=warp = 0.6*warp*abs(1-inside); -per_pixel_5=dy = if(outsidex,0,0.03*(q1-1)*log(2-(abs(y*2 - 1.8))) + 0.01*(sin((x*q2*0.483) + (y*q2*1.238)) + sin((x*q2*1.612) + (y*q2*0.648)))); -per_pixel_6=dx = if(outsidey,0,0.04*(q1-1)*log(2-(abs(x*2 - 1.8))) + 0.01*(cos((y*q2*0.483) + (x*q2*1.238)) + cos((y*q2*1.612) + (x*q2*0.648)))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=1.816695 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.091806 -fWaveSmoothing=0.750000 -fWaveParam=-0.480000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.950000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=31.199999 -nMotionVectorsY=2.280001 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=2.500000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.800000 -mv_a=0.100000 -per_frame_1=warp=0; -per_frame_2= -per_frame_3=framethird = frame%3; -per_frame_4= -per_frame_5=q8 =oldq8+ min(0.007*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,4)/fps),0.1); -per_frame_6=oldq8 = q8; -per_frame_7=q7= 0.007*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,5)/fps); -per_frame_8=q6 =oldq6+ 0.0001*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_9=oldq6 = q6; -per_frame_10= -per_frame_11=x1 = 0.5 + 0.15*sin(0.416*q8) + 0.15*sin(0.832*q8) + 0.1*sin(1.324*q8); -per_frame_12=x2 = 0.5 + 0.15*sin(0.341*q8) + 0.15*sin(0.768*q8) + 0.1*sin(1.523*q8); -per_frame_13=x3 = 0.5 + 0.15*sin(0.287*q8) + 0.15*sin(0.913*q8) + 0.1*sin(1.142*q8); -per_frame_14=y1 = 0.8 + 0.05*sin(0.516*q8) + 0.05*sin(0.232*q8) + 0.05*sin(1.024*q8); -per_frame_15=y2 = 0.8 + 0.05*sin(0.341*q8) + 0.05*sin(0.768*q8) + 0.05*sin(1.093*q8); -per_frame_16=y3 = 0.8 + 0.05*sin(0.301*q8) + 0.05*sin(0.873*q8) + 0.05*sin(1.251*q8); -per_frame_17=r1 = 0.5 + 0.15*sin(0.512*time) + 0.15*sin(0.943*time) + 0.1*sin(1.024*time); -per_frame_18=r2 = 0.5 + 0.15*sin(0.483*time) + 0.15*sin(0.879*time) + 0.1*sin(1.423*time); -per_frame_19=r3 = 0.5 + 0.15*sin(0.531*time) + 0.15*sin(0.671*time) + 0.1*sin(1.442*time); -per_frame_20=g1 = 0.5 + 0.15*sin(0.248*time) + 0.15*sin(0.829*time) + 0.1*sin(1.623*time); -per_frame_21=g2 = 0.5 + 0.15*sin(0.461*time) + 0.15*sin(0.699*time) + 0.1*sin(1.254*time); -per_frame_22=g3 = 0.5 + 0.15*sin(0.397*time) + 0.15*sin(0.768*time) + 0.1*sin(1.157*time); -per_frame_23=b1 = 0.5 + 0.15*sin(0.211*time) + 0.15*sin(0.652*time) + 0.1*sin(1.865*time); -per_frame_24=b2 = 0.5 + 0.15*sin(0.333*time) + 0.15*sin(0.978*time) + 0.1*sin(1.359*time); -per_frame_25=b3 = 0.5 + 0.15*sin(0.475*time) + 0.15*sin(0.791*time) + 0.1*sin(1.011*time); -per_frame_26=wave_x = if(equal(framethird,0),x1,if(equal(framethird,1),x2,x3)); -per_frame_27=wave_y = if(equal(framethird,0),y1,if(equal(framethird,1),y2,y3)); -per_frame_28=wave_r = if(equal(framethird,0),r1,if(equal(framethird,1),r2,r3)); -per_frame_29=wave_g = if(equal(framethird,0),g1,if(equal(framethird,1),g2,g3)); -per_frame_30=wave_b = if(equal(framethird,0),b1,if(equal(framethird,1),b2,b3)); -per_frame_31= -per_frame_32=volume = 0.3*(bass+mid); -per_frame_33=beatrate = equal(beatrate,0) + (1-equal(beatrate,0))*(below(volume,0.01) + (1-below(volume,0.01))*beatrate); -per_frame_34=lastbeat = lastbeat + equal(lastbeat,0)*time; -per_frame_35=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_36=peakbass_att = max(bass_att,peakbass_att); -per_frame_37=beat = above(volume,0.8)*below(peakbass_att - bass_att, 0.05*peakbass_att)*above(time - lastbeat, 0.1 + 0.5*(beatrate - 0.1)); -per_frame_38=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_39=peakbass_att = beat*bass_att + (1-beat)*peakbass_att*(above(time - lastbeat, 2*beatrate)*0.99 + (1-above(time - lastbeat, 2*beatrate))*0.998); -per_frame_40=lastbeat = beat*time + (1-beat)*lastbeat; -per_frame_41=peakbass_att = max(peakbass_att,1.1*meanbass_att); -per_frame_42=dx = beat; -per_frame_43=mv_a = beat; -per_pixel_1=dy = 0.001+0.008*q7 + 0.001*sin(12*x+3.059*q6) + 0.001*sin(24*x+2.025*q6) + 0.001*sin(1.231*q8); -per_pixel_2=dx = dx + 0.0001*sin(9*y+0.612*q6) + 0.0001*sin(13*y+0.429*q6) + 0.0001*sin(1.027*q8); -per_frame_init_1=oldq8 = time*0.1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Magic Carpet.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Magic Carpet.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Magic Carpet.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Magic Carpet.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.994000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=8 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.013223 -fWaveSmoothing=0.630000 -fWaveParam=-0.340000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.100000 -wave_y=0.860000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=0.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.400000 -mv_dx=0.000000 -mv_dy=-0.100000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_3=oldq8 = q8; -per_frame_4=ib_r = 0.5+0.5*sin(1.123*q8); -per_frame_5=ib_g = 0.5+0.5*sin(q8*1.576); -per_frame_6=ib_b = 0.5+0.5*cos(q8*1.465); -per_frame_7=wave_a=0; -per_frame_8=decay = 0.990 + abs(0.01*sin(0.321*q8)); -per_pixel_1=dx = 0.008*sin(100*y+(q8*y)); -per_pixel_2=dy = 0.008*sin(100*x+(q8*x)); -per_frame_init_1=q8=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.960000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.704175 -fWaveScale=0.031716 -fWaveSmoothing=0.630000 -fWaveParam=-0.800000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.980296 -sy=1.000000 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=wave_mystery = 2; -per_frame_3=zoom = 1.4 +0.15*cos(time*0.42); -per_frame_4=rot = 0.01*sin(1.34*time); -per_frame_5=dx = 0.005*sin(time*0.646); -per_frame_6=dy=0.005*sin(time*0.314); -per_frame_7=cx = 0.5 + 0.05*sin(0.497*time); -per_frame_8=cy = 0.5 +0.05*sin(0.413*time); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.300000 -fDecay=0.960000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.704175 -fWaveScale=0.031716 -fWaveSmoothing=0.630000 -fWaveParam=-0.800000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.980296 -sy=1.000000 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=wave_mystery = 2; -per_pixel_1=zoom = 1.8 +0.04*cos(time*0.857) + atan(atan(0.5*sqrt(2)-rad)*1.5*rad); -per_pixel_2=rot = 0.03*sin(0.84*time)-0.013*cos(0.784*time)+0.02*sin(1-rad); -per_pixel_3=dx = 0.02*sin(time*0.46)*(0.5*sqrt(2)-rad)+0.015*sin(time*0.511); -per_pixel_4=dy=0.02*sin(time*0.54)*(0.5*sqrt(2)-rad)+0.013*cos(time*0.633); -per_pixel_5=cx = 0.5 + 0.1*sin(0.97*time)*(rad*rad); -per_pixel_6=cy = 0.5 +0.1*sin(0.613*time)*(rad*rad); -per_pixel_7=zoomexp = 0.8-0.2*(1-rad)+0.2*sin(-rad*rad)+0.1*sin(time*0.669); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,89 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.970000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.020000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.020000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.3*sin(time*1.254); -per_frame_2=wave_g = wave_g +0.3*sin(time*0.952); -per_frame_3=wave_b = wave_b + 0.3*sin(time*0.824); -per_frame_4=ob_r = 0.5 + 0.4*sin(time*1.324); -per_frame_5=ob_g = 0.5 + 0.4*cos(time*1.371); -per_frame_6=ob_b = 0.5+0.4*sin(2.332*time); -per_frame_7=ib_r = 0.5 + 0.25*sin(time*1.424); -per_frame_8=ib_g = 0.25 + 0.25*cos(time*1.871); -per_frame_9=ib_b = 0.5+0.5*sin(2.273*time); -per_frame_10=volume = 0.15*(bass+bass_att+treb+treb_att+mid+mid_att); -per_frame_11=xamptarg = if(equal(frame%15,0),min(0.5*volume*bass_att,0.5),xamptarg); -per_frame_12=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_13=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_14=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_15=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_16=xpos = xpos + 0.001*xspeed; -per_frame_17=dx = xpos; -per_frame_18=yamptarg = if(equal(frame%15,0),min(0.3*volume*treb_att,0.5),yamptarg); -per_frame_19=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_20=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_21=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_22=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_23=ypos = ypos + 0.001*yspeed; -per_frame_24=dy = ypos; -per_pixel_1=myzoom = log(sqrt(2)-rad) -0.25; -per_pixel_2=zoom = if(above(rad,0.4),myzoom,(0.5*sqrt(2)-rad)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Pandora's Volcano.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Pandora's Volcano.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Pandora's Volcano.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Pandora's Volcano.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.925000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.627609 -fWaveSmoothing=0.108000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.070500 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.005000 -dy=0.000000 -warp=0.198054 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.040000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.059900 -ib_size=0.000000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=tt = time/2; -per_frame_2=wave_r = 1; -per_frame_3=wave_b = 0.4 + sin(tt)/3; -per_frame_4=wave_g = 0.5 - cos(2*tt)/4; -per_frame_5=sy = 1.1 + progress/10; -per_pixel_1=sx = tan(pow(y,2))-log(y); -per_pixel_2=zoom = 1.0 + sin(rad)/5 + progress/10; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Parallel Universe.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Parallel Universe.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Parallel Universe.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Parallel Universe.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.990000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.032378 -fWaveSmoothing=0.630000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.045000 -wave_y=0.940000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=4.400000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=wave_r = 0.5+0.5*sin(time); -per_frame_2=wave_r = 0.5+0.5*sin(time); -per_frame_3=xwave_a = 0; -per_frame_4=ib_b = 0.5+0.3*sin(time*2.314); -per_frame_5=ib_r = 0.7+0.3*sin(time*1.867); -per_frame_6=q8 = if(above(bass,1.2),2*bass,0.5); -per_frame_7=q7 = if(above(bass_att,1.2),2*bass_att,0.5); -per_frame_8=q6 = if(above(bass+bass_att,2.3),bass+bass_att,0.5); -per_frame_9=warp =0; -per_frame_10=q5 = if(above(treb+treb_att,2.8),1,0); -per_frame_11=monitor = q5; -per_frame_12=ib_g = q5; -per_pixel_1=myx = x-0.5; -per_pixel_2=myy = y-0.5; -per_pixel_3=q1 =0.1*sqrt(x*x+y*y); -per_pixel_4=q1 = 0.05*(x+y); -per_pixel_5=dy = q1*abs(sin(50*bass)); -per_pixel_6=dx = q1*abs(sin(50*bass_att)); -per_pixel_7=dy = 0.2*q1*q6; -per_pixel_8=dx=0.2*q1*q6; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Rocke - Headspin.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Rocke - Headspin.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Rocke - Headspin.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Rocke - Headspin.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.990000 -fVideoEchoZoom=0.999600 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.060957 -fWaveSmoothing=0.900000 -fWaveParam=-0.280000 -fModWaveAlphaStart=0.030000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.396381 -fWarpScale=0.720100 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.959069 -rot=0.500000 -cx=0.500000 -cy=0.500000 -dx=-0.002000 -dy=-0.002000 -warp=0.010000 -sx=1.000000 -sy=0.999999 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.010000 -ib_r=0.230000 -ib_g=0.230000 -ib_b=0.230000 -ib_a=0.499900 -nMotionVectorsX=1.384000 -nMotionVectorsY=4.320006 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = 0.225*mid_att; -per_frame_3=wave_g = 0.213*treb_att; -per_frame_4=wave_b = 0.235*bass_att; -per_frame_5=wave_mystery = wave_mystery + 0.15*sin(0.5*time); -per_frame_6=cx = cx + 0.1*sin(0.2*time); -per_frame_7=cy = cy + 0.1*sin(0.4*time); -per_frame_8=decay = decay + 0.01*sin(time); -per_frame_9=mv_x = 1.5; -per_frame_10=mv_y = 3 + 0.1*sin(time); -per_frame_11=mv_b = 0.5+0.4*sin(time*0.863); -per_frame_12=mv_g = 0.5+0.45*sin(time*0.523); -per_frame_13=mv_r = 0.5+0.45*sin(time*0.98); -per_frame_14=mv_l = 0.1+ 0.45*mv_y ; -per_frame_15=mv_dx = 0.5*(1-bass)+0.5*sin(time*1.1); -per_frame_16=mv_dy = 0.5*(1-bass)+0.5*sin(time*0.985); -per_frame_17=ob_r =max(bass+bass_att+treb+treb_att-5.5,0); -per_frame_18=ib_b = 0.5*max(bass-1,0); -per_frame_19=monitor = ob_r; -per_frame_20=ob_b = 0.12+0.1*sin(time*12); -per_frame_21=ob_g = 0.12+ 0.1*sin(5*time); -per_frame_22=warp =0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.998000 -fDecay=0.994000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.900000 -fWaveScale=1.116811 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.961900 -rot=-0.010000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.900000 -wave_g=0.450000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.570000 -ib_b=0.400000 -ib_a=0.000000 -nMotionVectorsX=63.936001 -nMotionVectorsY=47.952000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.050000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.800000 -mv_a=0.100000 -per_frame_1=wave_r = wave_r + 0.1*(0.6*sin(0.933*time) + 0.4*sin(1.072*time)); -per_frame_2=wave_g = wave_g + 0.1*(0.6*sin(0.888*time) + 0.4*sin(0.918*time)); -per_frame_3=wave_b = wave_b + 0.2*(0.6*sin(0.335*time) + 0.4*sin(0.4*time)); -per_frame_4=wave_mystery = 0.5*sin(0.35*bass); -per_frame_5=decay = decay - 0.01*equal(frame%50,0); -per_frame_6=mv_b = mv_b + 0.2*sin(time*1.411); -per_frame_7=cx = cx + 0.08*sin(time*1.315); -per_frame_8=cy = cy + 0.08*sin(time*1.127); -per_frame_9=q1 = sin(sin(1.211*time)+ cos(0.887*time)-sin(1.453*time)); -per_pixel_1=zoom = zoom + (0.1*rad); -per_pixel_2=rot = rot - 0.15*sin(q1-ang); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sea Shells.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sea Shells.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sea Shells.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sea Shells.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,243 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.900000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.893664 -fWaveSmoothing=0.600000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.995000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.002000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.400000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.330038 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = q1; -shape_0_per_frame2=y = 1- q2; -shape_0_per_frame3=r = 0.5 + 0.49*sin(time*0.467); -shape_0_per_frame4=b = 0.5 + 0.49*sin(time*0.568); -shape_0_per_frame5=g = 0.5 + 0.49*sin(time*0.669); -shape_0_per_frame6=r2 = 0.1*(bass+bass_att); -shape_0_per_frame7=b2 = r2; -shape_0_per_frame8=g2 = r2; -shape_0_per_frame9=rad = 0.5*r2 + 0.1; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_r = wave_r + 0.250*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.480*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.370*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=warp=0; -per_frame_5=zoom =1; -per_frame_6=rot=0; -per_frame_7=decay =0.99; -per_frame_8=decay =1; -per_frame_9=ib_r = 0.16 + 0.15*sin(time*0.783); -per_frame_10=ib_g = 0.16 + 0.15*sin(time*0.895); -per_frame_11=ib_b = 0.75 +0.24*sin(time*1.134); -per_frame_12=ib_size = 0.005*above(bass+bass_att,2.8); -per_frame_13= -per_frame_14=movement =movement + 0.5*(((bass+bass_att + 0.075*pow((bass+0.6*bass_att+0.2*treb_att),3)))/fps); -per_frame_15=movement = if(above(movement,10000), 0, movement); -per_frame_16= -per_frame_17=q1 = 0.5+0.1*sin(movement); -per_frame_18=q2 = 0.5-0.1*cos(0.781*movement); -per_frame_19=q3 = movement; -per_frame_20=wave_x = q1; -per_frame_21=wave_y = 1-q2; -per_pixel_1=newx =x- q1; -per_pixel_2=newy =y- q2; -per_pixel_3=newrad = min(sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2,sqrt(2)); -per_pixel_4=effect = newrad*((0.9+0.2*sin(q3*0.23))*y)*((0.9+0.2*sin(q3*0.197))*x); -per_pixel_5=dy=-0.007*cos(pow((sqrt(2)-effect),5)*10); -per_pixel_6=dx=-0.007*sin(pow((sqrt(2)-effect),5)*10); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Solarized Space.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Solarized Space.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Solarized Space.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Solarized Space.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.994000 -fDecay=0.960000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=1 -fWaveAlpha=1.882469 -fWaveScale=0.000000 -fWaveSmoothing=0.630000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.980296 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.001500 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=wave_mystery = -0.5; -per_frame_3=vol = 0.167*(bass+mid); -per_frame_4=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_5=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_6=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_7=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_8=xpos = xpos + 0.001*xspeed; -per_frame_9=myx = 1.25*xpos + 0.5; -per_frame_10=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_11=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_12=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_13=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_14=ypos = ypos + 0.001*yspeed; -per_frame_15=myy = 1.25*ypos + 0.5; -per_frame_16= -per_frame_17=cx = 0.5 + 0.05*sin(0.497*time); -per_frame_18=cy = 0.5 +0.05*sin(0.413*time); -per_frame_19=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_20=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_21=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_22=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_23=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_24=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_25=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_26=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_27=lastbeat = if(beat,time,lastbeat); -per_frame_28=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_29=beatcounter = if(above(beat,0),beatcounter +1, beatcounter); -per_frame_30=beatcounter = if(above(beatcounter,8), 0, beatcounter); -per_frame_31=beateven = beatcounter%4; -per_frame_32=mode = if(beat,(mode+rand(3)+1)%4,mode); -per_frame_33=beateven = if(equal(beateven,3),-1,beateven); -per_frame_34=beateven = if(equal(beateven,0),0.1*(myx+myy),beateven); -per_frame_35=beateven = if(equal(beateven,2),0.1*(-myx-myy),beateven); -per_frame_36=dx = 0.1*beateven*myx; -per_frame_37=dy = 0.1*beateven*myy; -per_frame_38=monitor = beateven; -per_frame_39=wave_a = Bass_thresh; -per_frame_40=zoom = 1.5 +0.25*myy; -per_frame_41=rot = myx*beateven; -per_frame_42=wave_x = 0.5 + 0.05*myx; -per_frame_43=wave_y=0.5 + 0.05*myy; -per_frame_44= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.994000 -fDecay=0.960000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=1 -bInvert=1 -fWaveAlpha=1.882469 -fWaveScale=0.000000 -fWaveSmoothing=0.630000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.980296 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.001500 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang = time*0.4;; -shape_0_per_frame2=x = 0.5 + 0.08*cos(time*1.3) + 0.03*cos(time*0.7); -shape_0_per_frame3=y = 0.5 + 0.08*sin(time*1.4) + 0.03*sin(time*0.7); -shape_0_per_frame4=r =0.5 + 0.5*sin(q8*0.613 + 1); -shape_0_per_frame5=g = 0.5 + 0.5*sin(q8*0.763 + 2); -shape_0_per_frame6=b = 0.5 + 0.5*sin(q8*0.771 + 5); -shape_0_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.635 + 4); -shape_0_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.616+ 1); -shape_0_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.538 + 3); -shape_0_per_frame10=sides = 360; -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=ang = time*0.4;; -shape_1_per_frame2=x = 0.5 + 0.08*cos(time*1.3) + 0.03*cos(time*0.5); -shape_1_per_frame3=y = 0.5 + 0.08*sin(time*1.4) + 0.03*sin(time*0.5); -shape_1_per_frame4=r =0.5 + 0.5*sin(q8*0.4413 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(q8*1.23 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(q8*0.721 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.775 + 4); -shape_1_per_frame8=g2 = 0.5 - 0.5*sin(q8*0.676+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.738 + 3); -shape_1_per_frame10=sides = 360; -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=ang = time*0.4;; -shape_2_per_frame2=x = 0.5 + 0.08*cos(time*1.3) + 0.03*cos(time*0.9); -shape_2_per_frame3=y = 0.5 + 0.08*sin(time*1.4) + 0.03*sin(time*0.9); -shape_2_per_frame4=r =0.5 + 0.5*sin(q8*0.413 + 1); -shape_2_per_frame5=g = 0.5 + 0.5*sin(q8*0.363 + 2); -shape_2_per_frame6=b = 0.5 + 0.5*sin(q8*0.871 + 5); -shape_2_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.835 + 4); -shape_2_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.686+ 1); -shape_2_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.938 + 3); -shape_2_per_frame10=sides = 360; -per_frame_1=warp = 0; -per_frame_2=wave_mystery = -0.5; -per_frame_3=vol = 0.167*(bass+mid); -per_frame_4=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_5=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_6=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_7=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_8=xpos = xpos + 0.001*xspeed; -per_frame_9=myx = 1.25*xpos + 0.5; -per_frame_10=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_11=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_12=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_13=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_14=ypos = ypos + 0.001*yspeed; -per_frame_15=myy = 1.25*ypos + 0.5; -per_frame_16=cx = 0.5 + 0.05*sin(0.497*time); -per_frame_17=cy = 0.5 +0.05*sin(0.413*time); -per_frame_18=volume = 0.15*(bass_att+bass+mid+mid_att); -per_frame_19=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_20=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_21=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_22=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_23=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_24=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_25=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_26=lastbeat = if(beat,time,lastbeat); -per_frame_27=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_28=beatcounter = if(above(beat,0),beatcounter +1, beatcounter); -per_frame_29=beatcounter = if(above(beatcounter,8), 0, beatcounter); -per_frame_30=beateven = beatcounter%4; -per_frame_31=mode = if(beat,(mode+rand(3)+1)%4,mode); -per_frame_32=beateven = if(equal(beateven,3),-1,beateven); -per_frame_33=beateven = if(equal(beateven,0),0.1*(myx+myy),beateven); -per_frame_34=beateven = if(equal(beateven,2),0.1*(-myx-myy),beateven); -per_frame_35=dx = 0.1*beateven*myx; -per_frame_36=dy = 0.1*beateven*myy; -per_frame_37=monitor = beateven; -per_frame_38=wave_a = Bass_thresh; -per_frame_39=zoom = 1.5 +0.25*myy; -per_frame_40=rot = myx*beateven; -per_frame_41=wave_x = 0.5 + 0.05*myx; -per_frame_42=wave_y=0.5 + 0.05*myy; -per_frame_43=q8 =oldq8+ 0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_44=oldq8 = q8; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Space.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Space.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Space.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Space.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.960000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.882469 -fWaveScale=0.000000 -fWaveSmoothing=0.630000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.980296 -sy=1.000000 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.001500 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=wave_mystery = -0.5; -per_frame_3=vol = 0.167*(bass+mid); -per_frame_4=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_5=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_6=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_7=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_8=xpos = xpos + 0.001*xspeed; -per_frame_9=myx = 1.25*xpos + 0.5; -per_frame_10=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_11=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_12=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_13=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_14=ypos = ypos + 0.001*yspeed; -per_frame_15=myy = 1.25*ypos + 0.5; -per_frame_16= -per_frame_17=cx = 0.5 + 0.05*sin(0.497*time); -per_frame_18=cy = 0.5 +0.05*sin(0.413*time); -per_frame_19= -per_frame_20= -per_frame_21= -per_frame_22= -per_frame_23= -per_frame_24= -per_frame_25= -per_frame_26= -per_frame_27= -per_frame_28= -per_frame_29= -per_frame_30= -per_frame_31=dx = dx + dx_residual; -per_frame_32=dy = dy + dy_residual; -per_frame_33= -per_frame_34= -per_frame_35=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_36=dx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_37=dy_residual = equal(bass_thresh,2)*0.012*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; -per_frame_38= -per_frame_39=wave_a = Bass_thresh; -per_frame_40=zoom = 1.5 +0.25*myy; -per_frame_41=rot = 215*myx*dx; -per_frame_42=wave_x = 0.5 + 0.05*myx; -per_frame_43=wave_y=0.5 + 0.05*myy; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.980000 -fDecay=0.940000 -fVideoEchoZoom=1.019701 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.882469 -fWaveScale=0.000000 -fWaveSmoothing=0.630000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.000000 -sx=0.980296 -sy=1.000000 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=wave_mystery = -0.5; -per_frame_3=vol = 0.167*(bass+mid); -per_frame_4=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_5=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_6=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_7=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_8=xpos = xpos + 0.001*xspeed; -per_frame_9=myx = 1.25*xpos + 0.5; -per_frame_10=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_11=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_12=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_13=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_14=ypos = ypos + 0.001*yspeed; -per_frame_15=myy = 1.25*ypos + 0.5; -per_frame_16= -per_frame_17=cx = 0.5 + 0.05*sin(0.497*time); -per_frame_18=cy = 0.5 +0.05*sin(0.413*time); -per_frame_19= -per_frame_20= -per_frame_21= -per_frame_22=dx = dx + dx_residual; -per_frame_23=dy = dy + dy_residual; -per_frame_24= -per_frame_25= -per_frame_26=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_27=dx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_28=dy_residual = equal(bass_thresh,2)*0.012*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; -per_frame_29= -per_frame_30=wave_a = Bass_thresh; -per_frame_31=monitor = rot; -per_frame_32=zoom = 1.5 +0.25*myy*dy; -per_frame_33=rot = 215*myx*dx; -per_frame_34=wave_x = 0.5 + 0.05*myx + 0.08*bass_thresh -0.1; -per_frame_35=wave_y=0.5 + 0.05*myy; -per_frame_36=monitor = rot; -per_frame_37=mv_dx = dx; -per_frame_38=mv_dy =dy; -per_frame_39=echo_zoom =1+ 0.1*(myx-myy); -per_frame_40=monitor=echo_zoom; -per_pixel_1=zoom = zoom + 0.1*(1-rad); -per_pixel_2=sy = 1+ 0.2*(1-rad); -per_pixel_3=rot = rot + 0.2*rad; -per_pixel_4=dx = dx*rad; -per_pixel_5=dy = dy*(1-rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm" 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.645252 -fWaveScale=0.010000 -fWaveSmoothing=0.500000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=1.025000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.290770 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=1.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.015000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.020410 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=x = 0.5 + 0.01*sin(0.89*q8); -shape_0_per_frame2=y = 0.5 - 0.01*cos(0.77*q8); -shape_0_per_frame3= -shape_0_per_frame4=r = 0.25+0.25*sin(time*0.7679); -shape_0_per_frame5=g = 0.25+0.25*sin(time*0.8079); -shape_0_per_frame6=b = 0.25+0.25*sin(time*0.7339); -shape_0_per_frame7=r2 = 0.25+0.25*sin(time*0.6979); -shape_0_per_frame8=g2 = 0.25+0.25*sin(time*0.849); -shape_0_per_frame9=b2 = 0.25+0.25*sin(time*0.8079); -shapecode_1_enabled=0 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.020068 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=x = 0.5 - 0.01*sin(0.7089*q8); -shape_1_per_frame2=y = 0.5 + 0.01*cos(0.5077*q8); -shape_1_per_frame3= -shape_1_per_frame4=r = 0.25+0.25*sin(time*0.6479); -shape_1_per_frame5=g = 0.25+0.25*sin(time*0.5079); -shape_1_per_frame6=b = 0.25+0.25*sin(time*0.9339); -shape_1_per_frame7=r2 = 0.25+0.25*sin(time*0.779); -shape_1_per_frame8=g2 = 0.25+0.25*sin(time*0.707); -shape_1_per_frame9=b2 = 0.25+0.25*sin(time*0.747); -shapecode_2_enabled=0 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.020068 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=0.000000 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=x = 0.5 + 0.01*sin(0.679*q8); -shape_2_per_frame2=y = 0.5 - 0.01*cos(0.877*q8); -shape_2_per_frame3= -shape_2_per_frame4=r = 0.25+0.25*sin(time*0.5679); -shape_2_per_frame5=g = 0.25+0.25*sin(time*0.4079); -shape_2_per_frame6=b = 0.25+0.25*sin(time*1.1339); -shape_2_per_frame7=r2 = 0.25+0.25*sin(time*0.9979); -shape_2_per_frame8=g2 = 0.25+0.25*sin(time*0.891); -shape_2_per_frame9=b2 = 0.25+0.25*sin(time*0.713); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_imageURL=Tux.tga -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.150068 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=0.7100000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x = 0.5 + 0.01*sin(0.916*q8); -shape_3_per_frame2=y = 0.5 - 0.01*cos(0.977*q8); -shape_3_per_frame3= -shape_3_per_frame4=r = 0.25+0.25*sin(time*1.1679); -shape_3_per_frame5=g = 0.25+0.25*sin(time*1.18079); -shape_3_per_frame6=b = 0.25+0.25*sin(time*1.17339); -shape_3_per_frame7=r2 = 0.25+0.25*sin(time*1.16979); -shape_3_per_frame8=g2 = 0.25+0.25*sin(time*1.1849); -shape_3_per_frame9=b2 = 0.25+0.25*sin(time*1.81079); -per_frame_1=wave_r = 0.0 + 0.000*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = 0.0 + 0.000*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = 0.0 + 0.000*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.01*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=//decay = decay - 0.01*equal(frame%6,0); -per_frame_7=warp=0; -per_frame_8=zoom =1; -per_frame_9=rot =0; -per_frame_10=cx=0.5; -per_frame_11=cy=0.5; -per_frame_12=q1 = 0.5 + 0.1*sin(time); -per_frame_13=q2 = 0.5 - 0.1*cos(time); -per_frame_14=wave_a =0; -per_frame_15=decay=1; -per_frame_16=q8 = oldq8+ 0.0005*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_17=oldq8 =q8; -per_frame_18=mybass = mybass + 0.01*(bass + bass_att); -per_frame_19=rot =1 + 0.15*sin(mybass*0.1789); -per_frame_20=zoom = 1.6 + 0.1*sin(mybass*0.786); -per_pixel_1=myx = (x-q1)*2; -per_pixel_2=myy= (y-q2)*2; -per_pixel_3=myrad = (myx*myx) + (myy*myy); -per_pixel_4=dx = 0.1*(myy/(myrad+1)); -per_pixel_5=dy = -0.1*(myx/(myrad+1)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.947994 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.396500 -fWaveScale=0.969133 -fWaveSmoothing=0.666000 -fWaveParam=0.000100 -fModWaveAlphaStart=1.379900 -fModWaveAlphaEnd=1.020000 -fWarpAnimSpeed=2.000000 -fWarpScale=1.000000 -fZoomExponent=0.056700 -fShader=0.700000 -zoom=0.539300 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.819500 -sy=0.819545 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.500000 -ob_g=0.010000 -ob_b=0.010000 -ob_a=0.950000 -ib_size=0.010000 -ib_r=0.010000 -ib_g=0.010000 -ib_b=0.500000 -ib_a=0.950000 -nMotionVectorsX=9.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = bass*.5; -per_frame_3=wave_g = treb*.5; -per_frame_4=wave_b = mid*.5; -per_frame_5=decay = .99; -per_frame_6=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_7=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); -per_pixel_1=zoom = zoom+rad*.1+0.05; -per_pixel_2=zoomexp =1 - 1*sin(rad*time*100); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.990000 -fVideoEchoZoom=1.001799 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.995648 -fWaveScale=0.995868 -fWaveSmoothing=0.837000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=10.784599 -fZoomExponent=1.001700 -fShader=0.000000 -zoom=1.009989 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.500000 -dy=0.500000 -warp=1.000000 -sx=0.999900 -sy=1.000000 -wave_r=0.500000 -wave_g=0.499900 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=0.950000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.950000 -nMotionVectorsX=64.000000 -nMotionVectorsY=1.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=bass_effect = max(max(bass,bass_att)-1.2,0); -per_frame_2=treb_effect = max(max(treb,treb_att)-1.2,0); -per_frame_3=warp = 0.25 + bass_att*1.25; -per_frame_4=ib_r= ib_r-+ 0.5*( sin(time*0.391)); -per_frame_5=ib_g= ib_g + 0.5*( sin(time*1.527) ); -per_frame_6=ib_b= ib_b - 0.5*( sin(time*1.843) ); -per_frame_7=ob_r = 1 - ib_r; -per_frame_8=ob_g = 1 - ib_g; -per_frame_9=ob_b = 1 - ib_b; -per_frame_10=ob_size = if(above(bass_effect,0), 0.001+0.0065*bass_effect,0.001); -per_frame_11=ib_size = if(above(treb_effect,0), 0.001+0.0065*treb_effect,0.001); -per_frame_12=zoom=1.35+0.2*sin(time); -per_pixel_1=rot = rot + 1 + log(sqrt(2)-rad); -per_pixel_2=zoom=zoom-0.5*rad +0.1*sin(rad); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sunflower Passion (Enlightment Mix)_Phat_edit.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sunflower Passion (Enlightment Mix)_Phat_edit.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sunflower Passion (Enlightment Mix)_Phat_edit.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sunflower Passion (Enlightment Mix)_Phat_edit.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=0.980000 -fVideoEchoZoom=2.447667 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.645252 -fWaveScale=1.951307 -fWaveSmoothing=0.500000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=1.025000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.290770 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.135177 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=x = 0.3 + 0.05*sin(0.89*q8); -shape_0_per_frame2=y = 0.4 - 0.05*cos(0.77*q8); -shape_0_per_frame3= -shape_0_per_frame4=r = 0.25+0.25*sin(time*0.7679); -shape_0_per_frame5=g = 0.25+0.25*sin(time*0.8079); -shape_0_per_frame6=b = 0.25+0.25*sin(time*0.7339); -shape_0_per_frame7=r2 = 0.25+0.25*sin(time*0.6979); -shape_0_per_frame8=g2 = 0.25+0.25*sin(time*0.849); -shape_0_per_frame9=b2 = 0.25+0.25*sin(time*0.8079); -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.066232 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=x = 0.3 - 0.05*sin(0.7089*q8); -shape_1_per_frame2=y = 0.4 + 0.05*cos(0.5077*q8); -shape_1_per_frame3= -shape_1_per_frame4=r = 0.25+0.25*sin(time*0.6479); -shape_1_per_frame5=g = 0.25+0.25*sin(time*0.5079); -shape_1_per_frame6=b = 0.25+0.25*sin(time*0.9339); -shape_1_per_frame7=r2 = 0.25+0.25*sin(time*0.779); -shape_1_per_frame8=g2 = 0.25+0.25*sin(time*0.707); -shape_1_per_frame9=b2 = 0.25+0.25*sin(time*0.747); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.036457 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=0.000000 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=x = 0.3 + 0.05*sin(0.679*q8); -shape_2_per_frame2=y = 0.4 - 0.05*cos(0.877*q8); -shape_2_per_frame3= -shape_2_per_frame4=r = 0.25+0.25*sin(time*0.5679); -shape_2_per_frame5=g = 0.25+0.25*sin(time*0.4079); -shape_2_per_frame6=b = 0.25+0.25*sin(time*1.1339); -shape_2_per_frame7=r2 = 0.25+0.25*sin(time*0.9979); -shape_2_per_frame8=g2 = 0.25+0.25*sin(time*0.891); -shape_2_per_frame9=b2 = 0.25+0.25*sin(time*0.713); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.012202 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=0.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=x = 0.3 + 0.05*sin(0.916*q8); -shape_3_per_frame2=y = 0.4 - 0.05*cos(0.977*q8); -shape_3_per_frame3= -shape_3_per_frame4=r = 0.25+0.25*sin(time*1.1679); -shape_3_per_frame5=g = 0.25+0.25*sin(time*1.18079); -shape_3_per_frame6=b = 0.25+0.25*sin(time*1.17339); -shape_3_per_frame7=r2 = 0.25+0.25*sin(time*1.16979); -shape_3_per_frame8=g2 = 0.25+0.25*sin(time*1.1849); -shape_3_per_frame9=b2 = 0.25+0.25*sin(time*1.81079); -per_frame_1=//wave_r = 0.0 + 0.000*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=//wave_g = 0.0 + 0.000*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=//wave_b = 0.0 + 0.000*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=//zoom = zoom + 0.01*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=//rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=//decay = decay - 0.01*equal(frame%6,0); -per_frame_7=warp=0; -per_frame_8=//zoom =1; -per_frame_9=rot =0; -per_frame_10=cx=0.5; -per_frame_11=cy=0.5; -per_frame_12=q1 = 0.5 + 0.1*sin(time); -per_frame_13=q2 = 0.5 - 0.1*cos(time); -per_frame_14=wave_a =0; -per_frame_15=decay=.95; -per_frame_16=q1=0.5 +0.1*sin(q8); -per_frame_17=q2=0.5; -per_frame_18= -per_frame_19= -per_frame_20=q8 = oldq8+ 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_21=oldq8 =q8; -per_frame_22=mybass = mybass + 0.01*(bass + bass_att); -per_frame_23= -per_frame_24=//rot =1 + 0.15*sin(mybass*0.1789); -per_frame_25=//zoom = 1.6 + 0.1*sin(mybass*0.786); -per_frame_26=zoom = 1.09; -per_frame_27=//rot =0.12; -per_frame_28=//cx = 0.4; -per_frame_29=//cy = 0.4; -per_frame_30=q1=0.5 +0.00*sin(0.12*q8); -per_frame_31=q2=0.5 -0.00*cos(0.177*q8); -per_pixel_1=myx = (x-q1)*1.1; -per_pixel_2=myy= (y-q2)*1.1; -per_pixel_3=myrad = (myx*myx) + (myy*myy); -per_pixel_4=dx = (0.5+0.02*sin(q8))*(myy/(myrad+1)); -per_pixel_5=dy = -(0.5+0.02*sin(q8*0.897))*(myx/(myrad+1)); -per_pixel_6=rd=bass*rad; -per_pixel_7=rot=rd/10; -per_pixel_8= -per_pixel_9=sy=1.02+(rad/10); -per_pixel_10=sx=sy-myrad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sunflower Passion.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sunflower Passion.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sunflower Passion.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sunflower Passion.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,272 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.645252 -fWaveScale=0.010000 -fWaveSmoothing=0.500000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=1.025000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.290770 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=1.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.015000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.020410 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=x = 0.5 + 0.1*sin(0.89*q8); -shape_0_per_frame2=y = 0.5 - 0.1*cos(0.77*q8); -shape_0_per_frame3= -shape_0_per_frame4=r = 0.25+0.25*sin(time*0.7679); -shape_0_per_frame5=g = 0.25+0.25*sin(time*0.8079); -shape_0_per_frame6=b = 0.25+0.25*sin(time*0.7339); -shape_0_per_frame7=r2 = 0.25+0.25*sin(time*0.6979); -shape_0_per_frame8=g2 = 0.25+0.25*sin(time*0.849); -shape_0_per_frame9=b2 = 0.25+0.25*sin(time*0.8079); -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.020068 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=x = 0.5 - 0.1*sin(0.7089*q8); -shape_1_per_frame2=y = 0.5 + 0.1*cos(0.5077*q8); -shape_1_per_frame3= -shape_1_per_frame4=r = 0.25+0.25*sin(time*0.6479); -shape_1_per_frame5=g = 0.25+0.25*sin(time*0.5079); -shape_1_per_frame6=b = 0.25+0.25*sin(time*0.9339); -shape_1_per_frame7=r2 = 0.25+0.25*sin(time*0.779); -shape_1_per_frame8=g2 = 0.25+0.25*sin(time*0.707); -shape_1_per_frame9=b2 = 0.25+0.25*sin(time*0.747); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.020068 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=0.000000 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=x = 0.5 + 0.1*sin(0.679*q8); -shape_2_per_frame2=y = 0.5 - 0.1*cos(0.877*q8); -shape_2_per_frame3= -shape_2_per_frame4=r = 0.25+0.25*sin(time*0.5679); -shape_2_per_frame5=g = 0.25+0.25*sin(time*0.4079); -shape_2_per_frame6=b = 0.25+0.25*sin(time*1.1339); -shape_2_per_frame7=r2 = 0.25+0.25*sin(time*0.9979); -shape_2_per_frame8=g2 = 0.25+0.25*sin(time*0.891); -shape_2_per_frame9=b2 = 0.25+0.25*sin(time*0.713); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.020068 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=0.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=x = 0.5 + 0.1*sin(0.916*q8); -shape_3_per_frame2=y = 0.5 - 0.1*cos(0.977*q8); -shape_3_per_frame3= -shape_3_per_frame4=r = 0.25+0.25*sin(time*1.1679); -shape_3_per_frame5=g = 0.25+0.25*sin(time*1.18079); -shape_3_per_frame6=b = 0.25+0.25*sin(time*1.17339); -shape_3_per_frame7=r2 = 0.25+0.25*sin(time*1.16979); -shape_3_per_frame8=g2 = 0.25+0.25*sin(time*1.1849); -shape_3_per_frame9=b2 = 0.25+0.25*sin(time*1.81079); -per_frame_1=wave_r = 0.0 + 0.000*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = 0.0 + 0.000*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = 0.0 + 0.000*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.01*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=//decay = decay - 0.01*equal(frame%6,0); -per_frame_7=warp=0; -per_frame_8=zoom =1; -per_frame_9=rot =0; -per_frame_10=cx=0.5; -per_frame_11=cy=0.5; -per_frame_12=q1 = 0.5 + 0.1*sin(time); -per_frame_13=q2 = 0.5 - 0.1*cos(time); -per_frame_14=wave_a =0; -per_frame_15=decay=1; -per_frame_16= -per_frame_17= -per_frame_18= -per_frame_19=q8 = oldq8+ 0.0005*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_20=oldq8 =q8; -per_frame_21=mybass = mybass + 0.01*(bass + bass_att); -per_frame_22= -per_frame_23=rot =1 + 0.15*sin(mybass*0.1789); -per_frame_24=zoom = 1.4 + 0.1*sin(mybass*0.786); -per_pixel_1=myx = (x-q1)*2; -per_pixel_2=myy= (y-q2)*2; -per_pixel_3=myrad = (myx*myx) + (myy*myy); -per_pixel_4=dx = 0.1*(myy/(myrad+1)); -per_pixel_5=dy = -0.1*(myx/(myrad+1)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sunflower Passion (Simple Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sunflower Passion (Simple Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Sunflower Passion (Simple Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Sunflower Passion (Simple Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,268 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.645252 -fWaveScale=0.010000 -fWaveSmoothing=0.500000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=2.853000 -fZoomExponent=2.100000 -fShader=0.000000 -zoom=1.025000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.290770 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=1.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.015000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.020410 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=x = 0.5 + 0.01*sin(0.89*q8); -shape_0_per_frame2=y = 0.5 - 0.01*cos(0.77*q8); -shape_0_per_frame3= -shape_0_per_frame4=r = 0.25+0.25*sin(time*0.7679); -shape_0_per_frame5=g = 0.25+0.25*sin(time*0.8079); -shape_0_per_frame6=b = 0.25+0.25*sin(time*0.7339); -shape_0_per_frame7=r2 = 0.25+0.25*sin(time*0.6979); -shape_0_per_frame8=g2 = 0.25+0.25*sin(time*0.849); -shape_0_per_frame9=b2 = 0.25+0.25*sin(time*0.8079); -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.020068 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=1.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=x = 0.5 - 0.01*sin(0.7089*q8); -shape_1_per_frame2=y = 0.5 + 0.01*cos(0.5077*q8); -shape_1_per_frame3= -shape_1_per_frame4=r = 0.25+0.25*sin(time*0.6479); -shape_1_per_frame5=g = 0.25+0.25*sin(time*0.5079); -shape_1_per_frame6=b = 0.25+0.25*sin(time*0.9339); -shape_1_per_frame7=r2 = 0.25+0.25*sin(time*0.779); -shape_1_per_frame8=g2 = 0.25+0.25*sin(time*0.707); -shape_1_per_frame9=b2 = 0.25+0.25*sin(time*0.747); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.020068 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=0.000000 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=x = 0.5 + 0.01*sin(0.679*q8); -shape_2_per_frame2=y = 0.5 - 0.01*cos(0.877*q8); -shape_2_per_frame3= -shape_2_per_frame4=r = 0.25+0.25*sin(time*0.5679); -shape_2_per_frame5=g = 0.25+0.25*sin(time*0.4079); -shape_2_per_frame6=b = 0.25+0.25*sin(time*1.1339); -shape_2_per_frame7=r2 = 0.25+0.25*sin(time*0.9979); -shape_2_per_frame8=g2 = 0.25+0.25*sin(time*0.891); -shape_2_per_frame9=b2 = 0.25+0.25*sin(time*0.713); -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.020068 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=0.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=x = 0.5 + 0.01*sin(0.916*q8); -shape_3_per_frame2=y = 0.5 - 0.01*cos(0.977*q8); -shape_3_per_frame3= -shape_3_per_frame4=r = 0.25+0.25*sin(time*1.1679); -shape_3_per_frame5=g = 0.25+0.25*sin(time*1.18079); -shape_3_per_frame6=b = 0.25+0.25*sin(time*1.17339); -shape_3_per_frame7=r2 = 0.25+0.25*sin(time*1.16979); -shape_3_per_frame8=g2 = 0.25+0.25*sin(time*1.1849); -shape_3_per_frame9=b2 = 0.25+0.25*sin(time*1.81079); -per_frame_1=wave_r = 0.0 + 0.000*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = 0.0 + 0.000*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = 0.0 + 0.000*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=zoom = zoom + 0.01*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ); -per_frame_5=rot = rot + 0.010*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_6=//decay = decay - 0.01*equal(frame%6,0); -per_frame_7=warp=0; -per_frame_8=zoom =1; -per_frame_9=rot =0; -per_frame_10=cx=0.5; -per_frame_11=cy=0.5; -per_frame_12=q1 = 0.5 + 0.1*sin(time); -per_frame_13=q2 = 0.5 - 0.1*cos(time); -per_frame_14=wave_a =0; -per_frame_15=decay=1; -per_frame_16=q8 = oldq8+ 0.0005*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_17=oldq8 =q8; -per_frame_18=mybass = mybass + 0.01*(bass + bass_att); -per_frame_19=rot =1 + 0.15*sin(mybass*0.1789); -per_frame_20=zoom = 1.6 + 0.1*sin(mybass*0.786); -per_pixel_1=myx = (x-q1)*2; -per_pixel_2=myy= (y-q2)*2; -per_pixel_3=myrad = (myx*myx) + (myy*myy); -per_pixel_4=dx = 0.1*(myy/(myrad+1)); -per_pixel_5=dy = -0.1*(myx/(myrad+1)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.980000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.660126 -fWaveSmoothing=0.000000 -fWaveParam=0.300000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.150000 -mv_g=0.450000 -mv_b=0.650000 -mv_a=0.200000 -per_frame_1=warp=0; -per_frame_2=ib_a =0.2*bass; -per_frame_3=wave_r = wave_r + 0.45*(0.5*sin(time*0.701)+ 0.3*cos(time*0.438)); -per_frame_4=wave_b = wave_b - 0.4*(0.5*sin(time*4.782)+0.5*cos(time*0.522)); -per_frame_5=wave_g = wave_g + 0.4*sin(time*1.731); -per_frame_6=decay = decay - equal(frame%100,0)*0.1; -per_frame_7=vol = 0.167*(bass+mid); -per_frame_8=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_9=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_10=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_11=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_12=xpos = xpos + 0.001*xspeed; -per_frame_13=wave_x = 1.5*xpos + 0.5; -per_frame_14=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_15=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_16=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_17=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_18=ypos = ypos + 0.001*yspeed; -per_frame_19=wave_y = 1.5*ypos + 0.5; -per_frame_20=zoom = .995; -per_frame_21= -per_frame_22= -per_frame_23= -per_frame_24= -per_frame_25= -per_frame_26= -per_frame_27= -per_frame_28=frametest = frame%2; -per_frame_29=wave_x = if(frametest,1-wave_x,wave_x); -per_frame_30=wave_y = if(frametest,1-wave_y,wave_y); -per_frame_31=wave_r = if(frametest,wave_r,wave_g); -per_frame_32=wave_g = if(frametest,wave_g,wave_b); -per_frame_33=wave_b = if(frametest,wave_b,wave_r); -per_frame_34=monitor = green; -per_frame_35=q8 = oldq8+ 0.0005*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_36=oldq8 = q8; -per_frame_37= -per_frame_38=mv_g=0.5+bass_att*.1; -per_frame_39=beat=if(above(bass*bass_att,4.5),1-beat,beat); -per_frame_40=q1=beat*2-1; -per_frame_41= -per_frame_42=amp =amp*.8+.2*(bass_att+mid_att+treb_att)*.3; -per_frame_43=q2 = min(amp,1); -per_frame_44=trebcap=trebcap*.7+.16*treb; -per_frame_45=q3=trebcap*2; -per_frame_46=monitor = q3; -per_pixel_1=dx=dx+0.008*sin((y*2-1)*(48+12*sin(0.412*q8)))+0.008*sin(((y+sin(time*0.163))*2-1)* (3+sin(0.241*q8))); -per_pixel_2=dy=dy+0.008*cos((x*2-1)*(64+18*sin(0.376*q8)))+0.008*sin(((x+sin(q8*0.282))*2-1) *(3+sin(0.349*q8))); -per_pixel_3=wang = (3+q3)*x+time*1.7+bass*.1; -per_pixel_4=in = 0; -per_pixel_5=in = in + below(abs(x-.25),.05)*below(abs(y-.5),.25); -per_pixel_6=in = below(abs(y-(.5+.5*sin(wang)*q2)),.1); -per_pixel_7=in=bnot(bnot(in)); -per_pixel_8=dx = dx+.02*in; -per_pixel_9=dy = dy+.08*cos(wang)*q2*in; -per_pixel_10= -per_pixel_11=dx = dx+bnot(in)*.005*q1; -per_pixel_12=dy = dy+bnot(in)*cos(wang)*-.01*q1; -per_frame_init_1=q8=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,214 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.010000 -fWaveSmoothing=0.900000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.001000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.002000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=33.152000 -nMotionVectorsY=28.799997 -mv_dx=0.006000 -mv_dy=0.000000 -mv_l=2.500000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=32 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.300000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.500000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x = 0.5 + 0.2*sin(time*0.5624); -shape_0_per_frame2=y = 0.5+0.2*sin(time*0.8934); -shape_0_per_frame3=r =0.5+0.5*sin(time*0.9431); -shape_0_per_frame4=b2 = 0.5+0.5*sin(time*3.175); -shape_0_per_frame5=g = 1 - 0.1*bass; -shape_0_per_frame6=r2 = 0.5*0.5*sin(1.7823); -shape_0_per_frame7=g2 = 0.5 + 0.5*sin(time*2.32); -shape_0_per_frame8=rad=0.02 + 0.00004*pow(bass+bass,5); -shape_0_per_frame9=ang = 0.1*sin(time) + (rad-0.1)*10;; -shapecode_1_enabled=1 -shapecode_1_sides=32 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.500000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.500000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=x = 0.5 + 0.2*sin(time*0.6824); -shape_1_per_frame2=y = 0.5+0.2*sin(time*0.934); -shape_1_per_frame3=r =0.5+0.5*sin(time*0.9431); -shape_1_per_frame4=b2 = 0.5+0.5*sin(time*3.675); -shape_1_per_frame5=g = 1 - 0.1*bass; -shape_1_per_frame6=r2 = 0.5*0.5*sin(2.23); -shape_1_per_frame7=g2 = 0.5 + 0.5*sin(time*1.32); -shape_1_per_frame8=rad=0.08 + 0.00001*pow(bass+bass,7); -shape_1_per_frame9=ang = 0.1*sin(time) + (rad-0.1)*10;; -shapecode_2_enabled=1 -shapecode_2_sides=32 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.500000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.500000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=x = 0.5 + 0.2*sin(time*0.9824); -shape_2_per_frame2=y = 0.5+0.2*sin(time*0.34); -shape_2_per_frame3=v =0.5+0.5*sin(time*0.9431); -shape_2_per_frame4=r2 = 0.5+0.5*sin(time*1.675); -shape_2_per_frame5=g = 1 - 0.1*bass; -shape_2_per_frame6=g2 = 0.5*0.5*sin(1.23); -shape_2_per_frame7=b2 = 0.5 + 0.5*sin(time*1.32); -shape_2_per_frame8=rad=0.02 + 0.00001*pow(bass+bass,5); -shape_2_per_frame9=ang = 0.2*sin(time) + (rad-0.1)*10;; -per_frame_1=xx = sin(time*.13)*.5+.5; -per_frame_2= -per_frame_3=beat = above(bass*bass_att,4.5)+bnot(xx); -per_frame_4=//xx = if(beat,0,xx); -per_frame_5=//x = if(beat,rand(10)*.1,x); -per_frame_6=//y = if(beat,rand(10)*.1,y); -per_frame_7=x = if(beat, max(min(rand( 2 )*.2 -.1+x, 1), 0), x); -per_frame_8=y = if(beat, max(min(rand( 2 )*.2 -.1+y, 1), 0), y); -per_frame_9=zoom = 1-beat*.1; -per_frame_10=wave_x = x; -per_frame_11=wave_y = y; -per_frame_12=wave_mystery = xx*1.7-.5; -per_frame_13=ob_a = beat; -per_frame_14=wave_r= sin(time*.197)*.5+.5; -per_frame_15=wave_g=cos(time*.201)*.5+.5; -per_frame_16=wave_b=sin(time*.215)*.5+.5; -per_frame_17= -per_frame_18=xx=sin(xx*62.82)*.5+.5; -per_frame_19=wave_r = xx+(1-xx)*wave_r; -per_frame_20=wave_g = xx+(1-xx)*wave_g; -per_frame_21=wave_b = xx+(1-xx)*wave_b; -per_frame_22=//wave_b= wave_g; -per_frame_23=//rot = .015; -per_frame_24=monitor = xx; -per_pixel_1=//rot = 0.001*rad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Awakening.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Awakening.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Awakening.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Awakening.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.989000 -fVideoEchoZoom=1.483841 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.089269 -fWaveSmoothing=0.720000 -fWaveParam=-0.360000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.009963 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.999999 -sy=0.999830 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.060000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = wave_r + .4*sin(time*.678); -per_frame_3=wave_g = wave_g + .4*sin(time*.977); -per_frame_4=wave_b = wave_b + .4*sin(time*.766); -per_frame_5=decay = 1 - mid /20; -per_frame_6=q1 = wave_r; -per_frame_7=wave_mystery = -time/6; -per_pixel_1=zoom = 0.974 + rad/10 + abs(sin(ang-rad)/10) +q1/10; -per_pixel_2=rot = -0.4 + treb*.001 + sin(treb+rad)/33 -q1/8; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.550000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.100000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.900000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.200000 -shape_0_per_frame1=ang = time*1.4; -shape_0_per_frame2=x = 0.5 + 0.08*cos(time*1.3) + 0.03*cos(time*0.7); -shape_0_per_frame3=y = 0.5 + 0.08*sin(time*1.4) + 0.03*sin(time*0.7); -shape_0_per_frame4=r = 0.5 + 0.5*sin(q8*0.613 + 1); -shape_0_per_frame5=g = 0.5 + 0.5*sin(q8*0.763 + 2); -shape_0_per_frame6=b = 0.5 + 0.5*sin(q8*0.771 + 5); -shape_0_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.635 + 4); -shape_0_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.616+ 1); -shape_0_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.538 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=32 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.400000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.300000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.200000 -shape_1_per_frame1=ang = time*1.7; -shape_1_per_frame2=x = 0.5 + 0.08*cos(time*1.1) + 0.03*cos(time*0.7); -shape_1_per_frame3=y = 0.5 + 0.08*sin(time*1.1) + 0.03*sin(time*0.7); -shape_1_per_frame4=r = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_1_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.638 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.400000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=0.600000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.400000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.200000 -shape_2_per_frame1=ang = time*1.24; -shape_2_per_frame2=x = 0.5 - 0.08*cos(time*1.07) + 0.03*cos(time*0.7); -shape_2_per_frame3=y = 0.5 - 0.08*sin(time*1.33) + 0.03*sin(time*0.7); -shape_2_per_frame4=g = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_2_per_frame5=b = 0.5 + 0.5*cos(q8*0.563 + 2); -shape_2_per_frame6=r = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_2_per_frame7=r2 = 0.5 + 0.5*cos(q8*0.885 + 4); -shape_2_per_frame8=g2 = 0.5 + 0.5*cos(q8*0.556+ 1); -shape_2_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.638 + 3); -per_frame_1=ob_r = 0.5 + 0.4*sin(time*1.324); -per_frame_2=ob_g = 0.5 + 0.4*cos(time*1.371); -per_frame_3=ob_b = 0.5+0.4*sin(2.332*time); -per_frame_4=ib_r = 0.5 + 0.25*sin(time*1.424); -per_frame_5=ib_g = 0.25 + 0.25*cos(time*1.871); -per_frame_6=ib_b = 1-ob_b; -per_frame_7=volume = 0.15*(bass+bass_att+treb+treb_att+mid+mid_att); -per_frame_8=xamptarg = if(equal(frame%15,0),min(0.5*volume*bass_att,0.5),xamptarg); -per_frame_9=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_10=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_11=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_12=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_13=xpos = xpos + 0.001*xspeed; -per_frame_14=dx = xpos*0.005; -per_frame_15=yamptarg = if(equal(frame%15,0),min(0.3*volume*treb_att,0.5),yamptarg); -per_frame_16=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_17=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_18=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_19=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_20=ypos = ypos + 0.001*yspeed; -per_frame_21=dy = ypos*0.005; -per_frame_22=rot = 10*(dx-dy); -per_frame_23=wave_a = 0; -per_frame_24=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_25=oldq8 = q8; -per_frame_26=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_27=monitor = rot; -per_pixel_1=zoom = 1+0.05*rad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Chaos Of Colours.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Chaos Of Colours.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Chaos Of Colours.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Chaos Of Colours.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,215 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.940000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=13.290894 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.550000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.100000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.900000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.400000 -shape_0_per_frame1=ang = time*0.4;; -shape_0_per_frame2=x = 0.5 + 0.08*cos(time*1.3) + 0.03*cos(time*0.7); -shape_0_per_frame3=y = 0.5 + 0.08*sin(time*1.4) + 0.03*sin(time*0.7); -shape_0_per_frame4=r =0.5 + 0.5*sin(q8*0.613 + 1); -shape_0_per_frame5=g = 0.5 + 0.5*sin(q8*0.763 + 2); -shape_0_per_frame6=b = 0.5 + 0.5*sin(q8*0.771 + 5); -shape_0_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.635 + 4); -shape_0_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.616+ 1); -shape_0_per_frame9=b2 = 0.5 + 0.5*sin(q8*0.538 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=32 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.400000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.300000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shape_1_per_frame1=ang = time*1.7; -shape_1_per_frame2=x = 0.5 + 0.08*cos(time*1.1) + 0.03*cos(time*0.7); -shape_1_per_frame3=y = 0.5 + 0.08*sin(time*1.1) + 0.03*sin(time*0.7); -shape_1_per_frame4=r = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_1_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(tq8*0.638 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.400000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.500000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shape_2_per_frame1=ang = time*1.24; -shape_2_per_frame2=x = 0.5 - 0.08*cos(time*1.07) + 0.03*cos(time*0.7); -shape_2_per_frame3=y = 0.5 - 0.08*sin(time*1.33) + 0.03*sin(time*0.7); -shape_2_per_frame4=g = 0.5 + 0.5*sin(q8*0.713 + 1); -shape_2_per_frame5=b = 0.5 + 0.5*sin(q8*0.563 + 2); -shape_2_per_frame6=r = 0.5 + 0.5*sin(q8*0.654 + 5); -shape_2_per_frame7=r2 = 0.5 + 0.5*sin(q8*0.885 + 4); -shape_2_per_frame8=g2 = 0.5 + 0.5*sin(q8*0.556+ 1); -shape_2_per_frame9=b2 = 0.5 + 0.5*sin(q8*.638 + 3); -per_frame_1=ob_r = 0.5 + 0.4*sin(time*1.324); -per_frame_2=ob_g = 0.5 + 0.4*cos(time*1.371); -per_frame_3=ob_b = 0.5+0.4*sin(2.332*time); -per_frame_4=ib_r = 0.5 + 0.25*sin(time*1.424); -per_frame_5=ib_g = 0.25 + 0.25*cos(time*1.871); -per_frame_6=ib_b = 1-ob_b; -per_frame_7=volume = 0.15*(bass+bass_att+treb+treb_att+mid+mid_att); -per_frame_8=xamptarg = if(equal(frame%15,0),min(0.5*volume*bass_att,0.5),xamptarg); -per_frame_9=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_10=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_11=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_12=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_13=xpos = xpos + 0.001*xspeed; -per_frame_14=dx = xpos*0.05; -per_frame_15=yamptarg = if(equal(frame%15,0),min(0.3*volume*treb_att,0.5),yamptarg); -per_frame_16=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_17=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_18=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_19=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_20=ypos = ypos + 0.001*yspeed; -per_frame_21=dy = ypos*0.05; -per_frame_22=wave_a = 0; -per_frame_23=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_24=oldq8 = q8; -per_frame_25=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_pixel_1=zoom =( log(sqrt(2)-rad) -0.24)*1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Shroomery.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Shroomery.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - The Shroomery.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - The Shroomery.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,454 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=1.000000 -fVideoEchoZoom=0.332702 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.200000 -ob_a=0.500000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=7.058490 -nMotionVectorsY=31.639950 -mv_dx=-0.385207 -mv_dy=-0.168757 -mv_l=0.598467 -mv_r=0.358736 -mv_g=0.275337 -mv_b=0.561849 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=1 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.027964 -wavecode_0_smoothing=0.000000 -wavecode_0_r=0.300000 -wavecode_0_g=1.000000 -wavecode_0_b=0.300000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=//t8=3.14159265*0.15; -wave_0_init3=//t5 = 1; -wave_0_init4= -wave_0_init5=//n =300; -wave_0_init6=t1 = 300; -wave_0_init7=//rx = 0; -wave_0_init8=t2 = 0; -wave_0_init9=//ry = 0; -wave_0_init10=t3 = 0; -wave_0_init11=//tpi =3.1415; -wave_0_init12=t4 = 3.14159265; -wave_0_init13=//c=1; -wave_0_init14=t5 = 1; -wave_0_init15=//hu=10; -wave_0_init16=t6 = 10; -wave_0_init17=//hut=-10; -wave_0_init18=t7 = -10; -wave_0_per_frame1=t7 = 0.5+0.5*sin(time)*t4; -wave_0_per_frame2=t6 = (t7+t6*5)/6; -wave_0_per_frame3=t2 = pow(2*bass+bass_att,5)*0.00015111 +oldt2; -wave_0_per_frame4=oldt2 = t2; -wave_0_per_frame5=//t2 = 3*sin(time*0.0965); -wave_0_per_frame6=t3 = pow(2*bass+bass_att,4)*0.00026213 + oldt3; -wave_0_per_frame7=oldt3 = t3; -wave_0_per_frame8=//t3 = 3*sin(time*0.0872); -wave_0_per_frame9= -wave_0_per_frame10=q1 = -cos(cos(t2)); -wave_0_per_frame11=q2 = cos(-t3); -wave_0_per_frame12=q3 = sin(cos(-t2)); -wave_0_per_frame13=q4 = sin(t3); -wave_0_per_point1=u = sample*2-1; -wave_0_per_point2=rf = 512; -wave_0_per_point3=shc = 1-u*u; -wave_0_per_point4=cf = below(sample,0.45); -wave_0_per_point5=u=if(cf,sqrt(shc)*(-u/2+0.5), if(below(sample,0.55), (sample-0.45)*15+0.1, pow(shc,0.7)*1.5)); -wave_0_per_point6=u = u + v/8; -wave_0_per_point7=px = cos(sample*t4*rf)*u/2+cos(t6)+1.5; -wave_0_per_point8=py = sample*2-1; -wave_0_per_point9=pz = sin(sample*t4*rf)*u/2+2.9; -wave_0_per_point10=y1 = py*q1 + pz*q3; -wave_0_per_point11=z1 = pz*q1 - py*q3; -wave_0_per_point12=x2 = px*q2 + z1*q4; -wave_0_per_point13=z2 = z1*q2 - px*q4+5; -wave_0_per_point14=x = x2/z2; -wave_0_per_point15=y = y1/z2; -wave_0_per_point16=x = x*0.5 + 0.5; -wave_0_per_point17=y = 0.5*y + 0.5; -wave_0_per_point18=r = 0.5+sin(sample*195)*0.5; -wave_0_per_point19=g = 0.5*sin(time*0.145)+0.499*(0.5+sin(x*95)*0.5); -wave_0_per_point20=b = 0.5*sin(time*0.1876)+0.495*(0.5+sin(y*208)*0.5); -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=1 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.027964 -wavecode_1_smoothing=0.000000 -wavecode_1_r=0.000000 -wavecode_1_g=0.000000 -wavecode_1_b=0.400000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=//t8=3.14159265*0.15; -wave_1_init3=//t5 = 1; -wave_1_init4= -wave_1_init5=//n =300; -wave_1_init6=t1 = 300; -wave_1_init7=//rx = 0; -wave_1_init8=t2 = 0; -wave_1_init9=//ry = 0; -wave_1_init10=t3 = 0; -wave_1_init11=//tpi =3.1415; -wave_1_init12=t4 = 3.14159265; -wave_1_init13=//c=1; -wave_1_init14=t5 = 1; -wave_1_init15=//hu=10; -wave_1_init16=t6 = 10; -wave_1_init17=//hut=-10; -wave_1_init18=t7 = -10; -wave_1_per_frame1=t7 = 0.5+0.5*sin(time*0.135)*t4; -wave_1_per_frame2=t6 = (t7+t6*5)/6; -wave_1_per_frame3=t2 = pow(bass+bass_att,6)*0.00005 + 0.022+ oldt2; -wave_1_per_frame4=oldt2 = if(above(t2,10000),0,t2); -wave_1_per_frame5=//t2 = t2 -cos(time*0.451); -wave_1_per_frame6=t3 = pow(bass+bass_att,7)*0.00005 + 0.0278 +oldt3; -wave_1_per_frame7=oldt3 = t3; -wave_1_per_frame8=//t3 = t3-cos(time*0.321); -wave_1_per_frame9=q1 = -cos(cos(t2)); -wave_1_per_frame10=q2 = -cos(t3); -wave_1_per_frame11=q3 = sin(cos(t2)); -wave_1_per_frame12=q4 = sin(t3); -wave_1_per_point1=u = sample*2-1; -wave_1_per_point2=rf = 1000; -wave_1_per_point3=shc = 1-u*u; -wave_1_per_point4=cf = below(sample,0.45); -wave_1_per_point5=u=if(cf,sqrt(shc)*(-u/2+0.5), if(below(sample,0.55), (sample-0.45)*15+0.1, pow(shc,0.7)*1.5)); -wave_1_per_point6=u = u + v/8; -wave_1_per_point7=px = cos(sample*t4*rf)*u/2+cos(t6)+1.5; -wave_1_per_point8=py = sample*2-1; -wave_1_per_point9=pz = sin(sample*t4*rf)*u/2+2.9; -wave_1_per_point10=y1 = py*q1 + pz*q3; -wave_1_per_point11=z1 = pz*q1 - py*q3; -wave_1_per_point12=x2 = px*q2 + z1*q4; -wave_1_per_point13=z2 = z1*q2 - px*q4+5; -wave_1_per_point14=x = x2/z2; -wave_1_per_point15=y = y1/z2; -wave_1_per_point16=x = x*0.5 + 0.5; -wave_1_per_point17=y = 0.5*y + 0.5; -wave_1_per_point18=r = abs(sample-(sample*progress)); -wave_1_per_point19=g = sample/y; -wave_1_per_point20=b = x2*sample; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.027964 -wavecode_2_smoothing=0.000000 -wavecode_2_r=0.800000 -wavecode_2_g=0.400000 -wavecode_2_b=0.400000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=//t8=3.14159265*0.15; -wave_2_init3=//t5 = 1; -wave_2_init4= -wave_2_init5=//n =300; -wave_2_init6=t1 = 300; -wave_2_init7=//rx = 0; -wave_2_init8=t2 = 0; -wave_2_init9=//ry = 0; -wave_2_init10=t3 = 0; -wave_2_init11=//tpi =3.1415; -wave_2_init12=t4 = 3.14159265; -wave_2_init13=//c=1; -wave_2_init14=t5 = 1; -wave_2_init15=//hu=10; -wave_2_init16=t6 = 10; -wave_2_init17=//hut=-10; -wave_2_init18=t7 = -10; -wave_2_per_frame1=t7 = 0.5+0.5*sin(time*0.896)*t4; -wave_2_per_frame2=t6 = (t7+t6*5)/6; -wave_2_per_frame3=t2 = pow(1.13*bass+bass_att,5)*0.0001 +0.0017+oldt2; -wave_2_per_frame4=oldt2 = t2; -wave_2_per_frame5=t2 = t2 + sin(time*0.01963); -wave_2_per_frame6=t3 = pow(bass+1.14*bass_att,5)*0.0001 + 0.00121 +oldt3; -wave_2_per_frame7=oldt3 = t3; -wave_2_per_frame8=t3 = t3 + sin(time*0.06527); -wave_2_per_frame9=q1 = -cos(cos(t2)); -wave_2_per_frame10=q2 = cos(t3); -wave_2_per_frame11=q3 = sin(cos(t2)); -wave_2_per_frame12=q4 = sin(t3); -wave_2_per_point1=u = sample*2-1; -wave_2_per_point2=rf = 1000; -wave_2_per_point3=shc = 1-u*u; -wave_2_per_point4=cf = below(sample,0.45); -wave_2_per_point5=u=if(cf,sqrt(shc)*(-u/2+0.5), if(below(sample,0.55), (sample-0.45)*15+0.1, pow(shc,0.7)*1.5)); -wave_2_per_point6=u = u + v/8; -wave_2_per_point7=px = cos(sample*t4*rf)*u/2+cos(t6)+1.5; -wave_2_per_point8=py = sample*2-1; -wave_2_per_point9=pz = sin(sample*t4*rf)*u/2+2.9; -wave_2_per_point10=y1 = py*q1 + pz*q3; -wave_2_per_point11=z1 = pz*q1 - py*q3; -wave_2_per_point12=x2 = px*q2 + z1*q4; -wave_2_per_point13=z2 = z1*q2 - px*q4+5; -wave_2_per_point14=x = x2/z2; -wave_2_per_point15=y = y1/z2; -wave_2_per_point16=x = x*0.5 + 0.5; -wave_2_per_point17=y = 0.5*y + 0.5; -wave_2_per_point18=r = sample; -wave_2_per_point19=g = x*sample; -wave_2_per_point20=b = y*x/sample; -wavecode_3_enabled=1 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=1 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.027964 -wavecode_3_smoothing=0.000000 -wavecode_3_r=0.000000 -wavecode_3_g=0.500000 -wavecode_3_b=0.700000 -wavecode_3_a=1.000000 -wave_3_init1=//pi -wave_3_init2=//t8=3.14159265*0.15; -wave_3_init3=//t5 = 1; -wave_3_init4= -wave_3_init5=//n =300; -wave_3_init6=t1 = 300; -wave_3_init7=//rx = 0; -wave_3_init8=t2 = 0; -wave_3_init9=//ry = 0; -wave_3_init10=t3 = 0; -wave_3_init11=//tpi =3.1415; -wave_3_init12=t4 = 3.14159265; -wave_3_init13=//c=1; -wave_3_init14=t5 = 1; -wave_3_init15=//hu=10; -wave_3_init16=t6 = 10; -wave_3_init17=//hut=-10; -wave_3_init18=t7 = -10; -wave_3_per_frame1=t7 = 0.5+0.5*sin(time)*t4; -wave_3_per_frame2=t6 = (t7+t6*5)/6; -wave_3_per_frame3=t2 = q8*0.7825; -wave_3_per_frame4=t3 = q8*0.6242; -wave_3_per_frame5=q1 = -cos(cos(t2)); -wave_3_per_frame6=q2 = cos(t3); -wave_3_per_frame7=q3 = sin(cos(t2)); -wave_3_per_frame8=q4 = sin(t3); -wave_3_per_point1=u = sample*2-1; -wave_3_per_point2=rf = 1000; -wave_3_per_point3=shc = 1-u*u; -wave_3_per_point4=cf = below(sample,0.45); -wave_3_per_point5=u=if(cf,sqrt(shc)*(-u/2+0.5), if(below(sample,0.55), (sample-0.45)*15+0.1, pow(shc,0.7)*1.5)); -wave_3_per_point6=u = u + v/8; -wave_3_per_point7=px = cos(sample*t4*rf)*u/2+cos(t6)+1.5; -wave_3_per_point8=py = sample*2-1; -wave_3_per_point9=pz = sin(sample*t4*rf)*u/2+2.9; -wave_3_per_point10=y1 = py*q1 + pz*q3; -wave_3_per_point11=z1 = pz*q1 - py*q3; -wave_3_per_point12=x2 = px*q2 + z1*q4; -wave_3_per_point13=z2 = z1*q2 - px*q4+5; -wave_3_per_point14=x = x2/z2; -wave_3_per_point15=y = y1/z2; -wave_3_per_point16=x = x*0.5 + 0.5; -wave_3_per_point17=y = 0.5*y + 0.5; -wave_3_per_point18=r = 0.5*(y/x) + 0.499*sin(time*0.564); -wave_3_per_point19=b = 0.5*(x*y) + 0.499*sin(time*0.457); -wave_3_per_point20=g = 0.5*(x*x) + 0.499*sin(time*0.134); -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.496295 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=5.617169 -shapecode_0_tex_zoom=1.699528 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.100000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=//x = 0.5+ 0.4*sin(0.2765*time+0.341*q8); -shape_0_per_frame2=//y = 0.5+ 0.4*sin(0.311*time+0.213*q8); -shape_0_per_frame3=//ang = 3.1415-3.1415*cos(time*0.1389); -shape_0_per_frame4=//rad = 0.5+0.5*sin(q8*0.2685); -shape_0_per_frame5=tex_Ang = q8; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.496295 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=5.617169 -shapecode_1_tex_zoom=1.719942 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.100000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=//x = 0.5+ 0.4*sin(0.2765*time+0.341*q8); -shape_1_per_frame2=//y = 0.5+ 0.4*sin(0.311*time+0.213*q8); -shape_1_per_frame3=//ang = 3.1415-3.1415*cos(time*0.1389); -shape_1_per_frame4=//rad = 0.5+0.5*sin(q8*0.2685); -shape_1_per_frame5=tex_Ang = q8-0.02; -shape_1_per_frame6=//x = x +0.01; -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.496295 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.740601 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.100000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=//x = 0.5+ 0.4*sin(0.2765*time+0.341*q8); -shape_2_per_frame2=//y = 0.5+ 0.4*sin(0.311*time+0.213*q8); -shape_2_per_frame3=//ang = 3.1415-3.1415*cos(time*0.1389); -shape_2_per_frame4=//rad = 0.5+0.5*sin(q8*0.2685); -shape_2_per_frame5=tex_Ang = q8-0.04; -shape_2_per_frame6=//x = x +0.01; -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.120000 -shapecode_3_y=0.200000 -shapecode_3_rad=0.330038 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x = 0.5+ 0.4*sin(0.105*time+0.3*q4); -shape_3_per_frame2=y = 0.5+ 0.4*sin(0.1267*time+0.323*q4); -shape_3_per_frame3=ang = 3.1415+3.1415*sin(time*0.2654); -shape_3_per_frame4=rad = 0.5+0.5*sin(q4*0.785); -per_frame_init_1=//With thanks to UnConeD for his mushy SSC code. :) -per_frame_1=warp=0; -per_frame_2=wave_a=0; -per_frame_3=decay = 0.97; -per_frame_4=q7 = 0.00004*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_5= -per_frame_6=q6 = oldq6+ 0.0002*(pow(1+0.1*bass+0.1*bass_att+1.2*treb+0.4*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_7=oldq6 = q6; -per_frame_8= -per_frame_9=q4 = oldq4+ 0.0002*(pow(1+0.1*bass+0.1*bass_att+0.1*treb+0.1*treb_att+1.2*mid+0.4*mid_att,6)/fps); -per_frame_10=oldq4 = q4; -per_frame_11= -per_frame_12=q8 = oldq8+ 0.0002*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_13=oldq8 = q8; -per_frame_14= -per_frame_15=q8 = oldq8+ 0.0002*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_16=oldq8 = if(above(q8,10000),0,q8); -per_frame_17=ob_b = max(0,sin(q8*0.2542)*0.2 +0.1); -per_frame_18=ob_r = max(0,sin(q8*0.985)*0.4 + 0.2); -per_frame_19=ob_g = max(0,sin(q8*0.8711)*0.3 + 0.1); -per_frame_20=ob_a =max(0,0.3*(q7-0.2))+0.1; -per_frame_21=ib_r = 1-if(ob_size-0.005,0,1); -per_frame_22=ib_g = ib_r*(0.21*0.2*sin(time*0.643)); -per_frame_23=ib_b = ib_r*(0.21*0.2*sin(time*0.853)); -per_frame_24=ib_a =0.2*q7; -per_frame_25=echo_alpha = above(q7,0.2); -per_frame_26=echo_zoom = 1 + 0.01*q7; -per_pixel_1=dx=dx+0.007*sin((y*2-1)*meshx)+ 0.006*sin((y*2-1)*meshx*1.3333); -per_pixel_2=dy=dy+sin(q8*0.1745)*0.007*cos((x*2-1)*meshx*1.3333)+ sin(q8*0.1875)*0.006*cos((x*2-1)*meshx*1.666); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Timeless Voyage.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Timeless Voyage.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Timeless Voyage.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Timeless Voyage.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.285749 -fWaveSmoothing=0.900000 -fWaveParam=0.600000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.380217 -rot=0.020000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.198054 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.000000 -ob_g=1.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.550000 -ib_a=0.000000 -nMotionVectorsX=52.090683 -nMotionVectorsY=37.504894 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=4.534792 -mv_r=0.000000 -mv_g=0.162823 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = bass-1; -per_frame_2=wave_g = mid-1.2; -per_frame_3=wave_b = treb-.5; -per_frame_4=warp =0; -per_pixel_1=rot=0.2*pow(ang,3); -per_pixel_2=zoom=sin(pow(rad,3))+1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Torrid Tales.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Torrid Tales.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Torrid Tales.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Torrid Tales.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=8 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.285751 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.990099 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=ib_r = 0.5+0.50*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_3=ib_g = 0.5+0.5*sin(time*1.476); -per_frame_4=ib_b = 0.5+0.5*sin(1.374*time); -per_frame_5=ob_r = ib_r; -per_frame_6=ob_g=ib_g; -per_frame_7=ob_b=ib_b; -per_frame_8=q8 =oldq8+ 0.001*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_9=oldq8 = q8; -per_frame_10=wave_a = 0; -per_frame_11=ib_a =1; -per_pixel_1=dx = sin((1000+sin(q8))/y)/200; -per_pixel_2=dy = cos((1000+sin(q8))/x)/200; -per_pixel_3=rot = dy*100*dx; -per_frame_init_1=q8=0; -per_frame_init_2=q1 = rand(2)+2; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Twilight Tunnel.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Twilight Tunnel.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar - Twilight Tunnel.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar - Twilight Tunnel.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.960000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.980296 -sy=1.000000 -wave_r=0.000000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.089632 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=0.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=//rad = rad +0.0155*cos(q8*0.423); -shape_0_per_frame2=border_r = 0.5 + 0.499*sin(time*0.6711); -shape_0_per_frame3=border_b = 0.5 + 0.499*sin(time*0.8011); -shape_0_per_frame4=border_g = 0.5 + 0.499*sin(time*0.7777); -shapecode_1_enabled=1 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.000000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=1.000000 -shape_1_per_frame1=//rad = rad +0.0155*cos(q8*0.423); -shape_1_per_frame2=border_r = 0.5 + 0.499*sin(time*0.7642); -shape_1_per_frame3=border_b = 0.5 + 0.499*sin(time*0.6411); -shape_1_per_frame4=border_g = 0.5 + 0.499*sin(time*0.7311); -shapecode_2_enabled=1 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.076440 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=1.000000 -shape_2_per_frame1=border_r = 0.5 + 0.499*sin(time*0.9413); -shape_2_per_frame2=border_b = 0.5 + 0.499*sin(time*0.2021); -shape_2_per_frame3=border_g = 0.5 + 0.499*sin(time*0.8549); -shapecode_3_enabled=1 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.067165 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=1.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=1.000000 -shape_3_per_frame1=border_r = 0.5 + 0.499*sin(time*0.5157); -shape_3_per_frame2=border_b = 0.5 + 0.499*sin(time*0.4877); -shape_3_per_frame3=border_g = 0.5 + 0.499*sin(time*0.3867); -per_frame_1=warp = 0; -per_frame_2=wave_mystery = 2; -per_frame_3=wave_a = 0; -per_frame_4=q8 =oldq8+ 0.005*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps) + 0.035; -per_frame_5=oldq8 = q8; -per_frame_6=zoom = 1.5 +0.155*cos(q8*0.423); -per_frame_7=rot = 0.0128*sin(1.343*q8); -per_frame_8=dx = 0.0035*sin(q8*0.646); -per_frame_9=dy = 0.0035*sin(q8*0.314); -per_frame_10=cx = 0.5 + 0.005*sin(0.497*q8); -per_frame_11=cy = 0.5 +0.005*sin(0.413*q8); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.996000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.818016 -fWaveScale=0.653093 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995700 -fWarpScale=1.331000 -fZoomExponent=0.999994 -fShader=0.000000 -zoom=1.008200 -rot=-0.760000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.424100 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.010000 -mv_a=1.000000 -per_frame_1=old_bass_flop=bass_flop; -per_frame_2=old_treb_flop=treb_flop; -per_frame_3=old_mid_flop=mid_flop; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_15=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_16=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_17=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.0035); -per_frame_18=entropy=if(bass_changed*mid_changed*treb_changed,(1+bass_flop+treb_flop+mid_flop)*(1+rand(3)),entropy); -per_frame_19=q1=mid_residual; -per_frame_20=q2=bass_residual; -per_frame_21=q3=treb_residual; -per_frame_22=q4=sin(pulse); -per_frame_23=q5=cos(pulse*(.5+.1*entropy)); -per_frame_24=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_25=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q8=entropy; -per_frame_27=wave_r=wave_r+wave_r*q1; -per_frame_28=wave_b=wave_b+wave_b*q2; -per_frame_29=wave_g=wave_g+wave_g*q3; -per_frame_30=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_31=ob_b=ob_b+ob_b*sin(q2+q3*2.14); -per_frame_32=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_33=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_34=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_35=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_36=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_37=ib_a=.25+.25*sin(q2*2.14+q3); -per_frame_38=ob_size=.1+.1*sin(q3*3+q1); -per_frame_39=ib_size=.1+.1*sin(q1*3+q3); -per_frame_40=wave_mystery=.5*q6; -per_frame_41=warp=0; -per_frame_42=wave_mode=q8%7; -per_frame_43=mv_x = 1.25; -per_frame_44=mv_y = 1.25; -per_frame_45=mv_dx = 0.1*sin(time); -per_frame_46=mv_dy = -0.1*cos(time); -per_pixel_1=c1=x*q1+sin(ang)*q4; -per_pixel_2=c2=y*q2+sin(ang)*q6; -per_pixel_3=radix=if(above(q3,0),min(x-c2,y-c2),max(x*c1,y*c1)); -per_pixel_4=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_5=rot=if(above(q6,0),((sqrt(2)*0.5)-rad)*.18*q5,.2*q5*sin(rad*2.133*q7)); -per_pixel_6=zoom=if(above(q2,0),zoom,if(above(q3,0),1+.07*sin(q4*.2*radix),1+.07*cos(radix*10*q4))); -per_pixel_7=zoomexp=if(above(q2,0),zoomexp, if(above(q3,0),1-.07*sin(q4*.2*radix), 1+.07*cos(radix*10*q4)))*rad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Zylot - Crystal Ball (Cerimonial Decor).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Zylot - Crystal Ball (Cerimonial Decor).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Zylot - Crystal Ball (Cerimonial Decor).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Zylot - Crystal Ball (Cerimonial Decor).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,377 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=0.999838 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.463735 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=t8=3.14159265; -wave_0_init3=t5 = 1; -wave_0_per_frame1=rotx = rotx+bass; -wave_0_per_frame2=roty = roty+mid; -wave_0_per_frame3=rotz = rotz+treb; -wave_0_per_frame4=//rotx = 0; -wave_0_per_frame5=//roty =0; -wave_0_per_frame6=//rotz = 0; -wave_0_per_frame7= -wave_0_per_frame8=//convert rotation values from degrees to radians -wave_0_per_frame9=t1= t8*rotx/180; -wave_0_per_frame10=t2 = t8*roty/180; -wave_0_per_frame11=t3 = t8*rotz/180; -wave_0_per_frame12= -wave_0_per_frame13=t4 = 3*sin(time); -wave_0_per_frame14=t5 = 10+8*cos(time); -wave_0_per_frame15= -wave_0_per_frame16=g = 0.5-0.4*cos(time); -wave_0_per_frame17=r = 0.5-0.4*sin(time); -wave_0_per_point1=//Define 3D Shape -wave_0_per_point2= -wave_0_per_point3=//Spiral -wave_0_per_point4=x1 = 0.5*sin(8*t8*sample); -wave_0_per_point5=y1 = 2*(sample-0.5)-value1; -wave_0_per_point6=z1= 0.5*cos(8*t8*sample); -wave_0_per_point7= -wave_0_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_0_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_0_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_0_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_0_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_0_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_0_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_0_per_point15=//move resulting shape in 3d space -wave_0_per_point16=x4 = x3+t4; -wave_0_per_point17=y4 = y3; -wave_0_per_point18=z4 = z3+t5; -wave_0_per_point19=//draw 3d shape in 2d -wave_0_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_0_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_0_per_point22= -wave_0_per_point23=b= r+value1; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.463735 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=t8=3.14159265; -wave_1_init3=t5 = 1; -wave_1_per_frame1=rotx = rotx+bass; -wave_1_per_frame2=roty = roty+mid; -wave_1_per_frame3=rotz = rotz+treb; -wave_1_per_frame4=//rotx = 0; -wave_1_per_frame5=//roty =0; -wave_1_per_frame6=//rotz = 0; -wave_1_per_frame7= -wave_1_per_frame8=//convert rotation values from degrees to radians -wave_1_per_frame9=t1= t8*rotx/180; -wave_1_per_frame10=t2 = t8*roty/180; -wave_1_per_frame11=t3 = t8*rotz/180; -wave_1_per_frame12= -wave_1_per_frame13=t4 = 3*sin(0.66*t8); -wave_1_per_frame14=t5 = 10+8*cos(0.66*t8); -wave_1_per_point1=//Define 3D Shape -wave_1_per_point2= -wave_1_per_point3=//Sphere -wave_1_per_point4=fvar = sample*512; -wave_1_per_point5=svar = fvar/32; -wave_1_per_point6=tvar = 0&svar; -wave_1_per_point7=nsample = tvar*3.5; -wave_1_per_point8=x1 = (1)*sin(nsample+value1*5); -wave_1_per_point9=y1 = (4)*cos(sample*t8*2); -wave_1_per_point10=z1= (4)*sin(sample*(t8*2)); -wave_1_per_point11= -wave_1_per_point12=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_1_per_point13=y2 = y1*cos(t1)-z1*sin(t1); -wave_1_per_point14=z2 = y1*sin(t1)+z1*cos(t1); -wave_1_per_point15=x2 = z2*sin(t2)+x1*cos(t2); -wave_1_per_point16=z3 = z2*cos(t2)-x1*sin(t2); -wave_1_per_point17=x3 = x2*cos(t3)-y2*sin(t3); -wave_1_per_point18=y3 = y2*cos(t3)+x2*sin(t3); -wave_1_per_point19=//move resulting shape in 3d space -wave_1_per_point20=x4 = x3; -wave_1_per_point21=y4 = y3; -wave_1_per_point22=z4 = z3+10; -wave_1_per_point23=//draw 3d shape in 2d -wave_1_per_point24=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_1_per_point25=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_1_per_point26= -wave_1_per_point27=r = sin(nsample); -wave_1_per_point28=g = -.1+cos(sample*5+(time*5)); -wave_1_per_point29=b = -.1-sin(sample*5+(time*5)); -wave_1_per_point30=g = if(below(g,0),0,g); -wave_1_per_point31=b = if(below(b,0),0,b); -wavecode_2_enabled=1 -wavecode_2_samples=48 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.463735 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=t8=3.14159265; -wave_2_init3=t5 = 1; -wave_2_per_frame1=rotx = rotx+bass; -wave_2_per_frame2=roty = roty+mid; -wave_2_per_frame3=rotz = rotz+treb; -wave_2_per_frame4=//rotx = 0; -wave_2_per_frame5=//roty =0; -wave_2_per_frame6=//rotz = 0; -wave_2_per_frame7= -wave_2_per_frame8=//convert rotation values from degrees to radians -wave_2_per_frame9=t1= t8*rotx/180; -wave_2_per_frame10=t2 = t8*roty/180; -wave_2_per_frame11=t3 = t8*rotz/180; -wave_2_per_frame12= -wave_2_per_frame13=t4 = 3*sin(time+1.33*t8); -wave_2_per_frame14=t5 = 10+8*cos(time+1.33*t8); -wave_2_per_frame15= -wave_2_per_frame16=r = 0.5-0.4*cos(time+1.33*t8); -wave_2_per_frame17=b = 0.5-0.4*sin(time+1.33*t8); -wave_2_per_point1=//Define 3D Shape -wave_2_per_point2= -wave_2_per_point3=//Zylot's dumb 3d wave -wave_2_per_point4=fvar = sample*512; -wave_2_per_point5=svar = fvar/16; -wave_2_per_point6=tvar = 0&svar; -wave_2_per_point7=newsample = tvar/3.2; -wave_2_per_point8=x1 = sin(newsample*3.1415926*2); -wave_2_per_point9=y1 = cos(newsample*3.1415926*2); -wave_2_per_point10=z1 = 0; -wave_2_per_point11= -wave_2_per_point12=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_2_per_point13=y2 = y1*cos(t1)-z1*sin(t1); -wave_2_per_point14=z2 = y1*sin(t1)+z1*cos(t1); -wave_2_per_point15=x2 = z2*sin(t2)+x1*cos(t2); -wave_2_per_point16=z3 = z2*cos(t2)-x1*sin(t2); -wave_2_per_point17=x3 = x2*cos(t3)-y2*sin(t3); -wave_2_per_point18=y3 = y2*cos(t3)+x2*sin(t3); -wave_2_per_point19=//move resulting shape in 3d space -wave_2_per_point20=x4 = x3; -wave_2_per_point21=y4 = y3; -wave_2_per_point22=z4 = z3+5; -wave_2_per_point23=//draw 3d shape in 2d -wave_2_per_point24=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_2_per_point25=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_2_per_point26= -wave_2_per_point27=r = -.5 + sin(sample*5+((time*5)+9)); -wave_2_per_point28=r = if(below(r,0),0,r); -wave_2_per_point29=g = -.5 + sin(sample*5+time*5); -wave_2_per_point30=g = if(below(g,0),0,g); -wave_2_per_point31=b = -.5 + sin(sample*5+((time*5)+18)); -wave_2_per_point32=b = if(below(b,0),0,b); -wave_2_per_point33=r = if(above(bass,1.5),1,r); -wave_2_per_point34=g = if(above(bass,1.5),1,g); -wave_2_per_point35=b = if(above(bass,1.5),1,b); -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=6.530878 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.500000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -shape_0_per_frame2=oldq8 = q8; -shape_0_per_frame3=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -shape_0_per_frame4=rad = rad + sin(q8); -shape_0_per_frame5=r2 = bass; -shape_0_per_frame6=g2 = treb; -shape_0_per_frame7=b2 = mid; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.022480 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.800000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.300000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -shape_1_per_frame2=oldq8 = q8; -shape_1_per_frame3=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -shape_1_per_frame4=rad = .55; -shape_1_per_frame5=r = min(1,max(0,r + 0.1*sin(time*0.417 + 1))); -shape_1_per_frame6=g = min(1,max(0,g + 0.1*sin(time*0.391 + 2))); -shape_1_per_frame7=b = min(1,max(0,b + 0.1*sin(time*0.432 + 4))); -shape_1_per_frame8=r2 = min(1,max(0,r2 + 0.1*sin(time*0.457 + 3))); -shape_1_per_frame9=g2 = min(1,max(0,g2 + 0.1*sin(time*0.437 + 5))); -shape_1_per_frame10=b2 = min(1,max(0,b2 + 0.1*sin(time*0.484 + 6))); -shape_1_per_frame11=ang = ang-cos(time*.02); -shape_1_per_frame12=x = .5 + .1*sin(q8*.11); -shape_1_per_frame13=y = .5 + .1*sin(q8*.51); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.650000 -shapecode_2_y=0.620000 -shapecode_2_rad=0.108925 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.540000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.400000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -shape_2_per_frame2=oldq8 = q8; -shape_2_per_frame3=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -shape_2_per_frame4=rad = .750 + .1*sin(q8*.02); -shape_2_per_frame5=r = min(1,max(0,r + 0.1*sin(time*0.417 + 1))); -shape_2_per_frame6=g = min(1,max(0,g + 0.1*sin(time*0.391 + 2))); -shape_2_per_frame7=b = min(1,max(0,b + 0.1*sin(time*0.432 + 4))); -shape_2_per_frame8=r2 = min(1,max(0,r2 + 0.1*sin(time*0.457 + 3))); -shape_2_per_frame9=g2 = min(1,max(0,g2 + 0.1*sin(time*0.437 + 5))); -shape_2_per_frame10=b2 = min(1,max(0,b2 + 0.1*sin(time*0.484 + 6))); -shape_2_per_frame11=ang = ang+4*sin(q8*.2); -shapecode_3_enabled=0 -shapecode_3_sides=100 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=1 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -per_frame_1=warp=0; -per_frame_2=wave_a=0; -per_frame_3=q8 =oldq8+ 0.0003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_4=oldq8 = q8; -per_frame_5=q7 = 0.003*(pow(1+1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_6=zoom = 1+.005*q7; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.221673 -fWaveScale=0.685151 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.200000 -ob_g=0.400000 -ob_b=0.220000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.750000 -ib_b=0.550000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=3.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=3.950000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = wave_r + .15*sin(time*.222); -per_frame_3=wave_g = wave_g + .15*sin(time*.333); -per_frame_4=wave_b = wave_b + .15*sin(time*.444); -per_frame_5=zoom = zoom+.01 - bass_att*.01; -per_frame_6=volume = 0.3*(bass+mid); -per_frame_7=beatrate = if(equal(beatrate,0),1,if(below(volume,0.01),1,beatrate)); -per_frame_8=lastbeat = if(equal(lastbeat,0),time,lastbeat); -per_frame_9=meanbass_att = 0.1*(meanbass_att*9 + bass_att); -per_frame_10=peakbass_att = if(above(bass_att,peakbass_att),bass_att,peakbass_att); -per_frame_11=beat = if(above(volume,0.8),if(below(peakbass_att - bass_att, 0.05*peakbass_att),if(above(time - lastbeat,0.1+0.5*(beatrate-0.1)),1,0),0),0); -per_frame_12=beatrate = max(if(beat,if(below(time-lastbeat,2*beatrate),0.1*(beatrate*9 + time - lastbeat),beatrate),beatrate),0.1); -per_frame_13=peakbass_att = if(equal(beat,0),if(above(time - lastbeat,2*beatrate),peakbass_att*0.95,peakbass_att*0.995),bass_att); -per_frame_14=lastbeat = if(beat,time,lastbeat); -per_frame_15=peakbass_att = max(if(beat,bass_att,peakbass_att),1.1*meanbass_att); -per_frame_16=beatcounter = if(above(beat,0),beatcounter +1, beatcounter); -per_frame_17=beatcounter = if(above(beatcounter,5), 0, beatcounter); -per_frame_18=beateven = beatcounter%2; -per_frame_19=mycounter = if(beateven,if(beat,if(above(mycounter,4),0,mycounter+1),mycounter),mycounter); -per_frame_20=q2 = if(beat,if(beateven,2,mycounter+3),oldq2); -per_frame_21=oldq2 = q2; -per_frame_22=ib_r = ib_r + 0.25*sin(time*0.965); -per_frame_23=ib_g = ib_g +0.25*sin(time*1.123); -per_frame_24=ib_b = ib_b + 0.25*sin(time*1.046); -per_frame_25=ob_r = ob_r + 0.15*sin(time*0.865); -per_frame_26=ob_g = ob_g +0.15*sin(time*1.103); -per_frame_27=ob_b = ob_b + 0.15*sin(time*1.086); -per_pixel_1=rot = .3*tan(.1*sin(pow(rad,4)*20+time)+sin(time*.222)*.1); -per_pixel_2=zoom = zoom + .1*sin((ang)*q2+time); -per_frame_init_1=beatcounter =0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.179142 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.199900 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.400000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_b = .25 + mid_att*.3; -per_frame_3=zoom = zoom + bass_att*.05; -per_pixel_1=dx = rad*sin(x*y)*.05; -per_pixel_2=warp = -rad; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzer & Neuro - Starover (Semicolon Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzer & Neuro - Starover (Semicolon Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzer & Neuro - Starover (Semicolon Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzer & Neuro - Starover (Semicolon Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.700000 -fDecay=0.970000 -fVideoEchoZoom=3.503422 -fVideoEchoAlpha=0.460000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.010000 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=4.583206 -fWarpScale=3.194907 -fZoomExponent=1.000000 -fShader=0.010000 -zoom=32.544483 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=-0.280000 -dy=-0.320000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.020000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.020000 -ib_r=0.950000 -ib_g=0.850000 -ib_b=0.650000 -ib_a=1.000000 -nMotionVectorsX=24.959995 -nMotionVectorsY=15.239994 -mv_dx=-0.660000 -mv_dy=0.260000 -mv_l=1.200000 -mv_r=0.670000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.3*sin(time*1.254); -per_frame_2=wave_g = wave_g +0.3*sin(time*0.952); -per_frame_3=wave_b = wave_b + 0.3*sin(time*0.824); -per_frame_4=ob_r = 0.5 + 0.4*sin(time*1.324); -per_frame_5=ob_g = 0.5 + 0.4*cos(time*1.371); -per_frame_6=ob_b = 0.5+0.4*sin(2.332*time); -per_frame_7=ib_r = 0.5 + 0.25*sin(time*1.424); -per_frame_8=ib_g = 0.25 + 0.25*cos(time*1.871); -per_frame_9=ib_b = 0.5+0.5*sin(2.273*time); -per_frame_10=volume = 0.15*(bass+bass_att+treb+treb_att+mid+mid_att); -per_frame_11=xamptarg = if(equal(frame%15,0),min(0.5*volume*bass_att,0.5),xamptarg); -per_frame_12=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_13=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_14=xaccel = xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_15=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_16=xpos = xpos + 0.001*xspeed; -per_frame_17=dx = xpos; -per_frame_18=yamptarg = if(equal(frame%15,0),min(0.3*volume*treb_att,0.5),yamptarg); -per_frame_19=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_20=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_21=yaccel = ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_22=yspeed = yspeed - cy -per_frame_23=yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_24=ypos = ypos + 0.001*yspeed; -per_frame_25=dy = ypos; -per_frame_26=zoom = cx; -per_pixel_1=myzoom = log(sqrt(2)-rad) -0.25; -per_pixel_2= -per_pixel_3=zoom = if(above(rad,0.4),myzoom,(0.5*sqrt(2)-rad)); -per_pixel_4=myzoom = myzoom - rot; -per_pixel_5=cx = cos(myzoom); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.050000 -fDecay=0.950000 -fVideoEchoZoom=0.333500 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.108925 -fWaveSmoothing=0.900000 -fWaveParam=-0.399900 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=slowtime = slowtime+beat; -per_frame_2=vol_now = .4 * bass + 0.1 * (bass_att+treb+mid); -per_frame_3=vol_mean = if(equal(frame%50,0),vol_mean-0.5*(vol_mean-vol_now),0.1*(vol_mean*9 + vol_now)); -per_frame_4=beat = if(above(vol_now,1.5*vol_mean),1,0); -per_frame_5=beatcount = beatcount + beat; -per_frame_6=wave_b = 1- (cos(time) + abs(cos(time))); -per_frame_7=wave_g = 1-abs(sin(time)) ; -per_frame_8=wave_r = 1-(-1 * cos(time)) + abs(-1 * cos(time)) + 0.2 * (cos(sin(time))+(abs(cos(sin(time)))+cos(sin(time)))); -per_frame_9=q1 = abs(sin(slowtime)/3)-.2; -per_frame_10= -per_frame_11=warp = 0; -per_frame_12=wave_mode = 6; -per_frame_13=wave_mystery = if(below(frame%2,1),0,1)+slowtime*q1; -per_frame_14=monitor = q1; -per_pixel_1=zoom = zoom - q1*rad; -per_pixel_2=dx = .5; -per_pixel_3=dy = .5; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Aderrasi - Canon.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Aderrasi - Canon.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Aderrasi - Canon.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Aderrasi - Canon.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.463937 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.600000 -wave_g=0.600000 -wave_b=0.600000 -wave_x=0.500000 -wave_y=0.100000 -ob_size=0.010000 -ob_r=1.000000 -ob_g=1.000000 -ob_b=1.000000 -ob_a=1.000000 -ib_size=0.015000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_mystery = wave_mystery + 0.25*tan(3*bass); -per_frame_2=q1 = wave_mystery; -per_frame_3=wave_b = cos(time) + abs(cos(time)); -per_frame_4=wave_g = abs(sin(time)) ; -per_frame_5=wave_r = (-1 * cos(time)) + abs(-1 * cos(time)) + 0.2 * (cos(sin(time))+(abs(cos(sin(time)))+cos(sin(time)))); -per_frame_6=ob_r = if(above(wave_r,1),1,if(above(wave_r,0), abs(wave_r),0)); -per_frame_7=ob_g = if(above(wave_g,1),1,if(above(wave_g,0), abs(wave_g),0)); -per_frame_8=ob_b = if(above(wave_b,1),1,if(above(wave_b,0), abs(wave_b),0)); -per_frame_9=ib_g = wave_g; -per_frame_10=ib_r = sin(time); -per_frame_11=kick = above(bass_att,kick)*2 + (1-above(bass_att,kick))*((kick-1.3)*0.96+1.3); -per_frame_12=dx_r = equal(kick,2)*0.018*sin(6*time) + (1-equal(kick,2))*dx_r; -per_frame_13=dy_r = equal(kick,2)*0.015*sin(7*time) + (1-equal(kick,2))*dy_r; -per_frame_14=dy = dy + 2*dy_r * 0.5*sin(0.8*time); -per_frame_15=dx = dx + 2*dx_r * 0.5*sin(time); -per_frame_16=warp = warp + if (below(kick,0), + 0.5*treb, 0); -per_frame_17=q2 = kick; -per_pixel_1=rot = rot + 0.3*(0.2*sin(1-rad)*5 - 0.2*sin(0.05*rad)*5) * q2; -per_pixel_2=cx = if(above(dy,-.5),1-rot * 2,rot*q2); -per_pixel_3= diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=1.175613 -fWaveSmoothing=0.306000 -fWaveParam=-0.460000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.854653 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.190000 -ob_g=0.120000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.015000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=7.679999 -nMotionVectorsY=11.519997 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=1.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.340000 -per_frame_1=slowtime = slowtime+beat*time; -per_frame_2=vol_now = .4 * bass + 0.1 * (bass_att+treb+mid); -per_frame_3=vol_mean = if(equal(frame%50,0),vol_mean-0.5*(vol_mean-vol_now),0.1*(vol_mean*9 + vol_now)); -per_frame_4=beat = if(above(vol_now,1.5*vol_mean),1,0); -per_frame_5=ib_r = - abs(cos(time)); -per_frame_6=ib_g = sin(time); -per_frame_7=ib_b= cos(time)*sign(cos(time)); -per_frame_8=mv_r = abs(sin(time)); -per_frame_9=mv_g = sin(slowtime) ; -per_frame_10=mv_b= cos(slowtime)*sign(cos(slowtime)); -per_frame_11=redneg = if(below(mv_r,0),1,0); -per_frame_12=greenneg = if(below(mv_g,0),1,0); -per_frame_13=blueneg = if(below(mv_b,0),1,0); -per_frame_14=wave_r = if(redneg,if(bor(greenneg , blueneg),1,1+mv_r),mv_r); -per_frame_15=wave_g = if(greenneg,if(equal(greenneg + blueneg,2),1,1+mv_g),mv_g); -per_frame_16=wave_b = if(blueneg,1 + mv_b, mv_b); -per_frame_17=dx=sin(slowtime*1.234)*.0125; -per_frame_18=dy=cos(slowtime*.9666)*.0125; -per_frame_19=q1 = sin(slowtime); -per_frame_20=q2 = wave_b; -per_pixel_1=zoom=1+above(sin(1.7*q2),-.5)*.1*sin(2*q2+.027*q1+4*(1+sin(.7*time+q2))*sin(.05*q2+time)*rad); -per_pixel_2=rot=.1*sin(q2)*sin(2.3*q2+.027*q1+2*sin(.07*q1+1.2*time)*(rad+sin(time+above(sin(q2),0)*4*sin(q2)*ang))); -per_pixel_3=rot=above(sin(1.2*q2+1.3),-.5)*rot; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=1 -fWaveAlpha=5.002776 -fWaveScale=1.186400 -fWaveSmoothing=0.630000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999513 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.500000 -mv_r=0.350000 -mv_g=0.350000 -mv_b=0.350000 -mv_a=0.000000 -per_frame_1=ob_r = 0.5+0.5*sin(2*time); -per_frame_2=ob_g = 0.5+0.5*sin(1.23*time); -per_frame_3=ob_b = 0.5+0.5*sin(time*1.321); -per_frame_4=wave_a =0; -per_frame_5=q8 =oldq8+ 0.003*(pow(1.2*bass+0.4*bass_att+0.1*treb+0.1*treb_att+0.1*mid+0.1*mid_att,6)/fps); -per_frame_6=oldq8 = q8; -per_frame_7=warp=0; -per_frame_8=sx = 1- 0.1*sin(q8)+0.05*sin(time); -per_frame_9=wave_b = cos(time) + abs(cos(time)); -per_frame_10=wave_g = abs(sin(time)) ; -per_frame_11=wave_r = (-1 * cos(time)) + abs(-1 * cos(time)) + 0.2 * (cos(sin(time))+(abs(cos(sin(time)))+cos(sin(time)))); -per_frame_12=wave_r = 1 - if(above(wave_r,1),1,if(above(wave_r,0), abs(wave_r),0)); -per_frame_13=wave_g = 1 - if(above(wave_g,1),1,if(above(wave_g,0), abs(wave_g),0)); -per_frame_14=wave_b = 1 - if(above(wave_b,1),1,if(above(wave_b,0), abs(wave_b),0)); -per_frame_15= -per_pixel_1=rot = 0.1*(rad+cos((5+5*sin(q8*1.211)*x)-0.5) -sin(((5+5*sin(q8*0.973))*y)-0.5)); -per_pixel_2=dx = 0.005*(cos((5+5*sin(q8*1.311)*x)-0.5) -sin(((5+5*sin(q8*0.9431))*y)-0.5)); -per_pixel_3=dy = 0.005*(cos((5+5*sin(q8*1.021)*x)-0.5) -sin(((5+5*sin(q8*0.987))*y)-0.5)); -per_pixel_4=zoom =1- 0.005*(rad+cos((5+5*sin(q8*0.943)*x)-0.5) -sin(((5+5*sin(q8*1.0961))*y)-0.5)); -per_pixel_5=cx = 1-rot * 2; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Shreyas - Deeper Aesthetics.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Shreyas - Deeper Aesthetics.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Shreyas - Deeper Aesthetics.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Shreyas - Deeper Aesthetics.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,373 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=0.998169 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=7.740000 -fWaveScale=0.656000 -fWaveSmoothing=0.800000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=1.960000 -fShader=0.190000 -zoom=0.999698 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.513000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.580000 -ib_size=0.015000 -ib_r=0.550000 -ib_g=1.000000 -ib_b=0.499900 -ib_a=0.230000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=302 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=ti=if(above(bass,1.3),.3,ti*.9); -wave_0_per_frame2=tt1=tt1+.01+ti*.1; -wave_0_per_frame3=t8=tt1; -wave_0_per_frame4=t7=cos(time*.1+1)*sin(time*.1-6); -wave_0_per_frame5=rx=atan2(sin(time*.1)*cos(t8),sqr(sin(t8)+1)+sqr(t7))/4+(sin(t8)+1)/2; -wave_0_per_frame6=ry=atan2(sin(time*.1)*cos(t8),t7); -wave_0_per_frame7=rz=0; -wave_0_per_frame8= -wave_0_per_frame9=t1=sin(rx);t2=cos(rx); -wave_0_per_frame10=t3=sin(ry);t4=cos(ry); -wave_0_per_frame11=t5=sin(rz);t6=cos(rz); -wave_0_per_point1=sample=sample*6.283185*.5;value1=(value1+1)*.3; -wave_0_per_point2=x1=sin(sample)*sin(sample*40)*value1; -wave_0_per_point3=y1=cos(sample)*value1; -wave_0_per_point4=z1=sin(sample)*cos(sample*40)*value1; -wave_0_per_point5=x1=x1+(sin(time*.1)*cos(t8)); -wave_0_per_point6=y1=y1+(sin(t8)+1); -wave_0_per_point7=z1=z1+t7; -wave_0_per_point8=x2=x1*t4-z1*t3;z2=x1*t3+z1*t4; -wave_0_per_point9=y2=y1*t2-z2*t1;z3=y1*t1+z2*t2+1.4; -wave_0_per_point10=x3=x2*t6-y2*t5;y3=x2*t5+y2*t6; -wave_0_per_point11=z3=if(above(z3,.1),.5/z3,0); -wave_0_per_point12=x=if(z3,x3*z3,x)+.5; -wave_0_per_point13=y=if(z3,-y3*z3,y)+.5; -wave_0_per_point14=hu=sample+sin(time); -wave_0_per_point15=r=sin(hu)*.5+.5; -wave_0_per_point16=g=sin(hu+6.283185*.33)*.5+.5; -wave_0_per_point17=b=sin(hu+6.283185*.66)*.5+.5; -wave_0_per_point18=a=z3*.8; -wavecode_1_enabled=1 -wavecode_1_samples=302 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_frame1=ti=if(above(bass,1.3),.3,ti*.9); -wave_1_per_frame2=tt1=tt1+.01+ti*.1; -wave_1_per_frame3=t8=tt1; -wave_1_per_frame4=t7=cos(time*.1+1)*sin(time*.1-6); -wave_1_per_frame5=rx=atan2(sin(time*.1)*cos(t8),sqr(sin(t8)+1)+sqr(t7))/4+(sin(t8)+1)/2; -wave_1_per_frame6=ry=atan2(sin(time*.1)*cos(t8),t7); -wave_1_per_frame7=rz=0; -wave_1_per_frame8= -wave_1_per_frame9=t1=sin(rx);t2=cos(rx); -wave_1_per_frame10=t3=sin(ry);t4=cos(ry); -wave_1_per_frame11=t5=sin(rz);t6=cos(rz); -wave_1_per_frame12= -wave_1_per_point1=cp=bnot(cp); -wave_1_per_point2=r=sample*6.283185*10; -wave_1_per_point3=i1=(sample*6)%2; -wave_1_per_point4=rt=if(cp,1,.5); -wave_1_per_point5=sample=sample*6.283185*.5; -wave_1_per_point6= -wave_1_per_point7=x1=sin(r)*rt; -wave_1_per_point8=z1=cos(r)*rt; -wave_1_per_point9=y1=-sin(i1)+.5; -wave_1_per_point10=x1=x1+(sin(time*.1)*cos(t8)); -wave_1_per_point11=y1=y1+(sin(t8)+1); -wave_1_per_point12=z1=z1+t7; -wave_1_per_point13=x2=x1*t4-z1*t3;z2=x1*t3+z1*t4; -wave_1_per_point14=y2=y1*t2-z2*t1;z3=y1*t1+z2*t2+1.4; -wave_1_per_point15=x3=x2*t6-y2*t5;y3=x2*t5+y2*t6; -wave_1_per_point16=z3=if(above(z3,.1),.5/z3,0); -wave_1_per_point17=x=if(z3,x3*z3,x)+.5; -wave_1_per_point18=y=if(z3,-y3*z3,y)+.5; -wave_1_per_point19=hu=sample+sin(time/6.283185)*6.283185; -wave_1_per_point20=r=sin(hu)*.5+.5; -wave_1_per_point21=g=sin(hu+6.283185*.33)*.5+.5; -wave_1_per_point22=b=sin(hu+6.283185*.66)*.5+.5; -wave_1_per_point23=a=z3*.8; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_frame1=ti=if(above(bass,1.3),.3,ti*.9); -wave_2_per_frame2=tt1=tt1+.01+ti*.1; -wave_2_per_frame3=t8=tt1; -wave_2_per_frame4=t7=cos(time*.1+1)*sin(time*.1-6); -wave_2_per_frame5=rx=atan2(sin(time*.1)*cos(t8),sqr(sin(t8)+1)+sqr(t7))/4+(sin(t8)+1)/2; -wave_2_per_frame6=ry=atan2(sin(time*.1)*cos(t8),t7); -wave_2_per_frame7=rz=0; -wave_2_per_frame8= -wave_2_per_frame9=t1=sin(rx);t2=cos(rx); -wave_2_per_frame10=t3=sin(ry);t4=cos(ry); -wave_2_per_frame11=t5=sin(rz);t6=cos(rz); -wave_2_per_point1=sample=sample*6.283185*134; -wave_2_per_point2=x1=sin(sample*543)*2+(sin(time*.1)*cos(t8)); -wave_2_per_point3=y1=cos(sample*4232)*2+(sin(t8)+1); -wave_2_per_point4=z1=sin(sample*90)*2+t7; -wave_2_per_point5= -wave_2_per_point6=x2=x1*t4-z1*t3;z2=x1*t3+z1*t4; -wave_2_per_point7=y2=y1*t2-z2*t1;z3=y1*t1+z2*t2+1; -wave_2_per_point8=x3=x2*t6-y2*t5;y3=x2*t5+y2*t6; -wave_2_per_point9=z3=if(above(z3,.1),.5/z3,0); -wave_2_per_point10=x=if(z3,x3*z3,x)+.5; -wave_2_per_point11=y=if(z3,-y3*z3,y)+.5; -wave_2_per_point12=a=z3*.8; -wavecode_3_enabled=1 -wavecode_3_samples=142 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=1 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -wave_3_per_frame1=ti=if(above(bass,1.3),.3,ti*.9); -wave_3_per_frame2=tt1=tt1+.01+ti*.1; -wave_3_per_frame3=t8=tt1; -wave_3_per_frame4=t7=cos(time*.1+1)*sin(time*.1-6); -wave_3_per_frame5=rx=atan2(sin(time*.1)*cos(t8),sqr(sin(t8)+1)+sqr(t7))/4+(sin(t8)+1)/2; -wave_3_per_frame6=ry=atan2(sin(time*.1)*cos(t8),t7); -wave_3_per_frame7=ry1=ry1+bass_att*.2; -wave_3_per_frame8=t1=sin(rx);t2=cos(rx); -wave_3_per_frame9=t3=sin(ry);t4=cos(ry); -wave_3_per_frame10=t5=ry1; -wave_3_per_frame11= -wave_3_per_point1=cp=bnot(cp); -wave_3_per_point2=r=sample*62.83185; -wave_3_per_point3=i1=(sample*6)%2; -wave_3_per_point4=rt=if(cp,.7,.2); -wave_3_per_point5=sample=sample*3.14159; -wave_3_per_point6= -wave_3_per_point7=x1=sin(r)*rt; -wave_3_per_point8=z1=cos(r)*rt; -wave_3_per_point9=y1=-.5; -wave_3_per_point10=x2=x1*cos(t5)-z1*sin(t5);z2=x1*sin(t5)+z1*cos(t5); -wave_3_per_point11=x1=x2+(sin(time*.1)*cos(t8)); -wave_3_per_point12=y1=y1+(sin(t8)+1); -wave_3_per_point13=z1=z2+t7; -wave_3_per_point14=x2=x1*t4-z1*t3;z2=x1*t3+z1*t4; -wave_3_per_point15=y2=y1*t2-z2*t1;z3=y1*t1+z2*t2+1.4; -wave_3_per_point16=x3=x2;y3=y2; -wave_3_per_point17=z3=if(above(z3,.1),.5/z3,0); -wave_3_per_point18=x=if(z3,x3*z3,x)+.5; -wave_3_per_point19=y=if(z3,-y3*z3,y)+.5; -wave_3_per_point20=hu=sample+cos(time/6.283185)*6.283185; -wave_3_per_point21=r=sin(hu)*.5+.5; -wave_3_per_point22=g=sin(hu+6.283185*.33)*.5+.5; -wave_3_per_point23=b=sin(hu+6.283185*.66)*.5+.5; -wave_3_per_point24=a=z3*.8; -wave_3_per_point25= -wave_3_per_point26= -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.2*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.05+.04*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_a=.03+.02*wave_g; -per_frame_38=ib_size=.05+.04*bass_residual; -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,0); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),1+q1*.05,1+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Zylot - Rainbow River.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Zylot - Rainbow River.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Rozzor & Zylot - Rainbow River.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Rozzor & Zylot - Rainbow River.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.140000 -fDecay=0.900000 -fVideoEchoZoom=0.072059 -fVideoEchoAlpha=0.010001 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.657818 -fWaveScale=2.010432 -fWaveSmoothing=0.000000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.001827 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=0.905286 -sy=0.932718 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=1.000000 -ob_size=0.000000 -ob_r=0.099314 -ob_g=0.316540 -ob_b=0.899422 -ob_a=0.634601 -ib_size=0.005000 -ib_r=0.803058 -ib_g=0.388354 -ib_b=0.572346 -ib_a=0.638229 -nMotionVectorsX=11.520000 -nMotionVectorsY=10.559999 -mv_dx=-0.797986 -mv_dy=0.997558 -mv_l=2.016270 -mv_r=0.833957 -mv_g=0.196963 -mv_b=0.380100 -mv_a=0.701722 -per_frame_1=tempb = cos(time) + abs(cos(time)); -per_frame_2=tempg = abs(sin(time)) ; -per_frame_3=tempr = (-1 * cos(time)) + abs(-1 * cos(time)) + 0.2 * (cos(sin(time))+(abs(cos(sin(time)))+cos(sin(time)))); -per_frame_4=ib_r = if(above(tempr,1),1,if(above(tempr,0), abs(tempr),0)); -per_frame_5=ib_g = if(above(tempg,1),1,if(above(tempg,0), abs(tempg),0)); -per_frame_6=ib_b = if(above(tempb,1),1,if(above(tempb,0), abs(tempb),0)); -per_frame_7= -per_pixel_1=rot=if(above(bnot(1*bass),bnot(1*treb)),rot*sin(rad*sin(time)),-rot*sin(rad*cos(time))); -per_pixel_2=rot = rot + .1*sin((pow(x,2))*50+(time*5)); -per_pixel_3=dy = rot; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - feathers (angel wings)_phat_remix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - feathers (angel wings)_phat_remix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - feathers (angel wings)_phat_remix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - feathers (angel wings)_phat_remix.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,341 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.350000 -fDecay=0.950000 -fVideoEchoZoom=0.999608 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=1 -fWaveAlpha=4.099998 -fWaveScale=1.285751 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=1 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=sp = sample*6.28*8*8*4; -wave_0_per_point2=vol = (bass_att + mid_att + treb_att)*0.33; -wave_0_per_point3=vol = 0.2 + 0.5*(value1 + value2); -wave_0_per_point4=vol = .2; -wave_0_per_point5= -wave_0_per_point6=mod = if(below(mid_att,1.8),mid_att+.2,2); -wave_0_per_point7= -wave_0_per_point8=ox = 0.5*sin(sp)*sin(sample*3.14)*vol; -wave_0_per_point9=oy = (sample - 0)*mod; -wave_0_per_point10=oz = 0.5*cos(sp)*sin(sample*3.14)*vol; -wave_0_per_point11= -wave_0_per_point12=xang = time*0.672; -wave_0_per_point13=axang = 0; -wave_0_per_point14=yang = time*-1.351; -wave_0_per_point15=ayang = 0; -wave_0_per_point16=zang = time*-0.401; -wave_0_per_point17=azang = 0; -wave_0_per_point18=fov = 0.6 + 0.2*sin(time); -wave_0_per_point19=fov = .5; -wave_0_per_point20= -wave_0_per_point21=mx = ox*cos(zang) - oy*sin(zang); -wave_0_per_point22=my = ox*sin(zang) + oy*cos(zang); -wave_0_per_point23=ox = mx; -wave_0_per_point24=oy = my; -wave_0_per_point25=mx = ox*cos(yang) + oz*sin(yang); -wave_0_per_point26=mz = - ox*sin(yang) + oz*cos(yang); -wave_0_per_point27=ox = mx; -wave_0_per_point28=oz = mz; -wave_0_per_point29=my = oy*cos(xang) - oz*sin(xang); -wave_0_per_point30=mz = oy*sin(xang) + oz*cos(xang); -wave_0_per_point31=oy = my; -wave_0_per_point32=oz = mz; -wave_0_per_point33= -wave_0_per_point34=oz = abs(oz) - 2; -wave_0_per_point35=x = ox*fov/oz + 0.5; -wave_0_per_point36=x = (x-.5)*0.75 + 0.5; -wave_0_per_point37=y = oy*fov/oz + 0.5; -wave_0_per_point38= -wave_0_per_point39=r = 1 + sin(sp); -wave_0_per_point40=b = 0.5 + 0.5*sin(sample*1.57); -wave_0_per_point41=g = 0.5 + 0.5*cos(sample*1.57); -wave_0_per_point42=a = 0.5 + (oz + 2)*0.25; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=1 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=sp = sample*6.28*8*8*4; -wave_1_per_point2=vol = (bass_att + mid_att + treb_att)*0.33; -wave_1_per_point3=vol = 0.2 + 0.5*(value1 + value2); -wave_1_per_point4=vol = .2; -wave_1_per_point5= -wave_1_per_point6=mod = if(below(bass_att,1.8),bass_att+.2,2); -wave_1_per_point7= -wave_1_per_point8=ox = 0.5*sin(sp)*sin(sample*3.14)*vol; -wave_1_per_point9=oy = (sample - 0)*mod; -wave_1_per_point10=oz = 0.5*cos(sp)*sin(sample*3.14)*vol; -wave_1_per_point11= -wave_1_per_point12=xang = time*-0.321; -wave_1_per_point13=axang = 0; -wave_1_per_point14=yang = time*1.531; -wave_1_per_point15=ayang = 0; -wave_1_per_point16=zang = time*-0.101; -wave_1_per_point17=azang = 0; -wave_1_per_point18=fov = 0.6 + 0.2*sin(time); -wave_1_per_point19=fov = .5; -wave_1_per_point20= -wave_1_per_point21=mx = ox*cos(zang) - oy*sin(zang); -wave_1_per_point22=my = ox*sin(zang) + oy*cos(zang); -wave_1_per_point23=ox = mx; -wave_1_per_point24=oy = my; -wave_1_per_point25=mx = ox*cos(yang) + oz*sin(yang); -wave_1_per_point26=mz = - ox*sin(yang) + oz*cos(yang); -wave_1_per_point27=ox = mx; -wave_1_per_point28=oz = mz; -wave_1_per_point29=my = oy*cos(xang) - oz*sin(xang); -wave_1_per_point30=mz = oy*sin(xang) + oz*cos(xang); -wave_1_per_point31=oy = my; -wave_1_per_point32=oz = mz; -wave_1_per_point33= -wave_1_per_point34=oz = abs(oz) - 2; -wave_1_per_point35=x = ox*fov/oz + 0.5; -wave_1_per_point36=x = (x-.5)*0.75 + 0.5; -wave_1_per_point37=y = oy*fov/oz + 0.5; -wave_1_per_point38= -wave_1_per_point39=g = 1 + sin(sp); -wave_1_per_point40=r = 0.5 + 0.5*sin(sample*1.57); -wave_1_per_point41=b = 0.5 + 0.5*cos(sample*1.57); -wave_1_per_point42=a = 0.5 + (oz + 2)*0.25; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=1 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=sp = sample*6.28*8*8*4; -wave_2_per_point2=vol = (bass_att + mid_att + treb_att)*0.33; -wave_2_per_point3=vol = 0.2 + 0.5*(value1 + value2); -wave_2_per_point4=vol = .2; -wave_2_per_point5= -wave_2_per_point6=mod = if(below(treb_att,1.8),treb_att+.2,2); -wave_2_per_point7= -wave_2_per_point8=ox = 0.5*sin(sp)*sin(sample*3.14)*vol; -wave_2_per_point9=oy = (sample - 0)*mod; -wave_2_per_point10=oz = 0.5*cos(sp)*sin(sample*3.14)*vol; -wave_2_per_point11= -wave_2_per_point12=xang = time*0.221; -wave_2_per_point13=axang = 0; -wave_2_per_point14=yang = time*-0.411; -wave_2_per_point15=ayang = 0; -wave_2_per_point16=zang = time*1.201; -wave_2_per_point17=azang = 0; -wave_2_per_point18=fov = 0.6 + 0.2*sin(time); -wave_2_per_point19=fov = .5; -wave_2_per_point20= -wave_2_per_point21=mx = ox*cos(zang) - oy*sin(zang); -wave_2_per_point22=my = ox*sin(zang) + oy*cos(zang); -wave_2_per_point23=ox = mx; -wave_2_per_point24=oy = my; -wave_2_per_point25=mx = ox*cos(yang) + oz*sin(yang); -wave_2_per_point26=mz = - ox*sin(yang) + oz*cos(yang); -wave_2_per_point27=ox = mx; -wave_2_per_point28=oz = mz; -wave_2_per_point29=my = oy*cos(xang) - oz*sin(xang); -wave_2_per_point30=mz = oy*sin(xang) + oz*cos(xang); -wave_2_per_point31=oy = my; -wave_2_per_point32=oz = mz; -wave_2_per_point33= -wave_2_per_point34=oz = abs(oz) - 2; -wave_2_per_point35=x = ox*fov/oz + 0.5; -wave_2_per_point36=x = (x-.5)*0.75 + 0.5; -wave_2_per_point37=y = oy*fov/oz + 0.5; -wave_2_per_point38= -wave_2_per_point39=b = 1+sin(sp); -wave_2_per_point40=g = 0.5 + 0.5*sin(sample*1.57); -wave_2_per_point41=r = 0.5 + 0.5*cos(sample*1.57); -wave_2_per_point42=a = 0.5 + (oz + 2)*0.25; -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=wave_a = 0; -per_frame_2=decay=.995; -per_pixel_1=it = 0.3*sin(time*0.2); -per_pixel_2=radm = rad*0.5; -per_pixel_3=rot = 0.02*sin((radm+it)*30)*rad; -per_pixel_4=mod = sin(ang*5); -per_pixel_5=mod = mod*mod*mod*mod*mod; -per_pixel_6=zoom = 1 + abs(0.01*mod); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - flashburn.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - flashburn.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - flashburn.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - flashburn.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.995000 -fVideoEchoZoom=0.999608 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.007768 -fWaveScale=1.285751 -fWaveSmoothing=0.630000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.055821 -fShader=0.000000 -zoom=0.970118 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000500 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=15 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_init1=set = rand(20); -shape_0_per_frame1=x = 0.5 + 0.5*(sin(time*1.4)*0.4 + 0.3*sin(time*1.9) + 0.3*sin(time*(1 + set*0.05))); -shape_0_per_frame2=y = 0.5 + 0.5*(sin(time*1.2)*0.7 + 0.3*sin(time*1.6)); -shape_0_per_frame3= -shape_0_per_frame4=r = 0.5 + 0.5*sin(time); -shape_0_per_frame5=g = 0.5 + 0.5*sin(time + 2.094); -shape_0_per_frame6=b = 0.5 + 0.5*sin(time + 4.188); -shape_0_per_frame7= -shape_0_per_frame8=r2 = 0.5 + 0.5*(sin(time*0.4)*0.8 + 0.2*sin(time*0.6)); -shape_0_per_frame9=g2 = 0.5 + 0.5*(sin(time*0.5)*0.5 + 0.5*sin(time*0.4)); -shape_0_per_frame10=b2 = 0.5 + 0.5*(sin(time*0.2)*0.6 + 0.4*sin(time*0.7)); -shape_0_per_frame11= -shape_0_per_frame12=rad = rad*(bass_att+mid_att+treb_att)/3; -shapecode_1_enabled=1 -shapecode_1_sides=15 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=x = 0.5 + 0.3*(sin(time*1.4)*0.4 + 0.6*sin(time*1.9)); -shape_1_per_frame2=y = 0.5 + 0.5*(sin(time*1.2)*0.7 + 0.3*sin(time*1.6)); -shape_1_per_frame3= -shape_1_per_frame4=r = 0.5 + 0.5*sin(time); -shape_1_per_frame5=g = 0.5 + 0.5*sin(time + 2.094); -shape_1_per_frame6=b = 0.5 + 0.5*sin(time + 4.188); -shape_1_per_frame7= -shape_1_per_frame8=r2 = 0.5 + 0.5*(sin(time*0.4)*0.8 + 0.2*sin(time*0.6)); -shape_1_per_frame9=g2 = 0.5 + 0.5*(sin(time*0.5)*0.5 + 0.5*sin(time*0.4)); -shape_1_per_frame10=b2 = 0.5 + 0.5*(sin(time*0.2)*0.6 + 0.4*sin(time*0.7)); -shape_1_per_frame11= -shape_1_per_frame12=rad = rad*(bass_att+mid_att+treb_att)/3; -shapecode_2_enabled=1 -shapecode_2_sides=15 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=x = 0.5 + 0.5*(sin(time*1.4)*0.4 + 0.6*sin(time*1.9)); -shape_2_per_frame2=y = 0.5 + 0.3*(sin(time*1.2)*0.7 + 0.3*sin(time*1.6)); -shape_2_per_frame3= -shape_2_per_frame4=r = 0.5 + 0.5*sin(time); -shape_2_per_frame5=g = 0.5 + 0.5*sin(time + 2.094); -shape_2_per_frame6=b = 0.5 + 0.5*sin(time + 4.188); -shape_2_per_frame7= -shape_2_per_frame8=r2 = 0.5 + 0.5*(sin(time*0.4)*0.8 + 0.2*sin(time*0.6)); -shape_2_per_frame9=g2 = 0.5 + 0.5*(sin(time*0.5)*0.5 + 0.5*sin(time*0.4)); -shape_2_per_frame10=b2 = 0.5 + 0.5*(sin(time*0.2)*0.6 + 0.4*sin(time*0.7)); -shape_2_per_frame11= -shape_2_per_frame12=rad = rad*(bass_att+mid_att+treb_att)/3; -shapecode_3_enabled=1 -shapecode_3_sides=15 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_init1=set = rand(10); -shape_3_per_frame1=x = 0.5 + 0.3*(sin(time*1.4)*0.4 + 0.6*sin(time*1.9)); -shape_3_per_frame2=y = 0.5 + 0.3*(sin(time*1.2)*0.3 + 0.3*sin(time*1.6) + 0.4*sin(time*(1 + set*0.1))); -shape_3_per_frame3= -shape_3_per_frame4=r = 0.6 + 0.4*(sin(time*0.3)*0.8 + 0.2*sin(time*0.5)); -shape_3_per_frame5=g = 0.6 + 0.4*(sin(time*0.3)*0.5 + 0.5*sin(time*0.4)); -shape_3_per_frame6=b = 0.6 + 0.4*(sin(time*0.6)*0.6 + 0.4*sin(time*0.1)); -shape_3_per_frame7= -shape_3_per_frame8=r2 = 0.5 + 0.5*(sin(time*0.4)*0.8 + 0.2*sin(time*0.6)); -shape_3_per_frame9=g2 = 0.5 + 0.5*(sin(time*0.5)*0.5 + 0.5*sin(time*0.4)); -shape_3_per_frame10=b2 = 0.5 + 0.5*(sin(time*0.2)*0.6 + 0.4*sin(time*0.7)); -shape_3_per_frame11= -shape_3_per_frame12=rad = rad*(bass_att+mid_att+treb_att)/3; -per_frame_1=azoom = -.95; -per_frame_2=decay = decay - .001; -per_pixel_1=azoom = -0.95 + 0.4*(x-0.5) + 0.4*(y-0.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - pinwheel.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - pinwheel.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - pinwheel.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - pinwheel.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.929500 -fVideoEchoZoom=0.999608 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.972361 -fWaveSmoothing=0.900000 -fWaveParam=0.094000 -fModWaveAlphaStart=1.000000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000158 -fWarpScale=0.241455 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.180000 -cx=0.500000 -cy=0.500000 -dx=0.004000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=1.000000 -wave_y=0.500000 -ob_size=0.030000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.050000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=40 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.599571 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=0.000000 -shape_0_init1=bob = 1.5; -shape_0_init2=ro = 0; -shape_0_init3=red = rand(20); -shape_0_per_frame1=vol = 1 + 0.2*((bass_att+treb_att+mid_att)/3); -shape_0_per_frame2=bob = bob*above(bob,0.01) - 0.01 + 1*(1 - above(bob,0.01)); -shape_0_per_frame3=bob = 0.4 + 0.4*sin(time*0.8); -shape_0_per_frame4=bob = bob*vol; -shape_0_per_frame5=rad = bob; -shape_0_per_frame6=border_1 = 0.4; -shape_0_per_frame7=sides = 30; -shape_0_per_frame8=ro = ro + 0.02; -shape_0_per_frame9=ang = ro; -shape_0_per_frame10=rad = 0.6; -shape_0_per_frame11= -shape_0_per_frame12=sp = red*0.025; -shape_0_per_frame13=spi = 0.5 - sp; -shape_0_per_frame14=tm = time*0.1; -shape_0_per_frame15=border_r = 0.5 + sp*sin(tm*0.6) + spi*cos(tm*1.46); -shape_0_per_frame16=border_g = 0.5 + sp*sin(tm*1.294) + spi*cos(tm*0.87); -shape_0_per_frame17=border_b = 0.5 + sp*sin(tm*1.418) + spi*cos(tm*0.76); -shapecode_1_enabled=1 -shapecode_1_sides=40 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=x = 0.5 + 0.5*(sin(time*1.1)*0.3 + 0.7*sin(time*0.5)); -shape_1_per_frame2=x = 0.5 + 0.225*sin(time); -shape_1_per_frame3=y = 0.5 + 0.3*cos(time); -shape_1_per_frame4= -shape_1_per_frame5=rad = rad*mid_att; -shape_1_per_frame6=r = 0.5 + 0.5*sin(frame*0.5); -shape_1_per_frame7=b = 0.5 + 0.5*sin(frame*0.5 + 2.094); -shape_1_per_frame8=g = 0.5 + 0.5*sin(frame*0.5 + 4.188); -shape_1_per_frame9= -shapecode_2_enabled=1 -shapecode_2_sides=40 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=x = 0.5 + 0.5*(sin(time*1.1)*0.3 + 0.7*sin(time*0.5)); -shape_2_per_frame2=x = 0.5 + 0.225*sin(time + 2.09); -shape_2_per_frame3=y = 0.5 + 0.3*cos(time + 2.09); -shape_2_per_frame4= -shape_2_per_frame5=rad = rad*bass_att; -shape_2_per_frame6=r = 0.5 + 0.5*sin(frame*0.5); -shape_2_per_frame7=b = 0.5 + 0.5*sin(frame*0.5 + 2.094); -shape_2_per_frame8=g = 0.5 + 0.5*sin(frame*0.5 + 4.188); -shape_2_per_frame9= -shapecode_3_enabled=1 -shapecode_3_sides=40 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_per_frame1=x = 0.5 + 0.5*(sin(time*1.1)*0.3 + 0.7*sin(time*0.5)); -shape_3_per_frame2=x = 0.5 + 0.225*sin(time + 4.19); -shape_3_per_frame3=y = 0.5 + 0.3*cos(time + 4.19); -shape_3_per_frame4= -shape_3_per_frame5=rad = rad*treb_att; -shape_3_per_frame6=r = 0.5 + 0.5*sin(frame*0.5); -shape_3_per_frame7=b = 0.5 + 0.5*sin(frame*0.5 + 2.094); -shape_3_per_frame8=g = 0.5 + 0.5*sin(frame*0.5 + 4.188); -shape_3_per_frame9= -per_frame_init_1=red = rand(20); -per_frame_1=dx = 0; -per_frame_2=dy = 0; -per_frame_3=wave_x = 0.5; -per_frame_4=sx = 1.1; -per_frame_5= -per_frame_6=rot = 0.2; -per_frame_7= -per_frame_8=wave_a = 0; -per_frame_9= -per_frame_10=sp = red*0.025; -per_frame_11=spi = 0.5 - sp; -per_frame_12= -per_frame_13=tm = time*0.1; -per_frame_14=wave_r = 0.5 + sp*sin(tm*0.6) + spi*cos(tm*1.46); -per_frame_15=wave_g = 0.5 + sp*sin(tm*1.294) + spi*cos(tm*0.87); -per_frame_16=wave_b = 0.5 + sp*sin(tm*1.418) + spi*cos(tm*0.76); -per_pixel_1=st = if(above(bass_att,1),(bass_att-1)*2 + 1,0); -per_pixel_2=warp = st*1.950*(x-0.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - pulsar.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - pulsar.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - pulsar.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - pulsar.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,255 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999609 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099900 -fWaveScale=0.010000 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999511 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=1.000000 -wave_y=0.500000 -ob_size=0.100000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.100000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_frame1=r = 0.6 + 0.3*(sin(time*1.21)*ws + sin(time*1.65)*(1 - ws)); -wave_0_per_frame2=g = 0.6 + 0.3*(sin(time*1.78)*ws + sin(time*1.06)*(1 - ws)); -wave_0_per_frame3=b = 0.6 + 0.3*(sin(time*1.32)*ws + sin(time*1.54)*(1 - ws)); -wave_0_per_point1=x = sample; -wave_0_per_point2=y = 0.9999; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=40 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.250000 -shapecode_0_rad=0.330000 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=1.000000 -shapecode_1_rad=1.203212 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=0.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_init1=ws = r -shape_1_per_frame1=an = an + 0.05; -shape_1_per_frame2=ang = an; -shape_1_per_frame3=sides = 40; -shape_1_per_frame4=rv = 0.4*(bass_att + mid_att + treb_att)/3; -shape_1_per_frame5=rad = rv; -shape_1_per_frame6=r = 0.5 + 0.5*sin(time); -shape_1_per_frame7=g = 0.5 + 0.5*sin(time + 2.094); -shape_1_per_frame8=b = 0.5 + 0.5*sin(time + 4.188); -shapecode_2_enabled=1 -shapecode_2_sides=40 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.900000 -shapecode_2_y=0.899900 -shapecode_2_rad=0.400312 -shapecode_2_ang=1.005310 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=1.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_init1=ws = rand(1); -shape_2_per_frame1=r = 0.5 + 0.5*sin(time); -shape_2_per_frame2=g = 0.5 + 0.5*sin(time + 2.094); -shape_2_per_frame3=b = 0.5 + 0.5*sin(time + 4.188); -shapecode_3_enabled=1 -shapecode_3_sides=3 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.970000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=1.000000 -shapecode_3_b=1.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=1.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=1.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.000000 -shape_3_init1=ws = rand(1); -shape_3_per_frame1=rad = rad*(bass_att + treb_att + mid_att)/3; -per_frame_init_1=wr1 = 1 + rand(0.404); -per_frame_init_2=wg1 = 1 + rand(0.446); -per_frame_init_3=wb1 = 1 + rand(0.465); -per_frame_init_4=wr2 = 1 + rand(0.454); -per_frame_init_5=wg2 = 1 + rand(0.489); -per_frame_init_6=wb2 = 1 + rand(0.432); -per_frame_init_7=ws = rand(1); -per_frame_init_8=decay = 0; -per_frame_init_9=dec = 0; -per_frame_init_10=vl = 0; -per_frame_1=vol = .3333*(bass_att + mid_att + treb_att); -per_frame_2=wave_a = 0; -per_frame_3=dec = dec + 0.1*(1-dec); -per_frame_4=decay = dec; -per_frame_5=awarp = 5*above(bass_att,1.4); -per_frame_6=dy = .07; -per_frame_7=dx = .01; -per_frame_8=//ib_a = above(bass_att,1.3); -per_pixel_1=vl = (bass_att + mid_att + treb_att)/3; -per_pixel_2=vlv = 1.5 + 0.1*(vl - 1); -per_pixel_3=arot = 5*if(above(bass_att,1.3),x,x-1); -per_pixel_4=shiv = -4 + above(bass_att,1)*(bass_att - 1); -per_pixel_5=split = sin(time); -per_pixel_6=//shiv = 1; -per_pixel_7=vol = 1 + 0.5*(bass_att + treb_att + mid_att)/3; -per_pixel_8=vol = 1.5; -per_pixel_9=rot = 0.8*(x - y)*vlv; -per_pixel_10=awarp = y*5; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - snow.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - snow.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/shifter - snow.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/shifter - snow.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.400000 -fDecay=0.949500 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=1.074092 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=1 -wavecode_0_bUseDots=1 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.074097 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=it = time*2; -wave_0_per_point2=sp = sample + it*0.1; -wave_0_per_point3= -wave_0_per_point4=vl = 1 + 0.5*(treb_att-0.7); -wave_0_per_point5= -wave_0_per_point6=my = 0.5 + 0.2*sin(time*0.932)*vl; -wave_0_per_point7=mx = 0.5 + 0.2*cos(time*0.932)*vl; -wave_0_per_point8= -wave_0_per_point9=mod = (value1+value2)/2; -wave_0_per_point10= -wave_0_per_point11=y = 0.5 + sample*(my-0.5) + mod; -wave_0_per_point12=x = 0.5 + sample*(mx-0.5) + mod; -wave_0_per_point13= -wave_0_per_point14=aa = 0.6 + 0.4*sin(sp*6.28); -wave_0_per_point15=bb = aa*(0.6 + 0.4*sin(sp*6.28)); -wave_0_per_point16=cc = bb*(0.6 + 0.4*sin(sp*6.28)); -wave_0_per_point17=r=aa;b=cc;g=bb; -wavecode_1_enabled=1 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=1 -wavecode_1_bUseDots=1 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.074097 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_per_point1=it = time*2; -wave_1_per_point2=sp = sample + it*0.1; -wave_1_per_point3= -wave_1_per_point4=vl = 1 + 0.5*(mid_att-0.7); -wave_1_per_point5= -wave_1_per_point6=my = 0.5 + 0.2*sin(time*0.654)*vl; -wave_1_per_point7=mx = 0.5 + 0.2*cos(time*0.654)*vl; -wave_1_per_point8= -wave_1_per_point9=mod = (value1+value2)/2; -wave_1_per_point10= -wave_1_per_point11=y = 0.5 + sample*(my-0.5) + mod; -wave_1_per_point12=x = 0.5 + sample*(mx-0.5) + mod; -wave_1_per_point13= -wave_1_per_point14=aa = 0.6 + 0.4*sin(sp*6.28); -wave_1_per_point15=bb = aa*(0.6 + 0.4*sin(sp*6.28)); -wave_1_per_point16=cc = bb*(0.6 + 0.4*sin(sp*6.28)); -wave_1_per_point17=b=aa;g=bb;r=cc; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=1 -wavecode_2_bUseDots=1 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.074096 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_per_point1=it = time*2; -wave_2_per_point2=sp = sample + it*0.1; -wave_2_per_point3= -wave_2_per_point4=vl = 1 + 0.5*(bass_att-0.7); -wave_2_per_point5= -wave_2_per_point6=my = 0.5 + 0.2*sin(time*0.378)*vl; -wave_2_per_point7=mx = 0.5 + 0.2*cos(time*0.378)*vl; -wave_2_per_point8= -wave_2_per_point9=mod = (value1+value2)/2; -wave_2_per_point10= -wave_2_per_point11=y = 0.5 + sample*(my-0.5) + mod; -wave_2_per_point12=x = 0.5 + sample*(mx-0.5) + mod; -wave_2_per_point13= -wave_2_per_point14=aa = 0.6 + 0.4*sin(sp*6.28); -wave_2_per_point15=bb = aa*(0.6 + 0.4*sin(sp*6.28)); -wave_2_per_point16=cc = bb*(0.6 + 0.4*sin(sp*6.28)); -wave_2_per_point17=r=aa;b=bb;g=cc; -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=40 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.150000 -shapecode_0_rad=0.453331 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=1.000000 -shapecode_0_b=1.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=1.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=it = it + 0.05; -per_frame_2=wave_mystery = it; -per_frame_3=tm = time; -per_frame_4=aa = 0.6 + 0.4*sin(tm*6.28); -per_frame_5=bb = aa*(0.6 + 0.4*sin(tm*6.28)); -per_frame_6=cc = bb*(0.6 + 0.4*sin(tm*6.28)); -per_frame_7=wave_b=aa; -per_frame_8=wave_g=bb; -per_frame_9=wave_r=cc; -per_frame_10=wave_a = 0; -per_pixel_1=modx = (0.5-abs(x-0.5)); -per_pixel_2=mody = (0.5-abs(y-0.5)); -per_pixel_3=rot = 5*modx*mody; -per_pixel_4=zoom = 1 - 0.1*modx*mody; -per_pixel_5=zoom=1;rot=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.000000 -fDecay=0.983000 -fVideoEchoZoom=0.998169 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=4 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=7.740000 -fWaveScale=0.372036 -fWaveSmoothing=0.387000 -fWaveParam=-0.360000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.334503 -fWarpScale=1.327831 -fZoomExponent=1.026514 -fShader=1.000000 -zoom=1.374512 -rot=0.020000 -cx=0.170000 -cy=0.830001 -dx=0.000000 -dy=0.000000 -warp=1.779457 -sx=0.990099 -sy=1.000000 -wave_r=0.270000 -wave_g=0.270000 -wave_b=0.270000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.360000 -ob_g=0.360000 -ob_b=0.360000 -ob_a=0.580000 -ib_size=0.010000 -ib_r=0.450000 -ib_g=0.450001 -ib_b=0.449900 -ib_a=0.530000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.2*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.05+.04*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_a=.03+.02*wave_g; -per_frame_38=ib_size=.05+.04*bass_residual; -per_frame_39=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_40=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_41=ib_b = ib_b + 0.2*sin(time*0.4354); -per_frame_42=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_43=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,0); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),1+q1*.05,1+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic - It's Only Make Believe.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic - It's Only Make Believe.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic - It's Only Make Believe.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic - It's Only Make Believe.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=1.006593 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=2.865441 -fWaveScale=69.200165 -fWaveSmoothing=0.792000 -fWaveParam=0.020000 -fModWaveAlphaStart=0.980000 -fModWaveAlphaEnd=0.999999 -fWarpAnimSpeed=0.960959 -fWarpScale=6.948194 -fZoomExponent=2.699864 -fShader=0.700000 -zoom=0.012572 -rot=0.000000 -cx=0.500000 -cy=0.500001 -dx=0.000000 -dy=0.000000 -warp=10.040655 -sx=0.999989 -sy=0.999999 -wave_r=0.250000 -wave_g=0.250000 -wave_b=0.250000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.150000 -ob_g=0.350000 -ob_b=0.250000 -ob_a=0.970000 -ib_size=0.010000 -ib_r=0.350000 -ib_g=0.250000 -ib_b=0.150000 -ib_a=0.970000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.050000 -mv_r=0.500000 -mv_g=0.500000 -mv_b=0.500000 -mv_a=0.950000 -per_frame_1=ff = frame/100; -per_frame_2=wave_r = sin(5*ff/bass)/2+0.5; -per_frame_3=wave_g = cos(ff/mid)/2+0.5; -per_frame_4=wave_b = cos(3*ff/treb)/2+0.5; -per_frame_5=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_6=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_7=ib_b = ib_b + 0.2*sin(time*0.4354); -per_frame_8=ob_r=wave_r; -per_frame_9=ob_g=wave_g; -per_frame_10=ob_b=wave_b; -per_frame_11=rot = rot + 0.180*( 0.60*sin(0.981*time) + 0.80*sin(0.279*time) ); -per_frame_12=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic - Numerosity.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic - Numerosity.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic - Numerosity.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic - Numerosity.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.330231 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=1 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.501800 -fWaveScale=1.297700 -fWaveSmoothing=0.450000 -fWaveParam=0.020000 -fModWaveAlphaStart=1.000000 -fModWaveAlphaEnd=1.000001 -fWarpAnimSpeed=0.517589 -fWarpScale=0.704400 -fZoomExponent=0.347586 -fShader=0.610000 -zoom=0.793914 -rot=0.000000 -cx=0.499900 -cy=0.499900 -dx=0.000000 -dy=0.000000 -warp=0.290273 -sx=0.929000 -sy=0.932617 -wave_r=0.030000 -wave_g=0.030000 -wave_b=0.030000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.500000 -ib_size=0.005000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.500000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.400000 -mv_dx=0.000000 -mv_dy=-0.100000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=wave_r = wave_r + 0.400*( 0.60*sin(0.933*time) + 0.40*sin(1.045*time) ); -per_frame_2=wave_g = wave_g + 0.400*( 0.60*sin(0.900*time) + 0.40*sin(0.956*time) ); -per_frame_3=wave_b = wave_b + 0.400*( 0.60*sin(0.910*time) + 0.40*sin(0.920*time) ); -per_frame_4=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_5=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_6=ib_b = ib_b + 0.2*sin(time*0.4354); -per_frame_7=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_8=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); -per_pixel_1=gridx=bnot((x*q7)%2); -per_pixel_2=gridy=bnot((y*q7)%2); -per_pixel_3=zoom=zoom+.07*cos(sin(rad*2.14*q3+abs(rad*3.14*gridy))*2.14+rad*sin(q4*2.14+q1))*gridx; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Entity.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Entity.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Entity.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Entity.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=0.998099 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=1 -fWaveAlpha=7.740000 -fWaveScale=0.988200 -fWaveSmoothing=0.450000 -fWaveParam=0.300000 -fModWaveAlphaStart=1.359900 -fModWaveAlphaEnd=0.380000 -fWarpAnimSpeed=0.787543 -fWarpScale=1.327700 -fZoomExponent=1.332000 -fShader=0.500000 -zoom=1.195700 -rot=0.000000 -cx=0.050000 -cy=0.950000 -dx=0.000000 -dy=0.000000 -warp=3.753000 -sx=0.990000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.340001 -ib_size=0.005000 -ib_r=0.970000 -ib_g=0.500000 -ib_b=0.499900 -ib_a=0.500000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.2*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.05+.04*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_a=.03+.02*wave_g; -per_frame_38=ib_size=.05+.04*bass_residual; -per_frame_39=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_40=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_41=ib_b = ib_b + 0.2*sin(time*0.4354); -per_frame_42=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_43=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,0); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),1+q1*.05,1+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,99 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.900000 -fVideoEchoZoom=0.998169 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=7.740000 -fWaveScale=0.372036 -fWaveSmoothing=0.387000 -fWaveParam=-0.360000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.334503 -fWarpScale=1.327831 -fZoomExponent=1.026514 -fShader=0.400000 -zoom=1.374512 -rot=0.020000 -cx=0.170000 -cy=0.830001 -dx=0.000000 -dy=0.000000 -warp=1.779457 -sx=0.990099 -sy=1.000000 -wave_r=0.270000 -wave_g=0.270000 -wave_b=0.270000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.360000 -ob_g=0.360000 -ob_b=0.360000 -ob_a=0.580000 -ib_size=0.010000 -ib_r=0.450000 -ib_g=0.450001 -ib_b=0.449900 -ib_a=0.900000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.1*bor(bor(bass_changed,treb_changed),mid_changed)+(mid_thresh+bass_thresh+treb_thresh)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.25+.25*treb_residual; -per_frame_34=ib_size=.05+.04*bass_residual; -per_frame_35=ib_r = if(bass_flop,ob_b,.5+ 0.2*sin(time*0.5413)); -per_frame_36=ib_g = if(treb_flop,ob_g,.5 + 0.2*sin(time*0.6459)); -per_frame_37=ib_b = if(mid_flop,ob_r,.5 + 0.2*sin(time*0.4354)); -per_frame_38=rot = rot + 0.04*q1; -per_frame_39=zoom=max(0.98, 0.2+0.35*bass_thresh); -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,rot); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),zoom+q1*.05,zoom+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Remembering How You Were (Perceived Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Remembering How You Were (Perceived Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Remembering How You Were (Perceived Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Remembering How You Were (Perceived Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.998100 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=13.378749 -fWaveScale=0.717349 -fWaveSmoothing=0.531000 -fWaveParam=0.020000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.208100 -fWarpScale=1.263386 -fZoomExponent=0.111607 -fShader=0.509900 -zoom=0.054279 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.333300 -sx=0.999901 -sy=0.999901 -wave_r=0.250000 -wave_g=0.350000 -wave_b=0.700000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.500000 -ob_g=0.250000 -ob_b=0.150000 -ob_a=0.970000 -ib_size=0.005000 -ib_r=0.100000 -ib_g=0.300000 -ib_b=0.500000 -ib_a=0.970000 -nMotionVectorsX=64.000000 -nMotionVectorsY=1.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.1*bor(bor(bass_changed,treb_changed),mid_changed)+(mid_thresh+bass_thresh+treb_thresh)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.25+.25*treb_residual; -per_frame_34=ib_size=.05+.04*bass_residual; -per_frame_35=ib_r = if(bass_flop,ob_b,.5+ 0.2*sin(time*0.5413)); -per_frame_36=ib_g = if(treb_flop,ob_g,.5 + 0.2*sin(time*0.6459)); -per_frame_37=ib_b = if(mid_flop,ob_r,.5 + 0.2*sin(time*0.4354)); -per_frame_38=rot = rot + 0.04*q1; -per_frame_39=zoom=max(0.98, 0.2+0.35*bass_thresh); -per_frame_40=rot = sin(bass*treb*mid)/16; -per_frame_41=wave_r = bass*.5; -per_frame_42=wave_g = treb*.5; -per_frame_43=wave_b = mid*.5; -per_pixel_1=dx = dx + if (above(crack,rip), 2*dx_r*crackdown, -2*dx_r*ripdown)*05; -per_pixel_2=dy = dy + if (above(rip,crack), 2*dy_r*crackdown, -2*dy_r*ripdown)*05; -per_pixel_3=zoom=0.9615+rad/12+ q2/20; -per_frame_init_1=entropy=2; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -[preset00] -fRating=1.000000 -fGammaAdj=1.350000 -fDecay=0.999000 -fVideoEchoZoom=1.006465 -fVideoEchoAlpha=0.499900 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=2.001574 -fWaveScale=0.728900 -fWaveSmoothing=0.783000 -fWaveParam=-0.140000 -fModWaveAlphaStart=0.760000 -fModWaveAlphaEnd=0.900001 -fWarpAnimSpeed=5.921029 -fWarpScale=1.095251 -fZoomExponent=1.570168 -fShader=0.650000 -zoom=0.970805 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.107093 -sx=1.078500 -sy=0.990000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.005000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=3.000000 -nMotionVectorsY=2.000000 -mv_dx=0.020000 -mv_dy=-0.020000 -mv_l=0.150000 -mv_r=0.490000 -mv_g=0.480000 -mv_b=0.300001 -mv_a=0.970000 -wavecode_0_enabled=0 -wavecode_0_samples=128 -wavecode_0_sep=2 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.749339 -wavecode_0_smoothing=0.250000 -wavecode_0_r=0.520000 -wavecode_0_g=0.410001 -wavecode_0_b=0.340001 -wavecode_0_a=0.970000 -wave_0_per_frame1=x=100*sin(time)*q2+.3; -wave_0_per_frame2=t1=cos(time)*q3; -wave_0_per_frame3=r = 0.5 + 0.5*sin(time*1.353 +3); -wave_0_per_frame4=b = 0.5 + 0.5*sin(time*1.561 + 2); -wave_0_per_frame5=g = 0.5 + 0.5*sin(time*1.213 + 4); -wave_0_per_point1=x = t8 + value1*0.7; -wave_0_per_point2=y = 0.5 + value2*0.7; -wave_0_per_point3=t1 = t1 + 0.01; -wave_0_per_point4=b = x; -wave_0_per_point5=a = 0.5 + 0.5*sin(time + t1*50); -wave_0_per_point6=a = a*a; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=0.370001 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.075209 -shapecode_0_ang=0.010000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.640000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.610000 -shapecode_0_border_r=0.460001 -shapecode_0_border_g=0.370001 -shapecode_0_border_b=0.600000 -shapecode_0_border_a=0.400000 -shape_0_per_frame1=x = 0.5 + 0.50*cos(q3*0.5) + 0.25*cos(time*6.5); -shape_0_per_frame2=y = 0.5 + 0.50*sin(q3*0.5) + 0.25*sin(time*6.5); -shape_0_per_frame3=r = 0.5 + 0.5*sin(time*1.713 + 2); -shape_0_per_frame4=g = 0.5 + 0.5*sin(time*1.063 + 3); -shape_0_per_frame5=b = 0.5 + 0.5*sin(time*1.054 + 1); -shape_0_per_frame6=r2 = 0.5 + 0.5*sin(time*1.085 + 3); -shape_0_per_frame7=g2 = 0.5 + 0.5*sin(time*1.056+ 1); -shape_0_per_frame8=b2 = 0.5 + 0.5*sin(time*1.038 + 3); -shapecode_1_enabled=1 -shapecode_1_sides=32 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.089633 -shapecode_1_ang=0.030000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=0.210001 -shapecode_1_g=0.440000 -shapecode_1_b=0.230000 -shapecode_1_a=0.540000 -shapecode_1_r2=0.180000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.110000 -shapecode_1_a2=0.510000 -shapecode_1_border_r=0.150001 -shapecode_1_border_g=0.400001 -shapecode_1_border_b=0.480000 -shapecode_1_border_a=0.290000 -shape_1_per_frame1=ang = time*1.4; -shape_1_per_frame2=x = 0.5 + 0.16*cos(time*2.1) + 0.03*cos(time*0.7); -shape_1_per_frame3=y = 0.5 + 0.12*sin(time*2.3) + 0.04*sin(time*0.2); -shape_1_per_frame4=r = 0.5 + 0.5*sin(time*0.713 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(time*0.563 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(time*0.654 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(time*0.885 + 4); -shape_1_per_frame8=g2 = 0.5 + 0.5*sin(time*0.556+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(time*0.638 + 3); -shapecode_2_enabled=1 -shapecode_2_sides=5 -shapecode_2_additive=0 -shapecode_2_thickOutline=1 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.090001 -shapecode_2_ang=0.030000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=0.590000 -shapecode_2_g=0.430000 -shapecode_2_b=0.290000 -shapecode_2_a=0.560000 -shapecode_2_r2=0.160000 -shapecode_2_g2=0.400001 -shapecode_2_b2=0.540000 -shapecode_2_a2=0.530000 -shapecode_2_border_r=0.390001 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=0.350001 -shapecode_2_border_a=0.390000 -shape_2_per_frame1=x = 0.5 + 0.15*cos(q3*0.5) + 0.21*cos(time*7.5); -shape_2_per_frame2=y = 0.5 + 0.15*sin(q3*0.5) + 0.21*sin(time*7.5); -shape_2_per_frame3=r = 0.5 + 0.5*sin(time*1.713 + 1); -shape_2_per_frame4=g = 0.5 + 0.5*sin(time*1.563 + 3); -shape_2_per_frame5=b = 0.5 + 0.5*sin(time*1.654 + 2); -shape_2_per_frame6=r2 = 0.5 + 0.5*sin(time*1.885 + 3); -shape_2_per_frame7=g2 = 0.5 + 0.5*sin(time*1.556+ 2); -shape_2_per_frame8=b2 = 0.5 + 0.5*sin(time*1.638 + 4); -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=sx=1; -per_frame_2=sy=1; -per_frame_3=warp=0; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_6=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_7=bass_changed=abs(bass_changed-equal(bass_thresh,2)); -per_frame_8=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_9=treb_changed=abs(bass_changed-equal(treb_thresh,2)); -per_frame_10=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_11=mid_changed=abs(bass_changed-equal(mid_thresh,2)); -per_frame_12=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_13=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_14=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_15=pulse=if(above(abs(pulse),20),-20,pulse+.2*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*.025); -per_frame_16=q1=mid_residual; -per_frame_17=q2=bass_residual; -per_frame_18=q3=treb_residual; -per_frame_19=q5=sin(pulse); -per_frame_20=q4=(1+1*above(q1,0))*(1+2*above(q2,0))*(1+4*above(q3,0))*(1+6*mid_changed*below(q5,0))*(1+10*below(q1,0))*(1+12*mid_changed*above(q5,0)); -per_frame_21=wave_r=if(equal(treb_changed,1),0+.2*q1,if(equal(bass_changed,1),.8+.2*q2,.6+.08*q5)); -per_frame_22=wave_g=if(equal(treb_changed,1),0,if(equal(mid_changed,1),0,.5+.5*q2)); -per_frame_23=wave_b=if(equal(treb_changed,1),.8+.2*q3,0); -per_frame_24=ob_r=if(bass_changed,treb_changed,wave_r); -per_frame_25=ob_b=if(treb_changed,mid_changedp,wave_b); -per_frame_26=ob_g=if(mid_changed,bass_changed,wave_g); -per_frame_27=ob_a=.03+.02*wave_r; -per_frame_28=ob_size=.05+.04*treb_residual; -per_frame_29=ob_size=bnot(q1%102)*.1; -per_frame_30=ib_r=if(bass_changed,ob_b,ob_g); -per_frame_31=ib_b=if(treb_changed,ob_g,ob_r); -per_frame_32=ib_g=if(mid_changed,ob_r,ob_b); -per_frame_33=ib_a=.03+.02*wave_g; -per_frame_34=ib_size=.05+.04*bass_residual; -per_frame_35=wave_mystery=bnot(q1%2)*.3-bnot(q1%11)*.3+.5*sin(pulse*q2); -per_frame_36=cx=cx+.5*q1; -per_frame_37=cy=cy+.5*q2; -per_frame_38=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_39=zoom=max(0.97, min(0.15+0.7*bass_att, 1.75 )); -per_pixel_1=state=q4; -per_pixel_2=bend = cos(x*10*q1*bnot(state%7)-rad*10*q2*bnot(state%3)); -per_pixel_3=zoom = zoom+bend*.05*q3*bnot(state%5); -per_pixel_4=grid=abs(x*10-5)%2 + abs(y*10-5)%2; -per_pixel_5=sx=sx-equal(grid,bnot(state%2))*above(q1*q2*q3*q5,.8)*.9; -per_pixel_6=rot=if(above(zoom-1,.03+.03*q5)*bnot(below(q1*q2*q3,0)),q1,rot); -per_pixel_7=rot=rot+if(q2,0,sin(time*.7243)*.5); -per_pixel_8=zoom=zoom+if(q2,0,rad*sin(time*.734)*.8); -per_pixel_9=warp=warp+if(above(rad,.2166),sin(ang*rad),0); -per_pixel_10=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*0.96+1.3); -per_pixel_11=dx_r = equal(thresh,2)*0.025*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_pixel_12=dy_r = equal(thresh,2)*0.025*sin(5*time)+(1-equal(thresh,2))*dy_r; -per_pixel_13=crack = 1.34*sin(3.12*thresh*time) + 0.95*sin(5*thresh*time) + 1.73*cos(1.66*thresh*time) - 0.5*sin(0.25*thresh*time); -per_pixel_14=rip = 1.92*cos(1.96*thresh*time) - 0.195*cos(3.27*thresh*time) + 0.236*sin(3.25*thresh*time) + 1.5*sin(thresh*time); -per_pixel_15=crackdown = ((crack*2)*dx_r)*sin(33.75*time); -per_pixel_16=ripdown = ((rip*2)*dy_r)*sin(5.75*time); -per_pixel_17=dx = dx + if (above(crack,rip), 2*dx_r*crackdown, -2*dx_r*ripdown)*25; -per_pixel_18=dy = dy + if (above(rip,crack), 2*dy_r*crackdown, -2*dy_r*ripdown)*25; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.983000 -fVideoEchoZoom=0.998168 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=4 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.973828 -fWaveScale=1.329466 -fWaveSmoothing=0.450000 -fWaveParam=0.020000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=0.999998 -fWarpScale=0.994977 -fZoomExponent=0.057600 -fShader=0.950000 -zoom=0.773282 -rot=0.000000 -cx=0.440000 -cy=0.440001 -dx=0.020000 -dy=0.000000 -warp=0.999100 -sx=0.990096 -sy=1.009997 -wave_r=0.350000 -wave_g=0.360000 -wave_b=0.400000 -wave_x=0.510000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.360000 -ob_g=0.500000 -ob_b=0.360001 -ob_a=0.959999 -ib_size=0.010000 -ib_r=0.450000 -ib_g=0.450001 -ib_b=0.500000 -ib_a=0.900000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.2*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.05+.04*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_a=.03+.02*wave_g; -per_frame_38=ib_size=.05+.04*bass_residual; -per_frame_39=ib_r = ib_r + 0.2*sin(time*0.5413); -per_frame_40=ib_g = ib_g + 0.2*sin(time*0.6459); -per_frame_41=ib_b = ib_b + 0.2*sin(time*0.4354); -per_frame_42=rot = rot + 0.040*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) ); -per_frame_43=zoom=max(0.98, min(0.15+0.8*bass_att, 1.75 )); -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,0); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),1+q1*.05,1+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.999001 -fDecay=0.980000 -fVideoEchoZoom=0.998100 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=5 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=64 -nMotionVectorsY=1 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=13.378749 -fWaveScale=0.717349 -fWaveSmoothing=0.531000 -fWaveParam=0.020000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.208100 -fWarpScale=1.263386 -fZoomExponent=0.111607 -fShader=0.509900 -zoom=0.054279 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.333300 -sx=0.999901 -sy=0.999901 -wave_r=0.250000 -wave_g=0.350000 -wave_b=0.700000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.500000 -ob_g=0.250000 -ob_b=0.150000 -ob_a=0.970000 -ib_size=0.010000 -ib_r=0.100000 -ib_g=0.300000 -ib_b=0.500000 -ib_a=0.970000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.1*bor(bor(bass_changed,treb_changed),mid_changed)+(mid_thresh+bass_thresh+treb_thresh)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.25+.25*treb_residual; -per_frame_34=ib_size=.05+.04*bass_residual; -per_frame_35=ib_r = if(bass_flop,ob_b,.5+ 0.2*sin(time*0.5413)); -per_frame_36=ib_g = if(treb_flop,ob_g,.5 + 0.2*sin(time*0.6459)); -per_frame_37=ib_b = if(mid_flop,ob_r,.5 + 0.2*sin(time*0.4354)); -per_frame_38=rot = rot + 0.04*q1; -per_frame_39=zoom=max(0.98, 0.2+0.35*bass_thresh); -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,rot); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),zoom+q1*.05,zoom+.07*cos(radix*10*q1))); -per_pixel_5=rot=if(equal(q1,1),rad*(sin(mid+treb)/7),rad*(sin(-mid-treb)/7)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Telek - Flicker.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Telek - Flicker.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Telek - Flicker.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Telek - Flicker.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=4.099998 -fWaveScale=0.430333 -fWaveSmoothing=0.630000 -fWaveParam=1.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.001000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.460000 -wave_y=0.005000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.060000 -ib_size=0.260000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=58.752007 -nMotionVectorsY=14.400000 -mv_dx=0.006000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=0.100000 -mv_g=1.000000 -mv_b=0.000000 -mv_a=0.000000 -per_frame_1=bass_x = max(bass_x*.7+max(bass_att-.9,0)*.3,0); //decaying bass max -per_frame_2= -per_frame_3=wave_x = ((frame%3-1)*.5*bass_x+1)*wave_x; //spreads flame -per_frame_4= -per_frame_5=decay = 3000000+57.75; // Magic 'flame' decay -per_frame_6=//wave_mystery = sin(time*.2)*.05+1; -per_frame_7= -per_frame_8=ob_a = sqr(sqr(sin(time*1)*.25+.25)); // 'ad-lib decay' to black - no ugly artefacts -per_frame_9=// ^4 to get it up there quick -> min time with decay on. -per_frame_10= -per_frame_11=ob_a = ob_a*(1-bass_x); // just so we don't get rid of the wide impressive -per_frame_12=// flames so quickly -per_frame_13= -per_frame_14=monitor = ob_a; -per_frame_15= -per_frame_16=//Other decays to try: -per_frame_17=//300000 + 42.53, 90.63, 43.00 These are all fairly similar, but all are stable (equiv to decay 0.990 -> 1 in terms of speed of fade) -per_frame_18=//3000000 + 57.75 <<< =:-) -per_pixel_1=dy = (x+.08*sin(rand(100)))*2%2*-.01-.005; -per_pixel_2=dy = -.0025*((1-y)*10+rand(5)); //wobble, and faster at top - accelerating like real flames -per_pixel_3= -per_pixel_4=dx = rand(20)*.0001*sin(rand(2)-.5); //flicker -per_pixel_5=dx = dx*sqr(y); //dampens top -per_pixel_6=//dx = dx*(1-x/2); //slows sides -per_pixel_7=dx = dx*-.2*(rand(10)-5); //random damper -per_pixel_8=dx = dx -(x-.5)*.04*(.8-sqr(y)); //drift towards centre -per_pixel_9=dx = dx + cos(sqr(y-.5)*10-time*1.1)*sqr(1-(y))*.01; //add flutter at top -per_pixel_10= -per_pixel_11=// Telek - 26/09/2002 -per_frame_init_1=bass_x = 1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001645 -fWaveScale=0.430333 -fWaveSmoothing=0.630000 -fWaveParam=1.000000 -fModWaveAlphaStart=2.000000 -fModWaveAlphaEnd=2.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.001000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.300000 -ob_a=1.000000 -ib_size=0.100000 -ib_r=1.000000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=48.000000 -mv_dx=-0.941273 -mv_dy=0.426319 -mv_l=5.000000 -mv_r=0.315997 -mv_g=0.078173 -mv_b=0.941976 -mv_a=0.000000 -per_frame_1=bv = bass*.01+.99*bv; -per_frame_2=tt=tt+bass*.01; -per_frame_3=tt = if(above(bass*bass_att,4.5),rand(32768),tt); -per_frame_4=wave_x =-1; -per_frame_5=dx = .3*sin(tt*.12)+10*sin(tt*.015); -per_frame_6=dy = .39*sin(tt*.21)+20*sin(tt*.041); -per_frame_7=rot = 1*sin(tt*.15); -per_frame_8=cx = sin(tt*.16)*.5+.5; -per_frame_9=cy = cos(tt*.46)*.5+.5; -per_frame_10=ib_r = sin(tt*.51)*.5+.5; -per_frame_11=ib_g = sin(tt*.71)*.5+.5; -per_frame_12=ib_b = sin(tt*.81)*.5+.5; -per_frame_13=monitor = tt; -per_frame_14= -per_pixel_1=zoom = .8-.2*pow(1-rad,1); -per_frame_init_1=tt = rand(10000); -per_frame_init_2= Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Tux.tga and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Tux.tga differ diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.993000 -fVideoEchoZoom=0.996620 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.264366 -fWaveScale=0.264076 -fWaveSmoothing=0.720000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.300000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.061520 -sy=1.061520 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=warp=0; -per_frame_2=entropy=if(bnot(entropy),2,if(equal(pulse,-9.42),1+rand(3),entropy)); -per_frame_3=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_4=bass_changed=abs(bass_flop-equal(bass_thresh,2)); -per_frame_5=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_6=treb_changed=abs(treb_flop-equal(treb_thresh,2)); -per_frame_7=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_8=mid_changed=abs(mid_flop-equal(mid_thresh,2)); -per_frame_9=bass_residual = bass_changed*sin(pulse*bass_thresh*.2*entropy) + bnot(bass_changed)*bass_residual; -per_frame_10=treb_residual = treb_changed*sin(pulse*treb_thresh*.2*entropy) + bnot(treb_changed)*treb_residual; -per_frame_11=mid_residual = mid_changed*sin(pulse*mid_thresh*.2*entropy) + bnot(mid_changed)*mid_residual; -per_frame_12=pulse=if(above(abs(pulse),9.42),-9.42,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.01); -per_frame_13=q1=mid_residual; -per_frame_14=q2=bass_residual; -per_frame_15=q3=treb_residual; -per_frame_16=q4=sin(pulse); -per_frame_17=q5=cos(pulse); -per_frame_18=wave_mystery=-.2+.2*q4; -per_frame_19=wave_r=wave_r+.5*bass_residual; -per_frame_20=wave_r=wave_g+.5*mid_residual; -per_frame_21=wave_r=wave_b+.5*treb_residual; -per_frame_22=zoom=zoom-.0035*q1; -per_frame_23=decay=decay+.003*sin(pulse); -per_pixel_1=anti_rad=(1-rad); -per_pixel_2=dx=if(below(sin(rad*10*q5),abs(q5)),.02*q1,.025*q2); -per_pixel_3=dy=dy-cos(anti_rad*10*q3-rad*10*q5+rad*10*q4)*.05; -per_pixel_4=zoom=zoom+(dy-1)*(dx-1)*q1*.07; -per_pixel_5=rot=rot+atan(anti_rad*3.14*q3)*abs(zoom-1.2)*above(q2,0); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 1.0.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 1.0.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 1.0.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 1.0.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.981000 -fVideoEchoZoom=1.006440 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=5 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.868299 -fWaveScale=2.781641 -fWaveSmoothing=0.540000 -fWaveParam=0.200000 -fModWaveAlphaStart=0.950000 -fModWaveAlphaEnd=0.750000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.008151 -fShader=0.200000 -zoom=0.999800 -rot=0.000000 -cx=0.470000 -cy=0.500000 -dx=0.005000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -per_frame_1=warp=0; -per_frame_2=chaos=.9+.1*sin(pulse-beat); -per_frame_3=entropy=if(bnot(entropy),2,if(equal(pulse,-20)*above(beat,0),1+rand(5),entropy)); -per_frame_4=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_5=bass_changed=abs(bass_changed-equal(bass_thresh,2)); -per_frame_6=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_7=treb_changed=abs(treb_changed-equal(treb_thresh,2)); -per_frame_8=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_9=mid_changed=abs(mid_changed-equal(mid_thresh,2)); -per_frame_10=pulse=if(above(abs(pulse),20),-20,pulse+(mid+bass+treb)*.025); -per_frame_11=beat=if(above(abs(beat),20),-20,beat+.1*chaos*bor(bor(bass_changed,treb_changed),mid_changed)); -per_frame_12=q3=sin(pulse); -per_frame_13=q2=sin(pulse+beat); -per_frame_14=q4=sin(beat); -per_frame_15=q5=entropy; -per_frame_16=q1=(1+1*above(q2,0))*(1+2*above(q3,0))*(1+4*mid_changed*above(q3,0))*(1+6*above(q4,0))*(1+10*bass_changed*above(q4,0))*(1+12*above(q5,3))*(1+16*treb_changed*above(q2,0)); -per_frame_17=wave_r=.5+.2*bnot(q1%2)-.2*bnot(q1%3)+.3*q3*bnot(q1%13); -per_frame_18=wave_g=.5+.2*bnot(q1%5)-.2*bnot(q1%13)+.3*q4*bnot(q1%7); -per_frame_19=wave_b=if(bnot(q1%6),.8+.2*q4,.5+.5*q2); -per_frame_20=ob_r=ob_r+.2*q2+.3*bnot(q1%13)*q3; -per_frame_21=ob_b=ob_b-.1*bnot(q1%105)-.4*q2; -per_frame_22=ob_g=ob_g+.5*sin(pulse*.4*entropy); -per_frame_23=ob_a=.07+.05*q3; -per_frame_24=ob_size=.01*entropy*bnot(q1%6); -per_frame_25=ib_r=ib_r+.2*q1-.3*bnot(q1%3)*q4; -per_frame_26=ib_b=ib_b-.2*bnot(q1%17)-.3*q2+.2*bnot(q1%11); -per_frame_27=ib_g=ib_g+.5*sin(pulse*.35*entropy); -per_frame_28=ib_a=.07+.05*q3*q4; -per_frame_29=ib_size=.005+.005*q3; -per_frame_30=zoom_fade=if(bnot(q1%2),zoom_fade-(zoom_fade-.97)/2,zoom_fade-bnot(q1%5)*.02*q4+bnot(q1%2)*.02*q3-bnot(q1%11)*.04*q2); -per_frame_31=zoom=zoom_fade; -per_frame_32=rot_fade=if(bnot(q1%7),rot_fade-(rot_fade-.1*q3)/2-.03*bnot(q1%13),rot_fade-.02*bnot(q1%11)+.02*bnot(q1%3)+.03*bnot(q1%35)); -per_frame_33=rot=rot_fade; -per_frame_34=cx=cx+.1*bnot(q1%39)+.07*bnot(q1%13)*q3-.2*bnot(q1%55)*q4; -per_frame_35=wave_x=wave_x+.1*q3+.2*q4*bnot(q1%2); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.0.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.0.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.0.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.0.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.818016 -fWaveScale=0.653093 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995700 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.008200 -rot=-0.760000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.424100 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=old_bass_flop=bass_flop; -per_frame_2=old_treb_flop=treb_flop; -per_frame_3=old_mid_flop=mid_flop; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_15=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_16=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_17=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.0035); -per_frame_18=entropy=if(bass_changed*mid_changed*treb_changed,(1+bass_flop+treb_flop+mid_flop)*(1+rand(3)),entropy); -per_frame_19=q1=mid_residual; -per_frame_20=q2=bass_residual; -per_frame_21=q3=treb_residual; -per_frame_22=q4=sin(pulse); -per_frame_23=q5=cos(pulse*(.5+.1*entropy)); -per_frame_24=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_25=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q8=entropy; -per_frame_27=wave_r=wave_r+wave_r*q1; -per_frame_28=wave_b=wave_b+wave_b*q2; -per_frame_29=wave_g=wave_g+wave_g*q3; -per_frame_30=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_31=ob_bob_b+ob_b*sin(q2+q3*2.14); -per_frame_32=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_33=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_34=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_35=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_36=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_37=ib_a=.25+.25*sin(q2*2.14+q3); -per_frame_38=ob_size=.1+.1*sin(q3*3+q1); -per_frame_39=ib_size=.1+.1*sin(q1*3+q3); -per_frame_40=zoom=zoom+.1*q4; -per_frame_41=rot=.2*q5; -per_frame_42=wave_mystery=.5*q6; -per_frame_43=cx=cx+.5*q1; -per_frame_44=cy=cy+.5*q2; -per_frame_45=warp=bnot(q7%2); -per_frame_46=echo_zoom=1+.5*q3; -per_frame_47=echo_orientation=q8%4; -per_frame_48=wave_mode=q8%7; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.1.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.1.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.1.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.1.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.818016 -fWaveScale=0.653093 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995700 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.008200 -rot=-0.760000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.424100 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=old_bass_flop=bass_flop; -per_frame_2=old_treb_flop=treb_flop; -per_frame_3=old_mid_flop=mid_flop; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_15=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_16=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_17=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.0035); -per_frame_18=entropy=if(bass_changed*mid_changed*treb_changed,(1+bass_flop+treb_flop+mid_flop)*(1+rand(3)),entropy); -per_frame_19=q1=mid_residual; -per_frame_20=q2=bass_residual; -per_frame_21=q3=treb_residual; -per_frame_22=q4=sin(pulse); -per_frame_23=q5=cos(pulse*(.5+.1*entropy)); -per_frame_24=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_25=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q8=entropy; -per_frame_27=wave_r=wave_r+wave_r*q1; -per_frame_28=wave_b=wave_b+wave_b*q2; -per_frame_29=wave_g=wave_g+wave_g*q3; -per_frame_30=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_31=ob_bob_b+ob_b*sin(q2+q3*2.14); -per_frame_32=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_33=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_34=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_35=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_36=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_37=ib_a=.25+.25*sin(q2*2.14+q3); -per_frame_38=ob_size=.1+.1*sin(q3*3+q1); -per_frame_39=ib_size=.1+.1*sin(q1*3+q3); -per_frame_40=wave_mystery=.5*q6; -per_frame_41=cx=cx+.5*q1; -per_frame_42=cy=cy+.5*q2; -per_frame_43=warp=bnot(q7%2); -per_frame_44=echo_zoom=1+.5*q3; -per_frame_45=echo_orientation=q8%4; -per_frame_46=wave_mode=q8%7; -per_pixel_1=zoom=zoom+.3*sin(y*3.14*q4); -per_pixel_2=rot=rot*cos(x*3.14*q5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.2.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.2.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.2.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.2.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.996000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.818016 -fWaveScale=0.653093 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995700 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.008200 -rot=-0.760000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.424100 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=old_bass_flop=bass_flop; -per_frame_2=old_treb_flop=treb_flop; -per_frame_3=old_mid_flop=mid_flop; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_15=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_16=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_17=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.0035); -per_frame_18=entropy=if(bass_changed*mid_changed*treb_changed,(1+bass_flop+treb_flop+mid_flop)*(1+rand(3)),entropy); -per_frame_19=q1=mid_residual; -per_frame_20=q2=bass_residual; -per_frame_21=q3=treb_residual; -per_frame_22=q4=sin(pulse); -per_frame_23=q5=cos(pulse*(.5+.1*entropy)); -per_frame_24=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_25=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q8=entropy; -per_frame_27=wave_r=wave_r+wave_r*q1; -per_frame_28=wave_b=wave_b+wave_b*q2; -per_frame_29=wave_g=wave_g+wave_g*q3; -per_frame_30=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_31=ob_bob_b+ob_b*sin(q2+q3*2.14); -per_frame_32=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_33=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_34=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_35=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_36=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_37=ib_a=.25+.25*sin(q2*2.14+q3); -per_frame_38=ob_size=.1+.1*sin(q3*3+q1); -per_frame_39=ib_size=.1+.1*sin(q1*3+q3); -per_frame_40=wave_mystery=.5*q6; -per_frame_41=warp=0; -per_frame_42=wave_mode=q8%7; -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q6,0),rad*.2*q5,.2*q5*sin(rad*2.133*q7)); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),1+.07*sin(q4*.2*radix),1+.07*cos(radix*10*q4))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.3.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.3.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Beat Demo 2.3.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Beat Demo 2.3.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,114 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.993000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.818016 -fWaveScale=0.653093 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995700 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.018281 -rot=-0.760000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.424100 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=old_bass_flop=bass_flop; -per_frame_2=old_treb_flop=treb_flop; -per_frame_3=old_mid_flop=mid_flop; -per_frame_4=chaos=.9+.1*sin(pulse); -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_15=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_16=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_17=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.0035); -per_frame_18=entropy=if(bass_changed*mid_changed*treb_changed,(1+bass_flop+treb_flop+mid_flop)*(1+rand(3)),entropy); -per_frame_19=q1=mid_residual; -per_frame_20=q2=bass_residual; -per_frame_21=q3=treb_residual; -per_frame_22=q4=sin(pulse); -per_frame_23=q5=cos(pulse*(.5+.1*entropy)); -per_frame_24=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_25=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q8=entropy; -per_frame_27=wave_r=wave_r+wave_r*q1; -per_frame_28=wave_b=wave_b+wave_b*q2; -per_frame_29=wave_g=wave_g+wave_g*q3; -per_frame_30=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_31=ob_bob_b+ob_b*sin(q2+q3*2.14); -per_frame_32=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_33=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_34=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_35=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_36=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_37=ib_a=.25+.25*sin(q2*2.14+q3); -per_frame_38=ob_size=.1+.1*sin(q3*3+q1); -per_frame_39=ib_size=.1+.1*sin(q1*3+q3); -per_frame_40=wave_mystery=.5*q6; -per_frame_41=warp=0; -per_frame_42=wave_mode=q8%7; -per_frame_43=decay=.98+q8*.001; -per_frame_44=monitor=q8; -per_pixel_1=c1=x*q1+sin(ang)*q4; -per_pixel_2=c2=y*q2+sin(ang)*q6; -per_pixel_3=c3=rad*q3; -per_pixel_4=radix=if(above(q5,0),min(c1,c2),max(c1,c2)); -per_pixel_5=radix=if(above(q6,0),min(radix,c3),max(radix,c3)); -per_pixel_6=rot=if(above(q6,0),rad*.2*q5,.2*q5*sin(rad*2.133*q7)); -per_pixel_7=zoom=if(below(abs(q1),.5),zoom,if(below(abs(q2),.5),1+.07*sin(q4*3.14*radix),1+.07*sin(radix*q8*q4*1.618))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Cartoon Factory.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Cartoon Factory.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Cartoon Factory.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Cartoon Factory.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=0.999600 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=7.014853 -fWaveScale=0.098608 -fWaveSmoothing=0.810000 -fWaveParam=-0.400000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.502500 -rot=0.002000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.100000 -wave_y=0.900000 -ob_size=0.010000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.032); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse/2+q1); -per_frame_25=q6=sin(q1*3.14+q2*3.14+q3*3.14); -per_frame_26=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_27=q8=entropy; -per_frame_28=wave_r=.5+.5*sin(q1+abs(q4*2.14)); -per_frame_29=wave_b=.5+.5*sin(q2+abs(q5*2.14)); -per_frame_30=wave_g=.5+.5*sin(q3+abs(q6*2.14)); -per_frame_31=ob_r=ob_r+ob_r*sin(q1+q2*2.14); -per_frame_32=ob_b=ob_b+ob_b*sin(q2+q3*2.14); -per_frame_33=ob_g=ob_g+ob_g*sin(q3+q1*2.14); -per_frame_34=ib_r=ib_r+ib_r*cos(q5+q1*2.14); -per_frame_35=ib_b=ib_b+ib_*cos(q5+q2*2.14); -per_frame_36=ib_g=ib_g+ib_g*cos(q5+q3*2.14); -per_frame_37=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_38=ib_a=.25+.25*sin(q2*2.14+q3); -per_frame_39=ob_size=.1+.1*sin(q3*3+q1); -per_frame_40=ib_size=.15+.05*sin(q1*3+q3); -per_frame_41=mv_r=mv_r+.5*sin(q4+q5*6*q1); -per_frame_42=mv_b=mv_b+.5*sin(q4+q5*6*q2); -per_frame_43=mv_g=mv_g+.5*sin(q5+q5*6*q3); -per_frame_44=mv_a=mv_a+mv_a*sin(q2+q3+q5*1.14); -per_frame_45=mv_l=.1*q8; -per_frame_46=mv_x=q8*q7; -per_frame_47=mv_y=q8*q7; -per_frame_48=wave_mystery=wave_mystery+.25*sin(time*q4); -per_frame_49=echo_zoom=1+.2*q1+.2*q5+.3*q4; -per_frame_50=echo_orientation=q7%3; -per_pixel_1=dx=sin(pow(x,2)*3.14*q3); -per_pixel_2=dy=sin(pow(y,2)*3.14*q2); -per_pixel_3=rot=sin(rad*3.14*q1); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Cranked On Failure.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Cranked On Failure.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Cranked On Failure.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Cranked On Failure.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=0.998169 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.320553 -fWaveScale=100.000000 -fWaveSmoothing=0.450000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=1.960000 -fShader=0.190000 -zoom=0.999698 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.513000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.580000 -ib_size=0.015000 -ib_r=0.550000 -ib_g=1.000000 -ib_b=0.499900 -ib_a=1.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid+thresh+treb_thresh)*.052+-(bass+treb+mid)*.01); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.05+.05*cos(wave_r+pulse*.03); -per_frame_33=ob_size=.2+.2*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_size=ob_size*cos(wave_g+pulse*0.4)*.5; -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,rot+.3*sin(radix*3.14*(q1+q2+q3))); -per_pixel_4=zoom=if(above(q2,0),zoom-cos(radix*3.14*q2)*.1,if(above(q3,0),1+q1*.05,1+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Deeper Logic.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Deeper Logic.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Deeper Logic.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Deeper Logic.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=0.998169 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=7.740000 -fWaveScale=0.656000 -fWaveSmoothing=0.800000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=1.960000 -fShader=0.190000 -zoom=0.999698 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.513000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.580000 -ib_size=0.015000 -ib_r=0.550000 -ib_g=1.000000 -ib_b=0.499900 -ib_a=0.230000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*bass_thresh*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*treb_thresh*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*mid_thresh*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+.2*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)+(mid+bass+treb)*entropy*.025); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.03+.02*wave_r; -per_frame_33=ob_size=.05+.04*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_a=.03+.02*wave_g; -per_frame_38=ib_size=.05+.04*bass_residual; -per_pixel_1=radix=if(above(q3,0),min(x,y),max(x,y)); -per_pixel_2=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_3=rot=if(above(q4,0),rad*.2*q5,0); -per_pixel_4=zoom=if(above(q2,0),zoom,if(above(q3,0),1+q1*.05,1+.07*cos(radix*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Goofy Beat Detection.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Goofy Beat Detection.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Goofy Beat Detection.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Goofy Beat Detection.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.992000 -fVideoEchoZoom=0.999400 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.059200 -fWaveScale=0.653093 -fWaveSmoothing=0.270000 -fWaveParam=-0.380000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.008000 -rot=0.001900 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.900000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.018); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse*(.5+.1*entropy)); -per_frame_25=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_26=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_27=q8=entropy; -per_frame_28=ob_r=.4+.4*sin(time*2.157+q6); -per_frame_29=ob_b=.8+.2*sin(time*1.689+q5); -per_frame_30=ob_g=.6+.4*sin(time*.413+q4); -per_frame_31=ib_r=.5+.5*cos(time*1.2+q1*.1); -per_frame_32=ib_b=.4+.4*cos(time*2.811+q2*.1); -per_frame_33=ib_g=.4+.4*cos(time*1.666+q3*.1); -per_frame_34=ib_size=.05+.03*q2; -per_frame_35=ob_size=.03+.02*sin(time*2.321+q2*.2); -per_frame_36=ob_a=.6+.4*q3; -per_frame_37=ib_a=.9+.1*sin(q2*.3+q4+q1*.5); -per_frame_38=mv_r=mv_r+.5*sin(q4+time*.678); -per_frame_39=mv_b=mv_b+.5*sin(q4+time*.789); -per_frame_40=mv_g=mv_g+.5*sin(q5+time*.456); -per_frame_41=mv_a=.2+.2*sin(time*1.178+q5*1.14); -per_frame_42=rot=0; -per_frame_43=wave_r=.6+.4*sin(q1+time*2.183); -per_frame_44=wave_b=.6+.4*sin(q2+time*1.211); -per_frame_45=wave_g=.6+.4*sin(q3+time*1.541); -per_frame_46=wave_mystery=wave_mystery+.5*sin(time*2.18+q6); -per_frame_47=wave_x=wave_x+.3*sin(time*.811)+.005*(frame%3); -per_frame_48=wave_y=wave_y+.3*sin(time*.788)+.005*(frame%3); -per_frame_49=wave_a=3+sin(time*1.414)+q3; -per_frame_50=wave_mode=q7; -per_frame_51=zoom=1+.7*sin(time*1.51); -per_pixel_1=rot=if(above(q4,0),rad*.2*q5,sin(rad*(q4+q3))); -per_pixel_2=zoom=if(above(q2,0),zoom+(1-zoom)*rot*cos(rad*3.14*q2),if(above(q3,0)*above(x,.5+.5*q5),zoom+(1-zoom)*sin(q1*rot*3.14),zoom+(1-zoom)*cos(rad*10*q6))); -per_pixel_3=dx=above(q1,0)*sin(rad*.5*q2); -per_pixel_4=dy=above(q3,0)*sin(rad*.5*q3); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Goo Kung Fu.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Goo Kung Fu.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Goo Kung Fu.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Goo Kung Fu.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.974000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.074092 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.850000 -fModWaveAlphaEnd=1.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.010000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.400000 -wave_g=0.400000 -wave_b=0.400000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=wave_r = wave_r + 0.25*(0.6*sin(0.784*time) + 0.4*sin(0.986*time)); -per_frame_3=wave_g = wave_g + 0.25*(0.6*sin(0.671*time) + 0.4*sin(1.164*time)); -per_frame_4=wave_b = wave_b + 0.25*(0.6*sin(1.423*time) + 0.4*sin(0.687*time)); -per_frame_5=zoom=zoom+mid_att*.1; -per_pixel_1=timer_a=10*sin(time); -per_pixel_2=timer_b=10*sin(time*.5); -per_pixel_3=ripple_x=cos(x*timer_a-timer_b)*bass_att; -per_pixel_4=ripple_y=cos(y*timer_a-timer_b)*treb_att; -per_pixel_5=ripple_r=cos(rad*timer_b-timer_a)*mid_att; -per_pixel_6=ripple=ripple_x+ripple_y+ripple_r; -per_pixel_7=zoom=zoom+ripple*.1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Illusion - Logic Morph.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Illusion - Logic Morph.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Illusion - Logic Morph.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Illusion - Logic Morph.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=1.006490 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=1 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=1 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=2 -nMotionVectorsY=1 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.968100 -fWaveScale=0.706300 -fWaveSmoothing=0.000000 -fWaveParam=-0.000000 -fModWaveAlphaStart=0.550000 -fModWaveAlphaEnd=1.150000 -fWarpAnimSpeed=1.530000 -fWarpScale=1.731000 -fZoomExponent=1.208145 -fShader=0.000000 -zoom=1.000223 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.263000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.301000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -per_frame_1=wave_r = wave_r + 0.350*( 0.60*sin(0.980*time) + 0.40*sin(1.047*time) ); -per_frame_2=wave_g = wave_g + 0.350*( 0.60*sin(0.835*time) + 0.40*sin(1.081*time) ); -per_frame_3=wave_b = wave_b + 0.350*( 0.60*sin(0.814*time) + 0.40*sin(1.011*time) ); -per_frame_4=rot = rot + 0.030*( 0.60*sin(0.381*time) + 0.40*sin(0.479*time) ); -per_frame_5=cx = cx + 0.110*( 0.60*sin(0.374*time) + 0.40*sin(0.294*time) ); -per_frame_6=cy = cy + 0.110*( 0.60*sin(0.393*time) + 0.40*sin(0.223*time) ); -per_frame_7=zoom=zoom+0.05+0.05*sin(time*0.133); -per_frame_8=decay=decay-0.01*(frame%2); -per_frame_9=dx = dx + dx_residual; -per_frame_10=dy = dy + dy_residual; -per_frame_11=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_12=dx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*dx_residual; -per_frame_13=dy_residual = equal(bass_thresh,2)*0.012*sin(time*9) + (1-equal(bass_thresh,2))*dy_residual; -per_frame_14=q1=dx_residual; -per_frame_15=q2=dy_residual; -per_frame_16=rot=rot+(dy_residual-dx_residual)*4; -per_frame_17=cy=cy+dy_residual*4; -per_frame_18=cx=cx+dx_residual*4; -per_frame_19=wave_x=wave_x+dx_residual*10; -per_frame_20=wave_y=wave_y+dy_residual*10; -per_frame_21=ob_r=wave_g; -per_frame_22=ob_g=wave_b; -per_frame_23=ob_b=wave_r; -per_frame_24=ib_r=wave_b; -per_frame_25=ib_g=wave_r; -per_frame_26=ib_b=wave_g; -per_frame_27=ob_size=dy_residual; -per_frame_28=ib_size=dx_residual; -per_pixel_1=zoom=1-zoom*rad*sin(time)*(q1+q2)*cos(rad*20*sin(time*.5))*10; -per_pixel_2=rot=rot-(1-zoom); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - In Memory Of Peg.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - In Memory Of Peg.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - In Memory Of Peg.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - In Memory Of Peg.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,118 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.990000 -fVideoEchoZoom=1.104060 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=1 -bSolarize=0 -bInvert=1 -fWaveAlpha=1.059269 -fWaveScale=0.653093 -fWaveSmoothing=0.270000 -fWaveParam=-0.380000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.998400 -rot=0.002000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.900000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.018); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse*(.5+.1*entropy)); -per_frame_25=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_26=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_27=q8=entropy; -per_frame_28=ob_r=.2+.1*sin(time*2.157+q6); -per_frame_29=ob_b=.2+.1*sin(time*1.689+q5); -per_frame_30=ob_g=.2+.1*sin(time*.413+q4); -per_frame_31=ib_r=.8+.2*cos(time*1.2+q1*.1); -per_frame_32=ib_b=.2+.2*cos(time*2.811+q2*.1); -per_frame_33=ib_g=.7+.3*cos(time*1.666+q3*.1); -per_frame_34=ib_size=.03+.02*q2; -per_frame_35=ob_size=.03+.02*sin(time*2.321+q2*.2); -per_frame_36=ob_a=.75+.25*q3; -per_frame_37=ib_a=.8+.2*sin(q2*.3+q4+q1*.5); -per_frame_38=mv_r=mv_r+.5*sin(q4+time*.678); -per_frame_39=mv_b=mv_b+.5*sin(q4+time*.789); -per_frame_40=mv_g=mv_g+.5*sin(q5+time*.456); -per_frame_41=mv_a=.2+.2*sin(time*1.178+q5*1.14); -per_frame_42=rot=0; -per_frame_43=wave_r=.6+.4*sin(q1+time*2.183); -per_frame_44=wave_b=.6+.4*sin(q2+time*1.211); -per_frame_45=wave_g=.6+.4*sin(q3+time*1.541); -per_frame_46=wave_mystery=wave_mystery+.3*sin(time*2.18+q6); -per_frame_47=wave_x=wave_x+.3*sin(time*.811)+.005*(frame%3); -per_frame_48=wave_y=wave_y+.3*sin(time*.788)+.005*(frame%3); -per_frame_49=wave_a=3+sin(time*1.414)+q3; -per_frame_50=zoom=zoom+.5*sin(time*1.69); -per_pixel_1=xx=(x-.5+.03*q5+.1*y*q6+.1*sin(time*.322))*2; -per_pixel_2=yy=(y-.5+.03*q6+.1*x*q5+.1*sin(time*.427))*2; -per_pixel_3=dx=sin(xx); -per_pixel_4=dy=sin(yy); -per_pixel_5=rot=sin(rad*(xx*q4+yy*q5+1.7*q6)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Jaded Emotion.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Jaded Emotion.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Jaded Emotion.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Jaded Emotion.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=0.996630 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.005729 -fWaveScale=7.184967 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.250000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.100000 -per_frame_1=warp = 0; -per_frame_2=wave_r = wave_r + bass*.5; -per_frame_3=wave_g = wave_g + treb*.5; -per_frame_4=wave_b = wave_b + mid*.5; -per_frame_5=ib_r = ib_r + .4*sin(time*.222); -per_frame_6=ib_g = ib_g + .4*sin(time*.333); -per_frame_7=ib_b = ib_b + .4*sin(time*.111); -per_frame_8=ib_a = ib_a + .05*sin(time*.555); -per_frame_9=ib_size = ib_size + .24*sin(time*.444); -per_frame_10=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_11=cx_residual = equal(bass_thresh,2)*0.016*sin(time*7) + (1-equal(bass_thresh,2))*cx_residual; -per_frame_12=treb_thresh = above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*0.96+1.3); -per_frame_13=cy_residual = equal(treb_thresh,2)*0.016*sin(time*7) + (1-equal(treb_thresh,2))*cy_residual; -per_frame_14=mid_thresh = above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*0.96+1.3); -per_frame_15=rot_residual = equal(mid_thresh,2)*0.016*sin(time*7) + (1-equal(mid_thresh,2))*rot_residual; -per_frame_16=cx=cx_residual+sin(time*.888); -per_frame_17=cy=cy_residual+sin(time*.999); -per_frame_18=rot=rot_residual*3; -per_pixel_1=zoom=zoom+cos(rad*10*sin(time*.666))*.07; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Morat's Final Voyage.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Morat's Final Voyage.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Morat's Final Voyage.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Morat's Final Voyage.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,83 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=1.001825 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.976151 -fWaveScale=0.931000 -fWaveSmoothing=0.180000 -fWaveParam=-0.320000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=2.300000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*0.96+1.3); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*0.96+1.3); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=pulse=if(above(abs(pulse),5000),-5000,pulse+mid_att*.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed)); -per_frame_15=wave_b=if(treb_changed,1,if(mid_changed,.45,-.45))*q4; -per_frame_16=wave_g=if(bass_changed,.1,bass_flop); -per_frame_17=wave_r=if(mid_flop,1,.5*q2*treb_flop); -per_frame_18=ib_b=ib_b+.5*sin(pulse); -per_frame_19=ib_g=ib_g+5*sin(pulse*.8); -per_frame_20=ib_r=ib_r+5*sin(pulse*.8); -per_frame_21=ob_b=wave_r; -per_frame_22=ob_g=wave_b; -per_frame_23=ob_r=wave_g; -per_frame_24=wave_mystery=sin(pulse); -per_frame_25=q1=pulse; -per_pixel_1=zoom=zoom-cos(x*10*sin(time+q1*.9)-10*sin(time+q1))*.1-sin(rad*10*sin(time+q1*.5))*.1; -per_pixel_2=rot=rot+abs(1-zoom)*sin(time+q1)*2; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Rozzor triangle tweak.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Rozzor triangle tweak.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Rozzor triangle tweak.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Rozzor triangle tweak.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.960000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=0.224562 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.199900 -wave_b=0.700000 -wave_x=0.600000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.030000 -ob_g=0.150000 -ob_b=0.250000 -ob_a=0.020000 -ib_size=0.500000 -ib_r=0.100000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.010000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=0.000000 -mv_g=0.700000 -mv_b=1.000000 -mv_a=0.500000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=1 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=0.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=4 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.100000 -shapecode_1_enabled=1 -shapecode_1_sides=3 -shapecode_1_additive=0 -shapecode_1_thickOutline=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.250000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=0.100000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.400000 -shape_1_per_frame1=ang = time*1.4; -shape_1_per_frame2=x = 0.5 + 0.08*cos(time*1.1) + 0.03*cos(time*0.7); -shape_1_per_frame3=y = 0.5 + 0.08*sin(time*1.1) + 0.03*sin(time*0.7); -shape_1_per_frame4=r = 0.5 + 0.5*sin(time*0.713 + 1); -shape_1_per_frame5=g = 0.5 + 0.5*sin(time*0.563 + 2); -shape_1_per_frame6=b = 0.5 + 0.5*sin(time*0.654 + 5); -shape_1_per_frame7=r2 = 0.5 + 0.5*sin(time*0.885 + 4); -shape_1_per_frame8=g2 = 0.5 + 0.5*sin(time*0.556+ 1); -shape_1_per_frame9=b2 = 0.5 + 0.5*sin(time*0.638 + 3); -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid+thresh+treb_thresh)*.052+-(bass+treb+mid)*.01); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.05+.05*cos(wave_r+pulse*.03); -per_frame_33=ob_size=.2+.2*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_size=ob_size*cos(wave_g+pulse*0.4)*.5; -per_frame_38=mv_a=q1; -per_frame_39=mv_x=rand(30); -per_frame_40=mv_y=rand(30); -per_frame_41=mv_r=wave_b; -per_frame_42=mv_b=wave_g; -per_frame_43=mv_g=wave_r; -per_frame_44=wave_mode=4+4*q4; -per_pixel_1=newx = x - abs(q1); -per_pixel_2=newy = y - abs(q2); -per_pixel_3=newrad = sqrt((newx)*(newx)+0.5625*(newy)*(newy))*2; -per_pixel_4=newzoom = pow(1.03, pow(0.01+sin(newrad*newrad), newrad*2-1)); -per_pixel_5=dx = (newx)*newzoom - newx; -per_pixel_6=dy = (newy)*newzoom - newy; -per_pixel_7=rot = -0.1*newrad*(0.5*rad+0.1); -per_pixel_8=zoom = zoom+.07*cos(x*10*q3); -per_pixel_9=rot = rot * (zoom-1); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Perverted Dialect.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Perverted Dialect.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Perverted Dialect.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Perverted Dialect.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=2.000000 -fDecay=0.983000 -fVideoEchoZoom=1.006596 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=3 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=2.047093 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=3.394161 -fShader=0.000000 -zoom=1.008148 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = wave_r + if(above(bass_att,1.4),1,.49*sin(time*2)); -per_frame_3=wave_g = wave_g + if(above(bass_att,1.4),0,if(above(treb_att,1.4),1,.49*sin(time*3))); -per_frame_4=wave_b = wave_b + if(above(treb_att,1.4),0,.49*sin(time)); -per_frame_5=timer_base=.5; -per_frame_6=q1=sin(time*timer_base*4); -per_frame_7=q2=sin(time*timer_base*2); -per_frame_8=q3=sin(time*timer_base); -per_frame_9=rot=if(above(q1,0),if(above(q2,0),.1,-.1),0); -per_frame_10=zoom=zoom+.05*q2+.05*q1; -per_frame_11=wave_mystery=wave_mystery+.7*q1+.3*q2; -per_frame_12=wave_size=wave_size+0.5*q3; -per_frame_13=cx=cx+.2*q1; -per_frame_14=cy=cy+.2*q3; -per_pixel_1=centerx = .5; -per_pixel_2=centery = .5; -per_pixel_3=crad = abs(rad-.5)*q2; -per_pixel_4=grid=abs(x*10-5)%2 + abs(y*10-5)%2; -per_pixel_5=sx_temp = if(equal(grid,0),if(above(x,centerx),sx - crad - centerx,sx + crad - centerx),sx); -per_pixel_6=sy_temp = if(equal(grid,0),if(above(y,centery),sy - crad - centery,sy + crad - centery),sy); -per_pixel_7=sx=if(below(q1,0),sx-sx_temp*q2*.1,sx); -per_pixel_8=sy=if(below(q1,0),sy-sx_temp*q2*.1,sy); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - ReAwoke.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - ReAwoke.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - ReAwoke.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - ReAwoke.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,269 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999489 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.059269 -fWaveScale=0.653093 -fWaveSmoothing=0.270000 -fWaveParam=-0.380000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.337423 -rot=0.001900 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.900000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=1 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.776608 -shapecode_0_ang=0.628319 -shapecode_0_tex_ang=3.141593 -shapecode_0_tex_zoom=0.408391 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=x=.5+.05*q4; -shape_0_per_frame2=y=.5+.05*q5; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.018); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse*(.5+.1*entropy)); -per_frame_25=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_26=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_27=q8=entropy; -per_frame_28=ob_r=.2+.1*sin(time*2.157+q6); -per_frame_29=ob_b=.2+.1*sin(time*1.689+q5); -per_frame_30=ob_g=.2+.1*sin(time*.413+q4); -per_frame_31=ib_r=.8+.2*cos(time*1.2+q1*.1); -per_frame_32=ib_b=.2+.2*cos(time*2.811+q2*.1); -per_frame_33=ib_g=.7+.3*cos(time*1.666+q3*.1); -per_frame_34=ib_size=.1+.05*q2; -per_frame_35=ob_size=.03+.02*sin(time*2.321+q2*.2); -per_frame_36=ob_a=.75+.25*q3; -per_frame_37=ib_a=.8+.2*sin(q2*.3+q4+q1*.5); -per_frame_38=mv_r=mv_r+.5*sin(q4+time*.678); -per_frame_39=mv_b=mv_b+.5*sin(q4+time*.789); -per_frame_40=mv_g=mv_g+.5*sin(q5+time*.456); -per_frame_41=mv_a=.2+.2*sin(time*1.178+q5*1.14); -per_frame_42=rot=0; -per_frame_43=wave_r=.6+.4*sin(q1+time*2.183); -per_frame_44=wave_b=.6+.4*sin(q2+time*1.211); -per_frame_45=wave_g=.6+.4*sin(q3+time*1.541); -per_frame_46=wave_mystery=wave_mystery+.5*sin(time*2.18+q6); -per_frame_47=wave_x=wave_x+.3*sin(time*.811)+.005*(frame%3); -per_frame_48=wave_y=wave_y+.3*sin(time*.788)+.005*(frame%3); -per_frame_49=wave_a=3+sin(time*1.414)+q3; -per_frame_50=zoom=zoom+.03*sin(time*.8); -per_frame_51=wave_mode=q8%2; -per_pixel_1=xx=(x-.5+.03*q5+.1*y*q6+.1*sin(time*.322))*2; -per_pixel_2=yy=(y-.5+.03*q6+.1*x*q5+.1*sin(time*.427))*2; -per_pixel_3=dx=sin(xx); -per_pixel_4=dy=sin(yy); -per_pixel_5=radix=if(above(q3,0),min(xx,yy),max(xx,yy)); -per_pixel_6=radix=if(above(q2,0),min(radix,rad),max(radix,rad)); -per_pixel_7=rot=sin(rad*(xx*q4+yy*q5+radix*q6)); -per_pixel_8=cx=cx+xx; -per_pixel_9=cy=cy+yy; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Ribald Ballad.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Ribald Ballad.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Ribald Ballad.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Ribald Ballad.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.991000 -fVideoEchoZoom=1.008149 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.160929 -fWaveScale=3.394157 -fWaveSmoothing=0.540000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.772000 -fZoomExponent=1.960000 -fShader=0.070000 -zoom=0.999698 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.513000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.580000 -ib_size=0.015000 -ib_r=0.550000 -ib_g=1.000000 -ib_b=0.499900 -ib_a=1.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-20),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid+thresh+treb_thresh)*.035-(bass+treb+mid)*.01); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=sin(pulse/2); -per_frame_25=wave_r=wave_r+.5*bass_residual; -per_frame_26=wave_r=wave_g+.5*mid_residual; -per_frame_27=wave_r=wave_b+.5*treb_residual; -per_frame_28=wave_mystery=mid_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.05+.05*cos(wave_r+pulse*.03); -per_frame_33=ob_size=.2+.2*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_size=ob_size*cos(wave_g+pulse*0.4)*.5; -per_frame_38=mv_a=.5+.5*q4; -per_frame_39=mv_x=bass_flop*(15+q2*15); -per_frame_40=mv_y=bass_flop*(15+q3*15); -per_frame_41=mv_r=wave_b; -per_frame_42=mv_b=wave_g; -per_frame_43=mv_g=wave_r; -per_frame_44=cx=cx+sin(pulse*q3)*.1; -per_frame_45=cy=cy+sin(pulse*q2)*.1; -per_pixel_1=rot=if(above(q4,0),rad*.2*q5,rot+.3*sin(ang*3.14*(q1+q2+q3))); -per_pixel_2=zoom=if(above(q2,0),zoom-cos(rad*3.14*q2)*.1,if(above(q3,0),1+q1*.05,1+.07*cos(ang*10*q1))); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.980000 -fVideoEchoZoom=0.999838 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=2 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=1 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=35.318443 -fWaveScale=0.010000 -fWaveSmoothing=0.792000 -fWaveParam=-1.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.970000 -fWarpAnimSpeed=1.444800 -fWarpScale=86.134796 -fZoomExponent=1.030300 -fShader=0.500000 -zoom=0.992400 -rot=0.000000 -cx=1.069900 -cy=1.069999 -dx=0.000000 -dy=0.000000 -warp=1.307431 -sx=1.000000 -sy=1.000000 -wave_r=0.250000 -wave_g=0.260000 -wave_b=0.270000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.500000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.100000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=1.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=1.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*0.96+1.3); -per_frame_6=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_7=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*0.96+1.3); -per_frame_8=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_9=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*0.96+1.3); -per_frame_10=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_11=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_12=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_13=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_14=pulse=if(above(abs(pulse),20),-20,pulse+.1*bor(bor(bass_changed*bnot(treb_changed),treb_changed*bnot(bass_changed))*bnot(mid_changed),mid_changed))+(bass+mid+treb)*.025; -per_frame_15=wave_b=if(treb_changed,1,if(mid_changed,.45,-.45))*q4; -per_frame_16=wave_g=if(bass_changed,.1,bass_flop); -per_frame_17=wave_r=if(mid_flop,1,.5*q2*treb_flop); -per_frame_18=ib_b=ib_b+.5*sin(pulse); -per_frame_19=ib_g=ib_g+5*sin(pulse*.8); -per_frame_20=ib_r=ib_r+5*sin(pulse*.8); -per_frame_21=ob_b=wave_r; -per_frame_22=ob_g=wave_b; -per_frame_23=ob_r=wave_g; -per_frame_24=wave_mystery=sin(pulse); -per_frame_25=q1=pulse; -per_frame_26=mv_y = 1.25; -per_pixel_1=rot = rot + 0.04*( 0.60*sin(0.381*time) + 0.40*sin(0.579*time) )+ if(above(q1,0),sin(rad)/30,sin(1-rad)/30); -per_pixel_2=zoom = zoom + 0.013*( 0.60*sin(0.339*time) + 0.40*sin(0.276*time) ) + if(above(sin(1.123*time/4),0),sin(1-rad)/40,-sin(rad*q1)/40); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Luckless.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Luckless.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Luckless.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Luckless.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999400 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.059269 -fWaveScale=0.653093 -fWaveSmoothing=0.270000 -fWaveParam=-0.380000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.619082 -rot=0.001900 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.900000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.018); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse*(.5+.1*entropy)); -per_frame_25=q6=sin(pulse*(.5+pow(.25,entropy))); -per_frame_26=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_27=q8=entropy; -per_frame_28=ob_r=.4+.4*sin(time*2.157+q6); -per_frame_29=ob_b=.8+.2*sin(time*1.689+q5); -per_frame_30=ob_g=.6+.4*sin(time*.413+q4); -per_frame_31=ib_r=.5+.5*cos(time*1.2+q1*.1); -per_frame_32=ib_b=.4+.4*cos(time*2.811+q2*.1); -per_frame_33=ib_g=.4+.4*cos(time*1.666+q3*.1); -per_frame_34=ib_size=.1+.05*q2; -per_frame_35=ob_size=.03+.02*sin(time*2.321+q2*.2); -per_frame_36=ob_a=.6+.4*q3; -per_frame_37=ib_a=.9+.1*sin(q2*.3+q4+q1*.5); -per_frame_38=mv_r=mv_r+.5*sin(q4+time*.678); -per_frame_39=mv_b=mv_b+.5*sin(q4+time*.789); -per_frame_40=mv_g=mv_g+.5*sin(q5+time*.456); -per_frame_41=mv_a=.2+.2*sin(time*1.178+q5*1.14); -per_frame_42=rot=0; -per_frame_43=wave_r=.6+.4*sin(q1+time*2.183); -per_frame_44=wave_b=.6+.4*sin(q2+time*1.211); -per_frame_45=wave_g=.6+.4*sin(q3+time*1.541); -per_frame_46=wave_mystery=wave_mystery+.5*sin(time*2.18+q6); -per_frame_47=wave_x=wave_x+.3*sin(time*.811)+.005*(frame%3); -per_frame_48=wave_y=wave_y+.3*sin(time*.788)+.005*(frame%3); -per_frame_49=wave_a=3+sin(time*1.414)+q3; -per_frame_50=wave_mode=q7; -per_frame_51=zoom=zoom+.1*sin(time*.8); -per_pixel_1=rot = rot + if(below(sin(ang+sin(rad+.5*q4)*5), q6), -rot, 0.5*sin((rad+.5*q1)*4*q5)); -per_pixel_2=zoom=zoom+rot*q3; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.989000 -fVideoEchoZoom=1.006593 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=7 -bAdditiveWaves=0 -bWaveDots=1 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.089269 -fWaveSmoothing=0.720000 -fWaveParam=-0.360000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.009963 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=0.999999 -sy=0.999830 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.060000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=3.200000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=chaos=.9+.1*sin(pulse-beat); -per_frame_2=entropy=if(bnot(entropy),2,if(equal(pulse,-20)*above(beat,0),1+rand(5),entropy)); -per_frame_3=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_4=bass_changed=abs(bass_changed-equal(bass_thresh,2)); -per_frame_5=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_6=treb_changed=abs(treb_changed-equal(treb_thresh,2)); -per_frame_7=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_8=mid_changed=abs(mid_changed-equal(mid_thresh,2)); -per_frame_9=pulse=if(above(abs(pulse),20),-20,pulse+(mid+bass+treb)*.025); -per_frame_10=beat=if(above(abs(beat),20),-20,beat+.1*chaos*bor(bor(bass_changed,treb_changed),mid_changed)); -per_frame_11=q3=sin(pulse); -per_frame_12=q2=sin(pulse+beat); -per_frame_13=q4=sin(beat); -per_frame_14=q5=entropy; -per_frame_15=q1=(1+1*above(q2,0))*(1+2*above(q3,0))*(1+4*mid_changed*above(q3,0))*(1+6*above(q4,0))*(1+10*bass_changed*above(q4,0))*(1+12*above(q5,3))*(1+16*treb_changed*above(q2,0)); -per_frame_16=wave_r=.5+.2*bnot(q1%2)-.2*bnot(q1%3)+.3*q3*bnot(q1%13); -per_frame_17=wave_g=.5+.2*bnot(q1%5)-.2*bnot(q1%13)+.3*q4*bnot(q1%7); -per_frame_18=wave_b=if(bnot(q1%6),.8+.2*q4,.5+.5*q2); -per_frame_19=ob_r=ob_r+.2*q2+.3*bnot(q1%13)*q3; -per_frame_20=ob_b=ob_b-.1*bnot(q1%105)-.4*q2; -per_frame_21=ob_g=ob_g+.5*sin(pulse*.4*entropy); -per_frame_22=ob_a=.07+.05*q3; -per_frame_23=ob_size=.01*entropy*bnot(q1%6); -per_frame_24=ib_r=ib_r+.2*q1-.3*bnot(q1%3)*q4; -per_frame_25=ib_b=ib_b-.2*bnot(q1%17)-.3*q2+.2*bnot(q1%11); -per_frame_26=ib_g=ib_g+.5*sin(pulse*.35*entropy); -per_frame_27=ib_a=.07+.05*q3*q4; -per_frame_28=ib_size=.005+.005*q3; -per_frame_29=zoom_fade=if(bnot(q1%2),zoom_fade-(zoom_fade-.92)/2,zoom_fade-bnot(q1%5)*.02*q4+bnot(q1%2)*.02*q3-bnot(q1%11)*.04*q2); -per_frame_30=zoom=zoom_fade; -per_frame_31=rot_fade=if(bnot(q1%7),rot_fade-(rot_fade-.1*q3)/2-.03*bnot(q1%13),rot_fade-.02*bnot(q1%11)+.02*bnot(q1%3)+.03*bnot(q1%35)); -per_frame_32=rot=rot_fade; -per_frame_33=cx=cx+.1*bnot(q1%39)+.07*bnot(q1%13)*q3-.2*bnot(q1%55)*q4; -per_frame_34=wave_x=wave_x+.1*q3+.2*q4*bnot(q1%2); -per_frame_35=wave_mystery=wave_x-.5; -per_pixel_1=zoom = zoom + rad/10 + abs(sin(ang-rad)/10) +q4/10; -per_pixel_2=rot = rot + treb*.001 + sin(treb+rad)/33 -q3/8; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Triptionary.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Triptionary.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Triptionary.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Triptionary.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=1 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.849581 -fWaveScale=7.858094 -fWaveSmoothing=0.360000 -fWaveParam=-0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.650000 -wave_g=0.650000 -wave_b=0.650000 -wave_x=0.500000 -wave_y=0.400000 -ob_size=0.001500 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.017500 -ib_r=1.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(beat); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-3.14),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.052); -per_frame_20=beat=if(above(abs(beat),3.14),-3.14,beat+(bass+treb+mid)*.052); -per_frame_21=q1=mid_residual; -per_frame_22=q2=bass_residual; -per_frame_23=q3=treb_residual; -per_frame_24=q4=sin(pulse); -per_frame_25=q5=sin(beat); -per_frame_26=wave_r=wave_r+.5*bass_residual; -per_frame_27=wave_g=wave_g+.5*mid_residual; -per_frame_28=wave_b=wave_b+.5*treb_residual; -per_frame_29=ob_r=if(bass_flop,treb_flop,wave_r); -per_frame_30=ob_b=if(treb_flop,mid_flop,wave_b); -per_frame_31=ob_g=if(mid_flop,bass_flop,wave_g); -per_frame_32=ob_a=.05+.05*cos(wave_r+pulse*.03); -per_frame_33=ob_size=.2+.2*treb_residual; -per_frame_34=ib_r=if(bass_flop,ob_b,ob_g); -per_frame_35=ib_b=if(treb_flop,ob_g,ob_r); -per_frame_36=ib_g=if(mid_flop,ob_r,ob_b); -per_frame_37=ib_size=ob_size*cos(wave_g+pulse*0.4)*.5; -per_frame_38=mv_a=.5+.5*q5; -per_frame_39=mv_x=abs(beat*10)*entropy; -per_frame_40=mv_y=mv_x; -per_frame_41=mv_r=wave_b; -per_frame_42=mv_b=wave_g; -per_frame_43=mv_g=wave_r; -per_frame_44=wave_x = 0.5+sin(2*time)/8; -per_frame_45=wave_y = 0.5-cos(3*time)/6; -per_frame_46=wave_mystery=q5; -per_pixel_1=zoom = 1- log(sqrt(2)-rad)/20 - 0.1*sin(rad)- 0.09*cos(1-rad); -per_pixel_2=rot = log(sqrt(2)-rad)/3- 0.1*cos(time+rad*0.123) - 0.08*sin(time-(1-rad)); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.438649 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.999996 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.976000 -ob_size=0.005000 -ob_r=0.400000 -ob_g=0.300000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.600000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = 0.5 + 0.5*sin(time*0.894); -per_frame_3=wave_g = 0.5 + 0.5*sin(time*1.14); -per_frame_4=wave_b = 0.5 + 0.5*sin(3-bass_att); -per_frame_5=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*(0.9+.1*sin(time*2.8))+1.3); -per_frame_6=dx_r = equal(thresh,2)*0.004*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_7=dy_r = equal(thresh,2)*0.004*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_8=q1 = thresh; -per_frame_9=dx = 1.1* dx_r; -per_frame_10=dy = 1.1* dy_r; -per_frame_11=dx = dx + if (above(bass,1.35), 31*dx_r, 0); -per_frame_12=dy = if(above(bass,1.3), 0, dy); -per_frame_13=decay=.995+.004*sin(time*.369)+.001*sin(time*1.54); -per_pixel_1=zoom = zoom -0.01*q1*rad; -per_pixel_2=zoomexp = 1+0.2*(rad-0.2*q1); -per_pixel_3=sx=sx-cos(y*(6.28+3.14*sin(time)))*(.009+.003*sin(time*2.18))*sin(time*.3); -per_pixel_4=rot=sin(x*3.14)*.001*sin(time*.67); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=7 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=100.000000 -fWaveScale=0.438649 -fWaveSmoothing=0.500000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=0.999996 -fShader=1.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.976000 -ob_size=0.005000 -ob_r=0.400000 -ob_g=0.300000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=1.000000 -ib_g=0.600000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = 0.5 + 0.3*sin(time*0.894); -per_frame_3=wave_g = 0.53 + 0.33*sin(time*1.14); -per_frame_4=wave_b = 0.2 + 0.2*(1-bass); -per_frame_5=thresh = above(bass_att,thresh)*2+(1-above(bass_att,thresh))*((thresh-1.3)*(0.9+.1*sin(time*2.8))+1.3); -per_frame_6=dx_r = equal(thresh,2)*0.004*sin(5*time)+(1-equal(thresh,2))*dx_r; -per_frame_7=dy_r = equal(thresh,2)*0.004*sin(6*time)+(1-equal(thresh,2))*dy_r; -per_frame_8=q1 = thresh; -per_frame_9=dx = 1.1* dx_r; -per_frame_10=dy = 1.1* dy_r; -per_frame_11=dx = dx + if (above(bass,1.35), 31*dx_r, 0); -per_frame_12=dy = if(above(bass,1.3), 0, dy); -per_frame_13=decay=.997+.003*sin(time*.369); -per_pixel_1=zoom = zoom -0.01*q1*rad; -per_pixel_2=zoomexp = 1+0.2*(rad-0.2*q1); -per_pixel_3=sx=sx-cos(y*(6.28+3.14*sin(time)))*.005; -per_pixel_4=rot=sin(x*3.14)*.01*q1; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,110 +0,0 @@ -[preset00] -fRating=2.000000 -fGammaAdj=1.000000 -fDecay=0.975000 -fVideoEchoZoom=0.999993 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.741913 -fWaveScale=0.502368 -fWaveSmoothing=0.360000 -fWaveParam=-0.280000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.942044 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.000000 -wave_g=0.000000 -wave_b=0.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.920000 -ib_size=0.004000 -ib_r=0.400000 -ib_g=0.400000 -ib_b=0.000000 -ib_a=1.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(beat); -per_frame_6=entropy=if(bnot(entropy),2,if(equal(pulse,-3.14),1+rand(3),entropy)); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.052); -per_frame_20=beat=if(above(abs(beat),3.14),-3.14,beat+(bass+treb+mid)*.01); -per_frame_21=q1=mid_residual; -per_frame_22=q2=bass_residual; -per_frame_23=q3=treb_residual; -per_frame_24=q4=sin(pulse); -per_frame_25=q5=sin(beat); -per_frame_26=mv_r=mv_r+.5*bass_residual; -per_frame_27=mv_g=mv_g+.5*mid_residual; -per_frame_28=mv_b=mv_b+.5*treb_residual; -per_frame_29=mv_a=1.1-(ob_a+ib_a)*chaos*.5; -per_frame_30=mv_x=abs(beat*10)*entropy; -per_frame_31=mv_y=abs(pulse*10)*entropy; -per_frame_32=mv_l=entropy*(q4-q5); -per_frame_33=wave_r=0.8+0.2*bass_flop*mv_g; -per_frame_34=wave_g=0.3+0.3*mid_flop*mv_b; -per_frame_35=wave_b=0.4+0.3*0.1*treb_flop*mv_r; -per_frame_36=ob_r=0.1 + 0.1*sin(time*1.143)+0.2*mv_g; -per_frame_37=ob_g=0.3 + 0.3*sin(time*0.897)+0.3*mv_b; -per_frame_38=ob_b=0.2+0.5*mv_r; -per_frame_39=treb_effect = max(max(treb, treb_att)-1.2,0); -per_frame_40=mid_effect = max(max(mid,mid_att)-1.2,0); -per_frame_41=ib_r = 1 - ob_b; -per_frame_42=ib_g = 1- mv_g; -per_frame_43=ib_b = 0.5*mv_b + 0.5*ob_b; -per_frame_44=ib_a = if(above(treb_effect,0), if(above(mid_effect,0),1,0),0); -per_pixel_1=bass_effect = max(max(bass,bass_att)-1.18,0); -per_pixel_2=grid=rad*10%(above(q1,q4)+above(q2,q5)+above(q3,q4)) + (sqrt(2)-rad)*10%(above(q1,q5)+above(q2,q4)+above(q3,q5))*q1; -per_pixel_3=rot=if(grid,.12*cos(rad*3.14+x*q1*3.14+y*q2*3.14)*(q5+q4),0); -per_pixel_4=zoom=zoom-bnot(grid)*atan2(x*q3*3.14,y*q5*3.14)*.14*(x*2-1)+0.12*bass_effect; -per_pixel_5=sx=sx+.2*q1*sin(x*1.6)*-grid; -per_pixel_6=sy=sy+.2*q2*sin(y*1.6)*(1-grid); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Shaping The Grid.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Shaping The Grid.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Shaping The Grid.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Shaping The Grid.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.985000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=1 -bInvert=0 -fWaveAlpha=0.625316 -fWaveScale=1.187274 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999700 -fShader=0.030000 -zoom=0.960496 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=0.000000 -ib_size=0.500000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.500000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=1 -shapecode_0_textured=0 -shapecode_0_x=0.650000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.605500 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.628319 -shapecode_0_tex_zoom=1.816695 -shapecode_0_r=1.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=ang=3.14+3.14*q1; -shape_0_per_frame2=x=.5+.1*q2; -shape_0_per_frame3=y=.5+.1*q3; -shape_0_per_frame4=sides=3+q6; -shape_0_per_frame5=rad=.5+.5*q4; -shape_0_per_frame6=textured=above(q6,3); -shape_0_per_frame7=border_r=1-rad; -shape_0_per_frame8=border_b=rad-.01*sides; -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_init_1=entropy=2; -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.1+.1*sin(pulse); -per_frame_6=bass_thresh =if(above(bass_att,bass_thresh),3,bass_thresh-chaos); -per_frame_7=bass_flop=abs(bass_flop-equal(bass_thresh,3)); -per_frame_8=treb_thresh=if(above(treb_att,treb_thresh),3,treb_thresh-chaos); -per_frame_9=treb_flop=abs(treb_flop-equal(treb_thresh,3)); -per_frame_10=mid_thresh=if(above(mid_att,mid_thresh),3,mid_thresh-chaos); -per_frame_11=mid_flop=abs(mid_flop-equal(mid_thresh,3)); -per_frame_12=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_13=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_14=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_15=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_16=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_17=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_18=pulse=if(above(abs(pulse),3.14),-3.14,pulse+(bass_thresh+mid_thresh+treb_thresh)*.032); -per_frame_19=entropy=if(equal(pulse,-3.14),bass_flop+mid_flop+treb_flop+rand(5),entropy); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse/2+q1); -per_frame_25=q6=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q7=entropy; -per_frame_27=q8=sin(q6*q1+q7*q2); -per_frame_28=zoom=zoom+.02*q8; -per_frame_29=wave_mystery=sin(q1+q5); -per_frame_30=wave_r=wave_r+.5*sin(q1+q2*2+q4*2.1); -per_frame_31=wave_b=wave_b+.5*sin(q2+q3*2+q4*2.2); -per_frame_32=wave_g=wave_g+.5*sin(q3+q1*2+q4*2.3); -per_frame_33=ob_r=if(bass_flop,ob_r+.5*sin(q1+q3*1.14+q2),wave_b); -per_frame_34=ob_b=if(treb_flop,ob_b+.5*sin(q2+q1*1.14+q3),wave_g); -per_frame_35=ob_g=if(mid_flop,ob_g+.5*sin(q3+q2*1.14+q1),wave_r); -per_frame_36=ib_r=if(bass_flop,ob_b,ib_r+.5*cos(q5+q1*2.14)); -per_frame_37=ib_b=if(treb_flop,ob_g,ib_b+.5*cos(q5+q2*2.14)); -per_frame_38=ib_g=if(mid_flop,ob_r,ib_g+.5*cos(q5+q3*2.14)); -per_frame_39=mv_r=mv_r+.5*sin(q4+q5*1.14*q1); -per_frame_40=mv_b=mv_b+.5*sin(q4+q5*1.14*q2); -per_frame_41=mv_g=mv_g+.5*sin(q5+q5*1.14*q3); -per_frame_42=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_43=ib_a=.5+.5*sin(q2*2.14+q3); -per_frame_44=mv_a=mv_a+mv_a*sin(q3*2.14+q2); -per_frame_45=ob_size=.1+.1*sin(q3*3+q1); -per_frame_46=ib_size=ib_size*.5+ib_size*.25*sin(q1*3+q3); -per_frame_47=wave_mode=q6+above(q4,0)+above(q5,0); -per_frame_48=wave_mystery=sin(q3*1.14+q1*1.14+q2); -per_frame_49=mv_l=(q6*q7)*q2; -per_frame_50=wave_x=wave_x+.1*q7*q4; -per_frame_51=wave_y=wave_y+.1*q6*q5; -per_frame_52=mv_x=q6*q7; -per_frame_53=mv_y=q6*q7; -per_frame_54=monitor=q1; -per_pixel_1=grid=(x*q7*3)%2+above(y,.5+.25)*above(q6,4); -per_pixel_2=zoom=zoom+.07*cos(sin(rad*2.14*q3+abs(rad-.1*grid))*2.14+rad*sin(q4*2.14+q1))*bnot(grid); -per_pixel_3=rot=.05*equal(grid,0)*cos(rad*2.14*q2+q3)*(q2+q3); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=0.999496 -fVideoEchoAlpha=1.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.059269 -fWaveScale=0.653093 -fWaveSmoothing=0.090000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=5.995790 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.998400 -rot=0.002000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.500000 -ib_g=0.900000 -ib_b=0.500000 -ib_a=1.000000 -nMotionVectorsX=24.959999 -nMotionVectorsY=19.199999 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=1.000000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.6)*chaos+1.6); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.6)*chaos+1.6); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.6)*chaos+1.6); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*3) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*3) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*3) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.008); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse*q1); -per_frame_24=q5=cos(pulse/2+q1); -per_frame_25=q6=sin(q1*1.14+q2*1.14+q3*1.14); -per_frame_26=q7=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_27=q8=entropy; -per_frame_28=ob_r=.2+.2*sin(time*2.157); -per_frame_29=ob_b=.2+.2*sin(time*1.689); -per_frame_30=ob_g=.2+.2*sin(time*1.413); -per_frame_31=ib_r=.8+.2*cos(time*1.2+q1*.1); -per_frame_32=ib_b=.2+.2*cos(time*2.811+q2*.1); -per_frame_33=ib_g=.7+.3*cos(time*1.666+q3*.1); -per_frame_34=ib_size=.03+.02*q2; -per_frame_35=ob_size=.03+.02*sin(time*2.321+q2*.2); -per_frame_36=ob_a=.75+.25*q3; -per_frame_37=ib_a=.8+.2*sin(q2*.3+q4+q1*.5); -per_frame_38=mv_r=mv_r+.5*sin(q4+time*.678); -per_frame_39=mv_b=mv_b+.5*sin(q4+time*.789); -per_frame_40=mv_g=mv_g+.5*sin(q5+time*.456); -per_frame_41=mv_a=.2+.2*sin(time*1.178+q5*1.14); -per_frame_42=rot=0; -per_frame_43=echo_zoom=1+.08*q1+.08*q2+.06*q3+.16*cos(time*.681); -per_frame_44=wave_r=.5+.5*sin(q1+time*2.183); -per_frame_45=wave_b=.5+.5*sin(q2+time*1.211); -per_frame_46=wave_g=.5+.5*sin(q3+time*1.541); -per_frame_47=wave_mystery=wave_mystery+.5*sin(time*3+q6); -per_frame_48=wave_x=wave_x+.3*sin(time*.811)+.005*(frame%3); -per_frame_49=wave_y=wave_y+.3*sin(time*.788)+.005*(frame%3); -per_frame_50=wave_mode=q8%3; -per_frame_51=wave_a=3+sin(time*1.414)+q3; -per_pixel_1=xx=x-.5+.03*q5+.1*y*q6+.1*sin(time*.322); -per_pixel_2=yy=y-.5+.03*q6+.1*x*q5+.1*sin(time*.427); -per_pixel_3=dx=sin(xx*2); -per_pixel_4=dy=sin(yy*2); -per_pixel_5=rot=sin(rad*1.4+.3*q4); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Working the Grid.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Working the Grid.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Unchained - Working the Grid.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Unchained - Working the Grid.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=1.000000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.500000 -nVideoEchoOrientation=3 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.625316 -fWaveScale=1.187274 -fWaveSmoothing=0.000000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=0.999700 -fShader=0.030000 -zoom=0.960496 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.500000 -ob_g=0.500000 -ob_b=0.500000 -ob_a=0.000000 -ib_size=0.500000 -ib_r=0.500000 -ib_g=0.500000 -ib_b=0.500000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.500000 -per_frame_1=warp=0; -per_frame_2=old_bass_flop=bass_flop; -per_frame_3=old_treb_flop=treb_flop; -per_frame_4=old_mid_flop=mid_flop; -per_frame_5=chaos=.9+.1*sin(pulse); -per_frame_6=entropy=if(equal(pulse,-20),1+bass_flop+treb_flop+mid_flop+rand(2),entropy); -per_frame_7=bass_thresh = above(bass_att,bass_thresh)*2 + (1-above(bass_att,bass_thresh))*((bass_thresh-1.3)*chaos+1.3); -per_frame_8=bass_flop=abs(bass_flop-equal(bass_thresh,2)); -per_frame_9=treb_thresh=above(treb_att,treb_thresh)*2 + (1-above(treb_att,treb_thresh))*((treb_thresh-1.3)*chaos+1.3); -per_frame_10=treb_flop=abs(treb_flop-equal(treb_thresh,2)); -per_frame_11=mid_thresh=above(mid_att,mid_thresh)*2 + (1-above(mid_att,mid_thresh))*((mid_thresh-1.3)*chaos+1.3); -per_frame_12=mid_flop=abs(mid_flop-equal(mid_thresh,2)); -per_frame_13=bass_changed=bnot(equal(old_bass_flop,bass_flop)); -per_frame_14=mid_changed=bnot(equal(old_mid_flop,mid_flop)); -per_frame_15=treb_changed=bnot(equal(old_treb_flop,treb_flop)); -per_frame_16=bass_residual = bass_changed*sin(pulse*.1*entropy) + bnot(bass_changed)*bass_residual; -per_frame_17=treb_residual = treb_changed*sin(pulse*.1*entropy) + bnot(treb_changed)*treb_residual; -per_frame_18=mid_residual = mid_changed*sin(pulse*.1*entropy) + bnot(mid_changed)*mid_residual; -per_frame_19=pulse=if(above(abs(pulse),20),-20,pulse+(bass_thresh+mid_thresh+treb_thresh)*.032); -per_frame_20=q1=mid_residual; -per_frame_21=q2=bass_residual; -per_frame_22=q3=treb_residual; -per_frame_23=q4=sin(pulse); -per_frame_24=q5=cos(pulse/2+q1); -per_frame_25=q6=above(q1,0)+above(q2,0)+above(q3,0)+above(q3,0)*treb_flop+above(q2,0)*bass_flop+above(q1,0)*mid_flop; -per_frame_26=q7=entropy; -per_frame_27=q8=sin(q6*q1+q7*q2); -per_frame_28=zoom=zoom+.02*q8; -per_frame_29=wave_mystery=sin(q1+q5); -per_frame_30=wave_r=wave_r+.5*sin(q1+q2*2+q4*2.1); -per_frame_31=wave_b=wave_b+.5*sin(q2+q3*2+q4*2.2); -per_frame_32=wave_g=wave_g+.5*sin(q3+q1*2+q4*2.3); -per_frame_33=ob_r=if(bass_flop,ob_r+.5*sin(q1+q3*1.14+q2),wave_b); -per_frame_34=ob_b=if(treb_flop,ob_b+.5*sin(q2+q1*1.14+q3),wave_g); -per_frame_35=ob_g=if(mid_flop,ob_g+.5*sin(q3+q2*1.14+q1),wave_r); -per_frame_36=ib_r=if(bass_flop,ob_b,ib_r+.5*cos(q5+q1*2.14)); -per_frame_37=ib_b=if(treb_flop,ob_g,ib_b+.5*cos(q5+q2*2.14)); -per_frame_38=ib_g=if(mid_flop,ob_r,ib_g+.5*cos(q5+q3*2.14)); -per_frame_39=mv_r=mv_r+.5*sin(q4+q5*1.14*q1); -per_frame_40=mv_b=mv_b+.5*sin(q4+q5*1.14*q2); -per_frame_41=mv_g=mv_g+.5*sin(q5+q5*1.14*q3); -per_frame_42=ob_a=.25+.25*sin(q2+q3*2.14); -per_frame_43=ib_a=.5+.5*sin(q2*2.14+q3); -per_frame_44=mv_a=mv_a+mv_a*sin(q3*2.14+q2); -per_frame_45=ob_size=.1+.1*sin(q3*3+q1); -per_frame_46=ib_size=ib_size*.5+ib_size*.25*sin(q1*3+q3); -per_frame_47=wave_mode=q6+above(q4,0)+above(q5,0); -per_frame_48=wave_mystery=sin(q3*1.14+q1*1.14+q2); -per_frame_49=mv_l=(q6*q7)*q2; -per_frame_50=wave_x=wave_x+.1*q7*q4; -per_frame_51=wave_y=wave_y+.1*q6*q5; -per_frame_52=mv_x=q6*q7; -per_frame_53=mv_y=q6*q7; -per_pixel_1=grid=(x*q7*3)%2+above(y,.5+.25)*above(q6,4); -per_pixel_2=zoom=zoom+.07*cos(sin(rad*2.14*q3+abs(rad-.1*grid))*2.14+rad*sin(q4*2.14+q1))*bnot(grid); -per_pixel_3=rot=.05*equal(grid,0)*cos(rad*2.14*q2+q3)*(q2+q3); -per_frame_init_1=entropy=2; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=2.163847 -fWaveScale=0.591235 -fWaveSmoothing=0.000000 -fWaveParam=-0.440000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=ob_a = 1; -per_frame_3=ob_r = (bass*.3); -per_pixel_1=zoom = pow(rad+(0&bass*.5),2); -per_pixel_2=zoom = if(below(zoom,.5),.5,zoom); -per_pixel_3=rot = sin(time)*rad; -per_pixel_4=dx = .01*sin(time*.77); -per_pixel_5=dy = .01*cos(time*.33); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.124746 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.030000 -wave_y=0.960000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=2.016000 -mv_dx=0.000000 -mv_dy=-0.100000 -mv_l=5.000000 -mv_r=0.000000 -mv_g=0.000000 -mv_b=0.700000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.100000 -shapecode_0_ang=0.000000 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=ang = ang + 10*sin(time*.8); -shape_0_per_frame2=vol = 0.167*(bass+mid+att); -shape_0_per_frame3=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -shape_0_per_frame4=xamp = xamp + 0.5*(xamptarg-xamp); -shape_0_per_frame5=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -shape_0_per_frame6=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -shape_0_per_frame7=xpos = xpos + 0.001*xspeed; -shape_0_per_frame8=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -shape_0_per_frame9=yamp = yamp + 0.5*(yamptarg-yamp); -shape_0_per_frame10=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -shape_0_per_frame11=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -shape_0_per_frame12=ypos = ypos + 0.001*yspeed; -shape_0_per_frame13=x = centerx; -shape_0_per_frame14=y = abs(centery-1); -shape_0_per_frame15=centerx = 1.75*xpos + 0.5; -shape_0_per_frame16=centery = 1.75*ypos + 0.5; -shape_0_per_frame17=r2 = .5+.2*sin(time*.666); -shape_0_per_frame18=g2 = .5+.2*sin(time*.555); -shape_0_per_frame19=b2 = .5+.2*sin(time*.777); -shape_0_per_frame20=rad = rad + bass*.1; -shape_0_per_frame21=border_r = bass*.3; -shape_0_per_frame22=border_g = treb*.3; -shape_0_per_frame23=border_b = mis*.3; -shape_0_per_frame24=r = if(above(bass,1.3),1,0); -shape_0_per_frame25=g = if(above(bass,1.3),1,0); -shape_0_per_frame26=b = if(above(bass,1.3),1,0); -shapecode_1_enabled=0 -shapecode_1_sides=4 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.100000 -shapecode_1_ang=0.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.100000 -shapecode_2_enabled=0 -shapecode_2_sides=4 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.100000 -shapecode_2_ang=0.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.100000 -per_frame_1=warp = 0; -per_frame_2=vol = 0.167*(bass+mid+att); -per_frame_3=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_4=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_5=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_6=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_7=xpos = xpos + 0.001*xspeed; -per_frame_8=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_9=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_10=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_11=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_12=ypos = ypos + 0.001*yspeed; -per_frame_13=wave_x = centerx; -per_frame_14=wave_y = abs(centery-1); -per_frame_15=centerx = 1.75*xpos + 0.5; -per_frame_16=centery = 1.75*ypos + 0.5; -per_frame_17=q1 = centerx; -per_frame_18=q2 = centery; -per_frame_19=q3 = .06 + bass*.04; -per_frame_20=wave_r = bass*.3; -per_frame_21=wave_g = treb*.3; -per_frame_22=wave_b = mid*.3; -per_pixel_1=zoom = if(above(x,q1 - q3),if(below(x,q1 + q3),if(above(y,q2 - q3),if(below(y,q2 + q3),1,.94+ze),.94+ze),.94+ze),.94+ze); -per_pixel_2=zoomerx = if(above(x,q1),.01,-.01); -per_pixel_3=zoomery = if(above(y,q2),.01,-.01); -per_pixel_4=dx = if(above(x,q1 - q3),if(below(x,q1 + q3),if(above(y,q2 - q3),if(below(y,q2 + q3),zoomerx,.7+dxe),.7+dxe),.7+dxe),.7+dxe); -per_pixel_5=dy = if(above(x,q1 - q3),if(below(x,q1 + q3),if(above(y,q2 - q3),if(below(y,q2 + q3),zoomery,.7+dye),.7+dye),.7+dye),.7+dye); -per_pixel_6=dxe = .2 + .2*sin(time*.444); -per_pixel_7=dye = .2+.2*cos(time*.222); -per_pixel_8=ze = .04*sin(time*.777); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,93 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.558724 -fWaveScale=0.124746 -fWaveSmoothing=0.000000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.030000 -wave_y=0.960000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=vol = 0.167*(bass+mid+att); -per_frame_3=xamptarg = if(equal(frame%15,0),min(0.5*vol*bass_att,0.5),xamptarg); -per_frame_4=xamp = xamp + 0.5*(xamptarg-xamp); -per_frame_5=xdir = if(above(abs(xpos),xamp),-sign(xpos),if(below(abs(xspeed),0.1),2*above(xpos,0)-1,xdir)); -per_frame_6=xspeed = xspeed + xdir*xamp - xpos - xspeed*0.055*below(abs(xpos),xamp); -per_frame_7=xpos = xpos + 0.001*xspeed; -per_frame_8=yamptarg = if(equal(frame%15,0),min(0.3*vol*treb_att,0.5),yamptarg); -per_frame_9=yamp = yamp + 0.5*(yamptarg-yamp); -per_frame_10=ydir = if(above(abs(ypos),yamp),-sign(ypos),if(below(abs(yspeed),0.1),2*above(ypos,0)-1,ydir)); -per_frame_11=yspeed = yspeed + ydir*yamp - ypos - yspeed*0.055*below(abs(ypos),yamp); -per_frame_12=ypos = ypos + 0.001*yspeed; -per_frame_13=wave_x = centerx; -per_frame_14=wave_y = abs(centery-1); -per_frame_15=centerx = 1.75*xpos + 0.5; -per_frame_16=centery = 1.75*ypos + 0.5; -per_frame_17=q1 = centerx; -per_frame_18=q2 = centery; -per_frame_19=q3 = .06 + bass*.04; -per_frame_20=wave_r = bass*.3; -per_frame_21=wave_g = treb*.3; -per_frame_22=wave_b = mid*.3; -per_pixel_1=zoom = if(above(x,q1 - q3),if(below(x,q1 + q3),if(above(y,q2 - q3),if(below(y,q2 + q3),1,.94+ze),.94+ze),.94+ze),.94+ze); -per_pixel_2=zoomerx = if(above(x,q1),.01,-.01); -per_pixel_3=zoomery = if(above(y,q2),.01,-.01); -per_pixel_4=dx = if(above(x,q1 - q3),if(below(x,q1 + q3),if(above(y,q2 - q3),if(below(y,q2 + q3),zoomerx,.7+dxe),.7+dxe),.7+dxe),.7+dxe); -per_pixel_5=dy = if(above(x,q1 - q3),if(below(x,q1 + q3),if(above(y,q2 - q3),if(below(y,q2 + q3),zoomery,.7+dye),.7+dye),.7+dye),.7+dye); -per_pixel_6=dxe = .2 + .2*sin(time*.444); -per_pixel_7=dye = .2+.2*cos(time*.222); -per_pixel_8=ze = .04*sin(time*.777); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,364 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.000000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.463735 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=t8=3.14159265; -wave_0_init3=t5 = 1; -wave_0_per_frame1=rotx = rotx+bass; -wave_0_per_frame2=roty = roty+mid; -wave_0_per_frame3=rotz = rotz+treb; -wave_0_per_frame4=//rotx = 0; -wave_0_per_frame5=//roty =0; -wave_0_per_frame6=//rotz = 0; -wave_0_per_frame7= -wave_0_per_frame8=//convert rotation values from degrees to radians -wave_0_per_frame9=t1= t8*rotx/180; -wave_0_per_frame10=t2 = t8*roty/180; -wave_0_per_frame11=t3 = t8*rotz/180; -wave_0_per_frame12= -wave_0_per_frame13=t4 = 3*sin(time); -wave_0_per_frame14=t5 = 10+8*cos(time); -wave_0_per_frame15= -wave_0_per_frame16=g = 0.5-0.4*cos(time); -wave_0_per_frame17=r = 0.5-0.4*sin(time); -wave_0_per_point1=//Define 3D Shape -wave_0_per_point2= -wave_0_per_point3=//Spiral -wave_0_per_point4=x1 = 0.5*sin(8*t8*sample); -wave_0_per_point5=y1 = 2*(sample-0.5)-value1; -wave_0_per_point6=z1= 0.5*cos(8*t8*sample); -wave_0_per_point7= -wave_0_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_0_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_0_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_0_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_0_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_0_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_0_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_0_per_point15=//move resulting shape in 3d space -wave_0_per_point16=x4 = x3+t4; -wave_0_per_point17=y4 = y3; -wave_0_per_point18=z4 = z3+t5; -wave_0_per_point19=//draw 3d shape in 2d -wave_0_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_0_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_0_per_point22= -wave_0_per_point23=b= r+value1; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.463735 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=t8=3.14159265; -wave_1_init3=t5 = 1; -wave_1_per_frame1=rotx = rotx+bass; -wave_1_per_frame2=roty = roty+mid; -wave_1_per_frame3=rotz = rotz+treb; -wave_1_per_frame4=//rotx = 0; -wave_1_per_frame5=//roty =0; -wave_1_per_frame6=//rotz = 0; -wave_1_per_frame7= -wave_1_per_frame8=//convert rotation values from degrees to radians -wave_1_per_frame9=t1= t8*rotx/180; -wave_1_per_frame10=t2 = t8*roty/180; -wave_1_per_frame11=t3 = t8*rotz/180; -wave_1_per_frame12= -wave_1_per_frame13=t4 = 3*sin(time+0.66*t8); -wave_1_per_frame14=t5 = 10+8*cos(time+0.66*t8); -wave_1_per_frame15= -wave_1_per_frame16=b = 0.5-0.4*cos(time+0.66*t8); -wave_1_per_frame17=g = 0.5-0.4*sin(time+0.66*t8); -wave_1_per_point1=//Define 3D Shape -wave_1_per_point2= -wave_1_per_point3=//Sphere -wave_1_per_point4=x1 = (1+value1)*sin(t8*sample)*sin(16*t8*sample); -wave_1_per_point5=y1 = (1+value1)*cos(t8*sample); -wave_1_per_point6=z1= (1+value1)*sin(t8*sample)*cos(16*t8*sample); -wave_1_per_point7= -wave_1_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_1_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_1_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_1_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_1_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_1_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_1_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_1_per_point15=//move resulting shape in 3d space -wave_1_per_point16=x4 = x3+t4; -wave_1_per_point17=y4 = y3; -wave_1_per_point18=z4 = z3+t5; -wave_1_per_point19=//draw 3d shape in 2d -wave_1_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_1_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_1_per_point22= -wave_1_per_point23=r = g+value1; -wavecode_2_enabled=1 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.463735 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=t8=3.14159265; -wave_2_init3=t5 = 1; -wave_2_per_frame1=rotx = rotx+bass; -wave_2_per_frame2=roty = roty+mid; -wave_2_per_frame3=rotz = rotz+treb; -wave_2_per_frame4=//rotx = 0; -wave_2_per_frame5=//roty =0; -wave_2_per_frame6=//rotz = 0; -wave_2_per_frame7= -wave_2_per_frame8=//convert rotation values from degrees to radians -wave_2_per_frame9=t1= t8*rotx/180; -wave_2_per_frame10=t2 = t8*roty/180; -wave_2_per_frame11=t3 = t8*rotz/180; -wave_2_per_frame12= -wave_2_per_frame13=t4 = 3*sin(time+1.33*t8); -wave_2_per_frame14=t5 = 10+8*cos(time+1.33*t8); -wave_2_per_frame15= -wave_2_per_frame16=r = 0.5-0.4*cos(time+1.33*t8); -wave_2_per_frame17=b = 0.5-0.4*sin(time+1.33*t8); -wave_2_per_point1=//Define 3D Shape -wave_2_per_point2= -wave_2_per_point3=//Zylot's dumb 3d wave -wave_2_per_point4=fvar = sample*512; -wave_2_per_point5=svar = fvar/16; -wave_2_per_point6=tvar = 0&svar; -wave_2_per_point7=newsample = tvar/3.2; -wave_2_per_point8=x1 = sin(newsample*3.1415926*2); -wave_2_per_point9=y1 = cos(newsample*3.1415926*2); -wave_2_per_point10=z1 = 0; -wave_2_per_point11= -wave_2_per_point12=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_2_per_point13=y2 = y1*cos(t1)-z1*sin(t1); -wave_2_per_point14=z2 = y1*sin(t1)+z1*cos(t1); -wave_2_per_point15=x2 = z2*sin(t2)+x1*cos(t2); -wave_2_per_point16=z3 = z2*cos(t2)-x1*sin(t2); -wave_2_per_point17=x3 = x2*cos(t3)-y2*sin(t3); -wave_2_per_point18=y3 = y2*cos(t3)+x2*sin(t3); -wave_2_per_point19=//move resulting shape in 3d space -wave_2_per_point20=x4 = x3; -wave_2_per_point21=y4 = y3; -wave_2_per_point22=z4 = z3+5; -wave_2_per_point23=//draw 3d shape in 2d -wave_2_per_point24=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_2_per_point25=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_2_per_point26= -wave_2_per_point27=r = -.5 + sin(sample*5+((time*5)+9)); -wave_2_per_point28=r = if(below(r,0),0,r); -wave_2_per_point29=g = -.5 + sin(sample*5+time*5); -wave_2_per_point30=g = if(below(g,0),0,g); -wave_2_per_point31=b = -.5 + sin(sample*5+((time*5)+18)); -wave_2_per_point32=b = if(below(b,0),0,b); -wave_2_per_point33=r = if(above(bass,1.5),1,r); -wave_2_per_point34=g = if(above(bass,1.5),1,g); -wave_2_per_point35=b = if(above(bass,1.5),1,b); -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=6.530878 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=0.500000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=1.000000 -shapecode_0_a2=1.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=1.000000 -shape_0_per_frame1=rad = rad + sin(time); -shape_0_per_frame2=r2 = bass; -shape_0_per_frame3=g2 = treb; -shape_0_per_frame4=b2 = mid; -shape_0_per_frame5=r = if(above(bass+mid+treb/3,6),1,0); -shape_0_per_frame6=g = if(above(bass+mid+treb/3,6),1,0); -shape_0_per_frame7=b = if(above(bass+mid+treb/3,6),1,0); -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=1 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.022480 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=1.000000 -shapecode_1_b=1.000000 -shapecode_1_a=0.800000 -shapecode_1_r2=1.000000 -shapecode_1_g2=1.000000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.300000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=rad = .55; -shape_1_per_frame2=r = min(1,max(0,r + 0.1*sin(time*0.417 + 1))); -shape_1_per_frame3=g = min(1,max(0,g + 0.1*sin(time*0.391 + 2))); -shape_1_per_frame4=b = min(1,max(0,b + 0.1*sin(time*0.432 + 4))); -shape_1_per_frame5=r2 = min(1,max(0,r2 + 0.1*sin(time*0.457 + 3))); -shape_1_per_frame6=g2 = min(1,max(0,g2 + 0.1*sin(time*0.437 + 5))); -shape_1_per_frame7=b2 = min(1,max(0,b2 + 0.1*sin(time*0.484 + 6))); -shape_1_per_frame8=ang = ang-cos(time*.02); -shape_1_per_frame9=x = .5 + .1*sin(time*.11); -shape_1_per_frame10=y = .5 + .1*sin(time*.51); -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=1 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.108925 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=1.000000 -shapecode_2_b=1.000000 -shapecode_2_a=0.800000 -shapecode_2_r2=1.000000 -shapecode_2_g2=1.000000 -shapecode_2_b2=1.000000 -shapecode_2_a2=0.800000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=rad = .750 + .1*sin(time*.02); -shape_2_per_frame2=r = min(1,max(0,r + 0.1*sin(time*0.417 + 1))); -shape_2_per_frame3=g = min(1,max(0,g + 0.1*sin(time*0.391 + 2))); -shape_2_per_frame4=b = min(1,max(0,b + 0.1*sin(time*0.432 + 4))); -shape_2_per_frame5=r2 = min(1,max(0,r2 + 0.1*sin(time*0.457 + 3))); -shape_2_per_frame6=g2 = min(1,max(0,g2 + 0.1*sin(time*0.437 + 5))); -shape_2_per_frame7=b2 = min(1,max(0,b2 + 0.1*sin(time*0.484 + 6))); -shape_2_per_frame8=ang = ang+4*sin(time*.2); -shape_2_per_frame9=x = .5 + .1*cos(time*.11); -shape_2_per_frame10=y = .5 + .1*cos(time*.51); -shapecode_3_enabled=0 -shapecode_3_sides=4 -shapecode_3_additive=0 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.100000 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=1.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=1.000000 -shapecode_3_border_g=1.000000 -shapecode_3_border_b=1.000000 -shapecode_3_border_a=0.100000 -per_frame_1=warp=0; -per_frame_2=wave_a=0; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Dark Wisps.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Dark Wisps.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Dark Wisps.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Dark Wisps.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,420 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.900000 -fVideoEchoZoom=1.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=1 -bInvert=0 -fWaveAlpha=1.000000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.300000 -ob_g=0.300000 -ob_b=0.300000 -ob_a=1.000000 -ib_size=0.000000 -ib_r=0.000000 -ib_g=0.000000 -ib_b=0.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=1.920000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=0.000000 -wavecode_0_enabled=0 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=1 -wavecode_0_bAdditive=0 -wavecode_0_scaling=0.463735 -wavecode_0_smoothing=0.000000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_init1=//pi -wave_0_init2=t8=3.14159265; -wave_0_init3=t5 = 1; -wave_0_per_frame1=rotx = rotx+bass; -wave_0_per_frame2=roty = roty+mid; -wave_0_per_frame3=rotz = rotz+treb; -wave_0_per_frame4=//rotx = 0; -wave_0_per_frame5=//roty =0; -wave_0_per_frame6=//rotz = 0; -wave_0_per_frame7= -wave_0_per_frame8=//convert rotation values from degrees to radians -wave_0_per_frame9=t1= t8*rotx/180; -wave_0_per_frame10=t2 = t8*roty/180; -wave_0_per_frame11=t3 = t8*rotz/180; -wave_0_per_frame12= -wave_0_per_frame13=t4 = 3*sin(time); -wave_0_per_frame14=t5 = 10+8*cos(time); -wave_0_per_frame15= -wave_0_per_frame16=g = 0.5-0.4*cos(time); -wave_0_per_frame17=r = 0.5-0.4*sin(time); -wave_0_per_point1=//Define 3D Shape -wave_0_per_point2= -wave_0_per_point3=//Spiral -wave_0_per_point4=x1 = 0.5*sin(8*t8*sample); -wave_0_per_point5=y1 = 2*(sample-0.5)-value1; -wave_0_per_point6=z1= 0.5*cos(8*t8*sample); -wave_0_per_point7= -wave_0_per_point8=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_0_per_point9=y2 = y1*cos(t1)-z1*sin(t1); -wave_0_per_point10=z2 = y1*sin(t1)+z1*cos(t1); -wave_0_per_point11=x2 = z2*sin(t2)+x1*cos(t2); -wave_0_per_point12=z3 = z2*cos(t2)-x1*sin(t2); -wave_0_per_point13=x3 = x2*cos(t3)-y2*sin(t3); -wave_0_per_point14=y3 = y2*cos(t3)+x2*sin(t3); -wave_0_per_point15=//move resulting shape in 3d space -wave_0_per_point16=x4 = x3+t4; -wave_0_per_point17=y4 = y3; -wave_0_per_point18=z4 = z3+t5; -wave_0_per_point19=//draw 3d shape in 2d -wave_0_per_point20=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_0_per_point21=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_0_per_point22= -wave_0_per_point23=b= r+value1; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=1 -wavecode_1_bAdditive=0 -wavecode_1_scaling=0.463735 -wavecode_1_smoothing=0.000000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wave_1_init1=//pi -wave_1_init2=t8=3.14159265; -wave_1_init3=t5 = 1; -wave_1_per_frame1=rotx = rotx+bass; -wave_1_per_frame2=roty = roty+mid; -wave_1_per_frame3=rotz = rotz+treb; -wave_1_per_frame4=//rotx = 0; -wave_1_per_frame5=//roty =0; -wave_1_per_frame6=//rotz = 0; -wave_1_per_frame7= -wave_1_per_frame8=//convert rotation values from degrees to radians -wave_1_per_frame9=t1= t8*rotx/180; -wave_1_per_frame10=t2 = t8*roty/180; -wave_1_per_frame11=t3 = t8*rotz/180; -wave_1_per_frame12= -wave_1_per_frame13=t4 = 3*sin(time+0.66*t8); -wave_1_per_frame14=t5 = 10+8*cos(time+0.66*t8); -wave_1_per_frame15= -wave_1_per_frame16=b = 0.5-0.4*cos(time+0.66*t8); -wave_1_per_frame17=g = 0.5-0.4*sin(time+0.66*t8); -wave_1_per_point1=//Define 3D Shape -wave_1_per_point2= -wave_1_per_point3=//Sphere -wave_1_per_point4=fvar = sample*512; -wave_1_per_point5=svar = fvar/32; -wave_1_per_point6=tvar = 0&svar; -wave_1_per_point7=nsample = tvar*3.5; -wave_1_per_point8=x1 = (1*sin(t8*nsample)); -wave_1_per_point9=y1 = (1*cos(t8*nsample)); -wave_1_per_point10=z1 = 1.5*sin((0&sample)); -wave_1_per_point11= -wave_1_per_point12=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_1_per_point13=y2 = y1*cos(t1)-z1*sin(t1); -wave_1_per_point14=z2 = y1*sin(t1)+z1*cos(t1); -wave_1_per_point15=x2 = z2*sin(t2)+x1*cos(t2); -wave_1_per_point16=z3 = z2*cos(t2)-x1*sin(t2); -wave_1_per_point17=x3 = x2*cos(t3)-y2*sin(t3); -wave_1_per_point18=y3 = y2*cos(t3)+x2*sin(t3); -wave_1_per_point19=//move resulting shape in 3d space -wave_1_per_point20=x4 = x3; -wave_1_per_point21=y4 = y3; -wave_1_per_point22=z4 = z3+5; -wave_1_per_point23=//draw 3d shape in 2d -wave_1_per_point24=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_1_per_point25=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_1_per_point26= -wave_1_per_point27=r = g+value1; -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=1 -wavecode_2_bAdditive=0 -wavecode_2_scaling=0.463735 -wavecode_2_smoothing=0.000000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -wave_2_init1=//pi -wave_2_init2=t8=3.14159265; -wave_2_init3=t5 = 1; -wave_2_per_frame1=rotx = rotx+bass; -wave_2_per_frame2=roty = roty+mid; -wave_2_per_frame3=rotz = rotz+treb; -wave_2_per_frame4=//rotx = 0; -wave_2_per_frame5=//roty =0; -wave_2_per_frame6=//rotz = 0; -wave_2_per_frame7= -wave_2_per_frame8=//convert rotation values from degrees to radians -wave_2_per_frame9=t1= t8*rotx/180; -wave_2_per_frame10=t2 = t8*roty/180; -wave_2_per_frame11=t3 = t8*rotz/180; -wave_2_per_frame12= -wave_2_per_frame13=t4 = 3*sin(time+1.33*t8); -wave_2_per_frame14=t5 = 10+8*cos(time+1.33*t8); -wave_2_per_frame15= -wave_2_per_frame16=r = 0.5-0.4*cos(time+1.33*t8); -wave_2_per_frame17=b = 0.5-0.4*sin(time+1.33*t8); -wave_2_per_point1=//Define 3D Shape -wave_2_per_point2= -wave_2_per_point3=//Cube -wave_2_per_point4=x0 = if(below(sample*12,1),sample*12, if(below(sample*12,2),1, if(below(sample*12,3),abs(sample*12-3), if(below(sample*12,6),0, if(below(sample*12,8),1, if(below(sample*12,9),abs(sample*12-9), if(below(sample*12,10),0, if(below(sample*12,11),sample*12-10,1)))))))); -wave_2_per_point5=y0 = if(below(sample*12,1),0, if(below(sample*12,2),sample*12-1, if(below(sample*12,3),1, if(below(sample*12,4),abs(sample*12-4), if(below(sample*12,5),0, if(below(sample*12,7),1, if(below(sample*12,9),0, if(below(sample*12,10),sample*12-9, if(below(sample*12,11),1,abs(sample*12-12)))))))))); -wave_2_per_point6=z0 = if(below(sample*12,4),0, if(below(sample*12,5),sample*12-4, if(below(sample*12,6),abs(sample*12-6), if(below(sample*12,7),sample*12-6, if(below(sample*12,8),abs(sample*12-8),1))))); -wave_2_per_point7=x1 = 0.5-x0+if(below(sin(sample*12*3.1415),0),value1,0); -wave_2_per_point8=y1 = 0.5-y0+if(below(cos((sample*12-1.5)*3.1415),0),value1,0); -wave_2_per_point9=z1 = 0.5-z0+if(below(sample*12,4),0,if(below(sample*12,8),value1,0)); -wave_2_per_point10= -wave_2_per_point11=//modulate values to adjust for rotation on multiple axes, convert to world co-ordinates -wave_2_per_point12=y2 = y1*cos(t1)-z1*sin(t1); -wave_2_per_point13=z2 = y1*sin(t1)+z1*cos(t1); -wave_2_per_point14=x2 = z2*sin(t2)+x1*cos(t2); -wave_2_per_point15=z3 = z2*cos(t2)-x1*sin(t2); -wave_2_per_point16=x3 = x2*cos(t3)-y2*sin(t3); -wave_2_per_point17=y3 = y2*cos(t3)+x2*sin(t3); -wave_2_per_point18=//move resulting shape in 3d space -wave_2_per_point19=x4 = x3+t4; -wave_2_per_point20=y4 = y3; -wave_2_per_point21=z4 = z3+t5; -wave_2_per_point22=//draw 3d shape in 2d -wave_2_per_point23=x=0.5+0.5*(x4/(1+z4*0.5)); -wave_2_per_point24=y=0.5+0.5*(y4/(1+z4*0.5)); -wave_2_per_point25= -wave_2_per_point26=g = b+value1; -wavecode_3_enabled=0 -wavecode_3_samples=512 -wavecode_3_sep=0 -wavecode_3_bSpectrum=0 -wavecode_3_bUseDots=0 -wavecode_3_bDrawThick=0 -wavecode_3_bAdditive=0 -wavecode_3_scaling=1.000000 -wavecode_3_smoothing=0.500000 -wavecode_3_r=1.000000 -wavecode_3_g=1.000000 -wavecode_3_b=1.000000 -wavecode_3_a=1.000000 -shapecode_0_enabled=1 -shapecode_0_sides=100 -shapecode_0_additive=1 -shapecode_0_thickOutline=0 -shapecode_0_textured=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.217303 -shapecode_0_ang=0.000000 -shapecode_0_tex_ang=0.000000 -shapecode_0_tex_zoom=1.000000 -shapecode_0_r=0.000000 -shapecode_0_g=0.000000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.000000 -shapecode_0_g2=0.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=1.000000 -shapecode_0_border_g=1.000000 -shapecode_0_border_b=1.000000 -shapecode_0_border_a=0.000000 -shape_0_init1=speedc=0; -shape_0_init2=trebc=0; -shape_0_init3=radc=0; -shape_0_per_frame1=x = .5+radc*sin(speedc); -shape_0_per_frame2=y = .5+radc*cos(speedc); -shape_0_per_frame3= -shape_0_per_frame4=radc = if(above(bass*.3,radc),radc+.01,radc-.01); -shape_0_per_frame5=radc = if(below(radc,0),0,radc); -shape_0_per_frame6= -shape_0_per_frame7=trebc = if(above(treb*.05,trebc),trebc+.0005,trebc-.0005); -shape_0_per_frame8=trebc = if(below(trebc,0),0,trebc); -shape_0_per_frame9= -shape_0_per_frame10=speedc = speedc + trebc; -shape_0_per_frame11= -shape_0_per_frame12=r = bass; -shape_0_per_frame13=g = treb; -shape_0_per_frame14=b = mid; -shapecode_1_enabled=1 -shapecode_1_sides=100 -shapecode_1_additive=1 -shapecode_1_thickOutline=0 -shapecode_1_textured=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.215152 -shapecode_1_ang=0.000000 -shapecode_1_tex_ang=0.000000 -shapecode_1_tex_zoom=1.000000 -shapecode_1_r=1.000000 -shapecode_1_g=0.000000 -shapecode_1_b=0.000000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.000000 -shapecode_1_b2=0.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=0.000000 -shapecode_1_border_g=0.000000 -shapecode_1_border_b=0.000000 -shapecode_1_border_a=0.000000 -shape_1_init1=speedc=0; -shape_1_init2=trebc=0; -shape_1_init3=radc=0; -shape_1_per_frame1=x = .5+radc*sin(speedc+q1); -shape_1_per_frame2=y = .5+radc*cos(speedc+q1); -shape_1_per_frame3= -shape_1_per_frame4=radc = if(above(bass*.3,radc),radc+.01,radc-.01); -shape_1_per_frame5=radc = if(below(radc,0),0,radc); -shape_1_per_frame6= -shape_1_per_frame7=trebc = if(above(treb*.05,trebc),trebc+.0005,trebc-.0005); -shape_1_per_frame8=trebc = if(below(trebc,0),0,trebc); -shape_1_per_frame9= -shape_1_per_frame10=speedc = speedc + trebc; -shape_1_per_frame11= -shape_1_per_frame12=r = bass; -shape_1_per_frame13=g = treb; -shape_1_per_frame14=b = mid; -shapecode_2_enabled=1 -shapecode_2_sides=100 -shapecode_2_additive=1 -shapecode_2_thickOutline=0 -shapecode_2_textured=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.215152 -shapecode_2_ang=0.000000 -shapecode_2_tex_ang=0.000000 -shapecode_2_tex_zoom=1.000000 -shapecode_2_r=1.000000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=0.000000 -shapecode_2_g2=0.000000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=0.000000 -shapecode_2_border_g=0.000000 -shapecode_2_border_b=0.000000 -shapecode_2_border_a=0.000000 -shape_2_init1=speedc=0; -shape_2_init2=trebc=0; -shape_2_init3=radc=0; -shape_2_per_frame1=x = .5+radc*sin(speedc+(q1*2)); -shape_2_per_frame2=y = .5+radc*cos(speedc+(q1*2)); -shape_2_per_frame3= -shape_2_per_frame4=radc = if(above(bass*.3,radc),radc+.01,radc-.01); -shape_2_per_frame5=radc = if(below(radc,0),0,radc); -shape_2_per_frame6= -shape_2_per_frame7=trebc = if(above(treb*.05,trebc),trebc+.0005,trebc-.0005); -shape_2_per_frame8=trebc = if(below(trebc,0),0,trebc); -shape_2_per_frame9= -shape_2_per_frame10=speedc = speedc + trebc; -shape_2_per_frame11= -shape_2_per_frame12=r = bass; -shape_2_per_frame13=g = treb; -shape_2_per_frame14=b = mid; -shapecode_3_enabled=1 -shapecode_3_sides=100 -shapecode_3_additive=1 -shapecode_3_thickOutline=0 -shapecode_3_textured=0 -shapecode_3_x=0.500000 -shapecode_3_y=0.500000 -shapecode_3_rad=0.215152 -shapecode_3_ang=0.000000 -shapecode_3_tex_ang=0.000000 -shapecode_3_tex_zoom=1.000000 -shapecode_3_r=1.000000 -shapecode_3_g=0.000000 -shapecode_3_b=0.000000 -shapecode_3_a=1.000000 -shapecode_3_r2=0.000000 -shapecode_3_g2=0.000000 -shapecode_3_b2=0.000000 -shapecode_3_a2=0.000000 -shapecode_3_border_r=0.000000 -shapecode_3_border_g=0.000000 -shapecode_3_border_b=0.000000 -shapecode_3_border_a=0.000000 -shape_3_init1=speedc=0; -shape_3_init2=trebc=0; -shape_3_init3=radc=0; -shape_3_per_frame1=x = .5+radc*sin(speedc+(q1*3)); -shape_3_per_frame2=y = .5+radc*cos(speedc+(q1*3)); -shape_3_per_frame3= -shape_3_per_frame4=radc = if(above(bass*.3,radc),radc+.01,radc-.01); -shape_3_per_frame5=radc = if(below(radc,0),0,radc); -shape_3_per_frame6= -shape_3_per_frame7=trebc = if(above(treb*.05,trebc),trebc+.0005,trebc-.0005); -shape_3_per_frame8=trebc = if(below(trebc,0),0,trebc); -shape_3_per_frame9= -shape_3_per_frame10=speedc = speedc + trebc; -shape_3_per_frame11= -shape_3_per_frame12=r = bass; -shape_3_per_frame13=g = treb; -shape_3_per_frame14=b = mid; -per_frame_init_1=space = 3+(rand(80)*.1); -per_frame_1=warp=0; -per_frame_2=wave_a=0; -per_frame_3= -per_frame_4=zoom = zoom-.1+(bass*.1); -per_frame_5= -per_frame_6=q1=space; -per_frame_7=dx = .04*sin(time); -per_frame_8=dy = .04*sin(time*.6677); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -[preset00] -fGammaAdj=2.000000 -fDecay=0.900001 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=6 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=5.053452 -fWaveScale=2.448587 -fWaveSmoothing=0.900000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=0.010000 -fWarpScale=0.010000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.499900 -wave_y=0.499900 -per_frame_1=wave_r = wave_r + .3*sin(time*.222); -per_frame_2=wave_g = wave_g + .3*sin(time*.123); -per_frame_3=wave_b = wave_b + .3*sin(time*.444); -per_frame_4=decay = .9 + .1*sin(time*.01); -per_pixel_1=dx = dx - .08*tan(time + (x)*47); -per_pixel_2=dy = .01*sin((-time*.22 + (y+.5))); -fRating=2.000000 diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Ether Storm.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Ether Storm.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Ether Storm.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Ether Storm.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=0.970000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.958904 -fWaveScale=0.550447 -fWaveSmoothing=0.360000 -fWaveParam=-0.500000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.310000 -ob_r=0.300000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=dx = dx - .001; -per_frame_2=dy = dy - .001; -per_frame_3=wave_r = wave_r + .5*sin(time*.666); -per_frame_4=wave_g = wave_g + .5*sin(time*.777); -per_frame_5=wave_b = wave_b + .5*sin(time*.888); -per_pixel_1=dx = if(above(y,.7),001.*asin((x-.5)*(y-.7)),dx); -per_pixel_2=dx = if(below(y,.3),001.*-asin((x-.5)*(y-.3)),dx); -per_pixel_3=dy = (y-.5)*.05; -per_pixel_4=warp = dx*50; \ No newline at end of file diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Inside The Planar Portal.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Inside The Planar Portal.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Inside The Planar Portal.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Inside The Planar Portal.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -[preset00] -fRating=4.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=1 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=0.224799 -fWaveSmoothing=0.750000 -fWaveParam=-0.440000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=0.000000 -nMotionVectorsY=0.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=5.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=mv_l = 5; -per_frame_3=wave_mystery = wave_mystery + bass*.06; -per_frame_4=wave_r = bass*.4; -per_frame_5=wave_g = treb*.4; -per_frame_6=wave_b = mid*.4; -per_pixel_1=basseffect = bass*.03; -per_pixel_2=trebeffect = treb*.03; -per_pixel_3=zoom = if(above(x,.4-trebeffect), if(below(x,.6+trebeffect), if(above(y,.4-basseffect), if(below(y,.6+basseffect),1.04,.6),.6),.6),.6); -per_pixel_4=dx = if(above(x,.4-trebeffect), if(below(x,.6+trebeffect), if(above(y,.4-basseffect), if(below(y,.6+basseffect),0,.5),.5),.5),.5); -per_pixel_5=dy = if(above(x,.4-trebeffect), if(below(x,.6+trebeffect), if(above(y,.4-basseffect), if(below(y,.6+basseffect),0,1),1),1),1); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - light of the path.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - light of the path.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - light of the path.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - light of the path.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,65 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=3 -bAdditiveWaves=0 -bWaveDots=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bMotionVectorsOn=0 -bRedBlueStereo=0 -nMotionVectorsX=12 -nMotionVectorsY=9 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.800000 -fWaveScale=1.000000 -fWaveSmoothing=0.750000 -fWaveParam=-0.440000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.070000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -per_frame_1=dx = dx - .001; -per_frame_2=dy = dy - .001; -per_frame_3=warp = 0; -per_frame_4=wave_r = wave_r + .2*sin(time*1.33)+bass*.3; -per_frame_5=wave_g = wave_g + .2*sin(time)+treb*.3; -per_frame_6=wave_b = wave_b + .2*sin(time*.988)+mid*.3; -per_pixel_1=zoomlv = .1*sin(ang*1000+time)+.05; -per_pixel_2=zoom = zoom + zoomlv; -per_pixel_3=dx = zoomlv; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Present For Saddam.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Present For Saddam.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Present For Saddam.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Present For Saddam.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -[preset00] -fRating=5.000000 -fGammaAdj=1.700000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.078276 -fWaveScale=0.274297 -fWaveSmoothing=0.750000 -fWaveParam=-0.480000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.000000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_x = locx; -per_frame_3=wave_y = if(below(locy,.01),.01,locy); -per_frame_4=wave_r = if(equal(expt2,0),.6,1); -per_frame_5=wave_g = .6; -per_frame_6=wave_b = if(equal(expt2,0),.6,.05); -per_frame_7=wave_mode = if(equal(expt2,0),2,0); -per_frame_8=locx=locx-xspeed; -per_frame_9=locy=if(below(locy,.02),.01,locy-yspeed); -per_frame_10=xspeed = if(below(locy,.01),0,xspeed - (xspeed)*.03); -per_frame_11=yspeed = if(below(locy,.01),0,yspeed+(yspeed)*.03); -per_frame_12=decay = if(below(locy,.02),.94,.4); -per_frame_13=expt = if(below(locy,.011),if(below(expt,0.001),0,expt-.01),expt); -per_frame_14=expt2 = if(equal(expt,0),if(below(expt2,0.001),0,expt2-.01),expt2); -per_frame_15=q1 = locx; -per_frame_16=q2 = locy; -per_frame_17=q3 = expt; -per_frame_18=q4 = expt2; -per_frame_19=monitor = timer; -per_frame_20=timer = if(above(timer,.01),timer-.01,6); -per_frame_21=yspeed = if(below(timer,.012),.02,yspeed); -per_frame_22=xspeed = if(below(timer,.012),rand(200)*.0001,xspeed); -per_frame_23=locy = if(below(timer,.012),1,locy); -per_frame_24=locx = if(below(timer,.012),(rand(80)+20)*.01,locx); -per_frame_25=expt = if(below(timer,.012),.5,expt); -per_frame_26=expt2 = if(below(timer,.012),1,expt2); -per_pixel_1=randomn = rand(100)*.006; -per_pixel_2=xcenter = q1; -per_pixel_3=ycenter = abs(q2-1); -per_pixel_4=dx = if(below(q2,.011),if(equal(q3,0),if(equal(q4,0),dx + (x - xcenter)*.03,dx + (x - xcenter)*.1),dx + (x - xcenter)*randomn),0); -per_pixel_5=dy = if(below(q2,.011),if(equal(q3,0),if(equal(q4,0),dy + (y - ycenter)*.06*bass,dy + (y - ycenter)*.1),dy + (y - ycenter)*randomn),0); -per_frame_init_1=yspeed = .02; -per_frame_init_2=xspeed = rand(200)*.0001; -per_frame_init_3=locy = 1; -per_frame_init_4=locx = (rand(80)+20)*.01; -per_frame_init_5=expt = .5; -per_frame_init_6=expt2 = 1; -per_frame_init_7=timer = 6; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=2.000000 -fDecay=0.980000 -fVideoEchoZoom=2.000000 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=1 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=0 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=0 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=3.221673 -fWaveScale=1.104617 -fWaveSmoothing=0.750000 -fWaveParam=0.000000 -fModWaveAlphaStart=0.750000 -fModWaveAlphaEnd=0.950000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.000000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=1.000000 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.010000 -ob_r=0.000000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=1.000000 -ib_size=0.010000 -ib_r=0.250000 -ib_g=0.250000 -ib_b=0.250000 -ib_a=0.000000 -nMotionVectorsX=12.000000 -nMotionVectorsY=9.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.900000 -mv_r=1.000000 -mv_g=1.000000 -mv_b=1.000000 -mv_a=0.000000 -per_frame_1=warp = 0; -per_frame_2=wave_r = wave_r + if(above(bass,1),.5*cos(.33*time),.5*sin(.33*time)); -per_frame_3=wave_g = wave_g + if(above(bass,1),.5*cos(.55*time),.5*sin(.55*time)); -per_frame_4=wave_b = wave_b + if(above(bass,1),.5*cos(.44*time),.5*sin(.44*time)); -per_frame_5=wave_mystery = if(above(10*time%2,0),.5*sin(time)-.5,0); -per_pixel_1=zoom =-zoom + .1*sin(rad+tan(ang*5+(time*3)))*.1; -per_pixel_2=dx = rand(2)*.01; -per_pixel_3=dy = rand(2)*.01; diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.939999 -fVideoEchoZoom=2.006761 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=0 -nWaveMode=2 -bAdditiveWaves=1 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=1 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=0 -bSolarize=0 -bInvert=0 -fWaveAlpha=1.576900 -fWaveScale=1.074092 -fWaveSmoothing=0.540000 -fWaveParam=-0.240000 -fModWaveAlphaStart=0.500000 -fModWaveAlphaEnd=1.000000 -fWarpAnimSpeed=9.180534 -fWarpScale=3.544900 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=1.000000 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000010 -dy=0.000010 -warp=0.972365 -sx=1.000000 -sy=1.000000 -wave_r=0.500000 -wave_g=0.500000 -wave_b=0.500000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.005000 -ob_r=1.000000 -ob_g=0.930000 -ob_b=0.600000 -ob_a=1.000000 -ib_size=0.500000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=0.000000 -nMotionVectorsX=16.000004 -nMotionVectorsY=16.800003 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.150000 -mv_r=1.000000 -mv_g=0.000000 -mv_b=0.000000 -mv_a=1.000000 -per_frame_1=warp = 0; -per_frame_2=zoom = .6+.2*sin(time*.433); -per_frame_3=dx = .6 +.1*sin(time); -per_frame_4=dy = .6 +.1*cos(time*.888); -per_frame_5=rot = .3*sin(time*.333); -per_frame_6=wave_r = bass*.3; -per_frame_7=wave_g = treb*.3; -per_frame_8=wave_b = mid*.3; -per_frame_9=wave_a = if(equal(frame%2,0),if(above(bass,1.3),10,0),10.57); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Visionarie.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Visionarie.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/libprojectM/presets/Zylot - Visionarie.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/libprojectM/presets/Zylot - Visionarie.milk" 1970-01-01 00:00:00.000000000 +0000 @@ -1,174 +0,0 @@ -[preset00] -fRating=3.000000 -fGammaAdj=1.000000 -fDecay=0.997000 -fVideoEchoZoom=0.996629 -fVideoEchoAlpha=0.000000 -nVideoEchoOrientation=1 -nWaveMode=0 -bAdditiveWaves=0 -bWaveDots=0 -bWaveThick=1 -bModWaveAlphaByVolume=0 -bMaximizeWaveColor=0 -bTexWrap=1 -bDarkenCenter=0 -bRedBlueStereo=0 -bBrighten=0 -bDarken=1 -bSolarize=0 -bInvert=0 -fWaveAlpha=0.001000 -fWaveScale=0.010000 -fWaveSmoothing=0.270000 -fWaveParam=-0.380000 -fModWaveAlphaStart=0.710000 -fModWaveAlphaEnd=1.300000 -fWarpAnimSpeed=1.000000 -fWarpScale=1.331000 -fZoomExponent=1.000000 -fShader=0.000000 -zoom=0.999514 -rot=0.000000 -cx=0.500000 -cy=0.500000 -dx=0.000000 -dy=0.000000 -warp=0.010000 -sx=1.000000 -sy=1.000000 -wave_r=1.000000 -wave_g=1.000000 -wave_b=1.000000 -wave_x=0.500000 -wave_y=0.500000 -ob_size=0.500000 -ob_r=0.010000 -ob_g=0.000000 -ob_b=0.000000 -ob_a=0.000000 -ib_size=0.260000 -ib_r=1.000000 -ib_g=1.000000 -ib_b=1.000000 -ib_a=0.000000 -nMotionVectorsX=64.000000 -nMotionVectorsY=48.000000 -mv_dx=0.000000 -mv_dy=0.000000 -mv_l=0.850000 -mv_r=0.499900 -mv_g=0.499900 -mv_b=0.499900 -mv_a=0.000000 -wavecode_0_enabled=1 -wavecode_0_samples=512 -wavecode_0_sep=0 -wavecode_0_bSpectrum=0 -wavecode_0_bUseDots=0 -wavecode_0_bDrawThick=0 -wavecode_0_bAdditive=0 -wavecode_0_scaling=1.000000 -wavecode_0_smoothing=0.500000 -wavecode_0_r=1.000000 -wavecode_0_g=1.000000 -wavecode_0_b=1.000000 -wavecode_0_a=1.000000 -wave_0_per_point1=x = .5 + (bass*.2)*sin(sample*2*(time*10)); -wave_0_per_point2=y = .5 + (bass*.2)*cos(sample*2*(time*10)); -wave_0_per_point3=r = sample; -wave_0_per_point4=g = x; -wave_0_per_point5=b = y; -wavecode_1_enabled=0 -wavecode_1_samples=512 -wavecode_1_sep=0 -wavecode_1_bSpectrum=0 -wavecode_1_bUseDots=0 -wavecode_1_bDrawThick=0 -wavecode_1_bAdditive=0 -wavecode_1_scaling=1.000000 -wavecode_1_smoothing=0.500000 -wavecode_1_r=1.000000 -wavecode_1_g=1.000000 -wavecode_1_b=1.000000 -wavecode_1_a=1.000000 -wavecode_2_enabled=0 -wavecode_2_samples=512 -wavecode_2_sep=0 -wavecode_2_bSpectrum=0 -wavecode_2_bUseDots=0 -wavecode_2_bDrawThick=0 -wavecode_2_bAdditive=0 -wavecode_2_scaling=1.000000 -wavecode_2_smoothing=0.500000 -wavecode_2_r=1.000000 -wavecode_2_g=1.000000 -wavecode_2_b=1.000000 -wavecode_2_a=1.000000 -shapecode_0_enabled=0 -shapecode_0_sides=3 -shapecode_0_additive=0 -shapecode_0_thickOutline=0 -shapecode_0_x=0.500000 -shapecode_0_y=0.500000 -shapecode_0_rad=0.340000 -shapecode_0_ang=0.530000 -shapecode_0_r=0.560000 -shapecode_0_g=0.360000 -shapecode_0_b=0.000000 -shapecode_0_a=1.000000 -shapecode_0_r2=0.900000 -shapecode_0_g2=1.000000 -shapecode_0_b2=0.000000 -shapecode_0_a2=0.000000 -shapecode_0_border_r=0.000000 -shapecode_0_border_g=0.000000 -shapecode_0_border_b=0.000000 -shapecode_0_border_a=0.000000 -shape_0_per_frame1=ang = ang + time; -shapecode_1_enabled=0 -shapecode_1_sides=3 -shapecode_1_additive=0 -shapecode_1_thickOutline=0 -shapecode_1_x=0.500000 -shapecode_1_y=0.500000 -shapecode_1_rad=0.410000 -shapecode_1_ang=0.000000 -shapecode_1_r=0.000000 -shapecode_1_g=0.800000 -shapecode_1_b=0.700000 -shapecode_1_a=1.000000 -shapecode_1_r2=0.000000 -shapecode_1_g2=0.400000 -shapecode_1_b2=1.000000 -shapecode_1_a2=0.000000 -shapecode_1_border_r=1.000000 -shapecode_1_border_g=1.000000 -shapecode_1_border_b=1.000000 -shapecode_1_border_a=0.000000 -shape_1_per_frame1=ang = ang - time*.333; -shapecode_2_enabled=0 -shapecode_2_sides=3 -shapecode_2_additive=0 -shapecode_2_thickOutline=0 -shapecode_2_x=0.500000 -shapecode_2_y=0.500000 -shapecode_2_rad=0.210000 -shapecode_2_ang=0.000000 -shapecode_2_r=0.840000 -shapecode_2_g=0.000000 -shapecode_2_b=0.000000 -shapecode_2_a=1.000000 -shapecode_2_r2=1.000000 -shapecode_2_g2=0.580000 -shapecode_2_b2=0.000000 -shapecode_2_a2=0.000000 -shapecode_2_border_r=1.000000 -shapecode_2_border_g=1.000000 -shapecode_2_border_b=1.000000 -shapecode_2_border_a=0.000000 -shape_2_per_frame1=ang = ang + time*4; -per_frame_1=warp = 0; -per_frame_2=decay = .92; -per_pixel_1=zoom = zoom + .1; -per_pixel_2=rot = rot + rad*.1; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/projectM.cpp projectm-3.1.0/src/libprojectM/projectM.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/projectM.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/projectM.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -30,7 +30,7 @@ #include "timer.h" #include -#ifdef LINUX +#ifdef __unix__ #include "time.h" #endif @@ -68,15 +68,18 @@ projectM::~projectM() { + void *status; #ifdef USE_THREADS std::cout << "[projectM] thread "; printf("c"); + pthread_mutex_lock( &mutex ); running = false; + pthread_mutex_unlock( &mutex ); printf("l"); pthread_cond_signal(&condition); printf("e"); - pthread_mutex_unlock( &mutex ); + pthread_join(thread, &status); printf("a"); pthread_detach(thread); printf("n"); @@ -101,6 +104,11 @@ _pcm = 0; } + if(timeKeeper) { + delete timeKeeper; + timeKeeper = NULL; + } + delete(_pipelineContext); delete(_pipelineContext2); } @@ -117,7 +125,8 @@ projectM::projectM ( std::string config_file, int flags) : -beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()), _pipelineContext2(new PipelineContext()) +beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()), _pipelineContext2(new PipelineContext()), + timeKeeper(NULL), _matcher(NULL), _merger(NULL) { readConfig(config_file); projectM_reset(); @@ -126,7 +135,8 @@ } projectM::projectM(Settings settings, int flags): -beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()), _pipelineContext2(new PipelineContext()) +beatDetect ( 0 ), renderer ( 0 ), _pcm(0), m_presetPos(0), m_flags(flags), _pipelineContext(new PipelineContext()), _pipelineContext2(new PipelineContext()), + timeKeeper(NULL), _matcher(NULL), _merger(NULL) { readSettings(settings); projectM_reset(); @@ -179,8 +189,8 @@ ( "Smooth Preset Duration", config.read("Smooth Transition Duration", 10)); _settings.presetDuration = config.read ( "Preset Duration", 15 ); - #ifdef LINUX - _settings.presetURL = config.read ( "Preset Path", CMAKE_INSTALL_PREFIX "/share/projectM/presets" ); + #ifdef __unix__ + _settings.presetURL = config.read ( "Preset Path", "/usr/local/share/projectM/presets" ); #endif #ifdef __APPLE__ @@ -189,7 +199,7 @@ #endif #ifdef WIN32 - _settings.presetURL = config.read ( "Preset Path", CMAKE_INSTALL_PREFIX "/share/projectM/presets" ); + _settings.presetURL = config.read ( "Preset Path", "/usr/local/share/projectM/presets" ); #endif #ifdef __APPLE__ @@ -199,11 +209,11 @@ ( "Menu Font", "../Resources/fonts/VeraMono.ttf"); #endif - #ifdef LINUX + #ifdef __unix__ _settings.titleFontURL = config.read - ( "Title Font", projectM_FONT_TITLE ); + ( "Title Font", "/usr/local/share/projectM/fonts/Vera.tff" ); _settings.menuFontURL = config.read - ( "Menu Font", projectM_FONT_MENU ); + ( "Menu Font", "/usr/local/share/projectM/fonts/VeraMono.tff" ); #endif #ifdef WIN32 @@ -218,7 +228,7 @@ _settings.easterEgg = config.read ( "Easter Egg Parameter", 0.0); _settings.softCutRatingsEnabled = - config.read ( "Soft Cut Ratings Enabled", false); + config.read ( "Soft Cut Ratings Enabled", false); projectM_init ( _settings.meshX, _settings.meshY, _settings.fps, _settings.textureSize, _settings.windowWidth,_settings.windowHeight); @@ -257,6 +267,7 @@ _settings.titleFontURL = settings.titleFontURL; _settings.menuFontURL = settings.menuFontURL; _settings.shuffleEnabled = settings.shuffleEnabled; + _settings.datadir = settings.datadir; _settings.easterEgg = settings.easterEgg; @@ -297,6 +308,7 @@ void projectM::evaluateSecondPreset() { pipelineContext2().time = timeKeeper->GetRunningTime(); + pipelineContext2().presetStartTime = timeKeeper->PresetTimeB(); pipelineContext2().frame = timeKeeper->PresetFrameB(); pipelineContext2().progress = timeKeeper->PresetProgressB(); @@ -331,6 +343,7 @@ /// @bug who is responsible for updating this now?" pipelineContext().time = timeKeeper->GetRunningTime(); + pipelineContext().presetStartTime = timeKeeper->PresetTimeA(); pipelineContext().frame = timeKeeper->PresetFrameA(); pipelineContext().progress = timeKeeper->PresetProgressA(); @@ -374,16 +387,17 @@ assert ( m_activePreset2.get() ); #ifdef USE_THREADS - - pthread_cond_signal(&condition); - pthread_mutex_unlock( &mutex ); + pthread_cond_signal(&condition); #endif + m_activePreset->Render(*beatDetect, pipelineContext()); #ifdef USE_THREADS - pthread_mutex_lock( &mutex ); + // wait for the thread + pthread_mutex_lock( &mutex ); + pthread_mutex_unlock( &mutex ); #else - evaluateSecondPreset(); + evaluateSecondPreset(); #endif Pipeline pipeline; @@ -440,6 +454,7 @@ this->fpsstart=getTicks ( &timeKeeper->startTime ); } +#ifndef UNLOCK_FPS int timediff = getTicks ( &timeKeeper->startTime )-this->timestart; if ( timediff < this->mspf ) @@ -452,6 +467,8 @@ if ( usleep ( sleepTime ) != 0 ) {}} } this->timestart=getTicks ( &timeKeeper->startTime ); +#endif + #endif /** !WIN32 */ #ifdef SYNC_PRESET_SWITCHES @@ -496,7 +513,7 @@ mspf= ( int ) ( 1000.0/ ( float ) _settings.fps ); else mspf = 0; - this->renderer = new Renderer ( width, height, gx, gy, texsize, beatDetect, settings().presetURL, settings().titleFontURL, settings().menuFontURL ); + this->renderer = new Renderer ( width, height, gx, gy, beatDetect, settings().presetURL, settings().titleFontURL, settings().menuFontURL, settings().datadir ); running = true; @@ -517,7 +534,6 @@ std::cerr << "[projectM] failed to allocate a thread! try building with option USE_THREADS turned off" << std::endl;; exit(EXIT_FAILURE); } - pthread_mutex_lock( &mutex ); #endif /// @bug order of operatoins here is busted @@ -544,9 +560,11 @@ /** Resets OpenGL state */ void projectM::projectM_resetGL ( int w, int h ) { - + /** sanity check **/ + assert(w > 0); + assert(h > 0); + /** Stash the new dimensions */ - _settings.windowWidth = w; _settings.windowHeight = h; renderer->reset ( w,h ); @@ -600,7 +618,7 @@ *m_presetPos = m_presetChooser->end(); // Load idle preset - std::cerr << "[projectM] Allocating idle preset..." << std::endl; +// std::cerr << "[projectM] Allocating idle preset..." << std::endl; m_activePreset = m_presetLoader->loadPreset ("idle://Geiss & Sperl - Feedback (projectM idle HDR mix).milk"); @@ -611,7 +629,7 @@ if (m_presetChooser->empty()) { //std::cerr << "[projectM] warning: no valid files found in preset directory \"" - //<< m_presetLoader->directoryName() << "\"" << std::endl; + ///< m_presetLoader->directoryName() << "\"" << std::endl; } _matcher = new RenderItemMatcher(); @@ -650,12 +668,21 @@ m_presetLoader = 0; + if (_matcher) { + delete _matcher; + _matcher = NULL; + } + + if (_merger) { + delete _merger; + _merger = NULL; + } } /// @bug queuePreset case isn't handled void projectM::removePreset(unsigned int index) { - unsigned int chooserIndex = **m_presetPos; + size_t chooserIndex = **m_presetPos; m_presetLoader->removePreset(index); @@ -720,10 +747,14 @@ timeKeeper->StartSmoothing(); } - if (result.empty()) + if (result.empty()) { presetSwitchedEvent(hardCut, **m_presetPos); - else + errorLoadingCurrentPreset = false; + } else { presetSwitchFailedEvent(hardCut, **m_presetPos, result); + errorLoadingCurrentPreset = true; + + } } @@ -766,6 +797,8 @@ */ std::string projectM::switchPreset(std::auto_ptr & targetPreset) { + std::string result; + #ifdef SYNC_PRESET_SWITCHES pthread_mutex_lock(&preset_mutex); #endif @@ -778,15 +811,16 @@ std::cerr << "problem allocating target preset: " << e.message() << std::endl; return e.message(); } - // Set preset name here- event is not done because at the moment this function is oblivious to smooth/hard switches - renderer->setPresetName(targetPreset->name()); - renderer->SetPipeline(targetPreset->pipeline()); + + // Set preset name here- event is not done because at the moment this function is oblivious to smooth/hard switches + renderer->setPresetName(targetPreset->name()); + result = renderer->SetPipeline(targetPreset->pipeline()); #ifdef SYNC_PRESET_SWITCHES pthread_mutex_unlock(&preset_mutex); #endif - return std::string(); + return result; } void projectM::setPresetLock ( bool isLocked ) @@ -853,7 +887,7 @@ { bool atEndPosition = false; - int newSelectedIndex; + int newSelectedIndex = 0; if (*m_presetPos == m_presetChooser->end()) // Case: preset not selected @@ -897,8 +931,9 @@ delete renderer; renderer = new Renderer(_settings.windowWidth, _settings.windowHeight, _settings.meshX, _settings.meshY, - _settings.textureSize, beatDetect, _settings.presetURL, - _settings.titleFontURL, _settings.menuFontURL); + beatDetect, _settings.presetURL, + _settings.titleFontURL, _settings.menuFontURL, + _settings.datadir); } void projectM::changePresetDuration(int seconds) { @@ -909,4 +944,3 @@ *h = _settings.meshY; } - diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/projectM.hpp projectm-3.1.0/src/libprojectM/projectM.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/projectM.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/projectM.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -43,7 +43,7 @@ #endif #include -#ifdef MACOS +#ifdef __APPLE__ //#include //#include //#include @@ -84,7 +84,7 @@ #pragma warning (disable:4305) #endif /** WIN32 */ -#ifdef MACOS2 +#ifdef __APPLE__2 #define inline #endif @@ -128,6 +128,7 @@ std::string presetURL; std::string titleFontURL; std::string menuFontURL; + std::string datadir; int smoothPresetDuration; int presetDuration; float beatSensitivity; @@ -135,13 +136,26 @@ float easterEgg; bool shuffleEnabled; bool softCutRatingsEnabled; + + Settings() : + meshX(32), + meshY(24), + fps(35), + textureSize(512), + windowWidth(512), + windowHeight(512), + smoothPresetDuration(10), + presetDuration(15), + beatSensitivity(10.0), + aspectCorrection(true), + easterEgg(0.0), + shuffleEnabled(true), + softCutRatingsEnabled(false) {} }; projectM(std::string config_file, int flags = FLAG_NONE); projectM(Settings settings, int flags = FLAG_NONE); - //DLLEXPORT projectM(int gx, int gy, int fps, int texsize, int width, int height,std::string preset_url,std::string title_fonturl, std::string title_menuurl); - void projectM_resetGL( int width, int height ); void projectM_resetTextures(); void projectM_setTitle( std::string title ); @@ -242,7 +256,7 @@ } /// Occurs when active preset has switched. Switched to index is returned - virtual void presetSwitchedEvent(bool isHardCut, unsigned int index) const {}; + virtual void presetSwitchedEvent(bool isHardCut, size_t index) const {}; virtual void shuffleEnabledValueChanged(bool isEnabled) const {}; virtual void presetSwitchFailedEvent(bool hardCut, unsigned int index, const std::string & message) const {}; @@ -262,6 +276,11 @@ void selectPrevious(const bool); void selectNext(const bool); void selectRandom(const bool); + + int getWindowWidth() { return _settings.windowWidth; } + int getWindowHeight() { return _settings.windowHeight; } + bool getErrorLoadingCurrentPreset() const { return errorLoadingCurrentPreset; } + private: PCM * _pcm; double sampledPresetDuration(); @@ -320,6 +339,7 @@ MasterRenderItemMerge * _merger; bool running; + bool errorLoadingCurrentPreset; Pipeline* currentPipe; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/projectM-opengl.h projectm-3.1.0/src/libprojectM/projectM-opengl.h --- projectm-2.2.0~git28bb9/src/libprojectM/projectM-opengl.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/projectM-opengl.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,38 @@ +/** + Include appropriate OpenGL headers for this platform. +**/ + +#ifndef __PROJECTM_OPENGL_H__ +#define __PROJECTM_OPENGL_H__ + +// stuff that needs to be ported to newer GL calls +#define GL_TRANSITION + +// Enable openGL extra checks, better not be enabled in release build +#define OGL_DEBUG 0 + +// Unlock FPS for rendering benchmarks, it disables Vblank/Vsync and prints drawned frames count within a 5s test run +#define UNLOCK_FPS 0 + +// If a shader compilation failure occurs, it dumps shader source into /tmp instead of stderr +#define DUMP_SHADERS_ON_ERROR 0 + +#ifdef __APPLE__ +# include +# include +#elif defined(_WIN32) +# include +#else /* linux/unix/other */ +# ifdef USE_GLES +# include +# else +# if !defined(GL_GLEXT_PROTOTYPES) +# define GL_GLEXT_PROTOTYPES +# endif +# include +# include +# endif +#endif + + +#endif // __PROJECTM_OPENGL_H__ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/BeatDetect.cpp projectm-3.1.0/src/libprojectM/Renderer/BeatDetect.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/BeatDetect.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/BeatDetect.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -70,8 +70,9 @@ this->treb_att = 0; this->mid_att = 0; this->bass_att = 0; + this->vol_att = 0; this->vol = 0; - + } @@ -87,6 +88,7 @@ this->treb_att = 0; this->mid_att = 0; this->bass_att = 0; + this->vol_att = 0; } void BeatDetect::detectFromSamples() { @@ -168,6 +170,7 @@ treb_att=.6 * treb_att + .4 * treb; mid_att=.6 * mid_att + .4 * mid; bass_att=.6 * bass_att + .4 * bass; + vol_att=.6 * vol_att + .4 * vol; if(bass_att>100)bass_att=100; if(bass >100)bass=100; @@ -175,6 +178,7 @@ if(mid >100)mid=100; if(treb_att>100)treb_att=100; if(treb >100)treb=100; + if(vol_att>100)vol_att=100; if(vol>100)vol=100; // *vol=(beat_instant[3])/(beat_history[3]); diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/BeatDetect.hpp projectm-3.1.0/src/libprojectM/Renderer/BeatDetect.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/BeatDetect.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/BeatDetect.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -47,6 +47,7 @@ float mid_att ; float bass_att ; float vol; + float vol_att ; PCM *pcm; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/blur.cg projectm-3.1.0/src/libprojectM/Renderer/blur.cg --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/blur.cg 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/blur.cg 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -struct outtype {float4 color : COLOR;}; - -uniform float4 srctexsize; - -outtype blur1(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ -float2 uv2 = uv.xy + srctexsize.zw*float2(1,1); - -float d=.00175; - -float3 val = tex2D(sampler_blur, float2(uv.x-d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x+d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y + d)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y - d)).xyz; - -float3 val2 = tex2D(sampler_blur, float2(uv.x-d, uv.y -d)).xyz; -val += tex2D(sampler_blur, float2(uv.x-d, uv.y +d)).xyz; -val += tex2D(sampler_blur, float2(uv.x+d, uv.y + d)).xyz; -val += tex2D(sampler_blur, float2(uv.x +d, uv.y - d)).xyz; - -outtype OUT; -val *= 0.65; -val2 *= 0.35; - -OUT.color.xyz = val* 0.25 + val2 * 0.25; -OUT.color.w = 1; -return OUT; -} - -outtype blur2(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ -float2 uv2 = uv.xy + srctexsize.zw*float2(1,0); - -float d = srctexsize.z; -d=.0015; - -float3 val = tex2D(sampler_blur, float2(uv.x-d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x+d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y + d)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y - d)).xyz; - -val *= 0.25; - -float t = min( min(uv.x, uv.y), 1-max(uv.x,uv.y) ); -t = sqrt(t); - -float minimum = 0.5; -float variance = 0.5; -float size = 50; - -t = minimum + variance*saturate(t*size); -t = 1; -val.xyz *= t; - -outtype OUT; -OUT.color.xyz = val; -OUT.color.w = 1; -return OUT; -} - -outtype blurHoriz(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ - - // LONG HORIZ. PASS 1: - const float w[8] = { 4.0, 3.8, 3.5, 2.9, 1.9, 1.2, 0.7, 0.3 }; - const float w1 = w[0] + w[1]; - const float w2 = w[2] + w[3]; - const float w3 = w[4] + w[5]; - const float w4 = w[6] + w[7]; - const float d1 = 0 + 2*w[1]/w1; - const float d2 = 2 + 2*w[3]/w2; - const float d3 = 4 + 2*w[5]/w3; - const float d4 = 6 + 2*w[7]/w4; - const float w_div = 0.5/(w1+w2+w3+w4); - -float fscale = 1; -float fbias = 0; - - - // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels. - //float2 uv2 = uv.xy;// + srctexsize.zw*float2(0.5,0.5); - float2 uv2 = uv.xy + srctexsize.zw*float2(1,1); // + moves blur UP, LEFT by 1-pixel increments - - float3 blur = - ( tex2D( sampler_blur, uv2 + float2( d1*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d1*srctexsize.z,0) ).xyz)*w1 + - ( tex2D( sampler_blur, uv2 + float2( d2*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d2*srctexsize.z,0) ).xyz)*w2 + - ( tex2D( sampler_blur, uv2 + float2( d3*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d3*srctexsize.z,0) ).xyz)*w3 + - ( tex2D( sampler_blur, uv2 + float2( d4*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d4*srctexsize.z,0) ).xyz)*w4 - ; - blur.xyz *= w_div; - - blur.xyz = blur.xyz*fscale + fbias; - - outtype OUT; - OUT.color.xyz = blur; - OUT.color.w = 1; - -return OUT; -} - -outtype blurVert(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ - //SHORT VERTICAL PASS 2: - - - const float w[8] = { 4.0, 3.8, 3.5, 2.9, 1.9, 1.2, 0.7, 0.3 }; - - const float w1 = w[0]+w[1] + w[2]+w[3]; - const float w2 = w[4]+w[5] + w[6]+w[7]; - const float d1 = 0 + 2*((w[2]+w[3])/w1); - const float d2 = 2 + 2*((w[6]+w[7])/w2); - const float w_div = 1.0/((w1+w2)*2); - - - - // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels. - //float2 uv2 = uv.xy;// + srctexsize.zw*float2(-0.5,-0.5); - float2 uv2 = uv.xy + srctexsize.zw*float2(1,0); // + moves blur UP, LEFT by TWO-pixel increments! (since texture is 1/2 the size of blur1_ps) - - float3 blur = - ( tex2D( sampler_blur, uv2 + float2(0, d1*srctexsize.w) ).xyz - + tex2D( sampler_blur, uv2 + float2(0,-d1*srctexsize.w) ).xyz)*w1 + - ( tex2D( sampler_blur, uv2 + float2(0, d2*srctexsize.w) ).xyz - + tex2D( sampler_blur, uv2 + float2(0,-d2*srctexsize.w) ).xyz)*w2 - ; - blur.xyz *= w_div; - - // tone it down at the edges: (only happens on 1st X pass!) - float t = min( min(uv.x, uv.y), 1-max(uv.x,uv.y) ); - - float minimum = 0.5; - float variance = 0.5; - float size = 50; - - - blur.xyz *= t; - - t = sqrt(t); - t = minimum + variance*saturate(t*size); - t=1; - blur.xyz *= t; - -outtype OUT; -OUT.color.xyz = blur; -OUT.color.w = 1; -return OUT; -} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/CMakeLists.txt projectm-3.1.0/src/libprojectM/Renderer/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/CMakeLists.txt 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -project(Renderer) - -SET(SOIL_SOURCES - SOIL2/image_DXT.c - SOIL2/image_helper.c - SOIL2/SOIL2.c - SOIL2/etc1_utils.c -) - -SET(Renderer_SOURCES - FBO.cpp - MilkdropWaveform.cpp - PerPixelMesh.cpp - Pipeline.cpp - Renderer.cpp - ShaderEngine.cpp - UserTexture.cpp - Waveform.cpp - Filters.cpp - PerlinNoise.cpp - PipelineContext.cpp - Renderable.cpp - BeatDetect.cpp - Shader.cpp - TextureManager.cpp - VideoEcho.cpp - RenderItemDistanceMetric.cpp - RenderItemMatcher.cpp - ../KeyHandler.cpp - ${SOIL_SOURCES} -) - -IF(NOT MSVC) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") -ENDIF(NOT MSVC) - -if(MSVC) - SET (MATH_LIBRARIES ) -else(MSVC) - SET (MATH_LIBRARIES m) -endif(MSVC) - -if (APPLE) - FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) - INCLUDE_DIRECTORIES( /usr/include ) - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I/usr/include") -else (APPLE) - set(COREFOUNDATION_LIBRARY ) -endif(APPLE) - -INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR} ${projectM_SOURCE_DIR}/Renderer) - -ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) -TARGET_LINK_LIBRARIES(Renderer ${MATH_LIBRARIES} - #${GLEW_LINK_TARGETS} - ${FTGL_LINK_TARGETS} - ${OPENGL_LIBRARIES} - ${IMAGE_LINK_TARGETS} - ${CG_LINK_TARGETS} - ${FREETYPE2_LIBRARIES} - ${COREFOUNDATION_LIBRARY} -) -set_target_properties(Renderer PROPERTIES COMPILE_FLAGS "-Wno-parentheses") diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/FBO.cpp projectm-3.1.0/src/libprojectM/Renderer/FBO.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/FBO.cpp 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/FBO.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,296 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2004 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: FBO.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Render this methods - */ - -#include -#include -#include "Common.hpp" -#include "FBO.hpp" - -RenderTarget::~RenderTarget() { - - - glDeleteTextures( 1, &this->textureID[0]); - -#ifdef USE_FBO - if (useFBO) - { - glDeleteTextures( 1, &this->textureID[1] ); - glDeleteRenderbuffersEXT(1, &this->depthb[0]); - glDeleteFramebuffersEXT(1, &this->fbuffer[0]); - if(renderToTexture) - { - glDeleteTextures( 1, &this->textureID[2] ); - glDeleteRenderbuffersEXT(1, &this->depthb[1]); - glDeleteFramebuffersEXT(1, &this->fbuffer[1]); - } - } -#endif - -} - -GLuint RenderTarget::initRenderToTexture() -{ -#ifdef USE_FBO - - if (this->useFBO==1) - { - this->renderToTexture=1; - - GLuint fb2, depth_rb2; - glGenFramebuffersEXT(1, &fb2); - glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fb2 ); - glGenRenderbuffersEXT(1, &depth_rb2); - glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, depth_rb2 ); - - glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, this->texsize,this->texsize ); - glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_rb2 ); - this->fbuffer[1] = fb2; - this->depthb[1]= depth_rb2; - glGenTextures(1, &this->textureID[2]); - glBindTexture(GL_TEXTURE_2D, this->textureID[2]); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, this->textureID[2], 0 ); - return this->textureID[2]; - } -#endif -return -1; - -} - -/** Creates new pbuffers */ -RenderTarget::RenderTarget(int texsize, int width, int height) : useFBO(false) { - - int mindim = 0; - int origtexsize = 0; - - this->renderToTexture = 0; - this->texsize = texsize; - -#ifdef USE_FBO - //glewInit(); - // Forceably disable FBO if user requested it but the video card / driver lacks - // the appropraite frame buffer extension. - if (useFBO = 1)//glewIsSupported("GL_EXT_framebuffer_object")) - { - - GLuint fb, depth_rb, rgba_tex, other_tex; - glGenFramebuffersEXT(1, &fb); - glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fb ); - - glGenRenderbuffersEXT(1, &depth_rb); - glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, depth_rb ); - glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, this->texsize,this->texsize ); - glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, depth_rb ); - this->fbuffer[0] = fb; - this->depthb[0]= depth_rb; - - glGenTextures(1, &other_tex); - glBindTexture(GL_TEXTURE_2D,other_tex); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //glGenerateMipmapEXT(GL_TEXTURE_2D); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - - - glGenTextures(1, &rgba_tex); - glBindTexture(GL_TEXTURE_2D, rgba_tex); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsize, texsize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //glGenerateMipmapEXT(GL_TEXTURE_2D); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); - - - - glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, rgba_tex, 0 ); - this->textureID[0] = rgba_tex; - this->textureID[1] = other_tex; - - GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); - - glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, 0); - - if (status == GL_FRAMEBUFFER_COMPLETE_EXT) { - return; - } - std::cerr << "[projecM] warning: FBO support not detected. Using fallback." << std::endl; - } - -#endif - -// Can reach here via two code paths: -// (1) useFBO was set to false externally by cmake / system setting / etc. -// (2) useFBO was true but forced to false as it failed to pass all the GLU extension checks. - - /** Fallback pbuffer creation via teximage hack */ - /** Check the texture size against the viewport size */ - /** If the viewport is smaller, then we'll need to scale the texture size down */ - /** If the viewport is larger, scale it up */ - mindim = width < height ? width : height; - origtexsize = this->texsize; - this->texsize = nearestPower2( mindim, SCALE_MINIFY ); - glGenTextures(1, &this->textureID[0] ); - - glBindTexture(GL_TEXTURE_2D, this->textureID[0] ); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage2D(GL_TEXTURE_2D, - 0, - GL_RGB, - this->texsize, this->texsize, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - NULL); - - - - return; - } - - void RenderTarget::fallbackRescale(int width, int height) - { - int mindim = width < height ? width : height; - int origtexsize = this->texsize; - this->texsize = nearestPower2( mindim, SCALE_MINIFY ); - - if (origtexsize == texsize) - return; - - /* Create the texture that will be bound to the render this */ - /* - - if ( this->texsize != origtexsize ) { - - glDeleteTextures( 1, &this->textureID[0] ); - } - */ - - glGenTextures(1, &this->textureID[0] ); - - glBindTexture(GL_TEXTURE_2D, this->textureID[0] ); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - - glTexImage2D(GL_TEXTURE_2D, - 0, - GL_RGB, - this->texsize, this->texsize, - 0, - GL_RGBA, - GL_UNSIGNED_BYTE, - NULL); - - - } - -/** Destroys the pbuffer */ - -/** Locks the pbuffer */ -void RenderTarget::lock() { - -#ifdef USE_FBO - if(this->useFBO) - { - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->fbuffer[0]); - } -#endif - } - -/** Unlocks the pbuffer */ -void RenderTarget::unlock() { - -#ifdef USE_FBO - if(this->useFBO) - { - glBindTexture( GL_TEXTURE_2D, this->textureID[1] ); - glCopyTexSubImage2D( GL_TEXTURE_2D, - 0, 0, 0, 0, 0, - this->texsize, this->texsize ); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - return; - } -#endif - /** Fallback texture path */ - - glBindTexture( GL_TEXTURE_2D, this->textureID[0] ); - - glCopyTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 0, 0, this->texsize, this->texsize ); - } - -/** - * Calculates the nearest power of two to the given number using the - * appropriate rule - */ -int RenderTarget::nearestPower2( int value, TextureScale scaleRule ) { - - int x = value; - int power = 0; - - while ( ( x & 0x01 ) != 1 ) { - x >>= 1; - } - - if ( x == 1 ) { - return value; - } else { - x = value; - while ( x != 0 ) { - x >>= 1; - power++; - } - switch ( scaleRule ) { - case SCALE_NEAREST: - if ( ( ( 1 << power ) - value ) <= ( value - ( 1 << ( power - 1 ) ) ) ) { - return 1 << power; - } else { - return 1 << ( power - 1 ); - } - case SCALE_MAGNIFY: - return 1 << power; - case SCALE_MINIFY: - return 1 << ( power - 1 ); - default: - break; - } - } - return 0; - } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/FBO.hpp projectm-3.1.0/src/libprojectM/Renderer/FBO.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/FBO.hpp 2017-02-20 17:10:44.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/FBO.hpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -/** - * projectM -- Milkdrop-esque visualisation SDK - * Copyright (C)2003-2007 projectM Team - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * See 'LICENSE.txt' included within this release - * - */ -/** - * $Id: FBO.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ - * - * Opaque render target - * - */ - -#ifndef _RENDERTARGET_H -#define _RENDERTARGET_H - - -#ifdef EMSCRIPTEN -#include -#endif - -#ifdef USE_FBO -#ifdef USE_INCLUDED_GLEW -#include "glew.h" -#else -//#include -#define GL_GLEXT_PROTOTYPES -#include -#include -#endif -#endif - -#ifdef __APPLE__ -#include -#endif /** MACOS */ - -#ifdef WIN32 -#include -#endif /** WIN32 */ - -#ifdef LINUX -#ifdef USE_GLES1 -#include -#else -#include -#include -#endif -#endif - -typedef enum { SCALE_NEAREST, SCALE_MAGNIFY, SCALE_MINIFY } TextureScale; - -class RenderTarget { - - -public: - /** Texture size */ - int texsize; - - int useFBO; - int renderToTexture; - - ~RenderTarget(); - - RenderTarget( int texsize, int width, int height ); - void lock(); - void unlock(); - GLuint initRenderToTexture(); - int nearestPower2( int value, TextureScale scaleRule ); - void fallbackRescale(int width, int height); - - /** Opaque pbuffer context and pbuffer */ -/* -#ifdef MACOS - void *origContext; - void *pbufferContext; - void *pbuffer; -#endif -*/ - /** Render target texture ID for non-pbuffer systems */ - GLuint textureID[3]; -#ifdef USE_FBO - GLuint fbuffer[2]; - GLuint depthb[2]; -#endif - }; - - - -#endif /** !_RENDERTARGET_H */ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Filters.cpp projectm-3.1.0/src/libprojectM/Renderer/Filters.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Filters.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Filters.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -6,32 +6,33 @@ */ #include "Common.hpp" - -#ifdef USE_GLES1 -#include -#else -#ifdef __APPLE__ -#include -#include -#else -#include -#include -#endif -#endif - +#include "projectM-opengl.h" #include "Filters.hpp" +#include "ShaderEngine.hpp" +#include + +void Brighten::InitVertexAttrib() { + float points[4][2] = {{-0.5, -0.5}, + {-0.5, 0.5}, + { 0.5, 0.5}, + { 0.5, -0.5}}; + + glBufferData(GL_ARRAY_BUFFER, sizeof(points), points, GL_STATIC_DRAW); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); +} void Brighten::Draw(RenderContext &context) { - float points[4][2] = {{-0.5, -0.5}, - {-0.5, 0.5}, - { 0.5, 0.5}, - { 0.5, -0.5}}; + glUseProgram(context.programID_v2f_c4f); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2,GL_FLOAT,0,points); + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); - glColor4f(1.0, 1.0, 1.0, 1.0); + glBindVertexArray(m_vaoID); + + glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); glDrawArrays(GL_TRIANGLE_FAN,0,4); glBlendFunc(GL_ZERO, GL_DST_COLOR); @@ -40,59 +41,98 @@ glDrawArrays(GL_TRIANGLE_FAN,0,4); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDisableClientState(GL_VERTEX_ARRAY); + glBindVertexArray(0); +} + +void Darken::InitVertexAttrib() { + float points[4][2] = {{-0.5, -0.5}, + {-0.5, 0.5}, + { 0.5, 0.5}, + { 0.5, -0.5}}; + + glBufferData(GL_ARRAY_BUFFER, sizeof(points), points, GL_STATIC_DRAW); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); } void Darken::Draw(RenderContext &context) { - float points[4][2] = {{-0.5, -0.5}, - {-0.5, 0.5}, - { 0.5, 0.5}, - { 0.5, -0.5}}; - - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2,GL_FLOAT,0,points); - glColor4f(1.0, 1.0, 1.0, 1.0); - glBlendFunc(GL_ZERO, GL_DST_COLOR); - glDrawArrays(GL_TRIANGLE_FAN,0,4); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDisableClientState(GL_VERTEX_ARRAY); + glUseProgram(context.programID_v2f_c4f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + + glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0); + + glBlendFunc(GL_ZERO, GL_DST_COLOR); + + glBindVertexArray(m_vaoID); + glDrawArrays(GL_TRIANGLE_FAN,0,4); + glBindVertexArray(0); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +} + +void Invert::InitVertexAttrib() { + float points[4][2] = {{-0.5, -0.5}, + {-0.5, 0.5}, + { 0.5, 0.5}, + { 0.5, -0.5}}; + + glBufferData(GL_ARRAY_BUFFER, sizeof(points), points, GL_STATIC_DRAW); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); } void Invert::Draw(RenderContext &context) { - float points[4][2] = {{-0.5, -0.5}, - {-0.5, 0.5}, - { 0.5, 0.5}, - { 0.5, -0.5}}; - - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2,GL_FLOAT,0,points); - glColor4f(1.0, 1.0, 1.0, 1.0); - glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); - glDrawArrays(GL_TRIANGLE_FAN,0,4); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDisableClientState(GL_VERTEX_ARRAY); + glUseProgram(context.programID_v2f_c4f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + + glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0); + + glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO); + + glBindVertexArray(m_vaoID); + glDrawArrays(GL_TRIANGLE_FAN,0,4); + glBindVertexArray(0); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +} + +void Solarize::InitVertexAttrib() { + float points[4][2] = {{-0.5, -0.5}, + {-0.5, 0.5}, + { 0.5, 0.5}, + { 0.5, -0.5}}; + + glBufferData(GL_ARRAY_BUFFER, sizeof(points), points, GL_STATIC_DRAW); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); } void Solarize::Draw(RenderContext &context) { - float points[4][2] = {{-0.5, -0.5}, - {-0.5, 0.5}, - { 0.5, 0.5}, - { 0.5, -0.5}}; + glUseProgram(context.programID_v2f_c4f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); - glEnableClientState(GL_VERTEX_ARRAY); - glVertexPointer(2,GL_FLOAT,0,points); + glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0); - glColor4f(1.0, 1.0, 1.0, 1.0); glBlendFunc(GL_ZERO, GL_ONE_MINUS_DST_COLOR); + + glBindVertexArray(m_vaoID); glDrawArrays(GL_TRIANGLE_FAN,0,4); glBlendFunc(GL_DST_COLOR, GL_ONE); glDrawArrays(GL_TRIANGLE_FAN,0,4); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBindVertexArray(0); - glDisableClientState(GL_VERTEX_ARRAY); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } - diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Filters.hpp projectm-3.1.0/src/libprojectM/Renderer/Filters.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Filters.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Filters.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -13,28 +13,32 @@ class Brighten : public RenderItem { public: - Brighten(){} + Brighten(){ Init(); } + void InitVertexAttrib(); void Draw(RenderContext &context); }; class Darken : public RenderItem { public: - Darken(){} + Darken(){ Init(); } + void InitVertexAttrib(); void Draw(RenderContext &context); }; class Invert : public RenderItem { public: - Invert(){} + Invert(){ Init(); } + void InitVertexAttrib(); void Draw(RenderContext &context); }; class Solarize : public RenderItem { public: - Solarize(){} + Solarize(){ Init(); } + void InitVertexAttrib(); void Draw(RenderContext &context); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/.gitignore projectm-3.1.0/src/libprojectM/Renderer/hlslparser/.gitignore --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/.gitignore 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,17 @@ +*.user +*.ncb +*.suo +*.tlog +*.lastbuildstate +*.unsuccessfulbuild +*.ipch +*.resources +*.pdb +*.aps +*.bak +/Debug +/Release +*.log +*.sdf +*.opensdf +/build diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/hlslparser.sln projectm-3.1.0/src/libprojectM/Renderer/hlslparser/hlslparser.sln --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/hlslparser.sln 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/hlslparser.sln 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,22 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.40629.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlslparser", "hlslparser.vcxproj", "{FAA5AD82-3351-479F-A315-F287EBD0A816}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FAA5AD82-3351-479F-A315-F287EBD0A816}.Debug|Win32.ActiveCfg = Debug|Win32 + {FAA5AD82-3351-479F-A315-F287EBD0A816}.Debug|Win32.Build.0 = Debug|Win32 + {FAA5AD82-3351-479F-A315-F287EBD0A816}.Release|Win32.ActiveCfg = Release|Win32 + {FAA5AD82-3351-479F-A315-F287EBD0A816}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj projectm-3.1.0/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,90 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {FAA5AD82-3351-479F-A315-F287EBD0A816} + hlslparser + + + + Application + true + v120 + MultiByte + + + Application + false + v120 + true + MultiByte + + + + + + + + + + + + + + + Level3 + Disabled + true + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj.filters projectm-3.1.0/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj.filters --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/hlslparser.vcxproj.filters 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,72 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/LICENSE projectm-3.1.0/src/libprojectM/Renderer/hlslparser/LICENSE --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/LICENSE 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2014 Unknown Worlds Entertainment, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/premake4.lua projectm-3.1.0/src/libprojectM/Renderer/hlslparser/premake4.lua --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/premake4.lua 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/premake4.lua 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,18 @@ +solution "HLSLParser" + location "build" + configurations { "Debug", "Release" } + + project "HLSLParser" + kind "ConsoleApp" + language "C++" + files { "src/**.h", "src/**.cpp" } + + configuration "Debug" + targetdir "bin/debug" + defines { "DEBUG" } + flags { "Symbols" } + + configuration "Release" + targetdir "bin/release" + defines { "NDEBUG" } + flags { "Optimize" } \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/README.md projectm-3.1.0/src/libprojectM/Renderer/hlslparser/README.md --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/README.md 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/README.md 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,54 @@ +HLSLParser +========== + +This is a fork of [Unknownworld's hlslparser](https://github.com/unknownworlds/hlslparser) adapted to our needs in [The Witness](http://the-witness.net). We currently use it to translate pseudo-HLSL shaders (using the legacy D3D9 syntax) to HLSL10 and Metal Shading Language (MSL). There's also a GLSL translator available that we do not use yet, but that is being maintained by community contributions. + +The HLSL parser has been extended with many HLSL10 features, but retaining the original HLSL C-based syntax. + +For example, the following functions in our HLSL dialect: + +```C +float tex2Dcmp(sampler2DShadow s, float3 texcoord_comparevalue); +float4 tex2DMSfetch(sampler2DMS s, int2 texcoord, int sample); +int2 tex2Dsize(sampler2D s); +``` + +Are equivalent to these methods in HLSL10: + +```C++ +float Texture2D::SampleCmp(SamplerComparisonState s, float2 texcoord, float comparevalue); +float4 Texture2DMS::Load(int2 texcoord, int sample); +void Texture2D::GetDimensions(out uint w, out uint h); +``` + + + +Here are the original release notes: + + +> HLSL Parser and GLSL code generator +> +> This is the code we used in Natural Selection 2 to convert HLSL shader code to +GLSL for use with OpenGL. The code is pulled from a larger codebase and has some +dependencies which have been replaced with stubs. These dependencies are all very +basic (array classes, memory allocators, etc.) so replacing them with our own +equivalent should be simple if you want to use this code. +> +> The parser is designed to work with HLSL code written in the legacy Direct3D 9 +style (e.g. D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY should be used with D3D11). +The parser works with cbuffers for uniforms, so in addition to generating GLSL, +there is a class provided for generating D3D9-compatible HLSL which doesn't +support cbuffers. The GLSL code requires version 3.1 for support of uniform blocks. +The parser is designed to catch all errors and generate "clean" GLSL which can +then be compiled without any errors. +> +> The HLSL parsing is done though a basic recursive descent parser coded by hand +rather than using a parser generator. We believe makes the code easier to +understand and work with. +> +> To get consistent results from Direct3D and OpenGL, our engine renders in OpenGL +"upside down". This is automatically added into the generated GLSL vertex shaders. +> +> Although this code was written specifically for our use, we hope that it may be +useful as an educational tool or a base for someone who wants to do something +similar. diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/CodeWriter.cpp projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/CodeWriter.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/CodeWriter.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/CodeWriter.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,148 @@ +//============================================================================= +// +// Render/CodeWriter.cpp +// +// Created by Max McGuire (max@unknownworlds.com) +// Copyright (c) 2013, Unknown Worlds Entertainment, Inc. +// +//============================================================================= + +//#include "Engine/Assert.h" +//#include "Engine/String.h" +#include "Engine.h" + +#include "CodeWriter.h" + +#include + +namespace M4 +{ + +static const int _maxLineLength = 2048; + +CodeWriter::CodeWriter(bool writeFileNames) +{ + m_currentLine = 1; + m_currentFileName = NULL; + m_spacesPerIndent = 4; + m_writeLines = false; + m_writeFileNames = writeFileNames; +} + +void CodeWriter::BeginLine(int indent, const char* fileName, int lineNumber) +{ + if (m_writeLines) + { + bool outputLine = false; + bool outputFile = false; + + // Output a line number pragma if necessary. + if (fileName != NULL && m_currentFileName != fileName) + { + m_currentFileName = fileName; + fileName = m_currentFileName; + outputFile = true; + } + if (lineNumber != -1 && m_currentLine != lineNumber) + { + m_currentLine = lineNumber; + outputLine = true; + } + if (outputLine || outputFile) + { + char buffer[256]; + String_Printf(buffer, sizeof(buffer), "#line %d", lineNumber); + m_buffer += buffer; + if (outputFile && m_writeFileNames) + { + m_buffer += " \""; + m_buffer += fileName; + m_buffer += "\"\n\n"; + } + else + { + m_buffer += "\n\n"; + } + } + } + + // Handle the indentation. + for (int i = 0; i < indent * m_spacesPerIndent; ++i) + { + m_buffer += " "; + } +} + +void CodeWriter::EndLine(const char* text) +{ + if (text != NULL) + { + m_buffer += text; + } + m_buffer += "\n"; + ++m_currentLine; +} + +void CodeWriter::Write(const char* format, ...) +{ + va_list args; + va_start(args, format); + + char buffer[_maxLineLength]; + String_PrintfArgList(buffer, sizeof(buffer), format, args); + + m_buffer += buffer; + + va_end(args); +} + +void CodeWriter::WriteLine(int indent, const char* format, ...) +{ + va_list args; + va_start(args, format); + + char buffer[_maxLineLength]; + + int result = String_PrintfArgList(buffer, sizeof(buffer), format, args); + ASSERT(result != -1); + + for (int i = 0; i < indent * m_spacesPerIndent; ++i) + { + m_buffer += " "; + } + m_buffer += buffer; + + EndLine(); + + va_end(args); +} + +void CodeWriter::WriteLineTagged(int indent, const char* fileName, int lineNumber, const char* format, ...) +{ + va_list args; + va_start(args, format); + + BeginLine(indent, fileName, lineNumber); + + char buffer[_maxLineLength]; + int result = String_PrintfArgList(buffer, sizeof(buffer), format, args); + ASSERT(result != -1); + + m_buffer += buffer; + + EndLine(); + + va_end(args); +} + +const char* CodeWriter::GetResult() const +{ + return m_buffer.c_str(); +} + +void CodeWriter::Reset() +{ + m_buffer.clear(); +} + +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/CodeWriter.h projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/CodeWriter.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/CodeWriter.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/CodeWriter.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,60 @@ +//============================================================================= +// +// Render/CodeWriter.h +// +// Created by Max McGuire (max@unknownworlds.com) +// Copyright (c) 2013, Unknown Worlds Entertainment, Inc. +// +//============================================================================= + +#ifndef CODE_WRITER_H +#define CODE_WRITER_H + +#include "Engine.h" +#include + +#if defined(__GNUC__) +#define M4_PRINTF_ATTR(string_index, first_to_check) __attribute__((format(printf, string_index, first_to_check))) +#else +#define M4_PRINTF_ATTR(string_index, first_to_check) +#endif + +namespace M4 +{ + +class Allocator; + +/** + * This class is used for outputting code. It handles indentation and inserting #line markers + * to match the desired output line numbers. + */ +class CodeWriter +{ + +public: + CodeWriter(bool writeFileNames = true); + + void BeginLine(int indent, const char* fileName = NULL, int lineNumber = -1); + M4_PRINTF_ATTR(2, 3) void Write(const char* format, ...); + void EndLine(const char* text = NULL); + + M4_PRINTF_ATTR(3, 4) void WriteLine(int indent, const char* format, ...); + M4_PRINTF_ATTR(5, 6) void WriteLineTagged(int indent, const char* fileName, int lineNumber, const char* format, ...); + + const char* GetResult() const; + void Reset(); + +private: + + std::string m_buffer; + int m_currentLine; + const char* m_currentFileName; + int m_spacesPerIndent; + bool m_writeLines; + bool m_writeFileNames; + +}; + +} + +#endif \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/Engine.cpp projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/Engine.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/Engine.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/Engine.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,185 @@ + +#include "Engine.h" + +#include // vsnprintf +#include // strcmp, strcasecmp +#include // strtod, strtol + + +namespace M4 { + +// Engine/String.cpp + +int String_PrintfArgList(char * buffer, int size, const char * format, va_list args) { + + va_list tmp; + va_copy(tmp, args); + +#if _MSC_VER >= 1400 + int n = vsnprintf_s(buffer, size, _TRUNCATE, format, tmp); +#else + int n = vsnprintf(buffer, size, format, tmp); +#endif + + va_end(tmp); + + if (n < 0 || n > size) return -1; + return n; +} + +int String_Printf(char * buffer, int size, const char * format, ...) { + + va_list args; + va_start(args, format); + + int n = String_PrintfArgList(buffer, size, format, args); + + va_end(args); + + return n; +} + +int String_FormatFloat(char * buffer, int size, float value) { + return String_Printf(buffer, size, "%f", value); +} + +bool String_Equal(const char * a, const char * b) { + if (a == b) return true; + if (a == NULL || b == NULL) return false; + return strcmp(a, b) == 0; +} + +bool String_EqualNoCase(const char * a, const char * b) { + if (a == b) return true; + if (a == NULL || b == NULL) return false; +#if _MSC_VER + return _stricmp(a, b) == 0; +#else + return strcasecmp(a, b) == 0; +#endif +} + +double String_ToDouble(const char * str, char ** endptr) { + return strtod(str, endptr); +} + +int String_ToInteger(const char * str, char ** endptr) { + return strtol(str, endptr, 10); +} + +int String_ToIntegerHex(const char * str, char ** endptr) { + return strtol(str, endptr, 16); +} + + + +// Engine/Log.cpp + +void Log_Error(const char * format, ...) { + va_list args; + va_start(args, format); + Log_ErrorArgList(format, args); + va_end(args); +} + +void Log_ErrorArgList(const char * format, va_list args) { +#if 1 // @@ Don't we need to do this? + va_list tmp; + va_copy(tmp, args); + vprintf( format, args ); + va_end(tmp); +#else + vprintf( format, args ); +#endif +} + + +// Engine/StringPool.cpp + +StringPool::StringPool(Allocator * allocator) : stringArray(allocator) { +} +StringPool::~StringPool() { + for (int i = 0; i < stringArray.GetSize(); i++) { + free((void *)stringArray[i]); + stringArray[i] = NULL; + } +} + +const char * StringPool::AddString(const char * string) { + for (int i = 0; i < stringArray.GetSize(); i++) { + if (String_Equal(stringArray[i], string)) return stringArray[i]; + } +#if _MSC_VER + const char * dup = _strdup(string); +#else + const char * dup = strdup(string); +#endif + stringArray.PushBack(dup); + return dup; +} + +// @@ From mprintf.cpp +static char *mprintf_valist(int size, const char *fmt, va_list args) { + ASSERT(size > 0); + char *res = NULL; + va_list tmp; + + while (1) { + res = new char[size]; + if (!res) return NULL; + + va_copy(tmp, args); + int len = vsnprintf(res, size, fmt, tmp); + va_end(tmp); + + if ((len >= 0) && (size >= len + 1)) { + break; + } + + delete [] res; + + if (len > -1 ) { + size = len + 1; + } + else { + size *= 2; + } + } + + return res; +} + +const char * StringPool::AddStringFormatList(const char * format, va_list args) { + va_list tmp; + va_copy(tmp, args); + const char * string = mprintf_valist(256, format, tmp); + va_end(tmp); + + for (int i = 0; i < stringArray.GetSize(); i++) { + if (String_Equal(stringArray[i], string)) { + delete [] string; + return stringArray[i]; + } + } + + stringArray.PushBack(string); + return string; +} + +const char * StringPool::AddStringFormat(const char * format, ...) { + va_list args; + va_start(args, format); + const char * string = AddStringFormatList(format, args); + va_end(args); + + return string; +} + +bool StringPool::GetContainsString(const char * string) const { + for (int i = 0; i < stringArray.GetSize(); i++) { + if (String_Equal(stringArray[i], string)) return true; + } + return false; +} + +} // M4 namespace diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/Engine.h projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/Engine.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/Engine.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/Engine.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,194 @@ +#ifndef ENGINE_H +#define ENGINE_H + +#if _MSC_VER +#define _CRT_SECURE_NO_WARNINGS 1 +#endif + +#include // va_list, vsnprintf +#include // malloc +#include // for placement new + +#ifndef NULL +#define NULL 0 +#endif + +#ifndef va_copy +#define va_copy(a, b) (a) = (b) +#endif + +// Engine/Assert.h +#include + +#define ASSERT(...) // (assert(__VA_ARGS__)) + +namespace M4 { + + +// Engine/Allocator.h + +class Allocator { +public: + template T * New() { + return (T *)malloc(sizeof(T)); + } + template T * New(size_t count) { + return (T *)malloc(sizeof(T) * count); + } + template void Delete(T * ptr) { + free((void *)ptr); + } + template T * Realloc(T * ptr, size_t count) { + return (T *)realloc(ptr, sizeof(T) * count); + } +}; + + +// Engine/String.h + +int String_Printf(char * buffer, int size, const char * format, ...); +int String_PrintfArgList(char * buffer, int size, const char * format, va_list args); +int String_FormatFloat(char * buffer, int size, float value); +bool String_Equal(const char * a, const char * b); +bool String_EqualNoCase(const char * a, const char * b); +double String_ToDouble(const char * str, char ** end); +int String_ToInteger(const char * str, char ** end); + + +// Engine/Log.h + +void Log_Error(const char * format, ...); +void Log_ErrorArgList(const char * format, va_list args); + + +// Engine/Array.h + +template +void ConstructRange(T * buffer, int new_size, int old_size) { + for (int i = old_size; i < new_size; i++) { + new(buffer+i) T; // placement new + } +} + +template +void ConstructRange(T * buffer, int new_size, int old_size, const T & val) { + for (int i = old_size; i < new_size; i++) { + new(buffer+i) T(val); // placement new + } +} + +template +void DestroyRange(T * buffer, int new_size, int old_size) { + for (int i = new_size; i < old_size; i++) { + (buffer+i)->~T(); // Explicit call to the destructor + } +} + + +template +class Array { +public: + Array(Allocator * allocator) : allocator(allocator), buffer(NULL), size(0), capacity(0) {} + + void PushBack(const T & val) { + ASSERT(&val < buffer || &val >= buffer+size); + + int old_size = size; + int new_size = size + 1; + + SetSize(new_size); + + ConstructRange(buffer, new_size, old_size, val); + } + T & PushBackNew() { + int old_size = size; + int new_size = size + 1; + + SetSize(new_size); + + ConstructRange(buffer, new_size, old_size); + + return buffer[old_size]; + } + void Resize(int new_size) { + int old_size = size; + + DestroyRange(buffer, new_size, old_size); + + SetSize(new_size); + + ConstructRange(buffer, new_size, old_size); + } + + int GetSize() const { return size; } + const T & operator[](int i) const { ASSERT(i < size); return buffer[i]; } + T & operator[](int i) { ASSERT(i < size); return buffer[i]; } + +private: + + // Change array size. + void SetSize(int new_size) { + size = new_size; + + if (new_size > capacity) { + int new_buffer_size; + if (capacity == 0) { + // first allocation is exact + new_buffer_size = new_size; + } + else { + // following allocations grow array by 25% + new_buffer_size = new_size + (new_size >> 2); + } + + SetCapacity(new_buffer_size); + } + } + + // Change array capacity. + void SetCapacity(int new_capacity) { + ASSERT(new_capacity >= size); + + if (new_capacity == 0) { + // free the buffer. + if (buffer != NULL) { + allocator->Delete(buffer); + buffer = NULL; + } + } + else { + // realloc the buffer + buffer = allocator->Realloc(buffer, new_capacity); + } + + capacity = new_capacity; + } + + +private: + Allocator * allocator; // @@ Do we really have to keep a pointer to this? + T * buffer; + int size; + int capacity; +}; + + +// Engine/StringPool.h + +// @@ Implement this with a hash table! +struct StringPool { + StringPool(Allocator * allocator); + ~StringPool(); + + const char * AddString(const char * string); + const char * AddStringFormat(const char * fmt, ...); + const char * AddStringFormatList(const char * fmt, va_list args); + bool GetContainsString(const char * string) const; + + Array stringArray; +}; + + +} // M4 namespace + +#endif // ENGINE_H diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.cpp projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,2090 @@ +//============================================================================= +// +// Render/GLSLGenerator.cpp +// +// Created by Max McGuire (max@unknownworlds.com) +// Copyright (c) 2013, Unknown Worlds Entertainment, Inc. +// +//============================================================================= + +#include "GLSLGenerator.h" +#include "HLSLParser.h" +#include "HLSLTree.h" + +//#include "Engine/String.h" +//#include "Engine/Log.h" +#include "Engine.h" + +#include +#include +#include +#include +#include + +namespace M4 +{ + +static const HLSLType kFloatType(HLSLBaseType_Float); +static const HLSLType kUintType(HLSLBaseType_Uint); +static const HLSLType kIntType(HLSLBaseType_Int); +static const HLSLType kBoolType(HLSLBaseType_Bool); + +// These are reserved words in GLSL that aren't reserved in HLSL. +const char* GLSLGenerator::s_reservedWord[] = + { + "output", + "input", + "mod", + "mix", + "fract", + "dFdx", + "dFdy", + "filter", + "main", + }; + +static const char* GetTypeName(const HLSLType& type) +{ + switch (type.baseType) + { + case HLSLBaseType_Void: return "void"; + case HLSLBaseType_Float: return "float"; + case HLSLBaseType_Float2: return "vec2"; + case HLSLBaseType_Float3: return "vec3"; + case HLSLBaseType_Float4: return "vec4"; + case HLSLBaseType_Float2x4: return "mat4x2"; + case HLSLBaseType_Float2x3: return "mat3x2"; + case HLSLBaseType_Float2x2: return "mat2"; + case HLSLBaseType_Float3x4: return "mat4x3"; + case HLSLBaseType_Float3x3: return "mat3"; + case HLSLBaseType_Float3x2: return "mat2x3"; + case HLSLBaseType_Float4x4: return "mat4"; + case HLSLBaseType_Float4x3: return "mat3x4"; + case HLSLBaseType_Float4x2: return "mat2x4"; + case HLSLBaseType_Bool: return "bool"; + case HLSLBaseType_Bool2: return "bvec2"; + case HLSLBaseType_Bool3: return "bvec3"; + case HLSLBaseType_Bool4: return "bvec4"; + case HLSLBaseType_Int: return "int"; + case HLSLBaseType_Int2: return "ivec2"; + case HLSLBaseType_Int3: return "ivec3"; + case HLSLBaseType_Int4: return "ivec4"; + case HLSLBaseType_Uint: return "uint"; + case HLSLBaseType_Uint2: return "uvec2"; + case HLSLBaseType_Uint3: return "uvec3"; + case HLSLBaseType_Uint4: return "uvec4"; + case HLSLBaseType_Texture: return "texture"; + case HLSLBaseType_Sampler: return "sampler"; + case HLSLBaseType_Sampler2D: return "sampler2D"; + case HLSLBaseType_Sampler3D: return "sampler3D"; + case HLSLBaseType_SamplerCube: return "samplerCube"; + case HLSLBaseType_Sampler2DMS: return "sampler2DMS"; + case HLSLBaseType_Sampler2DArray: return "sampler2DArray"; + case HLSLBaseType_UserDefined: return type.typeName; + default: + ASSERT(0); + return "?"; + } +} + +static bool GetCanImplicitCast(const HLSLType& srcType, const HLSLType& dstType) +{ + return srcType.baseType == dstType.baseType; +} + +static int GetFunctionArguments(HLSLFunctionCall* functionCall, HLSLExpression* expression[], int maxArguments) +{ + HLSLExpression* argument = functionCall->argument; + int numArguments = 0; + while (argument != NULL) + { + if (numArguments < maxArguments) + { + expression[numArguments] = argument; + } + argument = argument->nextExpression; + ++numArguments; + } + return numArguments; +} + +GLSLGenerator::GLSLGenerator() : + m_writer(/* writeFileNames= */ false) +{ + m_tree = NULL; + m_entryName = NULL; + m_target = Target_VertexShader; + m_version = Version_140; + m_versionLegacy = false; + m_inAttribPrefix = NULL; + m_outAttribPrefix = NULL; + m_error = false; + m_matrixRowFunction[0] = 0; + m_matrixCtorFunction[0] = 0; + m_matrixMulFunction[0] = 0; + m_clipFunction[0] = 0; + m_tex2DlodFunction[0] = 0; + m_tex2DbiasFunction[0] = 0; + m_tex3DlodFunction[0] = 0; + m_texCUBEbiasFunction[0] = 0; + m_texCUBElodFunction[ 0 ] = 0; + m_scalarSwizzle2Function[0] = 0; + m_scalarSwizzle3Function[0] = 0; + m_scalarSwizzle4Function[0] = 0; + m_sinCosFunction[0] = 0; + m_bvecTernary[ 0 ] = 0; + m_outputPosition = false; + m_outputTargets = 0; +} + +bool GLSLGenerator::Generate(HLSLTree* tree, Target target, Version version, const char* entryName, const Options& options) +{ + + m_tree = tree; + m_entryName = entryName; + m_target = target; + m_version = version; + m_versionLegacy = (version == Version_110 || version == Version_100_ES); + m_options = options; + + ChooseUniqueName("matrix_row", m_matrixRowFunction, sizeof(m_matrixRowFunction)); + ChooseUniqueName("matrix_ctor", m_matrixCtorFunction, sizeof(m_matrixCtorFunction)); + ChooseUniqueName("matrix_mul", m_matrixMulFunction, sizeof(m_matrixMulFunction)); + ChooseUniqueName("clip", m_clipFunction, sizeof(m_clipFunction)); + ChooseUniqueName("tex2Dlod", m_tex2DlodFunction, sizeof(m_tex2DlodFunction)); + ChooseUniqueName("tex2Dbias", m_tex2DbiasFunction, sizeof(m_tex2DbiasFunction)); + ChooseUniqueName("tex2Dgrad", m_tex2DgradFunction, sizeof(m_tex2DgradFunction)); + ChooseUniqueName("tex3Dlod", m_tex3DlodFunction, sizeof(m_tex3DlodFunction)); + ChooseUniqueName("texCUBEbias", m_texCUBEbiasFunction, sizeof(m_texCUBEbiasFunction)); + ChooseUniqueName( "texCUBElod", m_texCUBElodFunction, sizeof( m_texCUBElodFunction ) ); + + for (int i = 0; i < s_numReservedWords; ++i) + { + ChooseUniqueName( s_reservedWord[i], m_reservedWord[i], sizeof(m_reservedWord[i]) ); + } + + ChooseUniqueName("m_scalar_swizzle2", m_scalarSwizzle2Function, sizeof(m_scalarSwizzle2Function)); + ChooseUniqueName("m_scalar_swizzle3", m_scalarSwizzle3Function, sizeof(m_scalarSwizzle3Function)); + ChooseUniqueName("m_scalar_swizzle4", m_scalarSwizzle4Function, sizeof(m_scalarSwizzle4Function)); + + ChooseUniqueName("sincos", m_sinCosFunction, sizeof(m_sinCosFunction)); + + ChooseUniqueName( "bvecTernary", m_bvecTernary, sizeof( m_bvecTernary ) ); + + if (target == Target_VertexShader) + { + m_inAttribPrefix = ""; + m_outAttribPrefix = "frag_"; + } + else + { + m_inAttribPrefix = "frag_"; + m_outAttribPrefix = "rast_"; + } + + m_tree->ReplaceUniformsAssignements(); + + HLSLRoot* root = m_tree->GetRoot(); + HLSLStatement* statement = root->statement; + + // Find the entry point function. + HLSLFunction* entryFunction = FindFunction(root, m_entryName); + if (entryFunction == NULL) + { + Error("Entry point '%s' doesn't exist", m_entryName); + return false; + } + + if (m_version == Version_110) + { + m_writer.WriteLine(0, "#version 110"); + } + else if (m_version == Version_140) + { + m_writer.WriteLine(0, "#version 140"); + + // Pragmas for NVIDIA. + m_writer.WriteLine(0, "#pragma optionNV(fastmath on)"); + //m_writer.WriteLine(0, "#pragma optionNV(fastprecision on)"); + m_writer.WriteLine(0, "#pragma optionNV(ifcvt none)"); + m_writer.WriteLine(0, "#pragma optionNV(inline all)"); + m_writer.WriteLine(0, "#pragma optionNV(strict on)"); + m_writer.WriteLine(0, "#pragma optionNV(unroll all)"); + } + else if (m_version == Version_150) + { + m_writer.WriteLine(0, "#version 150"); + } + else if (m_version == Version_100_ES) + { + m_writer.WriteLine(0, "#version 100"); + m_writer.WriteLine(0, "precision highp float;"); + } + else if (m_version == Version_300_ES) + { + m_writer.WriteLine(0, "#version 300 es"); + m_writer.WriteLine(0, "precision highp float;"); + } + else + { + Error("Unrecognized target version"); + return false; + } + + // Output the special function used to access rows in a matrix. + m_writer.WriteLine(0, "vec2 %s(mat2 m, int i) { return vec2( m[0][i], m[1][i] ); }", m_matrixRowFunction); + m_writer.WriteLine(0, "vec3 %s(mat3 m, int i) { return vec3( m[0][i], m[1][i], m[2][i] ); }", m_matrixRowFunction); + m_writer.WriteLine(0, "vec4 %s(mat4 m, int i) { return vec4( m[0][i], m[1][i], m[2][i], m[3][i] ); }", m_matrixRowFunction); + + // Output the special function used to do matrix cast for OpenGL 2.0 + if (m_version == Version_110) + { + m_writer.WriteLine(0, "mat3 %s(mat4 m) { return mat3(m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2], m[2][0], m[2][1], m[2][2]); }", m_matrixCtorFunction); + } + + // Output the special functions used for matrix multiplication lowering + // They make sure glsl-optimizer can fold expressions better + if (m_tree->NeedsFunction("mul") && (m_options.flags & Flag_LowerMatrixMultiplication)) + { + m_writer.WriteLine(0, "vec2 %s(mat2 m, vec2 v) { return m[0] * v.x + m[1] * v.y; }", m_matrixMulFunction); + m_writer.WriteLine(0, "vec2 %s(vec2 v, mat2 m) { return vec2(dot(m[0], v), dot(m[1], v)); }", m_matrixMulFunction); + m_writer.WriteLine(0, "vec3 %s(mat3 m, vec3 v) { return m[0] * v.x + m[1] * v.y + m[2] * v.z; }", m_matrixMulFunction); + m_writer.WriteLine(0, "vec3 %s(vec3 v, mat3 m) { return vec3(dot(m[0], v), dot(m[1], v), dot(m[2], v)); }", m_matrixMulFunction); + m_writer.WriteLine(0, "vec4 %s(mat4 m, vec4 v) { return m[0] * v.x + m[1] * v.y + m[2] * v.z + m[3] * v.w; }", m_matrixMulFunction); + m_writer.WriteLine(0, "vec4 %s(vec4 v, mat4 m) { return vec4(dot(m[0], v), dot(m[1], v), dot(m[2], v), dot(m[3], v)); }", m_matrixMulFunction); + } + + // Output the special function used to emulate HLSL clip. + if (m_tree->NeedsFunction("clip")) + { + const char* discard = m_target == Target_FragmentShader ? "discard" : ""; + m_writer.WriteLine(0, "void %s(float x) { if (x < 0.0) %s; }", m_clipFunction, discard); + m_writer.WriteLine(0, "void %s(vec2 x) { if (any(lessThan(x, vec2(0.0, 0.0)))) %s; }", m_clipFunction, discard); + m_writer.WriteLine(0, "void %s(vec3 x) { if (any(lessThan(x, vec3(0.0, 0.0, 0.0)))) %s; }", m_clipFunction, discard); + m_writer.WriteLine(0, "void %s(vec4 x) { if (any(lessThan(x, vec4(0.0, 0.0, 0.0, 0.0)))) %s; }", m_clipFunction, discard); + } + + // Output the special function used to emulate tex2Dlod. + if (m_tree->NeedsFunction("tex2Dlod")) + { + const char* function = "textureLod"; + + if (m_version == Version_110) + { + m_writer.WriteLine(0, "#extension GL_ARB_shader_texture_lod : require"); + function = "texture2DLod"; + } + else if (m_version == Version_100_ES) + { + m_writer.WriteLine(0, "#extension GL_EXT_shader_texture_lod : require"); + function = "texture2DLodEXT"; + } + + m_writer.WriteLine(0, "vec4 %s(sampler2D samp, vec4 texCoord) { return %s(samp, texCoord.xy, texCoord.w); }", m_tex2DlodFunction, function); + } + + // Output the special function used to emulate tex2Dgrad. + if (m_tree->NeedsFunction("tex2Dgrad")) + { + const char* function = "textureGrad"; + + if (m_version == Version_110) + { + m_writer.WriteLine(0, "#extension GL_ARB_shader_texture_lod : require"); + function = "texture2DGradARB"; + } + else if (m_version == Version_100_ES) + { + m_writer.WriteLine(0, "#extension GL_EXT_shader_texture_lod : require"); + function = "texture2DGradEXT"; + } + + m_writer.WriteLine(0, "vec4 %s(sampler2D samp, vec2 texCoord, vec2 dx, vec2 dy) { return %s(samp, texCoord, dx, dy); }", m_tex2DgradFunction, function); + } + + // Output the special function used to emulate tex2Dbias. + if (m_tree->NeedsFunction("tex2Dbias")) + { + if (target == Target_FragmentShader) + { + m_writer.WriteLine(0, "vec4 %s(sampler2D samp, vec4 texCoord) { return %s(samp, texCoord.xy, texCoord.w); }", m_tex2DbiasFunction, m_versionLegacy ? "texture2D" : "texture" ); + } + else + { + // Bias value is not supported in vertex shader. + m_writer.WriteLine(0, "vec4 %s(sampler2D samp, vec4 texCoord) { return texture(samp, texCoord.xy); }", m_tex2DbiasFunction ); + } + } + + // Output the special function used to emulate tex2DMSfetch. + if (m_tree->NeedsFunction("tex2DMSfetch")) + { + m_writer.WriteLine(0, "vec4 tex2DMSfetch(sampler2DMS samp, ivec2 texCoord, int sample) {"); + m_writer.WriteLine(1, "return texelFetch(samp, texCoord, sample);"); + m_writer.WriteLine(0, "}"); + } + + // Output the special function used to emulate tex3Dlod. + if (m_tree->NeedsFunction("tex3Dlod")) + { + m_writer.WriteLine(0, "vec4 %s(sampler3D samp, vec4 texCoord) { return %s(samp, texCoord.xyz, texCoord.w); }", m_tex3DlodFunction, m_versionLegacy ? "texture3D" : "texture" ); + } + + // Output the special function used to emulate texCUBEbias. + if (m_tree->NeedsFunction("texCUBEbias")) + { + if (target == Target_FragmentShader) + { + m_writer.WriteLine(0, "vec4 %s(samplerCube samp, vec4 texCoord) { return %s(samp, texCoord.xyz, texCoord.w); }", m_texCUBEbiasFunction, m_versionLegacy ? "textureCube" : "texture" ); + } + else + { + // Bias value is not supported in vertex shader. + m_writer.WriteLine(0, "vec4 %s(samplerCube samp, vec4 texCoord) { return texture(samp, texCoord.xyz); }", m_texCUBEbiasFunction ); + } + } + + // Output the special function used to emulate texCUBElod + if (m_tree->NeedsFunction("texCUBElod")) + { + const char* function = "textureLod"; + + if (m_version == Version_110) + { + m_writer.WriteLine(0, "#extension GL_ARB_shader_texture_lod : require"); + function = "textureCubeLod"; + } + else if (m_version == Version_100_ES) + { + m_writer.WriteLine(0, "#extension GL_EXT_shader_texture_lod : require"); + function = "textureCubeLodEXT"; + } + + m_writer.WriteLine( 0, "vec4 %s(samplerCube samp, vec4 texCoord) { return %s(samp, texCoord.xyz, texCoord.w); }", m_texCUBElodFunction, function); + } + + m_writer.WriteLine(0, "vec2 %s(float x) { return vec2(x, x); }", m_scalarSwizzle2Function); + m_writer.WriteLine(0, "ivec2 %s(int x) { return ivec2(x, x); }", m_scalarSwizzle2Function); + + m_writer.WriteLine(0, "vec3 %s(float x) { return vec3(x, x, x); }", m_scalarSwizzle3Function); + m_writer.WriteLine(0, "ivec3 %s(int x) { return ivec3(x, x, x); }", m_scalarSwizzle3Function); + + m_writer.WriteLine(0, "vec4 %s(float x) { return vec4(x, x, x, x); }", m_scalarSwizzle4Function); + m_writer.WriteLine(0, "ivec4 %s(int x) { return ivec4(x, x, x, x); }", m_scalarSwizzle4Function); + + if (!m_versionLegacy) + { + m_writer.WriteLine(0, "uvec2 %s(uint x) { return uvec2(x, x); }", m_scalarSwizzle2Function); + m_writer.WriteLine(0, "uvec3 %s(uint x) { return uvec3(x, x, x); }", m_scalarSwizzle3Function); + m_writer.WriteLine(0, "uvec4 %s(uint x) { return uvec4(x, x, x, x); }", m_scalarSwizzle4Function); + } + + if (m_tree->NeedsFunction("sincos")) + { + const char* floatTypes[] = { "float", "vec2", "vec3", "vec4" }; + for (int i = 0; i < 4; ++i) + { + m_writer.WriteLine(0, "void %s(%s x, out %s s, out %s c) { s = sin(x); c = cos(x); }", m_sinCosFunction, + floatTypes[i], floatTypes[i], floatTypes[i]); + } + } + + // special function to emulate ?: with bool{2,3,4} condition type + m_writer.WriteLine( 0, "vec2 %s(bvec2 cond, vec2 trueExpr, vec2 falseExpr) { vec2 ret; ret.x = cond.x ? trueExpr.x : falseExpr.x; ret.y = cond.y ? trueExpr.y : falseExpr.y; return ret; }", m_bvecTernary ); + m_writer.WriteLine( 0, "vec3 %s(bvec3 cond, vec3 trueExpr, vec3 falseExpr) { vec3 ret; ret.x = cond.x ? trueExpr.x : falseExpr.x; ret.y = cond.y ? trueExpr.y : falseExpr.y; ret.z = cond.z ? trueExpr.z : falseExpr.z; return ret; }", m_bvecTernary ); + m_writer.WriteLine( 0, "vec4 %s(bvec4 cond, vec4 trueExpr, vec4 falseExpr) { vec4 ret; ret.x = cond.x ? trueExpr.x : falseExpr.x; ret.y = cond.y ? trueExpr.y : falseExpr.y; ret.z = cond.z ? trueExpr.z : falseExpr.z; ret.w = cond.w ? trueExpr.w : falseExpr.w; return ret; }", m_bvecTernary ); + + m_tree->EnumerateMatrixCtorsNeeded(matrixCtors); + for(matrixCtor & ctor : matrixCtors) + { + std::string id = GetTypeName(HLSLType(ctor.matrixType)); + id += "_from"; + for(HLSLBaseType argType : ctor.argumentTypes) + { + id += "_"; + id += GetTypeName(HLSLType(argType)); + } + matrixCtorsId[ctor] = id; + } + + OutputMatrixCtors(); + + // Output the extension used for dFdx/dFdy in GLES2 + if (m_version == Version_100_ES && (m_tree->NeedsFunction("ddx") || m_tree->NeedsFunction("ddy"))) + { + m_writer.WriteLine(0, "#extension GL_OES_standard_derivatives : require"); + } + + OutputAttributes(entryFunction); + + if (m_target == Target_FragmentShader) + { + if (!m_outputTargets) + Error("Fragment shader must output a color"); + + if (!m_versionLegacy) + m_writer.WriteLine(0, "out vec4 rast_FragData[%d];", m_outputTargets); + } + + OutputStatements(0, statement); + OutputEntryCaller(entryFunction); + + m_tree = NULL; + + // The GLSL compilers don't check for this, so generate our own error message. + if (target == Target_VertexShader && !m_outputPosition) + { + Error("Vertex shader must output a position"); + } + + return !m_error; + +} + +const char* GLSLGenerator::GetResult() const +{ + return m_writer.GetResult(); +} + +void GLSLGenerator::OutputExpressionList(HLSLExpression* expression, HLSLArgument* argument) +{ + int numExpressions = 0; + while (expression != NULL) + { + if (numExpressions > 0) + { + m_writer.Write(", "); + } + + HLSLType* expectedType = NULL; + if (argument != NULL) + { + expectedType = &argument->type; + argument = argument->nextArgument; + } + + OutputExpression(expression, expectedType); + expression = expression->nextExpression; + ++numExpressions; + } +} + +const HLSLType* commonScalarType(const HLSLType& lhs, const HLSLType& rhs) +{ + if (!IsScalarType(lhs) || !IsScalarType(rhs)) + return NULL; + + if (lhs.baseType == HLSLBaseType_Float || rhs.baseType == HLSLBaseType_Float) + return &kFloatType; + + if (lhs.baseType == HLSLBaseType_Uint || rhs.baseType == HLSLBaseType_Uint) + return &kUintType; + + if (lhs.baseType == HLSLBaseType_Int || rhs.baseType == HLSLBaseType_Int) + return &kIntType; + + if (lhs.baseType == HLSLBaseType_Bool || rhs.baseType == HLSLBaseType_Bool) + return &kBoolType; + + return NULL; +} + +void GLSLGenerator::OutputExpression(HLSLExpression* expression, const HLSLType* dstType) +{ + + bool cast = dstType != NULL && !GetCanImplicitCast(expression->expressionType, *dstType); + if (expression->nodeType == HLSLNodeType_CastingExpression) + { + // No need to include a cast if the expression is already doing it. + cast = false; + } + + if (cast) + { + OutputCast(*dstType); + m_writer.Write("("); + } + + HLSLBuffer* bufferAccess = (m_options.flags & Flag_EmulateConstantBuffer) ? GetBufferAccessExpression(expression) : 0; + + if (bufferAccess) + { + OutputBufferAccessExpression(bufferAccess, expression, expression->expressionType, 0); + } + else if (expression->nodeType == HLSLNodeType_IdentifierExpression) + { + HLSLIdentifierExpression* identifierExpression = static_cast(expression); + OutputIdentifier(identifierExpression->name); + } + else if (expression->nodeType == HLSLNodeType_ConstructorExpression) + { + HLSLConstructorExpression* constructorExpression = static_cast(expression); + + bool matrixCtorNeeded = false; + if (IsMatrixType(constructorExpression->type.baseType)) + { + matrixCtor ctor = matrixCtorBuilder(constructorExpression->type, constructorExpression->argument); + if (std::find(matrixCtors.cbegin(), matrixCtors.cend(), ctor) != matrixCtors.cend()) + { + matrixCtorNeeded = true; + } + } + + if (matrixCtorNeeded) + { + // Matrix contructors needs to be adapted since GLSL access a matrix as m[c][r] while HLSL is m[r][c] + matrixCtor ctor = matrixCtorBuilder(constructorExpression->type, constructorExpression->argument); + m_writer.Write("%s(", matrixCtorsId[ctor].c_str()); + OutputExpressionList(constructorExpression->argument); + m_writer.Write(")"); + } + else + { + m_writer.Write("%s(", GetTypeName(constructorExpression->type)); + OutputExpressionList(constructorExpression->argument); + m_writer.Write(")"); + } + } + else if (expression->nodeType == HLSLNodeType_CastingExpression) + { + HLSLCastingExpression* castingExpression = static_cast(expression); + OutputCast(castingExpression->type); + m_writer.Write("("); + OutputExpression(castingExpression->expression); + m_writer.Write(")"); + } + else if (expression->nodeType == HLSLNodeType_LiteralExpression) + { + HLSLLiteralExpression* literalExpression = static_cast(expression); + switch (literalExpression->type) + { + case HLSLBaseType_Float: + { + // Don't use printf directly so that we don't use the system locale. + char buffer[64]; + String_FormatFloat(buffer, sizeof(buffer), literalExpression->fValue); + m_writer.Write("%s", buffer); + } + break; + case HLSLBaseType_Int: + case HLSLBaseType_Uint: + m_writer.Write("%d", literalExpression->iValue); + break; + case HLSLBaseType_Bool: + m_writer.Write("%s", literalExpression->bValue ? "true" : "false"); + break; + default: + ASSERT(0); + } + } + else if (expression->nodeType == HLSLNodeType_UnaryExpression) + { + HLSLUnaryExpression* unaryExpression = static_cast(expression); + const char* op = "?"; + bool pre = true; + const HLSLType* dstType = NULL; + switch (unaryExpression->unaryOp) + { + case HLSLUnaryOp_Negative: op = "-"; break; + case HLSLUnaryOp_Positive: op = "+"; break; + case HLSLUnaryOp_Not: op = "!"; dstType = &unaryExpression->expressionType; break; + case HLSLUnaryOp_PreIncrement: op = "++"; break; + case HLSLUnaryOp_PreDecrement: op = "--"; break; + case HLSLUnaryOp_PostIncrement: op = "++"; pre = false; break; + case HLSLUnaryOp_PostDecrement: op = "--"; pre = false; break; + case HLSLUnaryOp_BitNot: op = "~"; break; + } + m_writer.Write("("); + if (pre) + { + m_writer.Write("%s", op); + OutputExpression(unaryExpression->expression, dstType); + } + else + { + OutputExpression(unaryExpression->expression, dstType); + m_writer.Write("%s", op); + } + m_writer.Write(")"); + } + else if (expression->nodeType == HLSLNodeType_BinaryExpression) + { + HLSLBinaryExpression* binaryExpression = static_cast(expression); + const char* op = "?"; + const HLSLType* dstType1 = NULL; + const HLSLType* dstType2 = NULL; + + // + bool vectorExpression = IsVectorType( binaryExpression->expression1->expressionType ) || IsVectorType( binaryExpression->expression2->expressionType ); + if( vectorExpression && IsCompareOp( binaryExpression->binaryOp )) + { + switch (binaryExpression->binaryOp) + { + case HLSLBinaryOp_Less: m_writer.Write("lessThan("); break; + case HLSLBinaryOp_Greater: m_writer.Write("greaterThan("); break; + case HLSLBinaryOp_LessEqual: m_writer.Write("lessThanEqual("); break; + case HLSLBinaryOp_GreaterEqual: m_writer.Write("greaterThanEqual("); break; + case HLSLBinaryOp_Equal: m_writer.Write("equal("); break; + case HLSLBinaryOp_NotEqual: m_writer.Write("notEqual("); break; + default: + ASSERT(0); // is so, check isCompareOp + } + + if( IsVectorType( binaryExpression->expression1->expressionType ) && IsScalarType( binaryExpression->expression2->expressionType ) ) + dstType2 = &binaryExpression->expression1->expressionType; + else if( IsScalarType( binaryExpression->expression1->expressionType ) && IsVectorType( binaryExpression->expression2->expressionType ) ) + dstType1 = &binaryExpression->expression2->expressionType; + // TODO if both expressions are vector but with different dimension handle it here or in parser? + + OutputExpression(binaryExpression->expression1, dstType1); + m_writer.Write(", "); + OutputExpression(binaryExpression->expression2, dstType2); + m_writer.Write(")"); + } + else + { + switch (binaryExpression->binaryOp) + { + case HLSLBinaryOp_Add: op = " + "; dstType1 = dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_Sub: op = " - "; dstType1 = dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_Mul: op = " * "; dstType1 = dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_Div: op = " / "; dstType1 = dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_Mod: op = " % "; dstType1 = dstType2 = &kIntType; break; + case HLSLBinaryOp_Less: op = " < "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_Greater: op = " > "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_LessEqual: op = " <= "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_GreaterEqual: op = " >= "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_Equal: op = " == "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_NotEqual: op = " != "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_Assign: op = " = "; dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_AddAssign: op = " += "; dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_SubAssign: op = " -= "; dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_MulAssign: op = " *= "; dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_DivAssign: op = " /= "; dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_And: op = " && "; dstType1 = dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_Or: op = " || "; dstType1 = dstType2 = &binaryExpression->expressionType; break; + case HLSLBinaryOp_BitAnd: op = " & "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_BitOr: op = " | "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + case HLSLBinaryOp_BitXor: op = " ^ "; dstType1 = dstType2 = commonScalarType(binaryExpression->expression1->expressionType, binaryExpression->expression2->expressionType); break; + default: + ASSERT(0); + } + m_writer.Write("("); + OutputExpression(binaryExpression->expression1, dstType1); + m_writer.Write("%s", op); + OutputExpression(binaryExpression->expression2, dstType2); + m_writer.Write(")"); + } + } + else if (expression->nodeType == HLSLNodeType_ConditionalExpression) + { + HLSLConditionalExpression* conditionalExpression = static_cast(expression); + if( IsVectorType( conditionalExpression->condition->expressionType ) ) + { + m_writer.Write( "%s", m_bvecTernary ); + m_writer.Write( "( " ); + OutputExpression( conditionalExpression->condition ); + m_writer.Write( ", " ); + OutputExpression( conditionalExpression->trueExpression, &conditionalExpression->expressionType ); + m_writer.Write( ", " ); + OutputExpression( conditionalExpression->falseExpression, &conditionalExpression->expressionType ); + m_writer.Write( " )" ); + } + else + { + m_writer.Write( "((" ); + OutputExpression( conditionalExpression->condition, &kBoolType ); + m_writer.Write( ")?(" ); + OutputExpression( conditionalExpression->trueExpression, dstType ); + m_writer.Write( "):(" ); + OutputExpression( conditionalExpression->falseExpression, dstType ); + m_writer.Write( "))" ); + } + } + else if (expression->nodeType == HLSLNodeType_MemberAccess) + { + + HLSLMemberAccess* memberAccess = static_cast(expression); + + if (memberAccess->object->expressionType.baseType == HLSLBaseType_Float || + memberAccess->object->expressionType.baseType == HLSLBaseType_Int || + memberAccess->object->expressionType.baseType == HLSLBaseType_Uint) + { + // Handle swizzling on scalar values. + size_t swizzleLength = strlen(memberAccess->field); + if (swizzleLength == 2) + { + m_writer.Write("%s", m_scalarSwizzle2Function); + } + else if (swizzleLength == 3) + { + m_writer.Write("%s", m_scalarSwizzle3Function); + } + else if (swizzleLength == 4) + { + m_writer.Write("%s", m_scalarSwizzle4Function); + } + m_writer.Write("("); + OutputExpression(memberAccess->object); + m_writer.Write(")"); + } + else + { + m_writer.Write("("); + OutputExpression(memberAccess->object); + m_writer.Write(")"); + + if( IsMatrixType(memberAccess->object->expressionType.baseType)) + { + // Handle HLSL matrix "swizzling". + // TODO: Properly handle multiple element selection such as _m00_m12 + const char* n = memberAccess->field; + while (n[0] != 0) + { + if ( n[0] != '_' ) + { + ASSERT(0); + break; + } + ++n; + char base = '1'; + if (n[0] == 'm') + { + base = '0'; + ++n; + } + if (isdigit(n[0]) && isdigit(n[1]) ) + { + m_writer.Write("[%d][%d]", n[1] - base, n[0] - base); + n += 2; + } + else + { + ASSERT(0); + break; + } + } + } + else + { + m_writer.Write(".%s", memberAccess->field); + } + + } + + } + else if (expression->nodeType == HLSLNodeType_ArrayAccess) + { + HLSLArrayAccess* arrayAccess = static_cast(expression); + + if (!arrayAccess->array->expressionType.array && + IsMatrixType(arrayAccess->array->expressionType.baseType) ) + { + // GLSL access a matrix as m[c][r] while HLSL is m[r][c], so use our + // special row access function to convert. + m_writer.Write("%s(", m_matrixRowFunction); + OutputExpression(arrayAccess->array); + m_writer.Write(","); + OutputExpression(arrayAccess->index); + m_writer.Write(")"); + } + else + { + OutputExpression(arrayAccess->array); + m_writer.Write("["); + OutputExpression(arrayAccess->index); + m_writer.Write("]"); + } + + } + else if (expression->nodeType == HLSLNodeType_FunctionCall) + { + HLSLFunctionCall* functionCall = static_cast(expression); + + // Handle intrinsic funtions that are different between HLSL and GLSL. + bool handled = false; + const char* functionName = functionCall->function->name; + + if (String_Equal(functionName, "mul")) + { + HLSLExpression* argument[2]; + if (GetFunctionArguments(functionCall, argument, 2) != 2) + { + Error("mul expects 2 arguments"); + return; + } + + const HLSLType& type0 = functionCall->function->argument->type; + const HLSLType& type1 = functionCall->function->argument->nextArgument->type; + + if (IsVectorType(type0.baseType) && IsVectorType(type1.baseType)) + { + m_writer.Write("dot(("); + OutputExpression(argument[0], &type0); + m_writer.Write("),("); + OutputExpression(argument[1], &type1); + m_writer.Write("))"); + } + else + { + m_writer.Write("(("); + OutputExpression(argument[0], &type0); + m_writer.Write(")*("); + OutputExpression(argument[1], &type1); + m_writer.Write("))"); + } + + handled = true; + } + else if (String_Equal(functionName, "saturate")) + { + HLSLExpression* argument[1]; + if (GetFunctionArguments(functionCall, argument, 1) != 1) + { + Error("saturate expects 1 argument"); + return; + } + m_writer.Write("clamp("); + OutputExpression(argument[0]); + m_writer.Write(", 0.0, 1.0)"); + handled = true; + } + else if (String_Equal(functionName, "rsqrt")) + { + HLSLExpression* argument[1]; + if (GetFunctionArguments(functionCall, argument, 1) != 1) + { + Error("saturate expects 1 argument"); + return; + } + m_writer.Write("inversesqrt("); + OutputExpression(argument[0]); + m_writer.Write(")"); + handled = true; + } + + if (!handled) + { + OutputIdentifier(functionName); + m_writer.Write("("); + OutputExpressionList(functionCall->argument, functionCall->function->argument); + m_writer.Write(")"); + } + } + else + { + m_writer.Write(""); + } + + if (cast) + { + if (IsVectorType(dstType->baseType) || IsMatrixType(dstType->baseType)) + { + CompleteConstructorArguments(expression, dstType->baseType); + } + + m_writer.Write(")"); + } + +} + +void GLSLGenerator::OutputIdentifier(const char* name) +{ + + // Remap intrinstic functions. + if (String_Equal(name, "tex2D")) + { + name = m_versionLegacy ? "texture2D" : "texture"; + } + else if (String_Equal(name, "tex2Dproj")) + { + name = m_versionLegacy ? "texture2DProj" : "textureProj"; + } + else if (String_Equal(name, "texCUBE")) + { + name = m_versionLegacy ? "textureCube" : "texture"; + } + else if (String_Equal(name, "tex3D")) + { + name = m_versionLegacy ? "texture3D" : "texture"; + } + else if (String_Equal(name, "clip")) + { + name = m_clipFunction; + } + else if (String_Equal(name, "tex2Dlod")) + { + name = m_tex2DlodFunction; + } + else if (String_Equal(name, "tex2Dbias")) + { + name = m_tex2DbiasFunction; + } + else if (String_Equal(name, "tex2Dgrad")) + { + name = m_tex2DgradFunction; + } + else if (String_Equal(name, "tex2DArray")) + { + name = "texture"; + } + else if (String_Equal(name, "texCUBEbias")) + { + name = m_texCUBEbiasFunction; + } + else if( String_Equal( name, "texCUBElod" ) ) + { + name = m_texCUBElodFunction; + } + else if (String_Equal(name, "atan2")) + { + name = "atan"; + } + else if (String_Equal(name, "sincos")) + { + name = m_sinCosFunction; + } + else if (String_Equal(name, "fmod")) + { + // mod is not the same as fmod if the parameter is negative! + // The equivalent of fmod(x, y) is x - y * floor(x/y) + // We use the mod version for performance. + name = "mod"; + } + else if (String_Equal(name, "lerp")) + { + name = "mix"; + } + else if (String_Equal(name, "frac")) + { + name = "fract"; + } + else if (String_Equal(name, "ddx")) + { + name = "dFdx"; + } + else if (String_Equal(name, "ddy")) + { + name = "dFdy"; + } + else + { + // The identifier could be a GLSL reserved word (if it's not also a HLSL reserved word). + name = GetSafeIdentifierName(name); + } + m_writer.Write("%s", name); + +} + +void GLSLGenerator::OutputArguments(HLSLArgument* argument) +{ + int numArgs = 0; + while (argument != NULL) + { + if (numArgs > 0) + { + m_writer.Write(", "); + } + + switch (argument->modifier) + { + case HLSLArgumentModifier_In: + m_writer.Write("in "); + break; + case HLSLArgumentModifier_Out: + m_writer.Write("out "); + break; + case HLSLArgumentModifier_Inout: + m_writer.Write("inout "); + break; + default: + break; + } + + OutputDeclaration(argument->type, argument->name); + argument = argument->nextArgument; + ++numArgs; + } +} + +void GLSLGenerator::OutputStatements(int indent, HLSLStatement* statement, const HLSLType* returnType) +{ + + while (statement != NULL) + { + if (statement->hidden) + { + statement = statement->nextStatement; + continue; + } + + if (statement->nodeType == HLSLNodeType_Declaration) + { + HLSLDeclaration* declaration = static_cast(statement); + + // GLSL doesn't seem have texture uniforms, so just ignore them. + if (declaration->type.baseType != HLSLBaseType_Texture) + { + m_writer.BeginLine(indent, declaration->fileName, declaration->line); + if (indent == 0 && (declaration->type.flags & HLSLTypeFlag_Uniform)) + { + // At the top level, we need the "uniform" keyword. + m_writer.Write("uniform "); + } + OutputDeclaration(declaration); + m_writer.EndLine(";"); + } + } + else if (statement->nodeType == HLSLNodeType_Struct) + { + HLSLStruct* structure = static_cast(statement); + m_writer.WriteLine(indent, "struct %s {", structure->name); + HLSLStructField* field = structure->field; + while (field != NULL) + { + m_writer.BeginLine(indent + 1, field->fileName, field->line); + OutputDeclaration(field->type, field->name); + m_writer.Write(";"); + m_writer.EndLine(); + field = field->nextField; + } + m_writer.WriteLine(indent, "};"); + } + else if (statement->nodeType == HLSLNodeType_Buffer) + { + HLSLBuffer* buffer = static_cast(statement); + OutputBuffer(indent, buffer); + } + else if (statement->nodeType == HLSLNodeType_Function) + { + HLSLFunction* function = static_cast(statement); + + // Use an alternate name for the function which is supposed to be entry point + // so that we can supply our own function which will be the actual entry point. + const char* functionName = GetSafeIdentifierName(function->name); + const char* returnTypeName = GetTypeName(function->returnType); + + m_writer.BeginLine(indent, function->fileName, function->line); + m_writer.Write("%s %s(", returnTypeName, functionName); + + OutputArguments(function->argument); + + if (function->forward) + { + m_writer.WriteLine(indent, ");"); + } + else + { + m_writer.Write(") {"); + m_writer.EndLine(); + + OutputStatements(indent + 1, function->statement, &function->returnType); + m_writer.WriteLine(indent, "}"); + } + } + else if (statement->nodeType == HLSLNodeType_ExpressionStatement) + { + HLSLExpressionStatement* expressionStatement = static_cast(statement); + m_writer.BeginLine(indent, statement->fileName, statement->line); + OutputExpression(expressionStatement->expression); + m_writer.EndLine(";"); + } + else if (statement->nodeType == HLSLNodeType_ReturnStatement) + { + HLSLReturnStatement* returnStatement = static_cast(statement); + if (returnStatement->expression != NULL) + { + m_writer.BeginLine(indent, returnStatement->fileName, returnStatement->line); + m_writer.Write("return "); + OutputExpression(returnStatement->expression, returnType); + m_writer.EndLine(";"); + } + else + { + m_writer.WriteLineTagged(indent, returnStatement->fileName, returnStatement->line, "return;"); + } + } + else if (statement->nodeType == HLSLNodeType_DiscardStatement) + { + HLSLDiscardStatement* discardStatement = static_cast(statement); + if (m_target == Target_FragmentShader) + { + m_writer.WriteLineTagged(indent, discardStatement->fileName, discardStatement->line, "discard;"); + } + } + else if (statement->nodeType == HLSLNodeType_BreakStatement) + { + HLSLBreakStatement* breakStatement = static_cast(statement); + m_writer.WriteLineTagged(indent, breakStatement->fileName, breakStatement->line, "break;"); + } + else if (statement->nodeType == HLSLNodeType_ContinueStatement) + { + HLSLContinueStatement* continueStatement = static_cast(statement); + m_writer.WriteLineTagged(indent, continueStatement->fileName, continueStatement->line, "continue;"); + } + else if (statement->nodeType == HLSLNodeType_IfStatement) + { + HLSLIfStatement* ifStatement = static_cast(statement); + m_writer.BeginLine(indent, ifStatement->fileName, ifStatement->line); + m_writer.Write("if ("); + OutputExpression(ifStatement->condition, &kBoolType); + m_writer.Write(") {"); + m_writer.EndLine(); + OutputStatements(indent + 1, ifStatement->statement, returnType); + m_writer.WriteLine(indent, "}"); + if (ifStatement->elseStatement != NULL) + { + m_writer.WriteLine(indent, "else {"); + OutputStatements(indent + 1, ifStatement->elseStatement, returnType); + m_writer.WriteLine(indent, "}"); + } + } + else if (statement->nodeType == HLSLNodeType_ForStatement) + { + HLSLForStatement* forStatement = static_cast(statement); + m_writer.BeginLine(indent, forStatement->fileName, forStatement->line); + m_writer.Write("for ("); + if (forStatement->initialization != NULL) + { + OutputDeclaration(forStatement->initialization); + } + else + { + OutputExpression(forStatement->initializationWithoutType); + } + m_writer.Write("; "); + OutputExpression(forStatement->condition, &kBoolType); + m_writer.Write("; "); + OutputExpression(forStatement->increment); + m_writer.Write(") {"); + m_writer.EndLine(); + OutputStatements(indent + 1, forStatement->statement, returnType); + m_writer.WriteLine(indent, "}"); + } + else if (statement->nodeType == HLSLNodeType_WhileStatement) + { + HLSLWhileStatement* whileStatement = static_cast(statement); + m_writer.BeginLine(indent, whileStatement->fileName, whileStatement->line); + m_writer.Write("while ("); + OutputExpression(whileStatement->condition, &kBoolType); + m_writer.Write(") {"); + m_writer.EndLine(); + OutputStatements(indent + 1, whileStatement->statement, returnType); + m_writer.WriteLine(indent, "}"); + } + else if (statement->nodeType == HLSLNodeType_BlockStatement) + { + HLSLBlockStatement* blockStatement = static_cast(statement); + m_writer.WriteLine(indent, "{"); + OutputStatements(indent + 1, blockStatement->statement, returnType); + m_writer.WriteLine(indent, "}"); + } + else + { + // Unhanded statement type. + ASSERT(0); + } + + statement = statement->nextStatement; + + } + +} + +void GLSLGenerator::OutputBuffer(int indent, HLSLBuffer* buffer) +{ + // Empty uniform blocks cause compilation errors on NVIDIA, so don't emit them. + if (buffer->field == NULL) + return; + + if (m_options.flags & Flag_EmulateConstantBuffer) + { + unsigned int size = 0; + LayoutBuffer(buffer, size); + + unsigned int uniformSize = (size + 3) / 4; + + m_writer.WriteLineTagged(indent, buffer->fileName, buffer->line, "uniform vec4 %s%s[%d];", m_options.constantBufferPrefix, buffer->name, uniformSize); + } + else + { + m_writer.WriteLineTagged(indent, buffer->fileName, buffer->line, "layout (std140) uniform %s%s {", m_options.constantBufferPrefix, buffer->name); + HLSLDeclaration* field = buffer->field; + while (field != NULL) + { + m_writer.BeginLine(indent + 1, field->fileName, field->line); + OutputDeclaration(field->type, field->name); + m_writer.Write(";"); + m_writer.EndLine(); + field = (HLSLDeclaration*)field->nextStatement; + } + m_writer.WriteLine(indent, "};"); + } +} + +inline void alignForWrite(unsigned int& offset, unsigned int size) +{ + ASSERT(size <= 4); + + if (offset / 4 != (offset + size - 1) / 4) + offset = (offset + 3) & ~3; +} + +void GLSLGenerator::LayoutBuffer(HLSLBuffer* buffer, unsigned int& offset) +{ + for (HLSLDeclaration* field = buffer->field; field; field = (HLSLDeclaration*)field->nextStatement) + { + LayoutBuffer(field->type, offset); + } +} + +void GLSLGenerator::LayoutBuffer(const HLSLType& type, unsigned int& offset) +{ + LayoutBufferAlign(type, offset); + + if (type.array) + { + int arraySize = 0; + m_tree->GetExpressionValue(type.arraySize, arraySize); + + unsigned int elementSize = 0; + LayoutBufferElement(type, elementSize); + + unsigned int alignedElementSize = (elementSize + 3) & ~3; + + offset += alignedElementSize * arraySize; + } + else + { + LayoutBufferElement(type, offset); + } +} + +void GLSLGenerator::LayoutBufferElement(const HLSLType& type, unsigned int& offset) +{ + if (type.baseType == HLSLBaseType_Float) + { + offset += 1; + } + else if (type.baseType == HLSLBaseType_Float2) + { + offset += 2; + } + else if (type.baseType == HLSLBaseType_Float3) + { + offset += 3; + } + else if (type.baseType == HLSLBaseType_Float4) + { + offset += 4; + } + else if (type.baseType == HLSLBaseType_Float4x4) + { + offset += 16; + } + else if (type.baseType == HLSLBaseType_UserDefined) + { + HLSLStruct * st = m_tree->FindGlobalStruct(type.typeName); + + if (st) + { + for (HLSLStructField* field = st->field; field; field = field->nextField) + { + LayoutBuffer(field->type, offset); + } + } + else + { + Error("Unknown type %s", type.typeName); + } + } + else + { + Error("Constant buffer layout is not supported for %s", GetTypeName(type)); + } +} + +void GLSLGenerator::LayoutBufferAlign(const HLSLType& type, unsigned int& offset) +{ + if (type.array) + { + alignForWrite(offset, 4); + } + else if (type.baseType == HLSLBaseType_Float) + { + alignForWrite(offset, 1); + } + else if (type.baseType == HLSLBaseType_Float2) + { + alignForWrite(offset, 2); + } + else if (type.baseType == HLSLBaseType_Float3) + { + alignForWrite(offset, 3); + } + else if (type.baseType == HLSLBaseType_Float4) + { + alignForWrite(offset, 4); + } + else if (type.baseType == HLSLBaseType_Float4x4) + { + alignForWrite(offset, 4); + } + else if (type.baseType == HLSLBaseType_UserDefined) + { + alignForWrite(offset, 4); + } + else + { + Error("Constant buffer layout is not supported for %s", GetTypeName(type)); + } +} + +HLSLBuffer* GLSLGenerator::GetBufferAccessExpression(HLSLExpression* expression) +{ + if (expression->nodeType == HLSLNodeType_IdentifierExpression) + { + HLSLIdentifierExpression* identifierExpression = static_cast(expression); + + if (identifierExpression->global) + { + HLSLDeclaration * declaration = m_tree->FindGlobalDeclaration(identifierExpression->name); + + if (declaration && declaration->buffer) + return declaration->buffer; + } + } + else if (expression->nodeType == HLSLNodeType_MemberAccess) + { + HLSLMemberAccess* memberAccess = static_cast(expression); + + if (memberAccess->object->expressionType.baseType == HLSLBaseType_UserDefined) + return GetBufferAccessExpression(memberAccess->object); + } + else if (expression->nodeType == HLSLNodeType_ArrayAccess) + { + HLSLArrayAccess* arrayAccess = static_cast(expression); + + if (arrayAccess->array->expressionType.array) + return GetBufferAccessExpression(arrayAccess->array); + } + + return 0; +} + +void GLSLGenerator::OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpression* expression, const HLSLType& type, unsigned int postOffset) +{ + if (type.array) + { + Error("Constant buffer access is not supported for arrays (use indexing instead)"); + } + else if (type.baseType == HLSLBaseType_Float) + { + m_writer.Write("%s%s[", m_options.constantBufferPrefix, buffer->name); + unsigned int index = OutputBufferAccessIndex(expression, postOffset); + m_writer.Write("%d].%c", index / 4, "xyzw"[index % 4]); + } + else if (type.baseType == HLSLBaseType_Float2) + { + m_writer.Write("%s%s[", m_options.constantBufferPrefix, buffer->name); + unsigned int index = OutputBufferAccessIndex(expression, postOffset); + m_writer.Write("%d].%s", index / 4, index % 4 == 0 ? "xy" : index % 4 == 1 ? "yz" : "zw"); + } + else if (type.baseType == HLSLBaseType_Float3) + { + m_writer.Write("%s%s[", m_options.constantBufferPrefix, buffer->name); + unsigned int index = OutputBufferAccessIndex(expression, postOffset); + m_writer.Write("%d].%s", index / 4, index % 4 == 0 ? "xyz" : "yzw"); + } + else if (type.baseType == HLSLBaseType_Float4) + { + m_writer.Write("%s%s[", m_options.constantBufferPrefix, buffer->name); + unsigned int index = OutputBufferAccessIndex(expression, postOffset); + ASSERT(index % 4 == 0); + m_writer.Write("%d]", index / 4); + } + else if (type.baseType == HLSLBaseType_Float4x4) + { + m_writer.Write("mat4("); + for (int i = 0; i < 4; ++i) + { + m_writer.Write("%s%s[", m_options.constantBufferPrefix, buffer->name); + unsigned int index = OutputBufferAccessIndex(expression, postOffset + i * 4); + ASSERT(index % 4 == 0); + m_writer.Write("%d]%c", index / 4, i == 3 ? ')' : ','); + } + } + else if (type.baseType == HLSLBaseType_UserDefined) + { + HLSLStruct * st = m_tree->FindGlobalStruct(type.typeName); + + if (st) + { + m_writer.Write("%s(", st->name); + + unsigned int offset = postOffset; + + for (HLSLStructField* field = st->field; field; field = field->nextField) + { + OutputBufferAccessExpression(buffer, expression, field->type, offset); + + if (field->nextField) + m_writer.Write(","); + + LayoutBuffer(field->type, offset); + } + + m_writer.Write(")"); + } + else + { + Error("Unknown type %s", type.typeName); + } + } + else + { + Error("Constant buffer layout is not supported for %s", GetTypeName(type)); + } +} + +unsigned int GLSLGenerator::OutputBufferAccessIndex(HLSLExpression* expression, unsigned int postOffset) +{ + if (expression->nodeType == HLSLNodeType_IdentifierExpression) + { + HLSLIdentifierExpression* identifierExpression = static_cast(expression); + ASSERT(identifierExpression->global); + + HLSLDeclaration * declaration = m_tree->FindGlobalDeclaration(identifierExpression->name); + ASSERT(declaration); + + HLSLBuffer * buffer = declaration->buffer; + ASSERT(buffer); + + unsigned int offset = 0; + + for (HLSLDeclaration* field = buffer->field; field; field = (HLSLDeclaration*)field->nextStatement) + { + if (field == declaration) + { + LayoutBufferAlign(field->type, offset); + break; + } + + LayoutBuffer(field->type, offset); + } + + return offset + postOffset; + } + else if (expression->nodeType == HLSLNodeType_MemberAccess) + { + HLSLMemberAccess* memberAccess = static_cast(expression); + + const HLSLType& type = memberAccess->object->expressionType; + ASSERT(type.baseType == HLSLBaseType_UserDefined); + + HLSLStruct * st = m_tree->FindGlobalStruct(type.typeName); + + if (st) + { + unsigned int offset = 0; + + for (HLSLStructField* field = st->field; field; field = field->nextField) + { + if (field->name == memberAccess->field) + { + LayoutBufferAlign(field->type, offset); + break; + } + + LayoutBuffer(field->type, offset); + } + + return offset + OutputBufferAccessIndex(memberAccess->object, postOffset); + } + else + { + Error("Unknown type %s", type.typeName); + } + } + else if (expression->nodeType == HLSLNodeType_ArrayAccess) + { + HLSLArrayAccess* arrayAccess = static_cast(expression); + + const HLSLType& type = arrayAccess->array->expressionType; + ASSERT(type.array); + + unsigned int elementSize = 0; + LayoutBufferElement(type, elementSize); + + unsigned int alignedElementSize = (elementSize + 3) & ~3; + + int arrayIndex = 0; + if (m_tree->GetExpressionValue(arrayAccess->index, arrayIndex)) + { + unsigned int offset = arrayIndex * alignedElementSize; + + return offset + OutputBufferAccessIndex(arrayAccess->array, postOffset); + } + else + { + m_writer.Write("%d*(", alignedElementSize / 4); + OutputExpression(arrayAccess->index); + m_writer.Write(")+"); + + return OutputBufferAccessIndex(arrayAccess->array, postOffset); + } + } + else + { + ASSERT(!"IsBufferAccessExpression should have returned false"); + } + + return 0; +} + +HLSLFunction* GLSLGenerator::FindFunction(HLSLRoot* root, const char* name) +{ + HLSLStatement* statement = root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Function) + { + HLSLFunction* function = static_cast(statement); + if (String_Equal(function->name, name)) + { + return function; + } + } + statement = statement->nextStatement; + } + return NULL; +} + +HLSLStruct* GLSLGenerator::FindStruct(HLSLRoot* root, const char* name) +{ + HLSLStatement* statement = root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Struct) + { + HLSLStruct* structDeclaration = static_cast(statement); + if (String_Equal(structDeclaration->name, name)) + { + return structDeclaration; + } + } + statement = statement->nextStatement; + } + return NULL; +} + + +const char* GLSLGenerator::GetAttribQualifier(AttributeModifier modifier) +{ + if (m_versionLegacy) + { + if (m_target == Target_VertexShader) + return (modifier == AttributeModifier_In) ? "attribute" : "varying"; + else + return (modifier == AttributeModifier_In) ? "varying" : "out"; + } + else + { + return (modifier == AttributeModifier_In) ? "in" : "out"; + } +} + +void GLSLGenerator::OutputAttribute(const HLSLType& type, const char* semantic, AttributeModifier modifier) +{ + const char* qualifier = GetAttribQualifier(modifier); + const char* prefix = (modifier == AttributeModifier_In) ? m_inAttribPrefix : m_outAttribPrefix; + + HLSLRoot* root = m_tree->GetRoot(); + if (type.baseType == HLSLBaseType_UserDefined) + { + // If the argument is a struct with semantics specified, we need to + // grab them. + HLSLStruct* structDeclaration = FindStruct(root, type.typeName); + ASSERT(structDeclaration != NULL); + HLSLStructField* field = structDeclaration->field; + while (field != NULL) + { + if (field->semantic != NULL && GetBuiltInSemantic(field->semantic, modifier) == NULL) + { + m_writer.Write( "%s ", qualifier ); + char attribName[ 64 ]; + String_Printf( attribName, 64, "%s%s", prefix, field->semantic ); + OutputDeclaration( field->type, attribName ); + m_writer.EndLine(";"); + } + field = field->nextField; + } + } + else if (semantic != NULL && GetBuiltInSemantic(semantic, modifier) == NULL) + { + m_writer.Write( "%s ", qualifier ); + char attribName[ 64 ]; + String_Printf( attribName, 64, "%s%s", prefix, semantic ); + OutputDeclaration( type, attribName ); + m_writer.EndLine(";"); + } +} + +void GLSLGenerator::OutputAttributes(HLSLFunction* entryFunction) +{ + // Write out the input/output attributes to the shader. + HLSLArgument* argument = entryFunction->argument; + while (argument != NULL) + { + if (argument->modifier == HLSLArgumentModifier_None || argument->modifier == HLSLArgumentModifier_In) + OutputAttribute(argument->type, argument->semantic, AttributeModifier_In); + if (argument->modifier == HLSLArgumentModifier_Out) + OutputAttribute(argument->type, argument->semantic, AttributeModifier_Out); + + argument = argument->nextArgument; + } + + // Write out the output attributes from the shader. + OutputAttribute(entryFunction->returnType, entryFunction->semantic, AttributeModifier_Out); +} + +void GLSLGenerator::OutputSetOutAttribute(const char* semantic, const char* resultName) +{ + int outputIndex = -1; + const char* builtInSemantic = GetBuiltInSemantic(semantic, AttributeModifier_Out, &outputIndex); + if (builtInSemantic != NULL) + { + if (String_Equal(builtInSemantic, "gl_Position")) + { + if (m_options.flags & Flag_FlipPositionOutput) + { + // Mirror the y-coordinate when we're outputing from + // the vertex shader so that we match the D3D texture + // coordinate origin convention in render-to-texture + // operations. + // We also need to convert the normalized device + // coordinates from the D3D convention of 0 to 1 to the + // OpenGL convention of -1 to 1. + m_writer.WriteLine(1, "vec4 temp = %s;", resultName); + m_writer.WriteLine(1, "%s = temp * vec4(1,-1,2,1) - vec4(0,0,temp.w,0);", builtInSemantic); + } + else + { + m_writer.WriteLine(1, "%s = %s;", builtInSemantic, resultName); + } + + m_outputPosition = true; + } + else if (String_Equal(builtInSemantic, "gl_FragDepth")) + { + // If the value goes outside of the 0 to 1 range, the + // fragment will be rejected unlike in D3D, so clamp it. + m_writer.WriteLine(1, "%s = clamp(float(%s), 0.0, 1.0);", builtInSemantic, resultName); + } + else if (outputIndex >= 0) + { + m_writer.WriteLine(1, "%s[%d] = %s;", builtInSemantic, outputIndex, resultName); + } + else + { + m_writer.WriteLine(1, "%s = %s;", builtInSemantic, resultName); + } + } + else if (m_target == Target_FragmentShader) + { + Error("Output attribute %s does not map to any built-ins", semantic); + } + else + { + m_writer.WriteLine(1, "%s%s = %s;", m_outAttribPrefix, semantic, resultName); + } +} + +void GLSLGenerator::OutputEntryCaller(HLSLFunction* entryFunction) +{ + HLSLRoot* root = m_tree->GetRoot(); + + m_writer.WriteLine(0, "void main() {"); + + // Create local variables for each of the parameters we'll need to pass + // into the entry point function. + HLSLArgument* argument = entryFunction->argument; + while (argument != NULL) + { + m_writer.BeginLine(1); + OutputDeclaration(argument->type, argument->name); + m_writer.EndLine(";"); + + if (argument->modifier != HLSLArgumentModifier_Out) + { + // Set the value for the local variable. + if (argument->type.baseType == HLSLBaseType_UserDefined) + { + HLSLStruct* structDeclaration = FindStruct(root, argument->type.typeName); + ASSERT(structDeclaration != NULL); + HLSLStructField* field = structDeclaration->field; + while (field != NULL) + { + if (field->semantic != NULL) + { + const char* builtInSemantic = GetBuiltInSemantic(field->semantic, AttributeModifier_In); + if (builtInSemantic) + { + m_writer.WriteLine(1, "%s.%s = %s;", GetSafeIdentifierName(argument->name), GetSafeIdentifierName(field->name), builtInSemantic); + } + else + { + m_writer.WriteLine(1, "%s.%s = %s%s;", GetSafeIdentifierName(argument->name), GetSafeIdentifierName(field->name), m_inAttribPrefix, field->semantic); + } + } + field = field->nextField; + } + } + else if (argument->semantic != NULL) + { + const char* builtInSemantic = GetBuiltInSemantic(argument->semantic, AttributeModifier_In); + if (builtInSemantic) + { + m_writer.WriteLine(1, "%s = %s;", GetSafeIdentifierName(argument->name), builtInSemantic); + } + else + { + m_writer.WriteLine(1, "%s = %s%s;", GetSafeIdentifierName(argument->name), m_inAttribPrefix, argument->semantic); + } + } + } + + argument = argument->nextArgument; + } + + const char* resultName = "result"; + + // Call the original entry function. + m_writer.BeginLine(1); + if (entryFunction->returnType.baseType != HLSLBaseType_Void) + m_writer.Write("%s %s = ", GetTypeName(entryFunction->returnType), resultName); + m_writer.Write("%s(", m_entryName); + + int numArgs = 0; + argument = entryFunction->argument; + while (argument != NULL) + { + if (numArgs > 0) + { + m_writer.Write(", "); + } + + m_writer.Write("%s", GetSafeIdentifierName(argument->name)); + + argument = argument->nextArgument; + ++numArgs; + } + m_writer.EndLine(");"); + + // Copy values from the result into the out attributes as necessary. + argument = entryFunction->argument; + while (argument != NULL) + { + if (argument->modifier == HLSLArgumentModifier_Out && argument->semantic) + OutputSetOutAttribute(argument->semantic, GetSafeIdentifierName(argument->name)); + + argument = argument->nextArgument; + } + + if (entryFunction->returnType.baseType == HLSLBaseType_UserDefined) + { + HLSLStruct* structDeclaration = FindStruct(root, entryFunction->returnType.typeName); + ASSERT(structDeclaration != NULL); + HLSLStructField* field = structDeclaration->field; + while (field != NULL) + { + char fieldResultName[1024]; + String_Printf( fieldResultName, sizeof(fieldResultName), "%s.%s", resultName, field->name ); + OutputSetOutAttribute( field->semantic, fieldResultName ); + field = field->nextField; + } + } + else if (entryFunction->semantic != NULL) + { + OutputSetOutAttribute(entryFunction->semantic, resultName); + } + + m_writer.WriteLine(0, "}"); +} + +void GLSLGenerator::OutputDeclaration(HLSLDeclaration* declaration) +{ + OutputDeclarationType( declaration->type ); + + HLSLDeclaration* lastDecl = nullptr; + while( declaration ) + { + if( lastDecl ) + m_writer.Write( ", " ); + + OutputDeclarationBody( declaration->type, GetSafeIdentifierName( declaration->name ) ); + + if( declaration->assignment != NULL ) + { + m_writer.Write( " = " ); + if( declaration->type.array ) + { + m_writer.Write( "%s[]( ", GetTypeName( declaration->type ) ); + OutputExpressionList( declaration->assignment ); + m_writer.Write( " )" ); + } + else + { + bool matrixCtorNeeded = false; + if (IsMatrixType(declaration->type.baseType)) + { + matrixCtor ctor = matrixCtorBuilder(declaration->type, declaration->assignment); + if (std::find(matrixCtors.cbegin(), matrixCtors.cend(), ctor) != matrixCtors.cend()) + { + matrixCtorNeeded = true; + } + } + + if (matrixCtorNeeded) + { + // Matrix contructors needs to be adapted since GLSL access a matrix as m[c][r] while HLSL is m[r][c] + matrixCtor ctor = matrixCtorBuilder(declaration->type, declaration->assignment); + m_writer.Write("%s(", matrixCtorsId[ctor].c_str()); + OutputExpressionList(declaration->assignment); + m_writer.Write(")"); + } + else + { + m_writer.Write( "%s( ", GetTypeName( declaration->type ) ); + OutputExpressionList( declaration->assignment ); + m_writer.Write( " )" ); + } + } + } + + lastDecl = declaration; + declaration = declaration->nextDeclaration; + } +} + +void GLSLGenerator::OutputDeclaration(const HLSLType& type, const char* name) +{ + OutputDeclarationType( type ); + OutputDeclarationBody( type, name ); +} + +void GLSLGenerator::OutputDeclarationType( const HLSLType& type ) +{ + m_writer.Write( "%s ", GetTypeName( type ) ); +} + +void GLSLGenerator::OutputDeclarationBody( const HLSLType& type, const char* name ) +{ + if( !type.array ) + { + m_writer.Write( "%s", GetSafeIdentifierName( name ) ); + } + else + { + m_writer.Write( "%s[", GetSafeIdentifierName( name ) ); + if( type.arraySize != NULL ) + { + OutputExpression( type.arraySize ); + } + m_writer.Write( "]" ); + } +} + +void GLSLGenerator::OutputCast(const HLSLType& type) +{ + if (m_version == Version_110 && type.baseType == HLSLBaseType_Float3x3) + m_writer.Write("%s", m_matrixCtorFunction); + else + OutputDeclaration(type, ""); +} + +void GLSLGenerator::Error(const char* format, ...) +{ + // It's not always convenient to stop executing when an error occurs, + // so just track once we've hit an error and stop reporting them until + // we successfully bail out of execution. + if (m_error) + { + return; + } + m_error = true; + + va_list arg; + va_start(arg, format); + Log_ErrorArgList(format, arg); + va_end(arg); +} + +const char* GLSLGenerator::GetSafeIdentifierName(const char* name) const +{ + for (int i = 0; i < s_numReservedWords; ++i) + { + if (String_Equal(s_reservedWord[i], name)) + { + return m_reservedWord[i]; + } + } + return name; +} + +bool GLSLGenerator::ChooseUniqueName(const char* base, char* dst, int dstLength) const +{ + for (int i = 0; i < 1024; ++i) + { + String_Printf(dst, dstLength, "%s%d", base, i); + if (!m_tree->GetContainsString(dst)) + { + return true; + } + } + return false; +} + +const char* GLSLGenerator::GetBuiltInSemantic(const char* semantic, AttributeModifier modifier, int* outputIndex) +{ + if (outputIndex) + *outputIndex = -1; + + if (m_target == Target_VertexShader && modifier == AttributeModifier_Out && String_Equal(semantic, "POSITION")) + return "gl_Position"; + + if (m_target == Target_VertexShader && modifier == AttributeModifier_Out && String_Equal(semantic, "SV_Position")) + return "gl_Position"; + + if (m_target == Target_VertexShader && modifier == AttributeModifier_Out && String_Equal(semantic, "PSIZE")) + return "gl_PointSize"; + + if (m_target == Target_VertexShader && modifier == AttributeModifier_In && String_Equal(semantic, "SV_InstanceID")) + return "gl_InstanceID"; + + if (m_target == Target_FragmentShader && modifier == AttributeModifier_Out && String_Equal(semantic, "SV_Depth")) + return "gl_FragDepth"; + + if (m_target == Target_FragmentShader && modifier == AttributeModifier_In && String_Equal(semantic, "SV_Position")) + return "gl_FragCoord"; + + if (m_target == Target_FragmentShader && modifier == AttributeModifier_Out) + { + int index = -1; + + if (strncmp(semantic, "COLOR", 5) == 0) + index = atoi(semantic + 5); + else if (strncmp(semantic, "SV_Target", 9) == 0) + index = atoi(semantic + 9); + + if (index >= 0) + { + if (m_outputTargets <= index) + m_outputTargets = index + 1; + + if (outputIndex) + *outputIndex = index; + + return m_versionLegacy ? "gl_FragData" : "rast_FragData"; + } + } + + return NULL; +} + +void GLSLGenerator::CompleteConstructorArguments(HLSLExpression* expression, HLSLBaseType dstType) +{ + int nbComponentsProvided = 0; + int nbComponentsNeeded = 0; + + const BaseTypeDescription& dstTypeDesc = baseTypeDescriptions[dstType]; + nbComponentsNeeded = dstTypeDesc.numComponents * dstTypeDesc.height; + + const BaseTypeDescription& srcTypeDesc = baseTypeDescriptions[expression->expressionType.baseType]; + nbComponentsProvided = srcTypeDesc.numComponents * srcTypeDesc.height; + if (IsMatrixType(expression->expressionType.baseType) || + IsVectorType(expression->expressionType.baseType) ) + { + for(int i = nbComponentsProvided; i < nbComponentsNeeded; i++) + { + m_writer.Write(", 0"); + } + } +} + + +void GLSLGenerator::OutputMatrixCtors() { + for(matrixCtor & ctor : matrixCtors) + { + m_writer.Write("%s %s(", + GetTypeName(HLSLType(ctor.matrixType)), + matrixCtorsId[ctor].c_str()); + int argNum = 0; + for(HLSLBaseType argType : ctor.argumentTypes) + { + if (argNum == 0) + { + m_writer.Write("%s %c", GetTypeName(HLSLType(argType)), 'a' + argNum); + } + else + { + m_writer.Write(", %s %c", GetTypeName(HLSLType(argType)), 'a' + argNum); + } + argNum++; + } + m_writer.Write( ") { return %s(", GetTypeName(HLSLType(ctor.matrixType))); + + const BaseTypeDescription& ctorTypeDesc = baseTypeDescriptions[ctor.matrixType]; + std::vector args(ctorTypeDesc.numComponents * ctorTypeDesc.height, "0"); + int argNumIn = 0; + int argNumOut = 0; + for(HLSLBaseType argType : ctor.argumentTypes) + { + std::string arg; + arg += 'a' + argNumIn; + + if (IsScalarType(argType)) + { + int index = (argNumOut % ctorTypeDesc.height) * (ctorTypeDesc.numComponents) + + (argNumOut / ctorTypeDesc.height); + args[index] = arg; + argNumOut++; + } + else if (IsVectorType(argType)) + { + const BaseTypeDescription& argTypeDesc = baseTypeDescriptions[argType]; + for(int dim = 0; dim < argTypeDesc.numComponents; dim++) + { + std::string argVect = arg + "."; + argVect += "xyzw"[dim]; + int index = (argNumOut % ctorTypeDesc.height) * (ctorTypeDesc.numComponents) + + (argNumOut / ctorTypeDesc.height); + args[index] = argVect; + argNumOut++; + } + } + + argNumIn++; + } + + bool first = true; + for(std::string & arg : args) + { + if (!first) + { + m_writer.Write(",%s", arg.c_str()); + } + else + { + m_writer.Write("%s", arg.c_str()); + } + first = false; + } + + m_writer.Write("); }"); + m_writer.EndLine(); + } +} + + +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.h projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/GLSLGenerator.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,169 @@ +//============================================================================= +// +// Render/GLSLGenerator.h +// +// Created by Max McGuire (max@unknownworlds.com) +// Copyright (c) 2013, Unknown Worlds Entertainment, Inc. +// +//============================================================================= + +#ifndef GLSL_GENERATOR_H +#define GLSL_GENERATOR_H + +#include "CodeWriter.h" +#include "HLSLTree.h" + +namespace M4 +{ + +class GLSLGenerator +{ + +public: + enum Target + { + Target_VertexShader, + Target_FragmentShader, + }; + + enum Version + { + Version_110, // OpenGL 2.0 + Version_140, // OpenGL 3.1 + Version_150, // OpenGL 3.2 + Version_100_ES, // OpenGL ES 2.0 + Version_300_ES, // OpenGL ES 3.0 + }; + + enum Flags + { + Flag_FlipPositionOutput = 1 << 0, + Flag_EmulateConstantBuffer = 1 << 1, + Flag_PackMatrixRowMajor = 1 << 2, + Flag_LowerMatrixMultiplication = 1 << 3, + }; + + struct Options + { + unsigned int flags; + const char* constantBufferPrefix; + + Options() + { + flags = 0; + constantBufferPrefix = ""; + } + }; + + GLSLGenerator(); + + bool Generate(HLSLTree* tree, Target target, Version versiom, const char* entryName, const Options& options = Options()); + const char* GetResult() const; + +private: + + enum AttributeModifier + { + AttributeModifier_In, + AttributeModifier_Out, + }; + + void OutputExpressionList(HLSLExpression* expression, HLSLArgument* argument = NULL); + void OutputExpression(HLSLExpression* expression, const HLSLType* dstType = NULL); + void OutputIdentifier(const char* name); + void OutputArguments(HLSLArgument* argument); + + /** + * If the statements are part of a function, then returnType can be used to specify the type + * that a return statement is expected to produce so that correct casts will be generated. + */ + void OutputStatements(int indent, HLSLStatement* statement, const HLSLType* returnType = NULL); + + void OutputAttribute(const HLSLType& type, const char* semantic, AttributeModifier modifier); + void OutputAttributes(HLSLFunction* entryFunction); + void OutputEntryCaller(HLSLFunction* entryFunction); + void OutputDeclaration(HLSLDeclaration* declaration); + void OutputDeclarationType( const HLSLType& type ); + void OutputDeclarationBody( const HLSLType& type, const char* name ); + void OutputDeclaration(const HLSLType& type, const char* name); + void OutputCast(const HLSLType& type); + + void OutputSetOutAttribute(const char* semantic, const char* resultName); + + void LayoutBuffer(HLSLBuffer* buffer, unsigned int& offset); + void LayoutBuffer(const HLSLType& type, unsigned int& offset); + void LayoutBufferElement(const HLSLType& type, unsigned int& offset); + void LayoutBufferAlign(const HLSLType& type, unsigned int& offset); + + HLSLBuffer* GetBufferAccessExpression(HLSLExpression* expression); + void OutputBufferAccessExpression(HLSLBuffer* buffer, HLSLExpression* expression, const HLSLType& type, unsigned int postOffset); + unsigned int OutputBufferAccessIndex(HLSLExpression* expression, unsigned int postOffset); + + void OutputBuffer(int indent, HLSLBuffer* buffer); + + HLSLFunction* FindFunction(HLSLRoot* root, const char* name); + HLSLStruct* FindStruct(HLSLRoot* root, const char* name); + + void Error(const char* format, ...); + + /** GLSL contains some reserved words that don't exist in HLSL. This function will + * sanitize those names. */ + const char* GetSafeIdentifierName(const char* name) const; + + /** Generates a name of the format "base+n" where n is an integer such that the name + * isn't used in the syntax tree. */ + bool ChooseUniqueName(const char* base, char* dst, int dstLength) const; + + const char* GetBuiltInSemantic(const char* semantic, AttributeModifier modifier, int* outputIndex = 0); + const char* GetAttribQualifier(AttributeModifier modifier); + void CompleteConstructorArguments(HLSLExpression* expression, HLSLBaseType dstType); + void OutputMatrixCtors(); + +private: + + static const int s_numReservedWords = 9; + static const char* s_reservedWord[s_numReservedWords]; + + CodeWriter m_writer; + + HLSLTree* m_tree; + const char* m_entryName; + Target m_target; + Version m_version; + bool m_versionLegacy; + Options m_options; + + bool m_outputPosition; + int m_outputTargets; + + const char* m_outAttribPrefix; + const char* m_inAttribPrefix; + + char m_matrixRowFunction[64]; + char m_matrixCtorFunction[64]; + char m_matrixMulFunction[64]; + char m_clipFunction[64]; + char m_tex2DlodFunction[64]; + char m_tex2DbiasFunction[64]; + char m_tex2DgradFunction[64]; + char m_tex3DlodFunction[64]; + char m_texCUBEbiasFunction[64]; + char m_texCUBElodFunction[ 64 ]; + char m_scalarSwizzle2Function[64]; + char m_scalarSwizzle3Function[64]; + char m_scalarSwizzle4Function[64]; + char m_sinCosFunction[64]; + char m_bvecTernary[ 64 ]; + + bool m_error; + + char m_reservedWord[s_numReservedWords][64]; + + std::vector matrixCtors; + std::map matrixCtorsId; + +}; + +} + +#endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLParser.cpp projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLParser.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLParser.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLParser.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,4433 @@ +//============================================================================= +// +// Render/HLSLParser.cpp +// +// Created by Max McGuire (max@unknownworlds.com) +// Copyright (c) 2013, Unknown Worlds Entertainment, Inc. +// +//============================================================================= + +//#include "Engine/String.h" +#include "Engine.h" + +#include "HLSLParser.h" +#include "HLSLTree.h" + +#include +#include +#include +#include +#include +#include +#include + +namespace M4 +{ + +enum CompareFunctionsResult +{ + FunctionsEqual, + Function1Better, + Function2Better +}; + + +/** This structure stores a HLSLFunction-like declaration for an intrinsic function */ +struct Intrinsic +{ + explicit Intrinsic(const char* name, HLSLBaseType returnType) + { + function.name = name; + function.returnType.baseType = returnType; + function.numArguments = 0; + } + explicit Intrinsic(const char* name, HLSLBaseType returnType, HLSLBaseType arg1) + { + function.name = name; + function.returnType.baseType = returnType; + function.numArguments = 1; + function.argument = argument + 0; + argument[0].type.baseType = arg1; + argument[0].type.flags = HLSLTypeFlag_Const; + } + explicit Intrinsic(const char* name, HLSLBaseType returnType, HLSLBaseType arg1, HLSLBaseType arg2) + { + function.name = name; + function.returnType.baseType = returnType; + function.argument = argument + 0; + function.numArguments = 2; + argument[0].type.baseType = arg1; + argument[0].type.flags = HLSLTypeFlag_Const; + argument[0].nextArgument = argument + 1; + argument[1].type.baseType = arg2; + argument[1].type.flags = HLSLTypeFlag_Const; + } + explicit Intrinsic(const char* name, HLSLBaseType returnType, HLSLBaseType arg1, HLSLBaseType arg2, HLSLBaseType arg3) + { + function.name = name; + function.returnType.baseType = returnType; + function.argument = argument + 0; + function.numArguments = 3; + argument[0].type.baseType = arg1; + argument[0].type.flags = HLSLTypeFlag_Const; + argument[0].nextArgument = argument + 1; + argument[1].type.baseType = arg2; + argument[1].type.flags = HLSLTypeFlag_Const; + argument[1].nextArgument = argument + 2; + argument[2].type.baseType = arg3; + argument[2].type.flags = HLSLTypeFlag_Const; + } + explicit Intrinsic(const char* name, HLSLBaseType returnType, HLSLBaseType arg1, HLSLBaseType arg2, HLSLBaseType arg3, HLSLBaseType arg4) + { + function.name = name; + function.returnType.baseType = returnType; + function.argument = argument + 0; + function.numArguments = 4; + argument[0].type.baseType = arg1; + argument[0].type.flags = HLSLTypeFlag_Const; + argument[0].nextArgument = argument + 1; + argument[1].type.baseType = arg2; + argument[1].type.flags = HLSLTypeFlag_Const; + argument[1].nextArgument = argument + 2; + argument[2].type.baseType = arg3; + argument[2].type.flags = HLSLTypeFlag_Const; + argument[2].nextArgument = argument + 3; + argument[3].type.baseType = arg4; + argument[3].type.flags = HLSLTypeFlag_Const; + } + HLSLFunction function; + HLSLArgument argument[4]; +}; + +Intrinsic SamplerIntrinsic(const char* name, HLSLBaseType returnType, HLSLBaseType arg1, HLSLBaseType samplerType, HLSLBaseType arg2) +{ + Intrinsic i(name, returnType, arg1, arg2); + i.argument[0].type.samplerType = samplerType; + return i; +} + + + +static const int _numberTypeRank[NumericType_Count][NumericType_Count] = +{ + //F B I U + { 0, 4, 4, 4 }, // NumericType_Float + { 5, 0, 5, 5 }, // NumericType_Bool + { 2, 4, 0, 1 }, // NumericType_Int + { 2, 4, 1, 0 } // NumericType_Uint +}; + + +struct EffectStateValue +{ + const char * name; + int value; +}; + +static const EffectStateValue textureFilteringValues[] = { + {"None", 0}, + {"Point", 1}, + {"Linear", 2}, + {"Anisotropic", 3}, + {NULL, 0} +}; + +static const EffectStateValue textureAddressingValues[] = { + {"Wrap", 1}, + {"Mirror", 2}, + {"Clamp", 3}, + {"Border", 4}, + {"MirrorOnce", 5}, + {NULL, 0} +}; + +static const EffectStateValue booleanValues[] = { + {"False", 0}, + {"True", 1}, + {NULL, 0} +}; + +static const EffectStateValue cullValues[] = { + {"None", 1}, + {"CW", 2}, + {"CCW", 3}, + {NULL, 0} +}; + +static const EffectStateValue cmpValues[] = { + {"Never", 1}, + {"Less", 2}, + {"Equal", 3}, + {"LessEqual", 4}, + {"Greater", 5}, + {"NotEqual", 6}, + {"GreaterEqual", 7}, + {"Always", 8}, + {NULL, 0} +}; + +static const EffectStateValue blendValues[] = { + {"Zero", 1}, + {"One", 2}, + {"SrcColor", 3}, + {"InvSrcColor", 4}, + {"SrcAlpha", 5}, + {"InvSrcAlpha", 6}, + {"DestAlpha", 7}, + {"InvDestAlpha", 8}, + {"DestColor", 9}, + {"InvDestColor", 10}, + {"SrcAlphaSat", 11}, + {"BothSrcAlpha", 12}, + {"BothInvSrcAlpha", 13}, + {"BlendFactor", 14}, + {"InvBlendFactor", 15}, + {"SrcColor2", 16}, // Dual source blending. D3D9Ex only. + {"InvSrcColor2", 17}, + {NULL, 0} +}; + +static const EffectStateValue blendOpValues[] = { + {"Add", 1}, + {"Subtract", 2}, + {"RevSubtract", 3}, + {"Min", 4}, + {"Max", 5}, + {NULL, 0} +}; + +static const EffectStateValue fillModeValues[] = { + {"Point", 1}, + {"Wireframe", 2}, + {"Solid", 3}, + {NULL, 0} +}; + +static const EffectStateValue stencilOpValues[] = { + {"Keep", 1}, + {"Zero", 2}, + {"Replace", 3}, + {"IncrSat", 4}, + {"DecrSat", 5}, + {"Invert", 6}, + {"Incr", 7}, + {"Decr", 8}, + {NULL, 0} +}; + +// These are flags. +static const EffectStateValue colorMaskValues[] = { + {"False", 0}, + {"Red", 1<<0}, + {"Green", 1<<1}, + {"Blue", 1<<2}, + {"Alpha", 1<<3}, + {"X", 1<<0}, + {"Y", 1<<1}, + {"Z", 1<<2}, + {"W", 1<<3}, + {NULL, 0} +}; + +static const EffectStateValue integerValues[] = { + {NULL, 0} +}; + +static const EffectStateValue floatValues[] = { + {NULL, 0} +}; + + +struct EffectState +{ + const char * name; + int d3drs; + const EffectStateValue * values; +}; + +static const EffectState samplerStates[] = { + {"AddressU", 1, textureAddressingValues}, + {"AddressV", 2, textureAddressingValues}, + {"AddressW", 3, textureAddressingValues}, + // "BorderColor", 4, D3DCOLOR + {"MagFilter", 5, textureFilteringValues}, + {"MinFilter", 6, textureFilteringValues}, + {"MipFilter", 7, textureFilteringValues}, + {"MipMapLodBias", 8, floatValues}, + {"MaxMipLevel", 9, integerValues}, + {"MaxAnisotropy", 10, integerValues}, + {"sRGBTexture", 11, booleanValues}, +}; + +static const EffectState effectStates[] = { + {"VertexShader", 0, NULL}, + {"PixelShader", 0, NULL}, + {"AlphaBlendEnable", 27, booleanValues}, + {"SrcBlend", 19, blendValues}, + {"DestBlend", 20, blendValues}, + {"BlendOp", 171, blendOpValues}, + {"SeparateAlphaBlendEanble", 206, booleanValues}, + {"SrcBlendAlpha", 207, blendValues}, + {"DestBlendAlpha", 208, blendValues}, + {"BlendOpAlpha", 209, blendOpValues}, + {"AlphaTestEnable", 15, booleanValues}, + {"AlphaRef", 24, integerValues}, + {"AlphaFunc", 25, cmpValues}, + {"CullMode", 22, cullValues}, + {"ZEnable", 7, booleanValues}, + {"ZWriteEnable", 14, booleanValues}, + {"ZFunc", 23, cmpValues}, + {"StencilEnable", 52, booleanValues}, + {"StencilFail", 53, stencilOpValues}, + {"StencilZFail", 54, stencilOpValues}, + {"StencilPass", 55, stencilOpValues}, + {"StencilFunc", 56, cmpValues}, + {"StencilRef", 57, integerValues}, + {"StencilMask", 58, integerValues}, + {"StencilWriteMask", 59, integerValues}, + {"TwoSidedStencilMode", 185, booleanValues}, + {"CCW_StencilFail", 186, stencilOpValues}, + {"CCW_StencilZFail", 187, stencilOpValues}, + {"CCW_StencilPass", 188, stencilOpValues}, + {"CCW_StencilFunc", 189, cmpValues}, + {"ColorWriteEnable", 168, colorMaskValues}, + {"FillMode", 8, fillModeValues}, + {"MultisampleAlias", 161, booleanValues}, + {"MultisampleMask", 162, integerValues}, + {"ScissorTestEnable", 174, booleanValues}, + {"SlopeScaleDepthBias", 175, floatValues}, + {"DepthBias", 195, floatValues} +}; + + +static const EffectStateValue witnessCullModeValues[] = { + {"None", 0}, + {"Back", 1}, + {"Front", 2}, + {NULL, 0} +}; + +static const EffectStateValue witnessFillModeValues[] = { + {"Solid", 0}, + {"Wireframe", 1}, + {NULL, 0} +}; + +static const EffectStateValue witnessBlendModeValues[] = { + {"Disabled", 0}, + {"AlphaBlend", 1}, // src * a + dst * (1-a) + {"Add", 2}, // src + dst + {"Mixed", 3}, // src + dst * (1-a) + {"Multiply", 4}, // src * dst + {"Multiply2", 5}, // 2 * src * dst + {NULL, 0} +}; + +static const EffectStateValue witnessDepthFuncValues[] = { + {"LessEqual", 0}, + {"Less", 1}, + {"Equal", 2}, + {"Greater", 3}, + {"Always", 4}, + {NULL, 0} +}; + +static const EffectStateValue witnessStencilModeValues[] = { + {"Disabled", 0}, + {"Set", 1}, + {"Test", 2}, + {NULL, 0} +}; + +static const EffectStateValue witnessFilterModeValues[] = { + {"Point", 0}, + {"Linear", 1}, + {"Mipmap_Nearest", 2}, + {"Mipmap_Best", 3}, // Quality of mipmap filtering depends on render settings. + {"Anisotropic", 4}, // Aniso without mipmaps for reflection maps. + {NULL, 0} +}; + +static const EffectStateValue witnessWrapModeValues[] = { + {"Repeat", 0}, + {"Clamp", 1}, + {"ClampToBorder", 2}, + {NULL, 0} +}; + +static const EffectState pipelineStates[] = { + {"VertexShader", 0, NULL}, + {"PixelShader", 0, NULL}, + + // Depth_Stencil_State + {"DepthWrite", 0, booleanValues}, + {"DepthEnable", 0, booleanValues}, + {"DepthFunc", 0, witnessDepthFuncValues}, + {"StencilMode", 0, witnessStencilModeValues}, + + // Raster_State + {"CullMode", 0, witnessCullModeValues}, + {"FillMode", 0, witnessFillModeValues}, + {"MultisampleEnable", 0, booleanValues}, + {"PolygonOffset", 0, booleanValues}, + + // Blend_State + {"BlendMode", 0, witnessBlendModeValues}, + {"ColorWrite", 0, booleanValues}, + {"AlphaWrite", 0, booleanValues}, + {"AlphaTest", 0, booleanValues}, // This is really alpha to coverage. +}; + + + + + +#define INTRINSIC_FLOAT1_FUNCTION(name) \ + Intrinsic( name, HLSLBaseType_Float, HLSLBaseType_Float ), \ + Intrinsic( name, HLSLBaseType_Float2, HLSLBaseType_Float2 ), \ + Intrinsic( name, HLSLBaseType_Float3, HLSLBaseType_Float3 ), \ + Intrinsic( name, HLSLBaseType_Float4, HLSLBaseType_Float4 ) + +#define INTRINSIC_FLOAT2_FUNCTION(name) \ + Intrinsic( name, HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float ), \ + Intrinsic( name, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2 ), \ + Intrinsic( name, HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3 ), \ + Intrinsic( name, HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float4 ) + +#define INTRINSIC_FLOAT3_FUNCTION(name) \ + Intrinsic( name, HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float ), \ + Intrinsic( name, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2 ), \ + Intrinsic( name, HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3 ), \ + Intrinsic( name, HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float4 ) + +#if 0 +// @@ IC: For some reason this is not working with the Visual Studio compiler: +#define SAMPLER_INTRINSIC_FUNCTION(name, sampler, arg1) \ + SamplerIntrinsic( name, HLSLBaseType_Float4, sampler, HLSLBaseType_Float, arg1) +#else +#define SAMPLER_INTRINSIC_FUNCTION(name, sampler, arg1) \ + Intrinsic( name, HLSLBaseType_Float4, sampler, arg1) +#endif + +const Intrinsic _intrinsic[] = + { + INTRINSIC_FLOAT1_FUNCTION( "abs" ), + INTRINSIC_FLOAT1_FUNCTION( "acos" ), + + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float2 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float3 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float4 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float2x4 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float2x3 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float2x2 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float3x4 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float3x3 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float3x2 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float4x4 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float4x3 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Float4x2 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Bool ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Int ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Int2 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Int3 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Int4 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Uint ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Uint2 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Uint3 ), + Intrinsic( "any", HLSLBaseType_Bool, HLSLBaseType_Uint4 ), + + INTRINSIC_FLOAT1_FUNCTION( "asin" ), + INTRINSIC_FLOAT1_FUNCTION( "atan" ), + INTRINSIC_FLOAT2_FUNCTION( "atan2" ), + INTRINSIC_FLOAT3_FUNCTION( "clamp" ), + INTRINSIC_FLOAT1_FUNCTION( "cos" ), + INTRINSIC_FLOAT1_FUNCTION( "tan" ), + + INTRINSIC_FLOAT3_FUNCTION( "lerp" ), + INTRINSIC_FLOAT3_FUNCTION( "smoothstep" ), + + INTRINSIC_FLOAT1_FUNCTION( "floor" ), + INTRINSIC_FLOAT1_FUNCTION( "ceil" ), + INTRINSIC_FLOAT1_FUNCTION( "frac" ), + + INTRINSIC_FLOAT2_FUNCTION( "fmod" ), + + Intrinsic( "clip", HLSLBaseType_Void, HLSLBaseType_Float ), + Intrinsic( "clip", HLSLBaseType_Void, HLSLBaseType_Float2 ), + Intrinsic( "clip", HLSLBaseType_Void, HLSLBaseType_Float3 ), + Intrinsic( "clip", HLSLBaseType_Void, HLSLBaseType_Float4 ), + + Intrinsic( "dot", HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float ), + Intrinsic( "dot", HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float2 ), + Intrinsic( "dot", HLSLBaseType_Float, HLSLBaseType_Float3, HLSLBaseType_Float3 ), + Intrinsic( "dot", HLSLBaseType_Float, HLSLBaseType_Float4, HLSLBaseType_Float4 ), + + Intrinsic( "cross", HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3 ), + + Intrinsic( "length", HLSLBaseType_Float, HLSLBaseType_Float ), + Intrinsic( "length", HLSLBaseType_Float, HLSLBaseType_Float2 ), + Intrinsic( "length", HLSLBaseType_Float, HLSLBaseType_Float3 ), + Intrinsic( "length", HLSLBaseType_Float, HLSLBaseType_Float4 ), + + INTRINSIC_FLOAT2_FUNCTION( "max" ), + INTRINSIC_FLOAT2_FUNCTION( "min" ), + + // @@ Add all combinations. + // https://docs.microsoft.com/en-us/windows/desktop/direct3dhlsl/dx-graphics-hlsl-mul + + // scalar = mul(scalar, scalar) + Intrinsic( "mul", HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float), + + // vector = mul(scalar, vector) + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float, HLSLBaseType_Float4), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float, HLSLBaseType_Float3), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float, HLSLBaseType_Float2), + + // matrix = mul(scalar, matrix) + Intrinsic( "mul", HLSLBaseType_Float4x4, HLSLBaseType_Float, HLSLBaseType_Float4x4), + Intrinsic( "mul", HLSLBaseType_Float4x3, HLSLBaseType_Float, HLSLBaseType_Float4x3), + Intrinsic( "mul", HLSLBaseType_Float4x2, HLSLBaseType_Float, HLSLBaseType_Float4x2), + + Intrinsic( "mul", HLSLBaseType_Float3x4, HLSLBaseType_Float, HLSLBaseType_Float3x4), + Intrinsic( "mul", HLSLBaseType_Float3x3, HLSLBaseType_Float, HLSLBaseType_Float3x3), + Intrinsic( "mul", HLSLBaseType_Float3x2, HLSLBaseType_Float, HLSLBaseType_Float3x2), + + Intrinsic( "mul", HLSLBaseType_Float2x4, HLSLBaseType_Float, HLSLBaseType_Float2x4), + Intrinsic( "mul", HLSLBaseType_Float2x3, HLSLBaseType_Float, HLSLBaseType_Float2x3), + Intrinsic( "mul", HLSLBaseType_Float2x2, HLSLBaseType_Float, HLSLBaseType_Float2x2), + + // vector = mul(vector, scalar) + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float), + + // scalar = mul(vector, vector) it's a dot product ! + Intrinsic( "mul", HLSLBaseType_Float, HLSLBaseType_Float4, HLSLBaseType_Float4), + Intrinsic( "mul", HLSLBaseType_Float, HLSLBaseType_Float3, HLSLBaseType_Float3), + Intrinsic( "mul", HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float2), + + // vector = mul(vector, matrix) + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float4x4), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float4, HLSLBaseType_Float4x3), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float4, HLSLBaseType_Float4x2), + + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float3, HLSLBaseType_Float3x4), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3x3), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3x2), + + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float2x4), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float2x3), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2x2), + + // matrix = mul(matrix,scalar) + Intrinsic( "mul", HLSLBaseType_Float4x4, HLSLBaseType_Float4x4, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float3x4, HLSLBaseType_Float3x4, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float2x4, HLSLBaseType_Float2x4, HLSLBaseType_Float), + + Intrinsic( "mul", HLSLBaseType_Float4x3, HLSLBaseType_Float4x3, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float3x3, HLSLBaseType_Float3x3, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float2x3, HLSLBaseType_Float2x3, HLSLBaseType_Float), + + Intrinsic( "mul", HLSLBaseType_Float4x2, HLSLBaseType_Float4x2, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float3x2, HLSLBaseType_Float3x2, HLSLBaseType_Float), + Intrinsic( "mul", HLSLBaseType_Float2x2, HLSLBaseType_Float2x2, HLSLBaseType_Float), + + // vector = mul(matrix, vector) + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float4x4, HLSLBaseType_Float4), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float3x4, HLSLBaseType_Float4), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float2x4, HLSLBaseType_Float4), + + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float4x3, HLSLBaseType_Float3), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float3x3, HLSLBaseType_Float3), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float2x3, HLSLBaseType_Float3), + + Intrinsic( "mul", HLSLBaseType_Float4, HLSLBaseType_Float4x2, HLSLBaseType_Float2), + Intrinsic( "mul", HLSLBaseType_Float3, HLSLBaseType_Float3x2, HLSLBaseType_Float2), + Intrinsic( "mul", HLSLBaseType_Float2, HLSLBaseType_Float2x2, HLSLBaseType_Float2), + + // matrix = mul(matrix, matrix<4,M) + Intrinsic( "mul", HLSLBaseType_Float4x4, HLSLBaseType_Float4x4, HLSLBaseType_Float4x4 ), + Intrinsic( "mul", HLSLBaseType_Float4x3, HLSLBaseType_Float4x4, HLSLBaseType_Float4x3 ), + Intrinsic( "mul", HLSLBaseType_Float4x2, HLSLBaseType_Float4x4, HLSLBaseType_Float4x2 ), + + Intrinsic( "mul", HLSLBaseType_Float3x4, HLSLBaseType_Float3x4, HLSLBaseType_Float4x4 ), + Intrinsic( "mul", HLSLBaseType_Float3x3, HLSLBaseType_Float3x4, HLSLBaseType_Float4x3 ), + Intrinsic( "mul", HLSLBaseType_Float3x2, HLSLBaseType_Float3x4, HLSLBaseType_Float4x2 ), + + Intrinsic( "mul", HLSLBaseType_Float2x4, HLSLBaseType_Float2x4, HLSLBaseType_Float4x4 ), + Intrinsic( "mul", HLSLBaseType_Float2x3, HLSLBaseType_Float2x4, HLSLBaseType_Float4x3 ), + Intrinsic( "mul", HLSLBaseType_Float2x2, HLSLBaseType_Float2x4, HLSLBaseType_Float4x2 ), + + // matrix = mul(matrix, matrix<3,M>) + Intrinsic( "mul", HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float3x4 ), + Intrinsic( "mul", HLSLBaseType_Float4x3, HLSLBaseType_Float4x3, HLSLBaseType_Float3x3 ), + Intrinsic( "mul", HLSLBaseType_Float4x2, HLSLBaseType_Float4x3, HLSLBaseType_Float3x2 ), + + Intrinsic( "mul", HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x4 ), + Intrinsic( "mul", HLSLBaseType_Float3x3, HLSLBaseType_Float3x3, HLSLBaseType_Float3x3 ), + Intrinsic( "mul", HLSLBaseType_Float3x2, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2 ), + + Intrinsic( "mul", HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float3x4 ), + Intrinsic( "mul", HLSLBaseType_Float2x3, HLSLBaseType_Float2x3, HLSLBaseType_Float3x3 ), + Intrinsic( "mul", HLSLBaseType_Float2x2, HLSLBaseType_Float2x3, HLSLBaseType_Float3x2 ), + + // matrix = mul(matrix, matrix<2,M>) + Intrinsic( "mul", HLSLBaseType_Float4x4, HLSLBaseType_Float4x2, HLSLBaseType_Float2x4 ), + Intrinsic( "mul", HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, HLSLBaseType_Float2x3 ), + Intrinsic( "mul", HLSLBaseType_Float4x2, HLSLBaseType_Float4x2, HLSLBaseType_Float2x2 ), + + Intrinsic( "mul", HLSLBaseType_Float3x4, HLSLBaseType_Float3x2, HLSLBaseType_Float2x4 ), + Intrinsic( "mul", HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, HLSLBaseType_Float2x3 ), + Intrinsic( "mul", HLSLBaseType_Float3x2, HLSLBaseType_Float3x2, HLSLBaseType_Float2x2 ), + + Intrinsic( "mul", HLSLBaseType_Float2x4, HLSLBaseType_Float2x2, HLSLBaseType_Float2x4 ), + Intrinsic( "mul", HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, HLSLBaseType_Float2x3 ), + Intrinsic( "mul", HLSLBaseType_Float2x2, HLSLBaseType_Float2x2, HLSLBaseType_Float2x2 ), + + + Intrinsic( "transpose", HLSLBaseType_Float2x2, HLSLBaseType_Float2x2 ), + Intrinsic( "transpose", HLSLBaseType_Float3x3, HLSLBaseType_Float3x3 ), + Intrinsic( "transpose", HLSLBaseType_Float4x4, HLSLBaseType_Float4x4 ), + + INTRINSIC_FLOAT2_FUNCTION( "modf" ), + + INTRINSIC_FLOAT1_FUNCTION( "normalize" ), + INTRINSIC_FLOAT2_FUNCTION( "pow" ), + INTRINSIC_FLOAT1_FUNCTION( "saturate" ), + INTRINSIC_FLOAT1_FUNCTION( "sin" ), + INTRINSIC_FLOAT1_FUNCTION( "sqrt" ), + INTRINSIC_FLOAT1_FUNCTION( "rsqrt" ), + INTRINSIC_FLOAT1_FUNCTION( "rcp" ), + INTRINSIC_FLOAT1_FUNCTION( "exp" ), + INTRINSIC_FLOAT1_FUNCTION( "exp2" ), + INTRINSIC_FLOAT1_FUNCTION( "log" ), + INTRINSIC_FLOAT1_FUNCTION( "log2" ), + + INTRINSIC_FLOAT1_FUNCTION( "ddx" ), + INTRINSIC_FLOAT1_FUNCTION( "ddy" ), + + INTRINSIC_FLOAT1_FUNCTION( "sign" ), + INTRINSIC_FLOAT2_FUNCTION( "step" ), + INTRINSIC_FLOAT2_FUNCTION( "reflect" ), + + INTRINSIC_FLOAT1_FUNCTION("isnan"), + INTRINSIC_FLOAT1_FUNCTION("isinf"), + + Intrinsic("asuint", HLSLBaseType_Uint, HLSLBaseType_Float), + + SAMPLER_INTRINSIC_FUNCTION("tex2D", HLSLBaseType_Sampler2D, HLSLBaseType_Float2), + + Intrinsic("tex2Dproj", HLSLBaseType_Float4, HLSLBaseType_Sampler2D, HLSLBaseType_Float4), + + SAMPLER_INTRINSIC_FUNCTION("tex2Dlod", HLSLBaseType_Sampler2D, HLSLBaseType_Float4), + + Intrinsic("tex2Dlod", HLSLBaseType_Float4, HLSLBaseType_Sampler2D, HLSLBaseType_Float4, HLSLBaseType_Int2), // With offset. + + SAMPLER_INTRINSIC_FUNCTION("tex2Dbias", HLSLBaseType_Sampler2D, HLSLBaseType_Float4), + + Intrinsic("tex2Dgrad", HLSLBaseType_Float4, HLSLBaseType_Sampler2D, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2), + Intrinsic("tex2Dgather", HLSLBaseType_Float4, HLSLBaseType_Sampler2D, HLSLBaseType_Float2, HLSLBaseType_Int), + Intrinsic("tex2Dgather", HLSLBaseType_Float4, HLSLBaseType_Sampler2D, HLSLBaseType_Float2, HLSLBaseType_Int2, HLSLBaseType_Int), // With offset. + Intrinsic("tex2Dsize", HLSLBaseType_Int2, HLSLBaseType_Sampler2D), + Intrinsic("tex2Dfetch", HLSLBaseType_Float4, HLSLBaseType_Sampler2D, HLSLBaseType_Int3), // u,v,mipmap + + Intrinsic("tex2Dcmp", HLSLBaseType_Float4, HLSLBaseType_Sampler2DShadow, HLSLBaseType_Float4), // @@ IC: This really takes a float3 (uvz) and returns a float. + + Intrinsic("tex2DMSfetch", HLSLBaseType_Float4, HLSLBaseType_Sampler2DMS, HLSLBaseType_Int2, HLSLBaseType_Int), + Intrinsic("tex2DMSsize", HLSLBaseType_Int3, HLSLBaseType_Sampler2DMS), + + Intrinsic("tex2DArray", HLSLBaseType_Float4, HLSLBaseType_Sampler2DArray, HLSLBaseType_Float3), + + Intrinsic("tex3D", HLSLBaseType_Float4, HLSLBaseType_Sampler3D, HLSLBaseType_Float3), + Intrinsic("tex3Dlod", HLSLBaseType_Float4, HLSLBaseType_Sampler3D, HLSLBaseType_Float4), + Intrinsic("tex3Dbias", HLSLBaseType_Float4, HLSLBaseType_Sampler3D, HLSLBaseType_Float4), + Intrinsic("tex3Dsize", HLSLBaseType_Int3, HLSLBaseType_Sampler3D), + + Intrinsic("texCUBE", HLSLBaseType_Float4, HLSLBaseType_SamplerCube, HLSLBaseType_Float3), + Intrinsic("texCUBElod", HLSLBaseType_Float4, HLSLBaseType_SamplerCube, HLSLBaseType_Float4), + Intrinsic("texCUBEbias", HLSLBaseType_Float4, HLSLBaseType_SamplerCube, HLSLBaseType_Float4), + Intrinsic("texCUBEsize", HLSLBaseType_Int, HLSLBaseType_SamplerCube), + + Intrinsic( "sincos", HLSLBaseType_Void, HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float ), + Intrinsic( "sincos", HLSLBaseType_Void, HLSLBaseType_Float2, HLSLBaseType_Float, HLSLBaseType_Float2 ), + Intrinsic( "sincos", HLSLBaseType_Void, HLSLBaseType_Float3, HLSLBaseType_Float, HLSLBaseType_Float3 ), + Intrinsic( "sincos", HLSLBaseType_Void, HLSLBaseType_Float4, HLSLBaseType_Float, HLSLBaseType_Float4 ), + + Intrinsic( "mad", HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float, HLSLBaseType_Float ), + Intrinsic( "mad", HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2 ), + Intrinsic( "mad", HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3 ), + Intrinsic( "mad", HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float4, HLSLBaseType_Float4 ), + }; + +const int _numIntrinsics = sizeof(_intrinsic) / sizeof(Intrinsic); + +// The order in this array must match up with HLSLBinaryOp +const int _binaryOpPriority[] = + { + 2, 1, // &&, || + 8, 8, // +, - + 9, 9, // *, / + 7, 7, // <, >, + 7, 7, // <=, >=, + 6, 6, // ==, != + 5, 3, 4, // &, |, ^ + }; + + +// IC: I'm not sure this table is right, but any errors should be caught by the backend compiler. +// Also, this is operator dependent. The type resulting from (float4 * float4x4) is not the same as (float4 + float4x4). +// We should probably distinguish between component-wise operator and only allow same dimensions +HLSLBaseType _binaryOpTypeLookup[HLSLBaseType_NumericCount][HLSLBaseType_NumericCount] = + { + { // float + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4 + }, + { // float2 + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2 + }, + { // float3 + HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3, + HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3, + HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3 + }, + { // float4 + HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4 + }, + { // float2x4 + HLSLBaseType_Float2x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float2x3 + HLSLBaseType_Float2x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Float2x3, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float2x2 + HLSLBaseType_Float2x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Float2x2, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float2x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float3x4 + HLSLBaseType_Float3x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float3x3 + HLSLBaseType_Float3x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Float3x3, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float3x2 + HLSLBaseType_Float3x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Float3x2, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float3x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float4x4 + HLSLBaseType_Float4x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x4, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float4x3 + HLSLBaseType_Float4x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Float4x3, HLSLBaseType_Unknown, + HLSLBaseType_Float4x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x3, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // float4x2 + HLSLBaseType_Float4x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Float4x2, + HLSLBaseType_Float4x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Float4x2, HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown + }, + { // bool + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // bool2 + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // bool3 + HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Int3, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Int3, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Uint3, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // bool4 + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // int + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int2, + HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // int2 + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int2, + HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int2, HLSLBaseType_Int2, + HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2 + }, + { // int3 + HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Int3, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int3, + HLSLBaseType_Int3, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int3, + HLSLBaseType_Uint3, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint3 + }, + { // int4 + HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Int4, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Int4, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4, + HLSLBaseType_Uint4, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // uint + HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Float2x4, HLSLBaseType_Float2x3, HLSLBaseType_Float2x2, + HLSLBaseType_Float3x4, HLSLBaseType_Float3x3, HLSLBaseType_Float3x2, + HLSLBaseType_Float4x4, HLSLBaseType_Float4x3, HLSLBaseType_Float4x2, + HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4, + HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4, + HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + { // uint2 + HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, HLSLBaseType_Float2, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2, + HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2, + HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2, HLSLBaseType_Uint2 + }, + { // uint3 + HLSLBaseType_Float3, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float3, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Uint3, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint3, + HLSLBaseType_Uint3, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint3, + HLSLBaseType_Uint3, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint3 + }, + { // uint4 + HLSLBaseType_Float4, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Unknown, HLSLBaseType_Unknown, HLSLBaseType_Unknown, + HLSLBaseType_Uint4, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4, + HLSLBaseType_Uint4, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4, + HLSLBaseType_Uint4, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 + }, + }; + +// Priority of the ? : operator. +const int _conditionalOpPriority = 1; + +static const char* GetTypeName(const HLSLType& type) +{ + if (type.baseType == HLSLBaseType_UserDefined) + { + return type.typeName; + } + else + { + return baseTypeDescriptions[type.baseType].typeName; + } +} + +static const char* GetBinaryOpName(HLSLBinaryOp binaryOp) +{ + switch (binaryOp) + { + case HLSLBinaryOp_And: return "&&"; + case HLSLBinaryOp_Or: return "||"; + case HLSLBinaryOp_Add: return "+"; + case HLSLBinaryOp_Sub: return "-"; + case HLSLBinaryOp_Mul: return "*"; + case HLSLBinaryOp_Div: return "/"; + case HLSLBinaryOp_Mod: return "%"; + case HLSLBinaryOp_Less: return "<"; + case HLSLBinaryOp_Greater: return ">"; + case HLSLBinaryOp_LessEqual: return "<="; + case HLSLBinaryOp_GreaterEqual: return ">="; + case HLSLBinaryOp_Equal: return "=="; + case HLSLBinaryOp_NotEqual: return "!="; + case HLSLBinaryOp_BitAnd: return "&"; + case HLSLBinaryOp_BitOr: return "|"; + case HLSLBinaryOp_BitXor: return "^"; + case HLSLBinaryOp_Assign: return "="; + case HLSLBinaryOp_AddAssign: return "+="; + case HLSLBinaryOp_SubAssign: return "-="; + case HLSLBinaryOp_MulAssign: return "*="; + case HLSLBinaryOp_DivAssign: return "/="; + default: + ASSERT(0); + return "???"; + } +} + + +/* + * 1.) Match + * 2.) Scalar dimension promotion (scalar -> vector/matrix) + * 3.) Conversion + * 4.) Conversion + scalar dimension promotion + * 5.) Truncation (vector -> scalar or lower component vector, matrix -> scalar or lower component matrix) + * 6.) Conversion + truncation + */ +static int GetTypeCastRank(HLSLTree * tree, const HLSLType& srcType, const HLSLType& dstType) +{ + /*if (srcType.array != dstType.array || srcType.arraySize != dstType.arraySize) + { + return -1; + }*/ + + if (srcType.array != dstType.array) + { + return -1; + } + + if (srcType.array == true) + { + ASSERT(dstType.array == true); + int srcArraySize = -1; + int dstArraySize = -1; + + tree->GetExpressionValue(srcType.arraySize, srcArraySize); + tree->GetExpressionValue(dstType.arraySize, dstArraySize); + + if (srcArraySize != dstArraySize) { + return -1; + } + } + + if (srcType.baseType == HLSLBaseType_UserDefined && dstType.baseType == HLSLBaseType_UserDefined) + { + return strcmp(srcType.typeName, dstType.typeName) == 0 ? 0 : -1; + } + + if (srcType.baseType == dstType.baseType) + { + if (IsSamplerType(srcType.baseType)) + { + return srcType.samplerType == dstType.samplerType ? 0 : -1; + } + + return 0; + } + + const BaseTypeDescription& srcDesc = baseTypeDescriptions[srcType.baseType]; + const BaseTypeDescription& dstDesc = baseTypeDescriptions[dstType.baseType]; + if (srcDesc.numericType == NumericType_NaN || dstDesc.numericType == NumericType_NaN) + { + return -1; + } + + // Result bits: T R R R P H C (T = truncation, R = conversion rank, P = dimension promotion, H = height promotion, C = component promotion) + int result = _numberTypeRank[srcDesc.numericType][dstDesc.numericType] << 3; + + if (srcDesc.numDimensions == 0 && dstDesc.numDimensions > 0) + { + // Scalar dimension promotion + result |= (1 << 2); + } + else if ((srcDesc.numDimensions == dstDesc.numDimensions && (srcDesc.numComponents > dstDesc.numComponents || srcDesc.height > dstDesc.height)) || + (srcDesc.numDimensions > 0 && dstDesc.numDimensions == 0)) + { + // Truncation + result |= (1 << 6); + } + else if (srcDesc.numDimensions != dstDesc.numDimensions) + { + // Can't convert + return -1; + } + else if (srcDesc.height != dstDesc.height) + { + // Scalar height promotion + result |= (1 << 1); + } + else if (srcDesc.numComponents != dstDesc.numComponents) + { + // Scalar components promotion + result |= (1 << 0); + } + + return result; + +} + +static bool GetFunctionCallCastRanks(HLSLTree* tree, const HLSLFunctionCall* call, const HLSLFunction* function, int* rankBuffer) +{ + + if (function == NULL || function->numArguments < call->numArguments) + { + // Function not viable + return false; + } + + const HLSLExpression* expression = call->argument; + const HLSLArgument* argument = function->argument; + + for (int i = 0; i < call->numArguments; ++i) + { + int rank = GetTypeCastRank(tree, expression->expressionType, argument->type); + if (rank == -1) + { + return false; + } + + rankBuffer[i] = rank; + + argument = argument->nextArgument; + expression = expression->nextExpression; + } + + for (int i = call->numArguments; i < function->numArguments; ++i) + { + if (argument->defaultValue == NULL) + { + // Function not viable. + return false; + } + } + + return true; + +} + +struct CompareRanks +{ + bool operator() (const int& rank1, const int& rank2) { return rank1 > rank2; } +}; + +static CompareFunctionsResult CompareFunctions(HLSLTree* tree, const HLSLFunctionCall* call, const HLSLFunction* function1, const HLSLFunction* function2) +{ + + int* function1Ranks = static_cast(alloca(sizeof(int) * call->numArguments)); + int* function2Ranks = static_cast(alloca(sizeof(int) * call->numArguments)); + + const bool function1Viable = GetFunctionCallCastRanks(tree, call, function1, function1Ranks); + const bool function2Viable = GetFunctionCallCastRanks(tree, call, function2, function2Ranks); + + // Both functions have to be viable to be able to compare them + if (!(function1Viable && function2Viable)) + { + if (function1Viable) + { + return Function1Better; + } + else if (function2Viable) + { + return Function2Better; + } + else + { + return FunctionsEqual; + } + } + + std::sort(function1Ranks, function1Ranks + call->numArguments, CompareRanks()); + std::sort(function2Ranks, function2Ranks + call->numArguments, CompareRanks()); + + for (int i = 0; i < call->numArguments; ++i) + { + if (function1Ranks[i] < function2Ranks[i]) + { + return Function1Better; + } + else if (function2Ranks[i] < function1Ranks[i]) + { + return Function2Better; + } + } + +// // Dump matched function argument types +// std::string arg1; +// std::string arg2; +// const HLSLArgument* argument1 = function1->argument; +// const HLSLArgument* argument2 = function2->argument; +// for (int i = 0; i < call->numArguments; ++i) +// { +// arg1 += GetTypeName(argument1->type); +// arg1 += " "; +// arg2 += GetTypeName(argument2->type); +// arg2 += " "; + +// argument1 = argument1->nextArgument; +// argument2 = argument2->nextArgument; +// } + +// std::cout << "(" << arg1 << ") vs (" << arg2 << ")" << std::endl; + + + return FunctionsEqual; + +} + +static bool GetBinaryOpResultType(HLSLBinaryOp binaryOp, const HLSLType& type1, const HLSLType& type2, HLSLType& result) +{ + + if (type1.baseType < HLSLBaseType_FirstNumeric || type1.baseType > HLSLBaseType_LastNumeric || type1.array || + type2.baseType < HLSLBaseType_FirstNumeric || type2.baseType > HLSLBaseType_LastNumeric || type2.array) + { + return false; + } + + if (binaryOp == HLSLBinaryOp_BitAnd || binaryOp == HLSLBinaryOp_BitOr || binaryOp == HLSLBinaryOp_BitXor) + { + if (type1.baseType < HLSLBaseType_FirstInteger || type1.baseType > HLSLBaseType_LastInteger) + { + return false; + } + } + + switch (binaryOp) + { + case HLSLBinaryOp_And: + case HLSLBinaryOp_Or: + case HLSLBinaryOp_Less: + case HLSLBinaryOp_Greater: + case HLSLBinaryOp_LessEqual: + case HLSLBinaryOp_GreaterEqual: + case HLSLBinaryOp_Equal: + case HLSLBinaryOp_NotEqual: + { + int numComponents = std::max( baseTypeDescriptions[ type1.baseType ].numComponents, baseTypeDescriptions[ type2.baseType ].numComponents ); + result.baseType = HLSLBaseType( HLSLBaseType_Bool + numComponents - 1 ); + break; + } + default: + result.baseType = _binaryOpTypeLookup[type1.baseType - HLSLBaseType_FirstNumeric][type2.baseType - HLSLBaseType_FirstNumeric]; + break; + } + + result.typeName = NULL; + result.array = false; + result.arraySize = NULL; + result.flags = (type1.flags & type2.flags) & HLSLTypeFlag_Const; // Propagate constness. + + return result.baseType != HLSLBaseType_Unknown; + +} + +HLSLParser::HLSLParser(Allocator* allocator, HLSLTree* tree) : + m_userTypes(allocator), + m_variables(allocator), + m_functions(allocator), + m_macros(allocator) +{ + m_numGlobals = 0; + m_tree = tree; +} + +bool HLSLParser::Accept(int token) +{ + if (m_tokenizer.GetToken() == token) + { + m_tokenizer.Next(); + return true; + } + return false; +} + +bool HLSLParser::Accept(const char* token) +{ + if (m_tokenizer.GetToken() == HLSLToken_Identifier && String_Equal( token, m_tokenizer.GetIdentifier() ) ) + { + m_tokenizer.Next(); + return true; + } + return false; +} + +bool HLSLParser::Expect(int token) +{ + if (!Accept(token)) + { + char want[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(token, want); + char near[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(near); + m_tokenizer.Error("Syntax error: expected '%s' near '%s'", want, near); + return false; + } + return true; +} + +bool HLSLParser::Expect(const char * token) +{ + if (!Accept(token)) + { + const char * want = token; + char near[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(near); + m_tokenizer.Error("Syntax error: expected '%s' near '%s'", want, near); + return false; + } + return true; +} + + +bool HLSLParser::AcceptIdentifier(const char*& identifier) +{ + if (m_tokenizer.GetToken() == HLSLToken_Identifier) + { + identifier = m_tree->AddString( m_tokenizer.GetIdentifier() ); + m_tokenizer.Next(); + return true; + } + return false; +} + +bool HLSLParser::ExpectIdentifier(const char*& identifier) +{ + if (!AcceptIdentifier(identifier)) + { + char near[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(near); + m_tokenizer.Error("Syntax error: expected identifier near '%s'", near); + identifier = ""; + return false; + } + return true; +} + +bool HLSLParser::AcceptFloat(float& value) +{ + if (m_tokenizer.GetToken() == HLSLToken_FloatLiteral) + { + value = m_tokenizer.GetFloat(); + m_tokenizer.Next(); + return true; + } + return false; +} + +bool HLSLParser::AcceptInt(int& value) +{ + if (m_tokenizer.GetToken() == HLSLToken_IntLiteral) + { + value = m_tokenizer.GetInt(); + m_tokenizer.Next(); + return true; + } + return false; +} + +bool HLSLParser::ParseTopLevel(HLSLStatement*& statement) +{ + HLSLAttribute * attributes = NULL; + ParseAttributeBlock(attributes); + + int line = GetLineNumber(); + const char* fileName = GetFileName(); + + HLSLType type; + //HLSLBaseType type; + //const char* typeName = NULL; + //int typeFlags = false; + + bool doesNotExpectSemicolon = false; + + if (Accept(HLSLToken_Struct)) + { + // Struct declaration. + + const char* structName = NULL; + if (!ExpectIdentifier(structName)) + { + return false; + } + if (FindUserDefinedType(structName) != NULL) + { + m_tokenizer.Error("struct %s already defined", structName); + return false; + } + + if (!Expect('{')) + { + return false; + } + + HLSLStruct* structure = m_tree->AddNode(fileName, line); + structure->name = structName; + + m_userTypes.PushBack(structure); + + HLSLStructField* lastField = NULL; + + // Add the struct to our list of user defined types. + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + HLSLStructField* field = NULL; + if (!ParseFieldDeclaration(field)) + { + return false; + } + ASSERT(field != NULL); + if (lastField == NULL) + { + structure->field = field; + } + else + { + lastField->nextField = field; + } + lastField = field; + } + + statement = structure; + } + else if (Accept(HLSLToken_CBuffer) || Accept(HLSLToken_TBuffer)) + { + // cbuffer/tbuffer declaration. + + HLSLBuffer* buffer = m_tree->AddNode(fileName, line); + AcceptIdentifier(buffer->name); + + // Optional register assignment. + if (Accept(':')) + { + if (!Expect(HLSLToken_Register) || !Expect('(') || !ExpectIdentifier(buffer->registerName) || !Expect(')')) + { + return false; + } + // TODO: Check that we aren't re-using a register. + } + + // Fields. + if (!Expect('{')) + { + return false; + } + HLSLDeclaration* lastField = NULL; + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + HLSLDeclaration* field = NULL; + if (!ParseDeclaration(field)) + { + m_tokenizer.Error("Expected variable declaration"); + return false; + } + DeclareVariable( field->name, field->type ); + field->buffer = buffer; + if (buffer->field == NULL) + { + buffer->field = field; + } + else + { + lastField->nextStatement = field; + } + lastField = field; + + if (!Expect(';')) { + return false; + } + } + + statement = buffer; + } + else if (AcceptType(true, type)) + { + // Global declaration (uniform or function). + const char* globalName = NULL; + if (!ExpectIdentifier(globalName)) + { + return false; + } + + if (Accept('(')) + { + // Function declaration. + + HLSLFunction* function = m_tree->AddNode(fileName, line); + function->name = globalName; + function->returnType.baseType = type.baseType; + function->returnType.typeName = type.typeName; + function->attributes = attributes; + + BeginScope(); + + if (!ParseArgumentList(function->argument, function->numArguments, function->numOutputArguments)) + { + return false; + } + + const HLSLFunction* declaration = FindFunction(function); + + // Forward declaration + if (Accept(';')) + { + // Add a function entry so that calls can refer to it + if (!declaration) + { + m_functions.PushBack( function ); + statement = function; + } + EndScope(); + return true; + } + + // Optional semantic. + if (Accept(':') && !ExpectIdentifier(function->semantic)) + { + return false; + } + + if (declaration) + { + if (declaration->forward || declaration->statement) + { + m_tokenizer.Error("Duplicate function definition"); + return false; + } + + const_cast(declaration)->forward = function; + } + else + { + m_functions.PushBack( function ); + } + + if (!Expect('{') || !ParseBlock(function->statement, function->returnType)) + { + return false; + } + + EndScope(); + + // Note, no semi-colon at the end of a function declaration. + statement = function; + + return true; + } + else + { + HLSLDeclaration * firstDeclaration = NULL; + HLSLDeclaration * lastDeclaration = NULL; + + do { + if (firstDeclaration != NULL) { + if (!ExpectIdentifier(globalName)) + { + return false; + } + } + + // Uniform declaration. + HLSLDeclaration* declaration = m_tree->AddNode(fileName, line); + declaration->name = globalName; + declaration->type = type; + + // Handle array syntax. + if (Accept('[')) + { + if (!Accept(']')) + { + if (!ParseExpression(declaration->type.arraySize) || !Expect(']')) + { + return false; + } + } + declaration->type.array = true; + } + + // Handle optional register. + if (Accept(':')) + { + // @@ Currently we support either a semantic or a register, but not both. + if (AcceptIdentifier(declaration->semantic)) { + int k = 1; + } + else if (!Expect(HLSLToken_Register) || !Expect('(') || !ExpectIdentifier(declaration->registerName) || !Expect(')')) + { + return false; + } + } + + DeclareVariable( globalName, declaration->type ); + + if (!ParseDeclarationAssignment(declaration)) + { + return false; + } + if (firstDeclaration == NULL) firstDeclaration = declaration; + if (lastDeclaration != NULL) lastDeclaration->nextDeclaration = declaration; + lastDeclaration = declaration; + + } while(Accept(',')); + + statement = firstDeclaration; + } + } + else if (ParseTechnique(statement)) { + doesNotExpectSemicolon = true; + } + else if (ParsePipeline(statement)) { + doesNotExpectSemicolon = true; + } + else if (ParseStage(statement)) { + doesNotExpectSemicolon = true; + } + + if (statement != NULL) { + statement->attributes = attributes; + } + + return doesNotExpectSemicolon || Expect(';'); +} + +bool HLSLParser::ParseStatementOrBlock(HLSLStatement*& firstStatement, const HLSLType& returnType, bool scoped/*=true*/) +{ + if (scoped) + { + BeginScope(); + } + if (Accept('{')) + { + if (!ParseBlock(firstStatement, returnType)) + { + return false; + } + } + else + { + if (!ParseStatement(firstStatement, returnType)) + { + return false; + } + } + if (scoped) + { + EndScope(); + } + return true; +} + +bool HLSLParser::ParseBlock(HLSLStatement*& firstStatement, const HLSLType& returnType) +{ + HLSLStatement* lastStatement = NULL; + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + HLSLStatement* statement = NULL; + if (!ParseStatement(statement, returnType)) + { + return false; + } + if (statement != NULL) + { + if (firstStatement == NULL) + { + firstStatement = statement; + } + else + { + lastStatement->nextStatement = statement; + } + lastStatement = statement; + while (lastStatement->nextStatement) lastStatement = lastStatement->nextStatement; + } + } + return true; +} + +bool HLSLParser::ParseStatement(HLSLStatement*& statement, const HLSLType& returnType) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + // Empty statements. + if (Accept(';')) + { + return true; + } + + HLSLAttribute * attributes = NULL; + ParseAttributeBlock(attributes); // @@ Leak if not assigned to node? + +#if 0 // @@ Work in progress. + // Static statements: @if only for now. + if (Accept('@')) + { + if (Accept(HLSLToken_If)) + { + //HLSLIfStatement* ifStatement = m_tree->AddNode(fileName, line); + //ifStatement->isStatic = true; + //ifStatement->attributes = attributes; + + HLSLExpression * condition = NULL; + + m_allowUndeclaredIdentifiers = true; // Not really correct... better to push to stack? + if (!Expect('(') || !ParseExpression(condition) || !Expect(')')) + { + m_allowUndeclaredIdentifiers = false; + return false; + } + m_allowUndeclaredIdentifiers = false; + + if ((condition->expressionType.flags & HLSLTypeFlag_Const) == 0) + { + m_tokenizer.Error("Syntax error: @if condition is not constant"); + return false; + } + + int conditionValue; + if (!m_tree->GetExpressionValue(condition, conditionValue)) + { + m_tokenizer.Error("Syntax error: Cannot evaluate @if condition"); + return false; + } + + if (!conditionValue) m_disableSemanticValidation = true; + + HLSLStatement * ifStatements = NULL; + HLSLStatement * elseStatements = NULL; + + if (!ParseStatementOrBlock(ifStatements, returnType, /*scoped=*/false)) + { + m_disableSemanticValidation = false; + return false; + } + if (Accept(HLSLToken_Else)) + { + if (conditionValue) m_disableSemanticValidation = true; + + if (!ParseStatementOrBlock(elseStatements, returnType, /*scoped=*/false)) + { + m_disableSemanticValidation = false; + return false; + } + } + m_disableSemanticValidation = false; + + if (conditionValue) statement = ifStatements; + else statement = elseStatements; + + // @@ Free the pruned statements? + + return true; + } + else { + m_tokenizer.Error("Syntax error: unexpected token '@'"); + } + } +#endif + + // If statement. + if (Accept(HLSLToken_If)) + { + HLSLIfStatement* ifStatement = m_tree->AddNode(fileName, line); + ifStatement->attributes = attributes; + if (!Expect('(') || !ParseExpression(ifStatement->condition) || !Expect(')')) + { + return false; + } + statement = ifStatement; + if (!ParseStatementOrBlock(ifStatement->statement, returnType)) + { + return false; + } + if (Accept(HLSLToken_Else)) + { + return ParseStatementOrBlock(ifStatement->elseStatement, returnType); + } + return true; + } + + // For statement. + if (Accept(HLSLToken_For)) + { + HLSLForStatement* forStatement = m_tree->AddNode(fileName, line); + forStatement->attributes = attributes; + if (!Expect('(')) + { + return false; + } + BeginScope(); + if (!ParseDeclaration(forStatement->initialization) && !ParseExpression(forStatement->initializationWithoutType)) + { + return false; + } + if (!Expect(';')) + { + return false; + } + ParseExpression(forStatement->condition); + if (!Expect(';')) + { + return false; + } + ParseExpression(forStatement->increment); + if (!Expect(')')) + { + return false; + } + statement = forStatement; + if (!ParseStatementOrBlock(forStatement->statement, returnType)) + { + return false; + } + EndScope(); + return true; + } + + // While statement. + if (Accept(HLSLToken_While)) + { + HLSLWhileStatement* whileStatement = m_tree->AddNode(fileName, line); + whileStatement->attributes = attributes; + if (!Expect('(') || !ParseExpression(whileStatement->condition) || !Expect(')')) + { + return false; + } + statement = whileStatement; + if (!ParseStatementOrBlock(whileStatement->statement, returnType)) + { + return false; + } + return true; + } + + + if (attributes != NULL) + { + // @@ Error. Unexpected attribute. We only support attributes associated to if and for statements. + } + + // Block statement. + if (Accept('{')) + { + HLSLBlockStatement* blockStatement = m_tree->AddNode(fileName, line); + statement = blockStatement; + BeginScope(); + bool success = ParseBlock(blockStatement->statement, returnType); + EndScope(); + return success; + } + + // Discard statement. + if (Accept(HLSLToken_Discard)) + { + HLSLDiscardStatement* discardStatement = m_tree->AddNode(fileName, line); + statement = discardStatement; + return Expect(';'); + } + + // Break statement. + if (Accept(HLSLToken_Break)) + { + HLSLBreakStatement* breakStatement = m_tree->AddNode(fileName, line); + statement = breakStatement; + return Expect(';'); + } + + // Continue statement. + if (Accept(HLSLToken_Continue)) + { + HLSLContinueStatement* continueStatement = m_tree->AddNode(fileName, line); + statement = continueStatement; + return Expect(';'); + } + + // Return statement + if (Accept(HLSLToken_Return)) + { + HLSLReturnStatement* returnStatement = m_tree->AddNode(fileName, line); + if (!Accept(';') && !ParseExpression(returnStatement->expression)) + { + return false; + } + // Check that the return expression can be cast to the return type of the function. + HLSLType voidType(HLSLBaseType_Void); + if (!CheckTypeCast(returnStatement->expression ? returnStatement->expression->expressionType : voidType, returnType)) + { + return false; + } + + statement = returnStatement; + return Expect(';'); + } + + HLSLDeclaration* declaration = NULL; + HLSLExpression* expression = NULL; + + if (ParseDeclaration(declaration)) + { + statement = declaration; + } + else if (ParseExpression(expression)) + { + HLSLExpressionStatement* expressionStatement; + expressionStatement = m_tree->AddNode(fileName, line); + expressionStatement->expression = expression; + statement = expressionStatement; + } + + // Some statements are separated by a colon instead of a semicolon + if (Accept(',')) { + return true; + } + + return Expect(';'); +} + + +// IC: This is only used in block statements, or within control flow statements. So, it doesn't support semantics or layout modifiers. +// @@ We should add suport for semantics for inline input/output declarations. +bool HLSLParser::ParseDeclaration(HLSLDeclaration*& declaration) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + HLSLType type; + if (!AcceptType(/*allowVoid=*/false, type)) + { + return false; + } + + bool allowUnsizedArray = true; // @@ Really? + + HLSLDeclaration * firstDeclaration = NULL; + HLSLDeclaration * lastDeclaration = NULL; + + do { + const char* name; + if (!ExpectIdentifier(name)) + { + // TODO: false means we didn't accept a declaration and we had an error! + return false; + } + // Handle array syntax. + if (Accept('[')) + { + type.array = true; + // Optionally allow no size to the specified for the array. + if (Accept(']') && allowUnsizedArray) + { + return true; + } + if (!ParseExpression(type.arraySize) || !Expect(']')) + { + return false; + } + } + + HLSLDeclaration * declaration = m_tree->AddNode(fileName, line); + declaration->type = type; + declaration->name = name; + + DeclareVariable( declaration->name, declaration->type ); + + // Handle option assignment of the declared variables(s). + if (!ParseDeclarationAssignment( declaration )) { + return false; + } + + if (firstDeclaration == NULL) firstDeclaration = declaration; + if (lastDeclaration != NULL) lastDeclaration->nextDeclaration = declaration; + lastDeclaration = declaration; + + } while(Accept(',')); + + declaration = firstDeclaration; + + return true; +} + +bool HLSLParser::ParseDeclarationAssignment(HLSLDeclaration* declaration) +{ + if (Accept('=')) + { + // Handle array initialization syntax. + if (declaration->type.array) + { + int numValues = 0; + if (!Expect('{') || !ParseExpressionList('}', true, declaration->assignment, numValues)) + { + return false; + } + } + else if (IsSamplerType(declaration->type.baseType)) + { + if (!ParseSamplerState(declaration->assignment)) + { + return false; + } + } + else if (!ParseExpression(declaration->assignment)) + { + return false; + } + } + return true; +} + +bool HLSLParser::ParseFieldDeclaration(HLSLStructField*& field) +{ + field = m_tree->AddNode( GetFileName(), GetLineNumber() ); + if (!ExpectDeclaration(false, field->type, field->name)) + { + return false; + } + // Handle optional semantics. + if (Accept(':')) + { + if (!ExpectIdentifier(field->semantic)) + { + return false; + } + } + return Expect(';'); +} + +// @@ Add support for packoffset to general declarations. +/*bool HLSLParser::ParseBufferFieldDeclaration(HLSLBufferField*& field) +{ + field = m_tree->AddNode( GetFileName(), GetLineNumber() ); + if (AcceptDeclaration(false, field->type, field->name)) + { + // Handle optional packoffset. + if (Accept(':')) + { + if (!Expect("packoffset")) + { + return false; + } + const char* constantName = NULL; + const char* swizzleMask = NULL; + if (!Expect('(') || !ExpectIdentifier(constantName) || !Expect('.') || !ExpectIdentifier(swizzleMask) || !Expect(')')) + { + return false; + } + } + return Expect(';'); + } + return false; +}*/ + +bool HLSLParser::CheckTypeCast(const HLSLType& srcType, const HLSLType& dstType) +{ + if (GetTypeCastRank(m_tree, srcType, dstType) == -1) + { + const char* srcTypeName = GetTypeName(srcType); + const char* dstTypeName = GetTypeName(dstType); + m_tokenizer.Error("Cannot implicitly convert from '%s' to '%s'", srcTypeName, dstTypeName); + return false; + } + return true; +} + +bool HLSLParser::ParseExpression(HLSLExpression*& expression) +{ + if (!ParseBinaryExpression(0, expression)) + { + return false; + } + + HLSLBinaryOp assignOp; + if (AcceptAssign(assignOp)) + { + HLSLExpression* expression2 = NULL; + if (!ParseExpression(expression2)) + { + return false; + } + HLSLBinaryExpression* binaryExpression = m_tree->AddNode(expression->fileName, expression->line); + binaryExpression->binaryOp = assignOp; + binaryExpression->expression1 = expression; + binaryExpression->expression2 = expression2; + // This type is not strictly correct, since the type should be a reference. + // However, for our usage of the types it should be sufficient. + binaryExpression->expressionType = expression->expressionType; + + if (!CheckTypeCast(expression2->expressionType, expression->expressionType)) + { + const char* srcTypeName = GetTypeName(expression2->expressionType); + const char* dstTypeName = GetTypeName(expression->expressionType); + m_tokenizer.Error("Cannot implicitly convert from '%s' to '%s'", srcTypeName, dstTypeName); + return false; + } + + expression = binaryExpression; + } + + return true; +} + +bool HLSLParser::AcceptBinaryOperator(int priority, HLSLBinaryOp& binaryOp) +{ + int token = m_tokenizer.GetToken(); + switch (token) + { + case HLSLToken_AndAnd: binaryOp = HLSLBinaryOp_And; break; + case HLSLToken_BarBar: binaryOp = HLSLBinaryOp_Or; break; + case '+': binaryOp = HLSLBinaryOp_Add; break; + case '-': binaryOp = HLSLBinaryOp_Sub; break; + case '*': binaryOp = HLSLBinaryOp_Mul; break; + case '/': binaryOp = HLSLBinaryOp_Div; break; + case '%': binaryOp = HLSLBinaryOp_Mod; break; + case '<': binaryOp = HLSLBinaryOp_Less; break; + case '>': binaryOp = HLSLBinaryOp_Greater; break; + case HLSLToken_LessEqual: binaryOp = HLSLBinaryOp_LessEqual; break; + case HLSLToken_GreaterEqual: binaryOp = HLSLBinaryOp_GreaterEqual; break; + case HLSLToken_EqualEqual: binaryOp = HLSLBinaryOp_Equal; break; + case HLSLToken_NotEqual: binaryOp = HLSLBinaryOp_NotEqual; break; + case '&': binaryOp = HLSLBinaryOp_BitAnd; break; + case '|': binaryOp = HLSLBinaryOp_BitOr; break; + case '^': binaryOp = HLSLBinaryOp_BitXor; break; + default: + return false; + } + if (_binaryOpPriority[binaryOp] > priority) + { + m_tokenizer.Next(); + return true; + } + return false; +} + +bool HLSLParser::AcceptUnaryOperator(bool pre, HLSLUnaryOp& unaryOp) +{ + int token = m_tokenizer.GetToken(); + if (token == HLSLToken_PlusPlus) + { + unaryOp = pre ? HLSLUnaryOp_PreIncrement : HLSLUnaryOp_PostIncrement; + } + else if (token == HLSLToken_MinusMinus) + { + unaryOp = pre ? HLSLUnaryOp_PreDecrement : HLSLUnaryOp_PostDecrement; + } + else if (pre && token == '-') + { + unaryOp = HLSLUnaryOp_Negative; + } + else if (pre && token == '+') + { + unaryOp = HLSLUnaryOp_Positive; + } + else if (pre && token == '!') + { + unaryOp = HLSLUnaryOp_Not; + } + else if (pre && token == '~') + { + unaryOp = HLSLUnaryOp_Not; + } + else + { + return false; + } + m_tokenizer.Next(); + return true; +} + +bool HLSLParser::AcceptAssign(HLSLBinaryOp& binaryOp) +{ + if (Accept('=')) + { + binaryOp = HLSLBinaryOp_Assign; + } + else if (Accept(HLSLToken_PlusEqual)) + { + binaryOp = HLSLBinaryOp_AddAssign; + } + else if (Accept(HLSLToken_MinusEqual)) + { + binaryOp = HLSLBinaryOp_SubAssign; + } + else if (Accept(HLSLToken_TimesEqual)) + { + binaryOp = HLSLBinaryOp_MulAssign; + } + else if (Accept(HLSLToken_DivideEqual)) + { + binaryOp = HLSLBinaryOp_DivAssign; + } + else + { + return false; + } + return true; +} + +bool HLSLParser::ParseBinaryExpression(int priority, HLSLExpression*& expression) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + char needsExpressionEndChar; + + if (!ParseTerminalExpression(expression, needsExpressionEndChar)) + { + return false; + } + + // reset priority cause openned parenthesis + if( needsExpressionEndChar != 0 ) + priority = 0; + + bool acceptBinaryOp = false; + while (1) + { + HLSLBinaryOp binaryOp; + if (acceptBinaryOp || AcceptBinaryOperator(priority, binaryOp)) + { + acceptBinaryOp = false; + HLSLExpression* expression2 = NULL; + ASSERT( binaryOp < sizeof(_binaryOpPriority) / sizeof(int) ); + if (!ParseBinaryExpression(_binaryOpPriority[binaryOp], expression2)) + { + return false; + } + HLSLBinaryExpression* binaryExpression = m_tree->AddNode(fileName, line); + binaryExpression->binaryOp = binaryOp; + binaryExpression->expression1 = expression; + binaryExpression->expression2 = expression2; + if (!GetBinaryOpResultType( binaryOp, expression->expressionType, expression2->expressionType, binaryExpression->expressionType )) + { + const char* typeName1 = GetTypeName( binaryExpression->expression1->expressionType ); + const char* typeName2 = GetTypeName( binaryExpression->expression2->expressionType ); + m_tokenizer.Error("binary '%s' : no global operator found which takes types '%s' and '%s' (or there is no acceptable conversion)", + GetBinaryOpName(binaryOp), typeName1, typeName2); + + return false; + } + + // Propagate constness. + binaryExpression->expressionType.flags = (expression->expressionType.flags | expression2->expressionType.flags) & HLSLTypeFlag_Const; + + expression = binaryExpression; + } + else if (_conditionalOpPriority > priority && Accept('?')) + { + + HLSLConditionalExpression* conditionalExpression = m_tree->AddNode(fileName, line); + conditionalExpression->condition = expression; + + HLSLExpression* expression1 = NULL; + HLSLExpression* expression2 = NULL; + if (!ParseBinaryExpression(_conditionalOpPriority, expression1) || !Expect(':') || !ParseBinaryExpression(_conditionalOpPriority, expression2)) + { + return false; + } + + // Make sure both cases have compatible types. + if (GetTypeCastRank(m_tree, expression1->expressionType, expression2->expressionType) == -1) + { + const char* srcTypeName = GetTypeName(expression2->expressionType); + const char* dstTypeName = GetTypeName(expression1->expressionType); + m_tokenizer.Error("':' no possible conversion from '%s' to '%s'", srcTypeName, dstTypeName); + return false; + } + + conditionalExpression->trueExpression = expression1; + conditionalExpression->falseExpression = expression2; + conditionalExpression->expressionType = expression1->expressionType; + + expression = conditionalExpression; + } + else + { + break; + } + + // First: try if next is a binary op before exiting the loop + if (AcceptBinaryOperator(priority, binaryOp)) + { + acceptBinaryOp = true; + continue; + } + + if( needsExpressionEndChar != 0 ) + { + if( !Expect(needsExpressionEndChar) ) + return false; + needsExpressionEndChar = 0; + } + } + + return needsExpressionEndChar == 0 || Expect(needsExpressionEndChar); +} + +bool HLSLParser::ParsePartialConstructor(HLSLExpression*& expression, HLSLBaseType type, const char* typeName) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + HLSLConstructorExpression* constructorExpression = m_tree->AddNode(fileName, line); + constructorExpression->type.baseType = type; + constructorExpression->type.typeName = typeName; + int numArguments = 0; + if (!ParseExpressionList(')', false, constructorExpression->argument, numArguments)) + { + return false; + } + constructorExpression->expressionType = constructorExpression->type; + constructorExpression->expressionType.flags = HLSLTypeFlag_Const; + expression = constructorExpression; + return true; +} + +bool HLSLParser::ParseTerminalExpression(HLSLExpression*& expression, char& needsExpressionEndChar) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + needsExpressionEndChar = 0; + + HLSLUnaryOp unaryOp; + if (AcceptUnaryOperator(true, unaryOp)) + { + HLSLUnaryExpression* unaryExpression = m_tree->AddNode(fileName, line); + unaryExpression->unaryOp = unaryOp; + if (!ParseTerminalExpression(unaryExpression->expression, needsExpressionEndChar)) + { + return false; + } + if (unaryOp == HLSLUnaryOp_BitNot) + { + if (unaryExpression->expression->expressionType.baseType < HLSLBaseType_FirstInteger || + unaryExpression->expression->expressionType.baseType > HLSLBaseType_LastInteger) + { + const char * typeName = GetTypeName(unaryExpression->expression->expressionType); + m_tokenizer.Error("unary '~' : no global operator found which takes type '%s' (or there is no acceptable conversion)", typeName); + return false; + } + } + if (unaryOp == HLSLUnaryOp_Not) + { + if (unaryExpression->expression->expressionType.baseType != HLSLBaseType_Bool) + { + // Insert a cast to bool + HLSLCastingExpression* castingExpression = m_tree->AddNode(fileName, line); + castingExpression->type.baseType = HLSLBaseType_Bool; + castingExpression->expression = unaryExpression->expression; + castingExpression->expressionType.baseType = HLSLBaseType_Bool; + + unaryExpression->expression = castingExpression; + expression = unaryExpression; + } + + unaryExpression->expressionType = HLSLType(HLSLBaseType_Bool); + + // Propagate constness. + unaryExpression->expressionType.flags = unaryExpression->expression->expressionType.flags & HLSLTypeFlag_Const; + } + + if (unaryOp == HLSLUnaryOp_Negative || unaryOp == HLSLUnaryOp_Positive) + { + if (unaryExpression->expression->expressionType.baseType <= HLSLBaseType_Bool4 && + unaryExpression->expression->expressionType.baseType >= HLSLBaseType_Bool) + { + // Insert a cast bool to int + int numComponents = baseTypeDescriptions[ unaryExpression->expression->expressionType.baseType ].numComponents; + HLSLBaseType baseType = HLSLBaseType( HLSLBaseType_Int + numComponents - 1 ); + + unaryExpression->expressionType = unaryExpression->expression->expressionType; + + HLSLCastingExpression* castingExpression = m_tree->AddNode(fileName, line); + castingExpression->type.baseType = baseType; + castingExpression->expression = unaryExpression->expression; + castingExpression->expressionType.baseType = baseType; + + unaryExpression->expression = castingExpression; + expression = unaryExpression; + } + else + { + unaryExpression->expressionType = unaryExpression->expression->expressionType; + } + } + else + { + unaryExpression->expressionType = unaryExpression->expression->expressionType; + } + expression = unaryExpression; + return true; + } + + // Expressions inside parenthesis or casts. + char expressionEndChar = 0; + if (Accept('(')) + { + expressionEndChar = ')'; + } + else if (Accept('{')) + { + expressionEndChar = '}'; + } + + + if (expressionEndChar != 0) + { + // Check for a casting operator. + HLSLType type; + if (AcceptType(false, type)) + { + // This is actually a type constructor like (float2(... + if (Accept('(')) + { + needsExpressionEndChar = expressionEndChar; + return ParsePartialConstructor(expression, type.baseType, type.typeName); + } + HLSLCastingExpression* castingExpression = m_tree->AddNode(fileName, line); + castingExpression->type = type; + expression = castingExpression; + castingExpression->expressionType = type; + return Expect(')') && ParseExpression(castingExpression->expression); + } + + int numArguments = 0; + if (!ParseExpressionList(expressionEndChar, false, expression, numArguments)) + { + return false; + } + + if (expressionEndChar == ')') + { + // Allows comma separated expression lists, HLSL compiler keeps the last one + HLSLExpression* lastExpression = expression; + while(lastExpression->nextExpression != NULL) { + lastExpression = lastExpression->nextExpression; + } + } + } + else + { + // Terminal values. + float fValue = 0.0f; + int iValue = 0; + + if (AcceptFloat(fValue)) + { + HLSLLiteralExpression* literalExpression = m_tree->AddNode(fileName, line); + literalExpression->type = HLSLBaseType_Float; + literalExpression->fValue = fValue; + literalExpression->expressionType.baseType = literalExpression->type; + literalExpression->expressionType.flags = HLSLTypeFlag_Const; + expression = literalExpression; + return true; + } + else if (AcceptInt(iValue)) + { + HLSLLiteralExpression* literalExpression = m_tree->AddNode(fileName, line); + literalExpression->type = HLSLBaseType_Int; + literalExpression->iValue = iValue; + literalExpression->expressionType.baseType = literalExpression->type; + literalExpression->expressionType.flags = HLSLTypeFlag_Const; + expression = literalExpression; + return true; + } + else if (Accept(HLSLToken_True)) + { + HLSLLiteralExpression* literalExpression = m_tree->AddNode(fileName, line); + literalExpression->type = HLSLBaseType_Bool; + literalExpression->bValue = true; + literalExpression->expressionType.baseType = literalExpression->type; + literalExpression->expressionType.flags = HLSLTypeFlag_Const; + expression = literalExpression; + return true; + } + else if (Accept(HLSLToken_False)) + { + HLSLLiteralExpression* literalExpression = m_tree->AddNode(fileName, line); + literalExpression->type = HLSLBaseType_Bool; + literalExpression->bValue = false; + literalExpression->expressionType.baseType = literalExpression->type; + literalExpression->expressionType.flags = HLSLTypeFlag_Const; + expression = literalExpression; + return true; + } + + // Type constructor. + HLSLType type; + if (AcceptType(/*allowVoid=*/false, type)) + { + Expect('('); + if (!ParsePartialConstructor(expression, type.baseType, type.typeName)) + { + return false; + } + } + else + { + HLSLIdentifierExpression* identifierExpression = m_tree->AddNode(fileName, line); + if (!ExpectIdentifier(identifierExpression->name)) + { + return false; + } + + bool undeclaredIdentifier = false; + + const HLSLType* identifierType = FindVariable(identifierExpression->name, identifierExpression->global); + if (identifierType != NULL) + { + identifierExpression->expressionType = *identifierType; + } + else + { + if (GetIsFunction(identifierExpression->name)) + { + // Functions are always global scope. + identifierExpression->global = true; + } + else + { + undeclaredIdentifier = true; + } + } + + if (undeclaredIdentifier) + { + if (m_allowUndeclaredIdentifiers) + { + HLSLLiteralExpression* literalExpression = m_tree->AddNode(fileName, line); + literalExpression->bValue = false; + literalExpression->type = HLSLBaseType_Bool; + literalExpression->expressionType.baseType = literalExpression->type; + literalExpression->expressionType.flags = HLSLTypeFlag_Const; + expression = literalExpression; + } + else + { + m_tokenizer.Error("Undeclared identifier '%s'", identifierExpression->name); + return false; + } + } + else { + expression = identifierExpression; + } + } + } + + bool done = false; + while (!done) + { + done = true; + + // Post fix unary operator + HLSLUnaryOp unaryOp; + while (AcceptUnaryOperator(false, unaryOp)) + { + HLSLUnaryExpression* unaryExpression = m_tree->AddNode(fileName, line); + unaryExpression->unaryOp = unaryOp; + unaryExpression->expression = expression; + unaryExpression->expressionType = unaryExpression->expression->expressionType; + expression = unaryExpression; + done = false; + } + + // Member access operator. + while (Accept('.')) + { + HLSLMemberAccess* memberAccess = m_tree->AddNode(fileName, line); + memberAccess->object = expression; + if (!ExpectIdentifier(memberAccess->field)) + { + return false; + } + if (!GetMemberType( expression->expressionType, memberAccess)) + { + m_tokenizer.Error("Couldn't access '%s'", memberAccess->field); + return false; + } + expression = memberAccess; + done = false; + } + + // Handle array access. + while (Accept('[')) + { + HLSLArrayAccess* arrayAccess = m_tree->AddNode(fileName, line); + arrayAccess->array = expression; + if (!ParseExpression(arrayAccess->index) || !Expect(']')) + { + return false; + } + + if (expression->expressionType.array) + { + arrayAccess->expressionType = expression->expressionType; + arrayAccess->expressionType.array = false; + arrayAccess->expressionType.arraySize = NULL; + } + else + { + switch (expression->expressionType.baseType) + { + case HLSLBaseType_Float2: + case HLSLBaseType_Float3: + case HLSLBaseType_Float4: + arrayAccess->expressionType.baseType = HLSLBaseType_Float; + break; + case HLSLBaseType_Float4x4: + case HLSLBaseType_Float3x4: + case HLSLBaseType_Float2x4: + arrayAccess->expressionType.baseType = HLSLBaseType_Float4; + break; + case HLSLBaseType_Float4x3: + case HLSLBaseType_Float3x3: + case HLSLBaseType_Float2x3: + arrayAccess->expressionType.baseType = HLSLBaseType_Float3; + break; + case HLSLBaseType_Float4x2: + case HLSLBaseType_Float3x2: + case HLSLBaseType_Float2x2: + arrayAccess->expressionType.baseType = HLSLBaseType_Float2; + break; + case HLSLBaseType_Bool2: + case HLSLBaseType_Bool3: + case HLSLBaseType_Bool4: + arrayAccess->expressionType.baseType = HLSLBaseType_Bool; + break; + case HLSLBaseType_Int2: + case HLSLBaseType_Int3: + case HLSLBaseType_Int4: + arrayAccess->expressionType.baseType = HLSLBaseType_Int; + break; + case HLSLBaseType_Uint2: + case HLSLBaseType_Uint3: + case HLSLBaseType_Uint4: + arrayAccess->expressionType.baseType = HLSLBaseType_Uint; + break; + default: + m_tokenizer.Error("array, matrix, vector, or indexable object type expected in index expression"); + return false; + } + } + + expression = arrayAccess; + done = false; + } + + // Handle function calls. Note, HLSL functions aren't like C function + // pointers -- we can only directly call on an identifier, not on an + // expression. + if (Accept('(')) + { + HLSLFunctionCall* functionCall = m_tree->AddNode(fileName, line); + done = false; + if (!ParseExpressionList(')', false, functionCall->argument, functionCall->numArguments)) + { + return false; + } + + if (expression->nodeType != HLSLNodeType_IdentifierExpression) + { + m_tokenizer.Error("Expected function identifier"); + return false; + } + + const HLSLIdentifierExpression* identifierExpression = static_cast(expression); + const HLSLFunction* function = MatchFunctionCall( functionCall, identifierExpression->name ); + if (function == NULL) + { + return false; + } + + functionCall->function = function; + functionCall->expressionType = function->returnType; + expression = functionCall; + } + + } + return true; + +} + +bool HLSLParser::ParseExpressionList(int endToken, bool allowEmptyEnd, HLSLExpression*& firstExpression, int& numExpressions) +{ + numExpressions = 0; + HLSLExpression* lastExpression = NULL; + while (!Accept(endToken)) + { + if (CheckForUnexpectedEndOfStream(endToken)) + { + return false; + } + if (numExpressions > 0 && !Expect(',')) + { + return false; + } + // It is acceptable for the final element in the initialization list to + // have a trailing comma in some cases, like array initialization such as {1, 2, 3,} + if (allowEmptyEnd && Accept(endToken)) + { + break; + } + HLSLExpression* expression = NULL; + if (!ParseExpression(expression)) + { + return false; + } + if (firstExpression == NULL) + { + firstExpression = expression; + } + else + { + lastExpression->nextExpression = expression; + } + lastExpression = expression; + ++numExpressions; + } + return true; +} + +bool HLSLParser::ParseArgumentList(HLSLArgument*& firstArgument, int& numArguments, int& numOutputArguments) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + HLSLArgument* lastArgument = NULL; + numArguments = 0; + + while (!Accept(')')) + { + if (CheckForUnexpectedEndOfStream(')')) + { + return false; + } + if (numArguments > 0 && !Expect(',')) + { + return false; + } + + HLSLArgument* argument = m_tree->AddNode(fileName, line); + + if (Accept(HLSLToken_Uniform)) { argument->modifier = HLSLArgumentModifier_Uniform; } + else if (Accept(HLSLToken_In)) { argument->modifier = HLSLArgumentModifier_In; } + else if (Accept(HLSLToken_Out)) { argument->modifier = HLSLArgumentModifier_Out; } + else if (Accept(HLSLToken_InOut)) { argument->modifier = HLSLArgumentModifier_Inout; } + else if (Accept(HLSLToken_Const)) { argument->modifier = HLSLArgumentModifier_Const; } + + if (!ExpectDeclaration(/*allowUnsizedArray=*/true, argument->type, argument->name)) + { + return false; + } + + DeclareVariable( argument->name, argument->type ); + + // Optional semantic. + if (Accept(':') && !ExpectIdentifier(argument->semantic)) + { + return false; + } + + if (Accept('=') && !ParseExpression(argument->defaultValue)) + { + // @@ Print error! + return false; + } + + if (lastArgument != NULL) + { + lastArgument->nextArgument = argument; + } + else + { + firstArgument = argument; + } + lastArgument = argument; + + ++numArguments; + if (argument->modifier == HLSLArgumentModifier_Out || argument->modifier == HLSLArgumentModifier_Inout) + { + ++numOutputArguments; + } + } + return true; +} + + +bool HLSLParser::ParseSamplerState(HLSLExpression*& expression) +{ + if (!Expect(HLSLToken_SamplerState)) + { + return false; + } + + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + HLSLSamplerState* samplerState = m_tree->AddNode(fileName, line); + + if (!Expect('{')) + { + return false; + } + + HLSLStateAssignment* lastStateAssignment = NULL; + + // Parse state assignments. + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + + HLSLStateAssignment* stateAssignment = NULL; + if (!ParseStateAssignment(stateAssignment, /*isSamplerState=*/true, /*isPipeline=*/false)) + { + return false; + } + ASSERT(stateAssignment != NULL); + if (lastStateAssignment == NULL) + { + samplerState->stateAssignments = stateAssignment; + } + else + { + lastStateAssignment->nextStateAssignment = stateAssignment; + } + lastStateAssignment = stateAssignment; + samplerState->numStateAssignments++; + } + + expression = samplerState; + return true; +} + +bool HLSLParser::ParseTechnique(HLSLStatement*& statement) +{ + if (!Accept(HLSLToken_Technique)) { + return false; + } + + const char* techniqueName = NULL; + if (!ExpectIdentifier(techniqueName)) + { + return false; + } + + if (!Expect('{')) + { + return false; + } + + HLSLTechnique* technique = m_tree->AddNode(GetFileName(), GetLineNumber()); + technique->name = techniqueName; + + //m_techniques.PushBack(technique); + + HLSLPass* lastPass = NULL; + + // Parse state assignments. + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + + HLSLPass* pass = NULL; + if (!ParsePass(pass)) + { + return false; + } + ASSERT(pass != NULL); + if (lastPass == NULL) + { + technique->passes = pass; + } + else + { + lastPass->nextPass = pass; + } + lastPass = pass; + technique->numPasses++; + } + + statement = technique; + return true; +} + +bool HLSLParser::ParsePass(HLSLPass*& pass) +{ + if (!Accept(HLSLToken_Pass)) { + return false; + } + + // Optional pass name. + const char* passName = NULL; + AcceptIdentifier(passName); + + if (!Expect('{')) + { + return false; + } + + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + pass = m_tree->AddNode(fileName, line); + pass->name = passName; + + HLSLStateAssignment* lastStateAssignment = NULL; + + // Parse state assignments. + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + + HLSLStateAssignment* stateAssignment = NULL; + if (!ParseStateAssignment(stateAssignment, /*isSamplerState=*/false, /*isPipelineState=*/false)) + { + return false; + } + ASSERT(stateAssignment != NULL); + if (lastStateAssignment == NULL) + { + pass->stateAssignments = stateAssignment; + } + else + { + lastStateAssignment->nextStateAssignment = stateAssignment; + } + lastStateAssignment = stateAssignment; + pass->numStateAssignments++; + } + return true; +} + + +bool HLSLParser::ParsePipeline(HLSLStatement*& statement) +{ + if (!Accept("pipeline")) { + return false; + } + + // Optional pipeline name. + const char* pipelineName = NULL; + AcceptIdentifier(pipelineName); + + if (!Expect('{')) + { + return false; + } + + HLSLPipeline* pipeline = m_tree->AddNode(GetFileName(), GetLineNumber()); + pipeline->name = pipelineName; + + HLSLStateAssignment* lastStateAssignment = NULL; + + // Parse state assignments. + while (!Accept('}')) + { + if (CheckForUnexpectedEndOfStream('}')) + { + return false; + } + + HLSLStateAssignment* stateAssignment = NULL; + if (!ParseStateAssignment(stateAssignment, /*isSamplerState=*/false, /*isPipeline=*/true)) + { + return false; + } + ASSERT(stateAssignment != NULL); + if (lastStateAssignment == NULL) + { + pipeline->stateAssignments = stateAssignment; + } + else + { + lastStateAssignment->nextStateAssignment = stateAssignment; + } + lastStateAssignment = stateAssignment; + pipeline->numStateAssignments++; + } + + statement = pipeline; + return true; +} + + +const EffectState* GetEffectState(const char* name, bool isSamplerState, bool isPipeline) +{ + const EffectState* validStates = effectStates; + int count = sizeof(effectStates)/sizeof(effectStates[0]); + + if (isPipeline) + { + validStates = pipelineStates; + count = sizeof(pipelineStates) / sizeof(pipelineStates[0]); + } + + if (isSamplerState) + { + validStates = samplerStates; + count = sizeof(samplerStates)/sizeof(samplerStates[0]); + } + + // Case insensitive comparison. + for (int i = 0; i < count; i++) + { + if (String_EqualNoCase(name, validStates[i].name)) + { + return &validStates[i]; + } + } + + return NULL; +} + +static const EffectStateValue* GetStateValue(const char* name, const EffectState* state) +{ + // Case insensitive comparison. + for (int i = 0; ; i++) + { + const EffectStateValue & value = state->values[i]; + if (value.name == NULL) break; + + if (String_EqualNoCase(name, value.name)) + { + return &value; + } + } + + return NULL; +} + + +bool HLSLParser::ParseStateName(bool isSamplerState, bool isPipelineState, const char*& name, const EffectState *& state) +{ + if (m_tokenizer.GetToken() != HLSLToken_Identifier) + { + char near[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(near); + m_tokenizer.Error("Syntax error: expected identifier near '%s'", near); + return false; + } + + state = GetEffectState(m_tokenizer.GetIdentifier(), isSamplerState, isPipelineState); + if (state == NULL) + { + m_tokenizer.Error("Syntax error: unexpected identifier '%s'", m_tokenizer.GetIdentifier()); + return false; + } + + m_tokenizer.Next(); + return true; +} + +bool HLSLParser::ParseColorMask(int& mask) +{ + mask = 0; + + do { + if (m_tokenizer.GetToken() == HLSLToken_IntLiteral) { + mask |= m_tokenizer.GetInt(); + } + else if (m_tokenizer.GetToken() == HLSLToken_Identifier) { + const char * ident = m_tokenizer.GetIdentifier(); + const EffectStateValue * stateValue = colorMaskValues; + while (stateValue->name != NULL) { + if (String_EqualNoCase(stateValue->name, ident)) { + mask |= stateValue->value; + break; + } + ++stateValue; + } + } + else { + return false; + } + m_tokenizer.Next(); + } while (Accept('|')); + + return true; +} + +bool HLSLParser::ParseStateValue(const EffectState * state, HLSLStateAssignment* stateAssignment) +{ + const bool expectsExpression = state->values == colorMaskValues; + const bool expectsInteger = state->values == integerValues; + const bool expectsFloat = state->values == floatValues; + const bool expectsBoolean = state->values == booleanValues; + + if (!expectsExpression && !expectsInteger && !expectsFloat && !expectsBoolean) + { + if (m_tokenizer.GetToken() != HLSLToken_Identifier) + { + char near[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(near); + m_tokenizer.Error("Syntax error: expected identifier near '%s'", near); + stateAssignment->iValue = 0; + return false; + } + } + + if (state->values == NULL) + { + if (strcmp(m_tokenizer.GetIdentifier(), "compile") != 0) + { + m_tokenizer.Error("Syntax error: unexpected identifier '%s' expected compile statement", m_tokenizer.GetIdentifier()); + stateAssignment->iValue = 0; + return false; + } + + // @@ Parse profile name, function name, argument expressions. + + // Skip the rest of the compile statement. + while(m_tokenizer.GetToken() != ';') + { + m_tokenizer.Next(); + } + } + else { + if (expectsInteger) + { + if (!AcceptInt(stateAssignment->iValue)) + { + m_tokenizer.Error("Syntax error: expected integer near '%s'", m_tokenizer.GetIdentifier()); + stateAssignment->iValue = 0; + return false; + } + } + else if (expectsFloat) + { + if (!AcceptFloat(stateAssignment->fValue)) + { + m_tokenizer.Error("Syntax error: expected float near '%s'", m_tokenizer.GetIdentifier()); + stateAssignment->iValue = 0; + return false; + } + } + else if (expectsBoolean) + { + const EffectStateValue * stateValue = GetStateValue(m_tokenizer.GetIdentifier(), state); + + if (stateValue != NULL) + { + stateAssignment->iValue = stateValue->value; + + m_tokenizer.Next(); + } + else if (AcceptInt(stateAssignment->iValue)) + { + stateAssignment->iValue = (stateAssignment->iValue != 0); + } + else { + m_tokenizer.Error("Syntax error: expected bool near '%s'", m_tokenizer.GetIdentifier()); + stateAssignment->iValue = 0; + return false; + } + } + else if (expectsExpression) + { + if (!ParseColorMask(stateAssignment->iValue)) + { + m_tokenizer.Error("Syntax error: expected color mask near '%s'", m_tokenizer.GetIdentifier()); + stateAssignment->iValue = 0; + return false; + } + } + else + { + // Expect one of the allowed values. + const EffectStateValue * stateValue = GetStateValue(m_tokenizer.GetIdentifier(), state); + + if (stateValue == NULL) + { + m_tokenizer.Error("Syntax error: unexpected value '%s' for state '%s'", m_tokenizer.GetIdentifier(), state->name); + stateAssignment->iValue = 0; + return false; + } + + stateAssignment->iValue = stateValue->value; + + m_tokenizer.Next(); + } + } + + return true; +} + +bool HLSLParser::ParseStateAssignment(HLSLStateAssignment*& stateAssignment, bool isSamplerState, bool isPipelineState) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + stateAssignment = m_tree->AddNode(fileName, line); + + const EffectState * state; + if (!ParseStateName(isSamplerState, isPipelineState, stateAssignment->stateName, state)) { + return false; + } + + //stateAssignment->name = m_tree->AddString(m_tokenizer.GetIdentifier()); + stateAssignment->stateName = state->name; + stateAssignment->d3dRenderState = state->d3drs; + + if (!Expect('=')) { + return false; + } + + if (!ParseStateValue(state, stateAssignment)) { + return false; + } + + if (!Expect(';')) { + return false; + } + + return true; +} + + +bool HLSLParser::ParseAttributeList(HLSLAttribute*& firstAttribute) +{ + const char* fileName = GetFileName(); + int line = GetLineNumber(); + + HLSLAttribute * lastAttribute = firstAttribute; + do { + const char * identifier = NULL; + if (!ExpectIdentifier(identifier)) { + return false; + } + + HLSLAttribute * attribute = m_tree->AddNode(fileName, line); + + if (strcmp(identifier, "unroll") == 0) attribute->attributeType = HLSLAttributeType_Unroll; + else if (strcmp(identifier, "flatten") == 0) attribute->attributeType = HLSLAttributeType_Flatten; + else if (strcmp(identifier, "branch") == 0) attribute->attributeType = HLSLAttributeType_Branch; + else if (strcmp(identifier, "nofastmath") == 0) attribute->attributeType = HLSLAttributeType_NoFastMath; + + // @@ parse arguments, () not required if attribute constructor has no arguments. + + if (firstAttribute == NULL) + { + firstAttribute = attribute; + } + else + { + lastAttribute->nextAttribute = attribute; + } + lastAttribute = attribute; + + } while(Accept(',')); + + return true; +} + +// Attributes can have all these forms: +// [A] statement; +// [A,B] statement; +// [A][B] statement; +// These are not supported yet: +// [A] statement [B]; +// [A()] statement; +// [A(a)] statement; +bool HLSLParser::ParseAttributeBlock(HLSLAttribute*& attribute) +{ + HLSLAttribute ** lastAttribute = &attribute; + while (*lastAttribute != NULL) { lastAttribute = &(*lastAttribute)->nextAttribute; } + + if (!Accept('[')) + { + return false; + } + + // Parse list of attribute constructors. + ParseAttributeList(*lastAttribute); + + if (!Expect(']')) + { + return false; + } + + // Parse additional [] blocks. + ParseAttributeBlock(*lastAttribute); + + return true; +} + +bool HLSLParser::ParseStage(HLSLStatement*& statement) +{ + if (!Accept("stage")) + { + return false; + } + + // Required stage name. + const char* stageName = NULL; + if (!ExpectIdentifier(stageName)) + { + return false; + } + + if (!Expect('{')) + { + return false; + } + + HLSLStage* stage = m_tree->AddNode(GetFileName(), GetLineNumber()); + stage->name = stageName; + + BeginScope(); + + HLSLType voidType(HLSLBaseType_Void); + if (!Expect('{') || !ParseBlock(stage->statement, voidType)) + { + return false; + } + + EndScope(); + + // @@ To finish the stage definition we should traverse the statements recursively (including function calls) and find all the input/output declarations. + + statement = stage; + return true; +} + + + + +bool HLSLParser::Parse(const char* fileName, const char* buffer, size_t length) +{ + HLSLRoot* root = m_tree->GetRoot(); + HLSLStatement* lastStatement = NULL; + + m_tokenizer = HLSLTokenizer(fileName, buffer, length); + while (!Accept(HLSLToken_EndOfStream)) + { + HLSLStatement* statement = NULL; + if (!ParseTopLevel(statement)) + { + return false; + } + if (statement != NULL) + { + if (lastStatement == NULL) + { + root->statement = statement; + } + else + { + lastStatement->nextStatement = statement; + } + lastStatement = statement; + while (lastStatement->nextStatement) lastStatement = lastStatement->nextStatement; + } + } + return true; +} + + +bool HLSLParser::ParsePreprocessorDefine() +{ + int line = GetLineNumber(); + const char* fileName = GetFileName(); + + // Define identifier parsing: + // Don't use AcceptIdentifier to be able to check for whitespace after define name + // This is required to separate define name and value as both could contains parenthesis + const char* macroName = NULL; + m_tokenizer.Next(); + if (m_tokenizer.GetToken() == HLSLToken_Identifier) + { + macroName = m_tree->AddString( m_tokenizer.GetIdentifier() ); + } + else + { + char near[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(near); + m_tokenizer.Error("Syntax error: expected identifier near '%s'", near); + return false; + } + + bool macroWithArguments = !m_tokenizer.NextIsWhitespace(); + + // Macro declaration + HLSLMacro* macro = m_tree->AddNode(fileName, line); + macro->name = macroName; + m_macros.PushBack(macro); + + // Prepare next token + m_tokenizer.Next(); + + std::string value; + if (macroWithArguments) + { + // Macro with arguments + if (Accept('(')) + { + uint numArguments = 0; + HLSLArgument* lastArgument = NULL; + + while (!Accept(')')) + { + if (CheckForUnexpectedEndOfStream(')')) + { + return false; + } + if (numArguments > 0 && !Expect(',')) + { + return false; + } + + HLSLArgument* argument = m_tree->AddNode(fileName, line); + if (!ExpectIdentifier(argument->name)) + { + return false; + } + + if (lastArgument != NULL) + { + lastArgument->nextArgument = argument; + } + else + { + macro->argument = argument; + } + lastArgument = argument; + + ++numArguments; + } + + macro->numArguments = numArguments; + } + + // Macro value + while(m_tokenizer.GetToken() != HLSLToken_EndOfLine) + { + bool addOriginalSource = true; + + if (m_tokenizer.GetToken() == HLSLToken_Identifier) + { + // Search for macro attributes + HLSLArgument* argument = macro->argument; + unsigned argNum = 0; + while(argument != NULL) + { + if (String_Equal(argument->name, m_tokenizer.GetIdentifier())) + { + value.append("#" + std::to_string(argNum) + "#"); + addOriginalSource = false; + break; + } + + argument = argument->nextArgument; + argNum++; + } + } + + if (addOriginalSource) + { + value.append(m_tokenizer.getLastPos(true), + m_tokenizer.getCurrentPos() - m_tokenizer.getLastPos(true)); + } + + m_tokenizer.Next(false); + } + + + } + else + { + // Macro value + while(m_tokenizer.GetToken() != HLSLToken_EndOfLine) + { + const char * start = m_tokenizer.getLastPos(true); + + std::string valueAdd(start, m_tokenizer.getCurrentPos() - start); + value.append(valueAdd); + + m_tokenizer.Next(false); + } + } + + // Remove extra parenthesis + if (value[0] == '(') + { + value.erase(value.length()-1, 1); + value.erase(0, 1); + } + + macro->value = value; + + return true; +} + + +bool HLSLParser::ApplyPreprocessor(const char* fileName, const char* buffer, size_t length, + std::string & sourcePreprocessed) { + + m_tokenizer = HLSLTokenizer(fileName, buffer, length); + + // Fisrt pass, grab #define + while (m_tokenizer.GetToken() != HLSLToken_EndOfStream) + { + if (m_tokenizer.GetToken() == HLSLToken_PreprocessorDefine) + { + ParsePreprocessorDefine(); + } + + m_tokenizer.Next(); + } + + + // Second pass, propagate macros definitions across macros values + int index = 0; + while (index < m_macros.GetSize()) + { + HLSLMacro * macro = m_macros[index]; + m_tokenizer = HLSLTokenizer(fileName, macro->value.c_str(), macro->value.length()); + std::string valueProcessed; + + while (m_tokenizer.GetToken() != HLSLToken_EndOfStream) + { + bool addOriginalSource = true; + if (m_tokenizer.GetToken() == HLSLToken_Identifier) + { + HLSLMacro * matchedMacro = ProcessMacroFromIdentifier(valueProcessed, addOriginalSource); + if (matchedMacro != NULL) + { + // Check if macro is just an alias + // macros value must be equal to matched macro name + if (macro->value == matchedMacro->name) + { + macro->macroAliased = matchedMacro; + } + } + } + + if (addOriginalSource) + { + valueProcessed.append(m_tokenizer.getLastPos(true), + m_tokenizer.getCurrentPos() - m_tokenizer.getLastPos(true)); + } + + m_tokenizer.Next(); + } + + if (valueProcessed == "main") + { + valueProcessed = "sampler_fw_main"; + } + + if (valueProcessed != macro->value) + { + // Define value referenced another define, it was replaced + // try again until there is no replacement + macro->value = valueProcessed; + + } + else + { + index++; + } + } + + // Third pass, macro aliases get original value and arguments + index = 0; + while (index < m_macros.GetSize()) + { + HLSLMacro * macro = m_macros[index]; + + if (macro->macroAliased != NULL) + { + macro->argument = macro->macroAliased->argument; + macro->numArguments = macro->macroAliased->numArguments; + macro->value = macro->macroAliased->value; + } + + index++; + } + + // Fouth pass, search and replace preprocessor directives + std::stack isCodeActive; + isCodeActive.push(true); + m_tokenizer = HLSLTokenizer(fileName, buffer, length); + sourcePreprocessed.clear(); + while (m_tokenizer.GetToken() != HLSLToken_EndOfStream) + { + bool addOriginalSource = true; + + if (m_tokenizer.GetToken() == HLSLToken_PreprocessorIf) + { + while (m_tokenizer.GetToken() != HLSLToken_IntLiteral && m_tokenizer.GetToken() != HLSLToken_EndOfLine) + { + m_tokenizer.Next(false); + } + + if (m_tokenizer.GetToken() == HLSLToken_IntLiteral) + { + isCodeActive.push(m_tokenizer.GetInt() != 0); + } + else + { + m_tokenizer.Error("#if evaluation failed: not an integer"); + return false; + } + addOriginalSource = false; + } + else if (m_tokenizer.GetToken() == HLSLToken_PreprocessorElse) + { + // Invert stack state + bool state = isCodeActive.top(); + isCodeActive.pop(); + isCodeActive.push(!state); + addOriginalSource = false; + } + else if (m_tokenizer.GetToken() == HLSLToken_PreprocessorEndif) + { + isCodeActive.pop(); + addOriginalSource = false; + } + else if (m_tokenizer.GetToken() == HLSLToken_PreprocessorDefine) + { + // Skip macros definition + while(m_tokenizer.GetToken() != HLSLToken_EndOfLine) + { + m_tokenizer.Next(false); + } + + addOriginalSource = false; + } + else if (m_tokenizer.GetToken() == HLSLToken_Identifier && isCodeActive.top()) + { + ProcessMacroFromIdentifier(sourcePreprocessed, addOriginalSource); + } + else if (!isCodeActive.top()) + { + addOriginalSource = false; + } + + if (addOriginalSource) + { + sourcePreprocessed.append(m_tokenizer.getLastPos(false), + m_tokenizer.getCurrentPos() - m_tokenizer.getLastPos(false)); + } + + m_tokenizer.Next(); + } + + + return isCodeActive.size() == 1; +} + + +HLSLMacro * HLSLParser::ProcessMacroFromIdentifier(std::string & sourcePreprocessed, bool & addOriginalSource) +{ + // Search a define matching + for (int i = m_macros.GetSize() - 1; i >= 0; --i) + { + if (String_Equal(m_macros[i]->name, m_tokenizer.GetIdentifier())) + { + if (m_macros[i]->argument == NULL) + { + // Macro without arguments + sourcePreprocessed.append("("); + sourcePreprocessed.append(m_macros[i]->value); + sourcePreprocessed.append(")"); + addOriginalSource = false; + } + else + { + // Macro with arguments + const char * savePos = m_tokenizer.getLastPos(false); + + m_tokenizer.Next(); + + if (ProcessMacroArguments(m_macros[i], sourcePreprocessed)) + { + // Macro replaced + addOriginalSource = false; + } + else + { + // Macro signatures does not match: writing back readed parts + sourcePreprocessed.append(savePos, + m_tokenizer.getLastPos(false) - savePos); + + m_tokenizer.ReturnToPos(m_tokenizer.getLastPos(false)); + + addOriginalSource = true; + } + } + + return m_macros[i]; + } + } + + return NULL; +} + + + +bool HLSLParser::ProcessMacroArguments(HLSLMacro* macro, std::string & sourcePreprocessed) +{ + unsigned scopeLevel = 0; + std::vector argumentsValues; + std::string argValue; + bool firstToken = true; + + // Parse arguments values + while(m_tokenizer.GetToken() != HLSLToken_EndOfStream) { + bool addToValue = true; + + if (firstToken && m_tokenizer.GetToken() != '(') + { + break; + } + else if (m_tokenizer.GetToken() == '(') + { + scopeLevel++; + if (scopeLevel == 1) + { + addToValue = false; + } + } + else if (m_tokenizer.GetToken() == ')') + { + scopeLevel--; + if (scopeLevel == 0) + { + argumentsValues.push_back(argValue); + break; + } + } + else if (m_tokenizer.GetToken() == ',') + { + if (scopeLevel == 1) + { + argumentsValues.push_back(argValue); + argValue.clear(); + addToValue = false; + } + } + else if (m_tokenizer.GetToken() == HLSLToken_Identifier) + { + ProcessMacroFromIdentifier(argValue, addToValue); + } + + if (addToValue) + { + argValue.append(m_tokenizer.getLastPos(false), + m_tokenizer.getCurrentPos() - m_tokenizer.getLastPos(false)); + } + + m_tokenizer.Next(); + firstToken = false; + } + + // Arguments count does not match + if (argumentsValues.size() != macro->numArguments) { + return false; + } + + // Surround macro definition with parenthesis + sourcePreprocessed.append("("); + + // Write arguments value + unsigned index = 0; + std::string arg; + bool argFound = false; + while(index < macro->value.length()) + { + if (macro->value[index] == '#' && !argFound) + { + argFound = true; + arg.clear(); + } + else if (macro->value[index] == '#' && argFound) + { + unsigned indexArg = std::stoi(arg); + if (indexArg < argumentsValues.size()) + { + sourcePreprocessed.append(argumentsValues[indexArg]); + } + argFound = false; + } + else if (argFound) + { + arg += macro->value[index]; + } + else + { + sourcePreprocessed += macro->value[index]; + } + + index++; + } + + // Surround macro definition with parenthesis + sourcePreprocessed.append(")"); + + return true; +} + + +bool HLSLParser::AcceptTypeModifier(int& flags) +{ + if (Accept(HLSLToken_Const)) + { + flags |= HLSLTypeFlag_Const; + return true; + } + else if (Accept(HLSLToken_Static)) + { + flags |= HLSLTypeFlag_Static; + return true; + } + else if (Accept(HLSLToken_Uniform)) + { + flags |= HLSLTypeFlag_Uniform; + return true; + } + else if (Accept(HLSLToken_Inline)) + { + //flags |= HLSLTypeFlag_Uniform; // @@ Ignored. In HLSL all functions are inline. + return true; + } + /*else if (Accept("in")) + { + flags |= HLSLTypeFlag_Input; + return true; + } + else if (Accept("out")) + { + flags |= HLSLTypeFlag_Output; + return true; + }*/ + + // Not an usage keyword. + return false; +} + +bool HLSLParser::AcceptInterpolationModifier(int& flags) +{ + if (Accept("linear")) + { + flags |= HLSLTypeFlag_Linear; + return true; + } + else if (Accept("centroid")) + { + flags |= HLSLTypeFlag_Centroid; + return true; + } + else if (Accept("nointerpolation")) + { + flags |= HLSLTypeFlag_NoInterpolation; + return true; + } + else if (Accept("noperspective")) + { + flags |= HLSLTypeFlag_NoPerspective; + return true; + } + else if (Accept("sample")) + { + flags |= HLSLTypeFlag_Sample; + return true; + } + + return false; +} + + +bool HLSLParser::AcceptType(bool allowVoid, HLSLType& type/*, bool acceptFlags*/) +{ + //if (type.flags != NULL) + { + type.flags = 0; + while(AcceptTypeModifier(type.flags) || AcceptInterpolationModifier(type.flags)) {} + } + + int token = m_tokenizer.GetToken(); + + // Check built-in types. + type.baseType = HLSLBaseType_Void; + switch (token) + { + case HLSLToken_Float: + case HLSLToken_Float1: + case HLSLToken_Float1x1: + case HLSLToken_Half: + case HLSLToken_Half1: + case HLSLToken_Half1x1: + case HLSLToken_Double: + case HLSLToken_Double1: + case HLSLToken_Double1x1: + type.baseType = HLSLBaseType_Float; + break; + case HLSLToken_Float2: + case HLSLToken_Float2x1: + case HLSLToken_Half2: + case HLSLToken_Half2x1: + case HLSLToken_Double2: + case HLSLToken_Double2x1: + type.baseType = HLSLBaseType_Float2; + break; + case HLSLToken_Float3: + case HLSLToken_Float3x1: + case HLSLToken_Half3: + case HLSLToken_Half3x1: + case HLSLToken_Double3: + case HLSLToken_Double3x1: + type.baseType = HLSLBaseType_Float3; + break; + case HLSLToken_Float4: + case HLSLToken_Float4x1: + case HLSLToken_Half4: + case HLSLToken_Half4x1: + case HLSLToken_Double4: + case HLSLToken_Double4x1: + type.baseType = HLSLBaseType_Float4; + break; + case HLSLToken_Float2x4: + case HLSLToken_Half2x4: + case HLSLToken_Double2x4: + type.baseType = HLSLBaseType_Float2x4; + break; + case HLSLToken_Float2x3: + case HLSLToken_Half2x3: + case HLSLToken_Double2x3: + type.baseType = HLSLBaseType_Float2x3; + break; + case HLSLToken_Float2x2: + case HLSLToken_Half2x2: + case HLSLToken_Double2x2: + type.baseType = HLSLBaseType_Float2x2; + break; + case HLSLToken_Float3x4: + case HLSLToken_Half3x4: + case HLSLToken_Double3x4: + type.baseType = HLSLBaseType_Float3x4; + break; + case HLSLToken_Float3x3: + case HLSLToken_Half3x3: + case HLSLToken_Double3x3: + type.baseType = HLSLBaseType_Float3x3; + break; + case HLSLToken_Float3x2: + case HLSLToken_Half3x2: + case HLSLToken_Double3x2: + type.baseType = HLSLBaseType_Float3x2; + break; + case HLSLToken_Float4x4: + case HLSLToken_Half4x4: + case HLSLToken_Double4x4: + type.baseType = HLSLBaseType_Float4x4; + break; + case HLSLToken_Float4x3: + case HLSLToken_Half4x3: + case HLSLToken_Double4x3: + type.baseType = HLSLBaseType_Float4x3; + break; + case HLSLToken_Float4x2: + case HLSLToken_Half4x2: + case HLSLToken_Double4x2: + type.baseType = HLSLBaseType_Float4x2; + break; + case HLSLToken_Bool: + type.baseType = HLSLBaseType_Bool; + break; + case HLSLToken_Bool2: + type.baseType = HLSLBaseType_Bool2; + break; + case HLSLToken_Bool3: + type.baseType = HLSLBaseType_Bool3; + break; + case HLSLToken_Bool4: + type.baseType = HLSLBaseType_Bool4; + break; + case HLSLToken_Int: + type.baseType = HLSLBaseType_Int; + break; + case HLSLToken_Int2: + type.baseType = HLSLBaseType_Int2; + break; + case HLSLToken_Int3: + type.baseType = HLSLBaseType_Int3; + break; + case HLSLToken_Int4: + type.baseType = HLSLBaseType_Int4; + break; + case HLSLToken_Uint: + type.baseType = HLSLBaseType_Uint; + break; + case HLSLToken_Uint2: + type.baseType = HLSLBaseType_Uint2; + break; + case HLSLToken_Uint3: + type.baseType = HLSLBaseType_Uint3; + break; + case HLSLToken_Uint4: + type.baseType = HLSLBaseType_Uint4; + break; + case HLSLToken_Texture: + type.baseType = HLSLBaseType_Texture; + break; + case HLSLToken_Sampler: + type.baseType = HLSLBaseType_Sampler2D; // @@ IC: For now we assume that generic samplers are always sampler2D + break; + case HLSLToken_Sampler2D: + type.baseType = HLSLBaseType_Sampler2D; + break; + case HLSLToken_Sampler3D: + type.baseType = HLSLBaseType_Sampler3D; + break; + case HLSLToken_SamplerCube: + type.baseType = HLSLBaseType_SamplerCube; + break; + case HLSLToken_Sampler2DShadow: + type.baseType = HLSLBaseType_Sampler2DShadow; + break; + case HLSLToken_Sampler2DMS: + type.baseType = HLSLBaseType_Sampler2DMS; + break; + case HLSLToken_Sampler2DArray: + type.baseType = HLSLBaseType_Sampler2DArray; + break; + } + if (type.baseType != HLSLBaseType_Void) + { + m_tokenizer.Next(); + + if (IsSamplerType(type.baseType)) + { + // Parse optional sampler type. + if (Accept('<')) + { + int token = m_tokenizer.GetToken(); + if (token == HLSLToken_Float || token == HLSLToken_Float1) + { + type.samplerType = HLSLBaseType_Float; + } + else + { + m_tokenizer.Error("Expected half or float."); + return false; + } + m_tokenizer.Next(); + + if (!Expect('>')) + { + m_tokenizer.Error("Syntax error: '>' expected for sampler type"); + return false; + } + } + } + return true; + } + + if (allowVoid && Accept(HLSLToken_Void)) + { + type.baseType = HLSLBaseType_Void; + return true; + } + if (token == HLSLToken_Identifier) + { + const char* identifier = m_tree->AddString( m_tokenizer.GetIdentifier() ); + if (FindUserDefinedType(identifier) != NULL) + { + m_tokenizer.Next(); + type.baseType = HLSLBaseType_UserDefined; + type.typeName = identifier; + return true; + } + } + return false; +} + +bool HLSLParser::ExpectType(bool allowVoid, HLSLType& type) +{ + if (!AcceptType(allowVoid, type)) + { + m_tokenizer.Error("Expected type"); + return false; + } + return true; +} + +bool HLSLParser::AcceptDeclaration(bool allowUnsizedArray, HLSLType& type, const char*& name) +{ + if (!AcceptType(/*allowVoid=*/false, type)) + { + return false; + } + + if (!ExpectIdentifier(name)) + { + // TODO: false means we didn't accept a declaration and we had an error! + return false; + } + // Handle array syntax. + if (Accept('[')) + { + type.array = true; + // Optionally allow no size to the specified for the array. + if (Accept(']') && allowUnsizedArray) + { + return true; + } + if (!ParseExpression(type.arraySize) || !Expect(']')) + { + return false; + } + } + return true; +} + +bool HLSLParser::ExpectDeclaration(bool allowUnsizedArray, HLSLType& type, const char*& name) +{ + if (!AcceptDeclaration(allowUnsizedArray, type, name)) + { + m_tokenizer.Error("Expected declaration"); + return false; + } + return true; +} + +const HLSLStruct* HLSLParser::FindUserDefinedType(const char* name) const +{ + // Pointer comparison is sufficient for strings since they exist in the + // string pool. + for (int i = 0; i < m_userTypes.GetSize(); ++i) + { + if (m_userTypes[i]->name == name) + { + return m_userTypes[i]; + } + } + return NULL; +} + +bool HLSLParser::CheckForUnexpectedEndOfStream(int endToken) +{ + if (Accept(HLSLToken_EndOfStream)) + { + char what[HLSLTokenizer::s_maxIdentifier]; + m_tokenizer.GetTokenName(endToken, what); + m_tokenizer.Error("Unexpected end of file while looking for '%s'", what); + return true; + } + return false; +} + +int HLSLParser::GetLineNumber() const +{ + return m_tokenizer.GetLineNumber(); +} + +const char* HLSLParser::GetFileName() +{ + return m_tree->AddString( m_tokenizer.GetFileName() ); +} + +void HLSLParser::BeginScope() +{ + // Use NULL as a sentinel that indices a new scope level. + Variable& variable = m_variables.PushBackNew(); + variable.name = NULL; +} + +void HLSLParser::EndScope() +{ + int numVariables = m_variables.GetSize() - 1; + while (m_variables[numVariables].name != NULL) + { + --numVariables; + ASSERT(numVariables >= 0); + } + m_variables.Resize(numVariables); +} + +const HLSLType* HLSLParser::FindVariable(const char* name, bool& global) const +{ + for (int i = m_variables.GetSize() - 1; i >= 0; --i) + { + if (m_variables[i].name == name) + { + global = (i < m_numGlobals); + return &m_variables[i].type; + } + } + return NULL; +} + +const HLSLFunction* HLSLParser::FindFunction(const char* name) const +{ + for (int i = 0; i < m_functions.GetSize(); ++i) + { + if (m_functions[i]->name == name) + { + return m_functions[i]; + } + } + return NULL; +} + +static bool AreTypesEqual(HLSLTree* tree, const HLSLType& lhs, const HLSLType& rhs) +{ + return GetTypeCastRank(tree, lhs, rhs) == 0; +} + +static bool AreArgumentListsEqual(HLSLTree* tree, HLSLArgument* lhs, HLSLArgument* rhs) +{ + while (lhs && rhs) + { + if (!AreTypesEqual(tree, lhs->type, rhs->type)) + return false; + + if (lhs->modifier != rhs->modifier) + return false; + + if (lhs->semantic != rhs->semantic || lhs->sv_semantic != rhs->sv_semantic) + return false; + + lhs = lhs->nextArgument; + rhs = rhs->nextArgument; + } + + return lhs == NULL && rhs == NULL; +} + +const HLSLFunction* HLSLParser::FindFunction(const HLSLFunction* fun) const +{ + for (int i = 0; i < m_functions.GetSize(); ++i) + { + if (m_functions[i]->name == fun->name && + AreTypesEqual(m_tree, m_functions[i]->returnType, fun->returnType) && + AreArgumentListsEqual(m_tree, m_functions[i]->argument, fun->argument)) + { + return m_functions[i]; + } + } + return NULL; +} + +void HLSLParser::DeclareVariable(const char* name, const HLSLType& type) +{ + if (m_variables.GetSize() == m_numGlobals) + { + ++m_numGlobals; + } + Variable& variable = m_variables.PushBackNew(); + variable.name = name; + variable.type = type; +} + +bool HLSLParser::GetIsFunction(const char* name) const +{ + for (int i = 0; i < m_functions.GetSize(); ++i) + { + // == is ok here because we're passed the strings through the string pool. + if (m_functions[i]->name == name) + { + return true; + } + } + for (int i = 0; i < _numIntrinsics; ++i) + { + // Intrinsic names are not in the string pool (since they are compile time + // constants, so we need full string compare). + if (String_Equal(name, _intrinsic[i].function.name)) + { + return true; + } + } + + return false; +} + +const HLSLFunction* HLSLParser::MatchFunctionCall(const HLSLFunctionCall* functionCall, const char* name) +{ + const HLSLFunction* matchedFunction = NULL; + + int numArguments = functionCall->numArguments; + int numMatchedOverloads = 0; + bool nameMatches = false; + + // Get the user defined functions with the specified name. + for (int i = 0; i < m_functions.GetSize(); ++i) + { + const HLSLFunction* function = m_functions[i]; + if (function->name == name) + { + nameMatches = true; + + CompareFunctionsResult result = CompareFunctions( m_tree, functionCall, function, matchedFunction ); + if (result == Function1Better) + { + matchedFunction = function; + numMatchedOverloads = 1; + } + else if (result == FunctionsEqual) + { + ++numMatchedOverloads; + } + } + } + + // Get the intrinsic functions with the specified name. + for (int i = 0; i < _numIntrinsics; ++i) + { + const HLSLFunction* function = &_intrinsic[i].function; + if (String_Equal(function->name, name)) + { + nameMatches = true; + + CompareFunctionsResult result = CompareFunctions( m_tree, functionCall, function, matchedFunction ); + if (result == Function1Better) + { + matchedFunction = function; + numMatchedOverloads = 1; + } + else if (result == FunctionsEqual) + { + ++numMatchedOverloads; + } + } + } + + if (matchedFunction != NULL && numMatchedOverloads > 1) + { + // Multiple overloads match. + m_tokenizer.Error("'%s' %d overloads have similar conversions", name, numMatchedOverloads); + return NULL; + } + else if (matchedFunction == NULL) + { + if (nameMatches) + { + m_tokenizer.Error("'%s' no overloaded function matched all of the arguments", name); + } + else + { + m_tokenizer.Error("Undeclared identifier '%s'", name); + } + } + + return matchedFunction; +} + +bool HLSLParser::GetMemberType(const HLSLType& objectType, HLSLMemberAccess * memberAccess) +{ + const char* fieldName = memberAccess->field; + + if (objectType.baseType == HLSLBaseType_UserDefined) + { + const HLSLStruct* structure = FindUserDefinedType( objectType.typeName ); + ASSERT(structure != NULL); + + const HLSLStructField* field = structure->field; + while (field != NULL) + { + if (field->name == fieldName) + { + memberAccess->expressionType = field->type; + return true; + } + field = field->nextField; + } + + return false; + } + + if (baseTypeDescriptions[objectType.baseType].numericType == NumericType_NaN) + { + // Currently we don't have an non-numeric types that allow member access. + return false; + } + + int swizzleLength = 0; + + if (baseTypeDescriptions[objectType.baseType].numDimensions <= 1) + { + // Check for a swizzle on the scalar/vector types. + for (int i = 0; fieldName[i] != 0; ++i) + { + if (fieldName[i] != 'x' && fieldName[i] != 'y' && fieldName[i] != 'z' && fieldName[i] != 'w' && + fieldName[i] != 'r' && fieldName[i] != 'g' && fieldName[i] != 'b' && fieldName[i] != 'a') + { + m_tokenizer.Error("Invalid swizzle '%s'", fieldName); + return false; + } + ++swizzleLength; + } + ASSERT(swizzleLength > 0); + } + else + { + + // Check for a matrix element access (e.g. _m00 or _11) + + const char* n = fieldName; + while (n[0] == '_') + { + ++n; + int base = 1; + if (n[0] == 'm') + { + base = 0; + ++n; + } + if (!isdigit(n[0]) || !isdigit(n[1])) + { + return false; + } + + int r = (n[0] - '0') - base; + int c = (n[1] - '0') - base; + if (r >= baseTypeDescriptions[objectType.baseType].height || + c >= baseTypeDescriptions[objectType.baseType].numComponents) + { + return false; + } + ++swizzleLength; + n += 2; + + } + + if (n[0] != 0) + { + return false; + } + + } + + if (swizzleLength > 4) + { + m_tokenizer.Error("Invalid swizzle '%s'", fieldName); + return false; + } + + static const HLSLBaseType floatType[] = { HLSLBaseType_Float, HLSLBaseType_Float2, HLSLBaseType_Float3, HLSLBaseType_Float4 }; + static const HLSLBaseType intType[] = { HLSLBaseType_Int, HLSLBaseType_Int2, HLSLBaseType_Int3, HLSLBaseType_Int4 }; + static const HLSLBaseType uintType[] = { HLSLBaseType_Uint, HLSLBaseType_Uint2, HLSLBaseType_Uint3, HLSLBaseType_Uint4 }; + static const HLSLBaseType boolType[] = { HLSLBaseType_Bool, HLSLBaseType_Bool2, HLSLBaseType_Bool3, HLSLBaseType_Bool4 }; + + switch (baseTypeDescriptions[objectType.baseType].numericType) + { + case NumericType_Float: + memberAccess->expressionType.baseType = floatType[swizzleLength - 1]; + break; + case NumericType_Int: + memberAccess->expressionType.baseType = intType[swizzleLength - 1]; + break; + case NumericType_Uint: + memberAccess->expressionType.baseType = uintType[swizzleLength - 1]; + break; + case NumericType_Bool: + memberAccess->expressionType.baseType = boolType[swizzleLength - 1]; + break; + default: + ASSERT(0); + } + + memberAccess->swizzle = true; + + return true; +} + +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLParser.h projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLParser.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLParser.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLParser.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,151 @@ +//============================================================================= +// +// Render/HLSLParser.h +// +// Created by Max McGuire (max@unknownworlds.com) +// Copyright (c) 2013, Unknown Worlds Entertainment, Inc. +// +//============================================================================= + +#ifndef HLSL_PARSER_H +#define HLSL_PARSER_H + +//#include "Engine/StringPool.h" +//#include "Engine/Array.h" +#include "Engine.h" + +#include "HLSLTokenizer.h" +#include "HLSLTree.h" +#include + +namespace M4 +{ + +struct EffectState; + +class HLSLParser +{ + +public: + + HLSLParser(Allocator* allocator, HLSLTree *tree); + + bool Parse(const char *fileName, const char *buffer, size_t length); + bool ApplyPreprocessor(const char* fileName, const char* buffer, size_t length, std::string & sourcePreprocessed); + +private: + + bool Accept(int token); + bool Expect(int token); + + /** + * Special form of Accept for accepting a word that is not actually a token + * but will be treated like one. This is useful for HLSL keywords that are + * only tokens in specific contexts (like in/inout in parameter lists). + */ + bool Accept(const char* token); + bool Expect(const char* token); + + bool AcceptIdentifier(const char*& identifier); + bool ExpectIdentifier(const char*& identifier); + bool AcceptFloat(float& value); + bool AcceptInt(int& value); + bool AcceptType(bool allowVoid, HLSLType& type); + bool ExpectType(bool allowVoid, HLSLType& type); + bool AcceptBinaryOperator(int priority, HLSLBinaryOp& binaryOp); + bool AcceptUnaryOperator(bool pre, HLSLUnaryOp& unaryOp); + bool AcceptAssign(HLSLBinaryOp& binaryOp); + bool AcceptTypeModifier(int & typeFlags); + bool AcceptInterpolationModifier(int& flags); + + /** + * Handles a declaration like: "float2 name[5]". If allowUnsizedArray is true, it is + * is acceptable for the declaration to not specify the bounds of the array (i.e. name[]). + */ + bool AcceptDeclaration(bool allowUnsizedArray, HLSLType& type, const char*& name); + bool ExpectDeclaration(bool allowUnsizedArray, HLSLType& type, const char*& name); + + bool ParseTopLevel(HLSLStatement*& statement); + bool ParseBlock(HLSLStatement*& firstStatement, const HLSLType& returnType); + bool ParseStatementOrBlock(HLSLStatement*& firstStatement, const HLSLType& returnType, bool scoped = true); + bool ParseStatement(HLSLStatement*& statement, const HLSLType& returnType); + bool ParseDeclaration(HLSLDeclaration*& declaration); + bool ParseFieldDeclaration(HLSLStructField*& field); + //bool ParseBufferFieldDeclaration(HLSLBufferField*& field); + bool ParseExpression(HLSLExpression*& expression); + bool ParseBinaryExpression(int priority, HLSLExpression*& expression); + bool ParseTerminalExpression(HLSLExpression*& expression, char &needsExpressionEndChar); + bool ParseExpressionList(int endToken, bool allowEmptyEnd, HLSLExpression*& firstExpression, int& numExpressions); + bool ParseArgumentList(HLSLArgument*& firstArgument, int& numArguments, int& numOutputArguments); + bool ParseDeclarationAssignment(HLSLDeclaration* declaration); + bool ParsePartialConstructor(HLSLExpression*& expression, HLSLBaseType type, const char* typeName); + + bool ParseStateName(bool isSamplerState, bool isPipelineState, const char*& name, const EffectState *& state); + bool ParseColorMask(int& mask); + bool ParseStateValue(const EffectState * state, HLSLStateAssignment* stateAssignment); + bool ParseStateAssignment(HLSLStateAssignment*& stateAssignment, bool isSamplerState, bool isPipelineState); + bool ParseSamplerState(HLSLExpression*& expression); + bool ParseTechnique(HLSLStatement*& statement); + bool ParsePass(HLSLPass*& pass); + bool ParsePipeline(HLSLStatement*& pipeline); + bool ParseStage(HLSLStatement*& stage); + bool ParsePreprocessorDefine(); + + bool ParseAttributeList(HLSLAttribute*& attribute); + bool ParseAttributeBlock(HLSLAttribute*& attribute); + + bool CheckForUnexpectedEndOfStream(int endToken); + + const HLSLStruct* FindUserDefinedType(const char* name) const; + + void BeginScope(); + void EndScope(); + + void DeclareVariable(const char* name, const HLSLType& type); + + /** Returned pointer is only valid until Declare or Begin/EndScope is called. */ + const HLSLType* FindVariable(const char* name, bool& global) const; + + const HLSLFunction* FindFunction(const char* name) const; + const HLSLFunction* FindFunction(const HLSLFunction* fun) const; + + bool GetIsFunction(const char* name) const; + + /** Finds the overloaded function that matches the specified call. */ + const HLSLFunction* MatchFunctionCall(const HLSLFunctionCall* functionCall, const char* name); + + /** Gets the type of the named field on the specified object type (fieldName can also specify a swizzle. ) */ + bool GetMemberType(const HLSLType& objectType, HLSLMemberAccess * memberAccess); + + bool CheckTypeCast(const HLSLType& srcType, const HLSLType& dstType); + + const char* GetFileName(); + int GetLineNumber() const; + + bool ProcessMacroArguments(HLSLMacro* macro, std::string & sourcePreprocessed); + HLSLMacro *ProcessMacroFromIdentifier(std::string & sourcePreprocessed, bool &addOriginalSource); + +private: + + struct Variable + { + const char* name; + HLSLType type; + }; + + HLSLTokenizer m_tokenizer; + Array m_userTypes; + Array m_variables; + Array m_functions; + Array m_macros; + int m_numGlobals; + + HLSLTree* m_tree; + + bool m_allowUndeclaredIdentifiers = false; + bool m_disableSemanticValidation = false; +}; + +} + +#endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.cpp projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,716 @@ +//#include "Engine/Log.h" +//#include "Engine/String.h" +#include "Engine.h" + +#include "HLSLTokenizer.h" + +#include +#include +#include +#include +#include + +namespace M4 +{ + +// The order here must match the order in the Token enum. +static const char* _reservedWords[] = + { + "float", + "float1", + "float1x1", + "float2", + "float2x1", + "float3", + "float3x1", + "float4", + "float4x1", + "float2x4", + "float2x3", + "float2x2", + "float3x4", + "float3x3", + "float3x2", + "float4x4", + "float4x3", + "float4x2", + + "half", + "half1", + "half1x1", + "half2", + "half2x1", + "half3", + "half3x1", + "half4", + "half4x1", + "half2x4", + "half2x3", + "half2x2", + "half3x4", + "half3x3", + "half3x2", + "half4x4", + "half4x3", + "half4x2", + + "double", + "double1", + "double1x1", + "double2", + "double2x1", + "double3", + "double3x1", + "double4", + "double4x1", + "double2x4", + "double2x3", + "double2x2", + "double3x4", + "double3x3", + "double3x2", + "double4x4", + "double4x3", + "double4x2", + + "bool", + "bool2", + "bool3", + "bool4", + "int", + "int2", + "int3", + "int4", + "uint", + "uint2", + "uint3", + "uint4", + "texture", + "sampler", + "sampler2D", + "sampler3D", + "samplerCUBE", + "sampler2DShadow", + "sampler2DMS", + "sampler2DArray", + "if", + "else", + "for", + "while", + "break", + "true", + "false", + "void", + "struct", + "cbuffer", + "tbuffer", + "register", + "return", + "continue", + "discard", + "const", + "static", + "inline", + "#define", + "#if", + "#else", + "#endif", + "uniform", + "in", + "out", + "inout", + "sampler_state", + "technique", + "pass", + }; + +static bool GetIsSymbol(char c) +{ + switch (c) + { + case ';': + case ':': + case '(': case ')': + case '[': case ']': + case '{': case '}': + case '-': case '+': + case '*': case '/': case '%': + case '?': + case '!': + case ',': + case '=': + case '.': + case '<': case '>': + case '|': case '&': case '^': case '~': + case '@': + return true; + } + return false; +} + +/** Returns true if the character is a valid token separator at the end of a number type token */ +static bool GetIsNumberSeparator(char c) +{ + return c == 0 || isspace(c) || GetIsSymbol(c); +} + +HLSLTokenizer::HLSLTokenizer(const char* fileName, const char* buffer, size_t length) +{ + m_buffer = buffer; + m_bufferPrevious = m_buffer; + m_bufferEnd = buffer + length; + m_fileName = fileName; + m_lineNumber = 1; + m_tokenLineNumber = 1; + m_error = false; + Next(); +} + +void HLSLTokenizer::Next(const bool EOLSkipping) +{ + m_bufferPrevious = m_buffer; + + while( SkipWhitespace(EOLSkipping) || SkipComment(&m_buffer, EOLSkipping) || ScanLineDirective() || SkipPragmaDirective() ) + { + } + + if (m_error) + { + m_token = HLSLToken_EndOfStream; + return; + } + + if (!EOLSkipping && m_buffer[0] == '\n') + { + m_token = HLSLToken_EndOfLine; + return; + } + + m_tokenLineNumber = m_lineNumber; + + if (m_buffer >= m_bufferEnd || *m_buffer == '\0') + { + m_token = HLSLToken_EndOfStream; + return; + } + + const char* start = m_buffer; + + // +=, -=, *=, /=, ==, <=, >= + if (m_buffer[0] == '+' && m_buffer[1] == '=') + { + m_token = HLSLToken_PlusEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '-' && m_buffer[1] == '=') + { + m_token = HLSLToken_MinusEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '*' && m_buffer[1] == '=') + { + m_token = HLSLToken_TimesEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '/' && m_buffer[1] == '=') + { + m_token = HLSLToken_DivideEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '=' && m_buffer[1] == '=') + { + m_token = HLSLToken_EqualEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '!' && m_buffer[1] == '=') + { + m_token = HLSLToken_NotEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '<' && m_buffer[1] == '=') + { + m_token = HLSLToken_LessEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '>' && m_buffer[1] == '=') + { + m_token = HLSLToken_GreaterEqual; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '&' && m_buffer[1] == '&') + { + m_token = HLSLToken_AndAnd; + m_buffer += 2; + return; + } + else if (m_buffer[0] == '|' && m_buffer[1] == '|') + { + m_token = HLSLToken_BarBar; + m_buffer += 2; + return; + } + + // ++, -- + if ((m_buffer[0] == '-' || m_buffer[0] == '+') && (m_buffer[1] == m_buffer[0])) + { + m_token = (m_buffer[0] == '+') ? HLSLToken_PlusPlus : HLSLToken_MinusMinus; + m_buffer += 2; + return; + } + + // Check for the start of a number. + if (ScanNumber()) + { + return; + } + + if (GetIsSymbol(m_buffer[0])) + { + m_token = static_cast(m_buffer[0]); + ++m_buffer; + return; + } + + // Must be an identifier or a reserved word. + while (m_buffer < m_bufferEnd && m_buffer[0] != 0 && !GetIsSymbol(m_buffer[0]) && !isspace(m_buffer[0])) + { + ++m_buffer; + } + + size_t length = m_buffer - start; + memcpy(m_identifier, start, length); + m_identifier[length] = 0; + + const int numReservedWords = sizeof(_reservedWords) / sizeof(const char*); + for (int i = 0; i < numReservedWords; ++i) + { + if (strcmp(_reservedWords[i], m_identifier) == 0) + { + m_token = 256 + i; + return; + } + } + + m_token = HLSLToken_Identifier; + +} + +bool HLSLTokenizer::NextIsWhitespace() +{ + return isspace(m_buffer[0]); +} + +const char* HLSLTokenizer::getLastPos(const bool trimmed) +{ + const char * start = m_bufferPrevious; + + if (trimmed) + { + // Skip white space + while(isspace(start[0])) { + start++; + } + } + + return start; +} + + +bool HLSLTokenizer::SkipWhitespace(const bool EOLSkipping) +{ + bool result = false; + while (m_buffer < m_bufferEnd && isspace(m_buffer[0]) && + (EOLSkipping || (!EOLSkipping && m_buffer[0] != '\n'))) + { + result = true; + if (m_buffer[0] == '\n') + { + ++m_lineNumber; + } + ++m_buffer; + } + return result; +} + +bool HLSLTokenizer::SkipComment(const char** buffer, const bool EOLSkipping) +{ + bool result = false; + if ((*buffer)[0] == '/') + { + if ((*buffer)[1] == '/') + { + // Single line comment. + result = true; + *buffer += 2; + while (*buffer < m_bufferEnd) + { + if ((*buffer)[0] == '\n') + { + ++m_lineNumber; + if (EOLSkipping) + { + ++*buffer; + } + break; + } + ++*buffer; + } + } + else if ((*buffer)[1] == '*') + { + // Multi-line comment. + result = true; + *buffer += 2; + while (*buffer < m_bufferEnd) + { + if ((*buffer)[0] == '\n') + { + ++m_lineNumber; + } + if ((*buffer)[0] == '*' && (*buffer)[1] == '/') + { + break; + } + ++*buffer; + } + if (*buffer < m_bufferEnd) + { + *buffer += 2; + } + } + } + return result; +} + +bool HLSLTokenizer::SkipPragmaDirective() +{ + bool result = false; + if( m_bufferEnd - m_buffer > 7 && *m_buffer == '#' ) + { + const char* ptr = m_buffer + 1; + while( isspace( *ptr ) ) + ptr++; + + if( strncmp( ptr, "pragma", 6 ) == 0 && isspace( ptr[ 6 ] ) ) + { + m_buffer = ptr + 6; + result = true; + while( m_buffer < m_bufferEnd ) + { + if( *( m_buffer++ ) == '\n' ) + { + ++m_lineNumber; + break; + } + } + } + } + return result; +} + +bool HLSLTokenizer::ScanNumber() +{ + + // Don't treat the + or - as part of the number. + if (m_buffer[0] == '+' || m_buffer[0] == '-') + { + return false; + } + + // Parse hex literals. + if (m_bufferEnd - m_buffer > 2 && m_buffer[0] == '0' && m_buffer[1] == 'x') + { + char* hEnd = NULL; + int iValue = strtol(m_buffer+2, &hEnd, 16); + if (GetIsNumberSeparator(hEnd[0])) + { + m_buffer = hEnd; + m_token = HLSLToken_IntLiteral; + m_iValue = iValue; + return true; + } + } + + char* fEnd = NULL; + double fValue = String_ToDouble(m_buffer, &fEnd); + + if (fEnd == m_buffer) + { + return false; + } + + char* iEnd = NULL; + int iValue = String_ToInteger(m_buffer, &iEnd); + + // If the character after the number is an f then the f is treated as part + // of the number (to handle 1.0f syntax). + if( ( fEnd[ 0 ] == 'f' || fEnd[ 0 ] == 'h' ) && fEnd < m_bufferEnd ) + { + ++fEnd; + } + + if( fEnd > iEnd && GetIsNumberSeparator( fEnd[ 0 ] ) ) + { + m_buffer = fEnd; + m_token = HLSLToken_FloatLiteral; + m_fValue = static_cast(fValue); + return true; + } + else if (iEnd > m_buffer && GetIsNumberSeparator(iEnd[0])) + { + m_buffer = iEnd; + m_token = HLSLToken_IntLiteral; + m_iValue = iValue; + return true; + } + + return false; +} + +bool HLSLTokenizer::ScanLineDirective() +{ + + if (m_bufferEnd - m_buffer > 5 && strncmp(m_buffer, "#line", 5) == 0 && isspace(m_buffer[5])) + { + + m_buffer += 5; + + while (m_buffer < m_bufferEnd && isspace(m_buffer[0])) + { + if (m_buffer[0] == '\n') + { + Error("Syntax error: expected line number after #line"); + return false; + } + ++m_buffer; + } + + char* iEnd = NULL; + int lineNumber = String_ToInteger(m_buffer, &iEnd); + + if (!isspace(*iEnd)) + { + Error("Syntax error: expected line number after #line"); + return false; + } + + m_buffer = iEnd; + while (m_buffer < m_bufferEnd && isspace(m_buffer[0])) + { + char c = m_buffer[0]; + ++m_buffer; + if (c == '\n') + { + m_lineNumber = lineNumber; + return true; + } + } + + if (m_buffer >= m_bufferEnd) + { + m_lineNumber = lineNumber; + return true; + } + + if (m_buffer[0] != '"') + { + Error("Syntax error: expected '\"' after line number near #line"); + return false; + } + + ++m_buffer; + + int i = 0; + while (i + 1 < s_maxIdentifier && m_buffer < m_bufferEnd && m_buffer[0] != '"') + { + if (m_buffer[0] == '\n') + { + Error("Syntax error: expected '\"' before end of line near #line"); + return false; + } + + m_lineDirectiveFileName[i] = *m_buffer; + ++m_buffer; + ++i; + } + + m_lineDirectiveFileName[i] = 0; + + if (m_buffer >= m_bufferEnd) + { + Error("Syntax error: expected '\"' before end of file near #line"); + return false; + } + + if (i + 1 >= s_maxIdentifier) + { + Error("Syntax error: file name too long near #line"); + return false; + } + + // Skip the closing quote + ++m_buffer; + + while (m_buffer < m_bufferEnd && m_buffer[0] != '\n') + { + if (!isspace(m_buffer[0])) + { + Error("Syntax error: unexpected input after file name near #line"); + return false; + } + ++m_buffer; + } + + // Skip new line + ++m_buffer; + + m_lineNumber = lineNumber; + m_fileName = m_lineDirectiveFileName; + + return true; + + } + + return false; + +} + +int HLSLTokenizer::GetToken() const +{ + return m_token; +} + +float HLSLTokenizer::GetFloat() const +{ + return m_fValue; +} + +int HLSLTokenizer::GetInt() const +{ + return m_iValue; +} + +const char* HLSLTokenizer::GetIdentifier() const +{ + return m_identifier; +} + +int HLSLTokenizer::GetLineNumber() const +{ + return m_tokenLineNumber; +} + +const char* HLSLTokenizer::GetFileName() const +{ + return m_fileName; +} + +void HLSLTokenizer::Error(const char* format, ...) +{ + // It's not always convenient to stop executing when an error occurs, + // so just track once we've hit an error and stop reporting them until + // we successfully bail out of execution. + if (m_error) + { + return; + } + m_error = true; + + + char buffer[1024]; + va_list args; + va_start(args, format); + int result = vsnprintf(buffer, sizeof(buffer) - 1, format, args); + va_end(args); + + Log_Error("%s(%d) : %s\n", m_fileName, m_lineNumber, buffer); +} + +void HLSLTokenizer::GetTokenName(char buffer[s_maxIdentifier]) const +{ + if (m_token == HLSLToken_FloatLiteral) + { + sprintf(buffer, "%f", m_fValue); + } + else if (m_token == HLSLToken_IntLiteral) + { + sprintf(buffer, "%d", m_iValue); + } + else if (m_token == HLSLToken_Identifier) + { + strcpy(buffer, m_identifier); + } + else + { + GetTokenName(m_token, buffer); + } +} + +void HLSLTokenizer::GetTokenName(int token, char buffer[s_maxIdentifier]) +{ + if (token < 256) + { + buffer[0] = (char)token; + buffer[1] = 0; + } + else if (token < HLSLToken_LessEqual) + { + strcpy(buffer, _reservedWords[token - 256]); + } + else + { + switch (token) + { + case HLSLToken_PlusPlus: + strcpy(buffer, "++"); + break; + case HLSLToken_MinusMinus: + strcpy(buffer, "--"); + break; + case HLSLToken_PlusEqual: + strcpy(buffer, "+="); + break; + case HLSLToken_MinusEqual: + strcpy(buffer, "-="); + break; + case HLSLToken_TimesEqual: + strcpy(buffer, "*="); + break; + case HLSLToken_DivideEqual: + strcpy(buffer, "/="); + break; + case HLSLToken_FloatLiteral: + strcpy(buffer, "float"); + break; + case HLSLToken_IntLiteral: + strcpy(buffer, "int"); + break; + case HLSLToken_Identifier: + strcpy(buffer, "identifier"); + break; + case HLSLToken_EndOfStream: + strcpy(buffer, ""); + break; + default: + strcpy(buffer, "unknown"); + break; + } + } + +} + +void HLSLTokenizer::ReturnToPos(const char * pos) +{ + m_buffer = pos; +} + + +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.h projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTokenizer.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,226 @@ +#ifndef HLSL_TOKENIZER_H +#define HLSL_TOKENIZER_H + +namespace M4 +{ + +/** In addition to the values in this enum, all of the ASCII characters are +valid tokens. */ +enum HLSLToken +{ + // Built-in types. + HLSLToken_Float = 256, + HLSLToken_Float1, + HLSLToken_Float1x1, + HLSLToken_Float2, + HLSLToken_Float2x1, + HLSLToken_Float3, + HLSLToken_Float3x1, + HLSLToken_Float4, + HLSLToken_Float4x1, + HLSLToken_Float2x4, + HLSLToken_Float2x3, + HLSLToken_Float2x2, + HLSLToken_Float3x4, + HLSLToken_Float3x3, + HLSLToken_Float3x2, + HLSLToken_Float4x4, + HLSLToken_Float4x3, + HLSLToken_Float4x2, + + HLSLToken_Half, + HLSLToken_Half1, + HLSLToken_Half1x1, + HLSLToken_Half2, + HLSLToken_Half2x1, + HLSLToken_Half3, + HLSLToken_Half3x1, + HLSLToken_Half4, + HLSLToken_Half4x1, + HLSLToken_Half2x4, + HLSLToken_Half2x3, + HLSLToken_Half2x2, + HLSLToken_Half3x4, + HLSLToken_Half3x3, + HLSLToken_Half3x2, + HLSLToken_Half4x4, + HLSLToken_Half4x3, + HLSLToken_Half4x2, + + HLSLToken_Double, + HLSLToken_Double1, + HLSLToken_Double1x1, + HLSLToken_Double2, + HLSLToken_Double2x1, + HLSLToken_Double3, + HLSLToken_Double3x1, + HLSLToken_Double4, + HLSLToken_Double4x1, + HLSLToken_Double2x4, + HLSLToken_Double2x3, + HLSLToken_Double2x2, + HLSLToken_Double3x4, + HLSLToken_Double3x3, + HLSLToken_Double3x2, + HLSLToken_Double4x4, + HLSLToken_Double4x3, + HLSLToken_Double4x2, + + HLSLToken_Bool, + HLSLToken_Bool2, + HLSLToken_Bool3, + HLSLToken_Bool4, + HLSLToken_Int, + HLSLToken_Int2, + HLSLToken_Int3, + HLSLToken_Int4, + HLSLToken_Uint, + HLSLToken_Uint2, + HLSLToken_Uint3, + HLSLToken_Uint4, + HLSLToken_Texture, + HLSLToken_Sampler, + HLSLToken_Sampler2D, + HLSLToken_Sampler3D, + HLSLToken_SamplerCube, + HLSLToken_Sampler2DShadow, + HLSLToken_Sampler2DMS, + HLSLToken_Sampler2DArray, + + // Reserved words. + HLSLToken_If, + HLSLToken_Else, + HLSLToken_For, + HLSLToken_While, + HLSLToken_Break, + HLSLToken_True, + HLSLToken_False, + HLSLToken_Void, + HLSLToken_Struct, + HLSLToken_CBuffer, + HLSLToken_TBuffer, + HLSLToken_Register, + HLSLToken_Return, + HLSLToken_Continue, + HLSLToken_Discard, + HLSLToken_Const, + HLSLToken_Static, + HLSLToken_Inline, + HLSLToken_PreprocessorDefine, + HLSLToken_PreprocessorIf, + HLSLToken_PreprocessorElse, + HLSLToken_PreprocessorEndif, + + // Input modifiers. + HLSLToken_Uniform, + HLSLToken_In, + HLSLToken_Out, + HLSLToken_InOut, + + // Effect keywords. + HLSLToken_SamplerState, + HLSLToken_Technique, + HLSLToken_Pass, + + // Multi-character symbols. + HLSLToken_LessEqual, + HLSLToken_GreaterEqual, + HLSLToken_EqualEqual, + HLSLToken_NotEqual, + HLSLToken_PlusPlus, + HLSLToken_MinusMinus, + HLSLToken_PlusEqual, + HLSLToken_MinusEqual, + HLSLToken_TimesEqual, + HLSLToken_DivideEqual, + HLSLToken_AndAnd, // && + HLSLToken_BarBar, // || + + // Other token types. + HLSLToken_FloatLiteral, + HLSLToken_IntLiteral, + HLSLToken_Identifier, + + HLSLToken_EndOfLine, + + HLSLToken_EndOfStream, +}; + +class HLSLTokenizer +{ + +public: + HLSLTokenizer() { } + + /// Maximum string length of an identifier. + static const int s_maxIdentifier = 255 + 1; + + /** The file name is only used for error reporting. */ + HLSLTokenizer(const char* fileName, const char* buffer, size_t length); + + /** Advances to the next token in the stream. */ + void Next(const bool EOLSkipping = true); + + /** Returns the current token in the stream. */ + int GetToken() const; + + /** Returns the number of the current token. */ + float GetFloat() const; + int GetInt() const; + + /** Returns the identifier for the current token. */ + const char* GetIdentifier() const; + + /** Returns the line number where the current token began. */ + int GetLineNumber() const; + + /** Returns the file name where the current token began. */ + const char* GetFileName() const; + + /** Gets a human readable text description of the current token. */ + void GetTokenName(char buffer[s_maxIdentifier]) const; + + /** Reports an error using printf style formatting. The current line number + is included. Only the first error reported will be output. */ + void Error(const char* format, ...); + + /** Gets a human readable text description of the specified token. */ + static void GetTokenName(int token, char buffer[s_maxIdentifier]); + + /** Returns true if the next caracterer is a whitespace. */ + bool NextIsWhitespace(); + + const char* getLastPos(const bool trimmed); + const char* getCurrentPos() { return m_buffer; } + + void ReturnToPos(const char * pos); + +private: + + bool SkipWhitespace(const bool EOLSkipping); + bool SkipComment(const char **buffer, const bool EOLSkipping); + bool SkipPragmaDirective(); + bool ScanNumber(); + bool ScanLineDirective(); + +private: + + const char* m_fileName; + const char* m_buffer; + const char* m_bufferPrevious; + const char* m_bufferEnd; + int m_lineNumber; + bool m_error; + + int m_token; + float m_fValue; + int m_iValue; + char m_identifier[s_maxIdentifier]; + char m_lineDirectiveFileName[s_maxIdentifier]; + int m_tokenLineNumber; + +}; + +} + +#endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTree.cpp projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTree.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTree.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTree.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,2057 @@ +//#include "Engine/Assert.h" +#include "Engine.h" + +#include "HLSLTree.h" +#include +#include +#include +#include + +namespace M4 +{ + +HLSLTree::HLSLTree(Allocator* allocator) : + m_allocator(allocator), m_stringPool(allocator) +{ + m_firstPage = m_allocator->New(); + m_firstPage->next = NULL; + + m_currentPage = m_firstPage; + m_currentPageOffset = 0; + + m_root = AddNode(NULL, 1); +} + +HLSLTree::~HLSLTree() +{ + NodePage* page = m_firstPage; + while (page != NULL) + { + NodePage* next = page->next; + m_allocator->Delete(page); + page = next; + } +} + +void HLSLTree::AllocatePage() +{ + NodePage* newPage = m_allocator->New(); + newPage->next = NULL; + m_currentPage->next = newPage; + m_currentPageOffset = 0; + m_currentPage = newPage; +} + +const char* HLSLTree::AddString(const char* string) +{ + return m_stringPool.AddString(string); +} + +const char* HLSLTree::AddStringFormat(const char* format, ...) +{ + va_list args; + va_start(args, format); + const char * string = m_stringPool.AddStringFormatList(format, args); + va_end(args); + return string; +} + +bool HLSLTree::GetContainsString(const char* string) const +{ + return m_stringPool.GetContainsString(string); +} + +HLSLRoot* HLSLTree::GetRoot() const +{ + return m_root; +} + +void* HLSLTree::AllocateMemory(size_t size) +{ + if (m_currentPageOffset + size > s_nodePageSize) + { + AllocatePage(); + } + void* buffer = m_currentPage->buffer + m_currentPageOffset; + m_currentPageOffset += size; + return buffer; +} + +// @@ This doesn't do any parameter matching. Simply returns the first function with that name. +HLSLFunction * HLSLTree::FindFunction(const char * name) +{ + HLSLStatement * statement = m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Function) + { + HLSLFunction * function = (HLSLFunction *)statement; + if (String_Equal(name, function->name)) + { + return function; + } + } + + statement = statement->nextStatement; + } + + return NULL; +} + +HLSLDeclaration * HLSLTree::FindGlobalDeclaration(const char * name, HLSLBuffer ** buffer_out/*=NULL*/) +{ + HLSLStatement * statement = m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Declaration) + { + HLSLDeclaration * declaration = (HLSLDeclaration *)statement; + if (String_Equal(name, declaration->name)) + { + if (buffer_out) *buffer_out = NULL; + return declaration; + } + } + else if (statement->nodeType == HLSLNodeType_Buffer) + { + HLSLBuffer* buffer = (HLSLBuffer*)statement; + + HLSLDeclaration* field = buffer->field; + while (field != NULL) + { + ASSERT(field->nodeType == HLSLNodeType_Declaration); + if (String_Equal(name, field->name)) + { + if (buffer_out) *buffer_out = buffer; + return field; + } + field = (HLSLDeclaration*)field->nextStatement; + } + } + + statement = statement->nextStatement; + } + + if (buffer_out) *buffer_out = NULL; + return NULL; +} + +HLSLStruct * HLSLTree::FindGlobalStruct(const char * name) +{ + HLSLStatement * statement = m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Struct) + { + HLSLStruct * declaration = (HLSLStruct *)statement; + if (String_Equal(name, declaration->name)) + { + return declaration; + } + } + + statement = statement->nextStatement; + } + + return NULL; +} + +HLSLTechnique * HLSLTree::FindTechnique(const char * name) +{ + HLSLStatement * statement = m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Technique) + { + HLSLTechnique * technique = (HLSLTechnique *)statement; + if (String_Equal(name, technique->name)) + { + return technique; + } + } + + statement = statement->nextStatement; + } + + return NULL; +} + +HLSLPipeline * HLSLTree::FindFirstPipeline() +{ + return FindNextPipeline(NULL); +} + +HLSLPipeline * HLSLTree::FindNextPipeline(HLSLPipeline * current) +{ + HLSLStatement * statement = current ? current : m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Pipeline) + { + return (HLSLPipeline *)statement; + } + + statement = statement->nextStatement; + } + + return NULL; +} + +HLSLPipeline * HLSLTree::FindPipeline(const char * name) +{ + HLSLStatement * statement = m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Pipeline) + { + HLSLPipeline * pipeline = (HLSLPipeline *)statement; + if (String_Equal(name, pipeline->name)) + { + return pipeline; + } + } + + statement = statement->nextStatement; + } + + return NULL; +} + +HLSLBuffer * HLSLTree::FindBuffer(const char * name) +{ + HLSLStatement * statement = m_root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Buffer) + { + HLSLBuffer * buffer = (HLSLBuffer *)statement; + if (String_Equal(name, buffer->name)) + { + return buffer; + } + } + + statement = statement->nextStatement; + } + + return NULL; +} + + + +bool HLSLTree::GetExpressionValue(HLSLExpression * expression, int & value) +{ + ASSERT (expression != NULL); + + // Expression must be constant. + if ((expression->expressionType.flags & HLSLTypeFlag_Const) == 0) + { + return false; + } + + // We are expecting an integer scalar. @@ Add support for type conversion from other scalar types. + if (expression->expressionType.baseType != HLSLBaseType_Int && + expression->expressionType.baseType != HLSLBaseType_Bool) + { + return false; + } + + if (expression->expressionType.array) + { + return false; + } + + if (expression->nodeType == HLSLNodeType_BinaryExpression) + { + HLSLBinaryExpression * binaryExpression = (HLSLBinaryExpression *)expression; + + int value1, value2; + if (!GetExpressionValue(binaryExpression->expression1, value1) || + !GetExpressionValue(binaryExpression->expression2, value2)) + { + return false; + } + + switch(binaryExpression->binaryOp) + { + case HLSLBinaryOp_And: + value = value1 && value2; + return true; + case HLSLBinaryOp_Or: + value = value1 || value2; + return true; + case HLSLBinaryOp_Add: + value = value1 + value2; + return true; + case HLSLBinaryOp_Sub: + value = value1 - value2; + return true; + case HLSLBinaryOp_Mul: + value = value1 * value2; + return true; + case HLSLBinaryOp_Div: + value = value1 / value2; + return true; + case HLSLBinaryOp_Mod: + value = value1 % value2; + return true; + case HLSLBinaryOp_Less: + value = value1 < value2; + return true; + case HLSLBinaryOp_Greater: + value = value1 > value2; + return true; + case HLSLBinaryOp_LessEqual: + value = value1 <= value2; + return true; + case HLSLBinaryOp_GreaterEqual: + value = value1 >= value2; + return true; + case HLSLBinaryOp_Equal: + value = value1 == value2; + return true; + case HLSLBinaryOp_NotEqual: + value = value1 != value2; + return true; + case HLSLBinaryOp_BitAnd: + value = value1 & value2; + return true; + case HLSLBinaryOp_BitOr: + value = value1 | value2; + return true; + case HLSLBinaryOp_BitXor: + value = value1 ^ value2; + return true; + case HLSLBinaryOp_Assign: + case HLSLBinaryOp_AddAssign: + case HLSLBinaryOp_SubAssign: + case HLSLBinaryOp_MulAssign: + case HLSLBinaryOp_DivAssign: + // IC: These are not valid on non-constant expressions and should fail earlier when querying expression value. + return false; + } + } + else if (expression->nodeType == HLSLNodeType_UnaryExpression) + { + HLSLUnaryExpression * unaryExpression = (HLSLUnaryExpression *)expression; + + if (!GetExpressionValue(unaryExpression->expression, value)) + { + return false; + } + + switch(unaryExpression->unaryOp) + { + case HLSLUnaryOp_Negative: + value = -value; + return true; + case HLSLUnaryOp_Positive: + // nop. + return true; + case HLSLUnaryOp_Not: + value = !value; + return true; + case HLSLUnaryOp_BitNot: + value = ~value; + return true; + case HLSLUnaryOp_PostDecrement: + case HLSLUnaryOp_PostIncrement: + case HLSLUnaryOp_PreDecrement: + case HLSLUnaryOp_PreIncrement: + // IC: These are not valid on non-constant expressions and should fail earlier when querying expression value. + return false; + } + } + else if (expression->nodeType == HLSLNodeType_IdentifierExpression) + { + HLSLIdentifierExpression * identifier = (HLSLIdentifierExpression *)expression; + + HLSLDeclaration * declaration = FindGlobalDeclaration(identifier->name); + if (declaration == NULL) + { + return false; + } + if ((declaration->type.flags & HLSLTypeFlag_Const) == 0) + { + return false; + } + + return GetExpressionValue(declaration->assignment, value); + } + else if (expression->nodeType == HLSLNodeType_LiteralExpression) + { + HLSLLiteralExpression * literal = (HLSLLiteralExpression *)expression; + + if (literal->expressionType.baseType == HLSLBaseType_Int) value = literal->iValue; + else if (literal->expressionType.baseType == HLSLBaseType_Bool) value = (int)literal->bValue; + else return false; + + return true; + } + + return false; +} + +bool HLSLTree::NeedsFunction(const char* name) +{ + // Early out + if (!GetContainsString(name)) + return false; + + struct NeedsFunctionVisitor: HLSLTreeVisitor + { + const char* name; + bool result; + + virtual void VisitTopLevelStatement(HLSLStatement * node) + { + if (!node->hidden) + HLSLTreeVisitor::VisitTopLevelStatement(node); + } + + virtual void VisitFunctionCall(HLSLFunctionCall * node) + { + result = result || String_Equal(name, node->function->name); + + HLSLTreeVisitor::VisitFunctionCall(node); + } + }; + + NeedsFunctionVisitor visitor; + visitor.name = name; + visitor.result = false; + + visitor.VisitRoot(m_root); + + return visitor.result; +} + +int GetVectorDimension(HLSLType & type) +{ + if (type.baseType >= HLSLBaseType_FirstNumeric && + type.baseType <= HLSLBaseType_LastNumeric) + { + if (type.baseType == HLSLBaseType_Float) return 1; + if (type.baseType == HLSLBaseType_Float2) return 2; + if (type.baseType == HLSLBaseType_Float3) return 3; + if (type.baseType == HLSLBaseType_Float4) return 4; + + } + return 0; +} + +// Returns dimension, 0 if invalid. +int HLSLTree::GetExpressionValue(HLSLExpression * expression, float values[4]) +{ + ASSERT (expression != NULL); + + // Expression must be constant. + if ((expression->expressionType.flags & HLSLTypeFlag_Const) == 0) + { + return 0; + } + + if (expression->expressionType.baseType == HLSLBaseType_Int || + expression->expressionType.baseType == HLSLBaseType_Bool) + { + int int_value; + if (GetExpressionValue(expression, int_value)) { + for (int i = 0; i < 4; i++) values[i] = (float)int_value; // @@ Warn if conversion is not exact. + return 1; + } + + return 0; + } + if (expression->expressionType.baseType >= HLSLBaseType_FirstInteger && expression->expressionType.baseType <= HLSLBaseType_LastInteger) + { + // @@ Add support for uints? + // @@ Add support for int vectors? + return 0; + } + if (expression->expressionType.baseType > HLSLBaseType_LastNumeric) + { + return 0; + } + + // @@ Not supported yet, but we may need it? + if (expression->expressionType.array) + { + return false; + } + + if (expression->nodeType == HLSLNodeType_BinaryExpression) + { + HLSLBinaryExpression * binaryExpression = (HLSLBinaryExpression *)expression; + int dim = GetVectorDimension(binaryExpression->expressionType); + + float values1[4], values2[4]; + int dim1 = GetExpressionValue(binaryExpression->expression1, values1); + int dim2 = GetExpressionValue(binaryExpression->expression2, values2); + + if (dim1 == 0 || dim2 == 0) + { + return 0; + } + + if (dim1 != dim2) + { + // Brodacast scalar to vector size. + if (dim1 == 1) + { + for (int i = 1; i < dim2; i++) values1[i] = values1[0]; + dim1 = dim2; + } + else if (dim2 == 1) + { + for (int i = 1; i < dim1; i++) values2[i] = values2[0]; + dim2 = dim1; + } + else + { + return 0; + } + } + ASSERT(dim == dim1); + + switch(binaryExpression->binaryOp) + { + case HLSLBinaryOp_Add: + for (int i = 0; i < dim; i++) values[i] = values1[i] + values2[i]; + return dim; + case HLSLBinaryOp_Sub: + for (int i = 0; i < dim; i++) values[i] = values1[i] - values2[i]; + return dim; + case HLSLBinaryOp_Mul: + for (int i = 0; i < dim; i++) values[i] = values1[i] * values2[i]; + return dim; + case HLSLBinaryOp_Div: + for (int i = 0; i < dim; i++) values[i] = values1[i] / values2[i]; + return dim; + case HLSLBinaryOp_Mod: + for (int i = 0; i < dim; i++) values[i] = int(values1[i]) % int(values2[i]); + return dim; + default: + return 0; + } + } + else if (expression->nodeType == HLSLNodeType_UnaryExpression) + { + HLSLUnaryExpression * unaryExpression = (HLSLUnaryExpression *)expression; + int dim = GetVectorDimension(unaryExpression->expressionType); + + int dim1 = GetExpressionValue(unaryExpression->expression, values); + if (dim1 == 0) + { + return 0; + } + ASSERT(dim == dim1); + + switch(unaryExpression->unaryOp) + { + case HLSLUnaryOp_Negative: + for (int i = 0; i < dim; i++) values[i] = -values[i]; + return dim; + case HLSLUnaryOp_Positive: + // nop. + return dim; + default: + return 0; + } + } + else if (expression->nodeType == HLSLNodeType_ConstructorExpression) + { + HLSLConstructorExpression * constructor = (HLSLConstructorExpression *)expression; + + int dim = GetVectorDimension(constructor->expressionType); + + int idx = 0; + HLSLExpression * arg = constructor->argument; + while (arg != NULL) + { + float tmp[4]; + int n = GetExpressionValue(arg, tmp); + for (int i = 0; i < n; i++) values[idx + i] = tmp[i]; + idx += n; + + arg = arg->nextExpression; + } + ASSERT(dim == idx); + + return dim; + } + else if (expression->nodeType == HLSLNodeType_IdentifierExpression) + { + HLSLIdentifierExpression * identifier = (HLSLIdentifierExpression *)expression; + + HLSLDeclaration * declaration = FindGlobalDeclaration(identifier->name); + if (declaration == NULL) + { + return 0; + } + if ((declaration->type.flags & HLSLTypeFlag_Const) == 0) + { + return 0; + } + + return GetExpressionValue(declaration->assignment, values); + } + else if (expression->nodeType == HLSLNodeType_LiteralExpression) + { + HLSLLiteralExpression * literal = (HLSLLiteralExpression *)expression; + + if (literal->expressionType.baseType == HLSLBaseType_Float) values[0] = literal->fValue; + else if (literal->expressionType.baseType == HLSLBaseType_Bool) values[0] = literal->bValue; + else if (literal->expressionType.baseType == HLSLBaseType_Int) values[0] = (float)literal->iValue; // @@ Warn if conversion is not exact. + else return 0; + + return 1; + } + + return 0; +} + +bool HLSLTree::ReplaceUniformsAssignements() +{ + struct ReplaceUniformsAssignementsVisitor: HLSLTreeVisitor + { + HLSLTree * tree; + std::map uniforms; + std::map uniformsReplaced; + bool withinAssignement; + + virtual void VisitDeclaration(HLSLDeclaration * node) + { + HLSLTreeVisitor::VisitDeclaration(node); + + // Enumerate uniforms + if (node->type.flags & HLSLTypeFlag_Uniform) + { + uniforms[node->name] = node; + } + } + + virtual void VisitFunction(HLSLFunction * node) + { + uniformsReplaced.clear(); + + // Detect uniforms assignments + HLSLTreeVisitor::VisitFunction(node); + + // Declare uniforms replacements + std::map::const_iterator iter = uniformsReplaced.cbegin(); + for ( ; iter != uniformsReplaced.cend(); ++iter) + { + HLSLDeclaration * uniformDeclaration = uniforms[iter->first]; + HLSLDeclaration * declaration = tree->AddNode(node->fileName, node->line); + + declaration->name = tree->AddString(iter->second.c_str()); + declaration->type = uniformDeclaration->type; + + // Add declaration within function statements + declaration->nextStatement = node->statement; + node->statement = declaration; + } + } + + virtual void VisitBinaryExpression(HLSLBinaryExpression * node) + { + // Visit expression 2 first to not replace possible uniform reading + VisitExpression(node->expression2); + + if (IsAssignOp(node->binaryOp)) + { + withinAssignement = true; + } + + VisitExpression(node->expression1); + + withinAssignement = false; + } + + virtual void VisitIdentifierExpression(HLSLIdentifierExpression * node) + { + if (withinAssignement) + { + // Check if variable is a uniform + if (uniforms.find(node->name) != uniforms.end()) + { + // Check if variable is not already replaced + if (uniformsReplaced.find(node->name) == uniformsReplaced.end()) + { + std::string newName(node->name); + do + { + newName.insert(0, "new"); + } + while(tree->GetContainsString(newName.c_str())); + + uniformsReplaced[node->name] = newName; + } + } + } + + // Check if variable need to be replaced + if (uniformsReplaced.find(node->name) != uniformsReplaced.end()) + { + // Replace + node->name = tree->AddString( uniformsReplaced[node->name].c_str() ); + } + } + }; + + ReplaceUniformsAssignementsVisitor visitor; + visitor.tree = this; + visitor.withinAssignement = false; + visitor.VisitRoot(m_root); + + return true; +} + + +matrixCtor matrixCtorBuilder(HLSLType type, HLSLExpression * arguments) { + matrixCtor ctor; + + ctor.matrixType = type.baseType; + + // Fetch all arguments + HLSLExpression* argument = arguments; + while (argument != NULL) + { + ctor.argumentTypes.push_back(argument->expressionType.baseType); + argument = argument->nextExpression; + } + + return ctor; +} + +void HLSLTree::EnumerateMatrixCtorsNeeded(std::vector & matrixCtors) { + + struct EnumerateMatrixCtorsVisitor: HLSLTreeVisitor + { + std::vector matrixCtorsNeeded; + + virtual void VisitConstructorExpression(HLSLConstructorExpression * node) + { + if (IsMatrixType(node->expressionType.baseType)) + { + matrixCtor ctor = matrixCtorBuilder(node->expressionType, node->argument); + + if (std::find(matrixCtorsNeeded.cbegin(), matrixCtorsNeeded.cend(), ctor) == matrixCtorsNeeded.cend()) + { + matrixCtorsNeeded.push_back(ctor); + } + } + + HLSLTreeVisitor::VisitConstructorExpression(node); + } + + virtual void VisitDeclaration(HLSLDeclaration * node) + { + if ( IsMatrixType(node->type.baseType) && + (node->type.flags & HLSLArgumentModifier_Uniform) == 0 ) + { + matrixCtor ctor = matrixCtorBuilder(node->type, node->assignment); + + // No special constructor needed if it already a matrix + bool matrixArgument = false; + for(HLSLBaseType & type: ctor.argumentTypes) + { + if (IsMatrixType(type)) + { + matrixArgument = true; + break; + } + } + + if ( !matrixArgument && + std::find(matrixCtorsNeeded.cbegin(), matrixCtorsNeeded.cend(), ctor) == matrixCtorsNeeded.cend()) + { + matrixCtorsNeeded.push_back(ctor); + } + } + + HLSLTreeVisitor::VisitDeclaration(node); + } + }; + + EnumerateMatrixCtorsVisitor visitor; + visitor.VisitRoot(m_root); + + matrixCtors = visitor.matrixCtorsNeeded; +} + + +void HLSLTreeVisitor::VisitType(HLSLType & type) +{ +} + +void HLSLTreeVisitor::VisitRoot(HLSLRoot * root) +{ + HLSLStatement * statement = root->statement; + while (statement != NULL) { + VisitTopLevelStatement(statement); + statement = statement->nextStatement; + } +} + +void HLSLTreeVisitor::VisitTopLevelStatement(HLSLStatement * node) +{ + if (node->nodeType == HLSLNodeType_Declaration) { + VisitDeclaration((HLSLDeclaration *)node); + } + else if (node->nodeType == HLSLNodeType_Struct) { + VisitStruct((HLSLStruct *)node); + } + else if (node->nodeType == HLSLNodeType_Buffer) { + VisitBuffer((HLSLBuffer *)node); + } + else if (node->nodeType == HLSLNodeType_Function) { + VisitFunction((HLSLFunction *)node); + } + else if (node->nodeType == HLSLNodeType_Technique) { + VisitTechnique((HLSLTechnique *)node); + } + else if (node->nodeType == HLSLNodeType_Pipeline) { + VisitPipeline((HLSLPipeline *)node); + } + else { + ASSERT(0); + } +} + +void HLSLTreeVisitor::VisitStatements(HLSLStatement * statement) +{ + while (statement != NULL) { + VisitStatement(statement); + statement = statement->nextStatement; + } +} + +void HLSLTreeVisitor::VisitStatement(HLSLStatement * node) +{ + // Function statements + if (node->nodeType == HLSLNodeType_Declaration) { + VisitDeclaration((HLSLDeclaration *)node); + } + else if (node->nodeType == HLSLNodeType_ExpressionStatement) { + VisitExpressionStatement((HLSLExpressionStatement *)node); + } + else if (node->nodeType == HLSLNodeType_ReturnStatement) { + VisitReturnStatement((HLSLReturnStatement *)node); + } + else if (node->nodeType == HLSLNodeType_DiscardStatement) { + VisitDiscardStatement((HLSLDiscardStatement *)node); + } + else if (node->nodeType == HLSLNodeType_BreakStatement) { + VisitBreakStatement((HLSLBreakStatement *)node); + } + else if (node->nodeType == HLSLNodeType_ContinueStatement) { + VisitContinueStatement((HLSLContinueStatement *)node); + } + else if (node->nodeType == HLSLNodeType_IfStatement) { + VisitIfStatement((HLSLIfStatement *)node); + } + else if (node->nodeType == HLSLNodeType_ForStatement) { + VisitForStatement((HLSLForStatement *)node); + } + else if (node->nodeType == HLSLNodeType_WhileStatement) { + VisitWhileStatement((HLSLWhileStatement *)node); + } + else if (node->nodeType == HLSLNodeType_BlockStatement) { + VisitBlockStatement((HLSLBlockStatement *)node); + } + else { + ASSERT(0); + } +} + +void HLSLTreeVisitor::VisitDeclaration(HLSLDeclaration * node) +{ + VisitType(node->type); + /*do { + VisitExpression(node->assignment); + node = node->nextDeclaration; + } while (node);*/ + if (node->assignment != NULL) { + VisitExpression(node->assignment); + } + if (node->nextDeclaration != NULL) { + VisitDeclaration(node->nextDeclaration); + } +} + +void HLSLTreeVisitor::VisitStruct(HLSLStruct * node) +{ + HLSLStructField * field = node->field; + while (field != NULL) { + VisitStructField(field); + field = field->nextField; + } +} + +void HLSLTreeVisitor::VisitStructField(HLSLStructField * node) +{ + VisitType(node->type); +} + +void HLSLTreeVisitor::VisitBuffer(HLSLBuffer * node) +{ + HLSLDeclaration * field = node->field; + while (field != NULL) { + ASSERT(field->nodeType == HLSLNodeType_Declaration); + VisitDeclaration(field); + ASSERT(field->nextDeclaration == NULL); + field = (HLSLDeclaration *)field->nextStatement; + } +} + +/*void HLSLTreeVisitor::VisitBufferField(HLSLBufferField * node) +{ + VisitType(node->type); +}*/ + +void HLSLTreeVisitor::VisitFunction(HLSLFunction * node) +{ + VisitType(node->returnType); + + HLSLArgument * argument = node->argument; + while (argument != NULL) { + VisitArgument(argument); + argument = argument->nextArgument; + } + + VisitStatements(node->statement); +} + +void HLSLTreeVisitor::VisitArgument(HLSLArgument * node) +{ + VisitType(node->type); + if (node->defaultValue != NULL) { + VisitExpression(node->defaultValue); + } +} + +void HLSLTreeVisitor::VisitExpressionStatement(HLSLExpressionStatement * node) +{ + VisitExpression(node->expression); +} + +void HLSLTreeVisitor::VisitExpression(HLSLExpression * node) +{ + VisitType(node->expressionType); + + if (node->nodeType == HLSLNodeType_UnaryExpression) { + VisitUnaryExpression((HLSLUnaryExpression *)node); + } + else if (node->nodeType == HLSLNodeType_BinaryExpression) { + VisitBinaryExpression((HLSLBinaryExpression *)node); + } + else if (node->nodeType == HLSLNodeType_ConditionalExpression) { + VisitConditionalExpression((HLSLConditionalExpression *)node); + } + else if (node->nodeType == HLSLNodeType_CastingExpression) { + VisitCastingExpression((HLSLCastingExpression *)node); + } + else if (node->nodeType == HLSLNodeType_LiteralExpression) { + VisitLiteralExpression((HLSLLiteralExpression *)node); + } + else if (node->nodeType == HLSLNodeType_IdentifierExpression) { + VisitIdentifierExpression((HLSLIdentifierExpression *)node); + } + else if (node->nodeType == HLSLNodeType_ConstructorExpression) { + VisitConstructorExpression((HLSLConstructorExpression *)node); + } + else if (node->nodeType == HLSLNodeType_MemberAccess) { + VisitMemberAccess((HLSLMemberAccess *)node); + } + else if (node->nodeType == HLSLNodeType_ArrayAccess) { + VisitArrayAccess((HLSLArrayAccess *)node); + } + else if (node->nodeType == HLSLNodeType_FunctionCall) { + VisitFunctionCall((HLSLFunctionCall *)node); + } + // Acoget-TODO: This was missing. Did adding it break anything? + else if (node->nodeType == HLSLNodeType_SamplerState) { + VisitSamplerState((HLSLSamplerState *)node); + } + else { + ASSERT(0); + } +} + +void HLSLTreeVisitor::VisitReturnStatement(HLSLReturnStatement * node) +{ + VisitExpression(node->expression); +} + +void HLSLTreeVisitor::VisitDiscardStatement(HLSLDiscardStatement * node) {} +void HLSLTreeVisitor::VisitBreakStatement(HLSLBreakStatement * node) {} +void HLSLTreeVisitor::VisitContinueStatement(HLSLContinueStatement * node) {} + +void HLSLTreeVisitor::VisitIfStatement(HLSLIfStatement * node) +{ + VisitExpression(node->condition); + VisitStatements(node->statement); + if (node->elseStatement) { + VisitStatements(node->elseStatement); + } +} + +void HLSLTreeVisitor::VisitForStatement(HLSLForStatement * node) +{ + if (node->initialization) { + VisitDeclaration(node->initialization); + } + if (node->condition) { + VisitExpression(node->condition); + } + if (node->increment) { + VisitExpression(node->increment); + } + VisitStatements(node->statement); +} + +void HLSLTreeVisitor::VisitWhileStatement(HLSLWhileStatement * node) +{ + if (node->condition) { + VisitExpression(node->condition); + } + VisitStatements(node->statement); +} + +void HLSLTreeVisitor::VisitBlockStatement(HLSLBlockStatement * node) +{ + VisitStatements(node->statement); +} + +void HLSLTreeVisitor::VisitUnaryExpression(HLSLUnaryExpression * node) +{ + VisitExpression(node->expression); +} + +void HLSLTreeVisitor::VisitBinaryExpression(HLSLBinaryExpression * node) +{ + VisitExpression(node->expression1); + VisitExpression(node->expression2); +} + +void HLSLTreeVisitor::VisitConditionalExpression(HLSLConditionalExpression * node) +{ + VisitExpression(node->condition); + VisitExpression(node->falseExpression); + VisitExpression(node->trueExpression); +} + +void HLSLTreeVisitor::VisitCastingExpression(HLSLCastingExpression * node) +{ + VisitType(node->type); + VisitExpression(node->expression); +} + +void HLSLTreeVisitor::VisitLiteralExpression(HLSLLiteralExpression * node) {} +void HLSLTreeVisitor::VisitIdentifierExpression(HLSLIdentifierExpression * node) {} + +void HLSLTreeVisitor::VisitConstructorExpression(HLSLConstructorExpression * node) +{ + HLSLExpression * argument = node->argument; + while (argument != NULL) { + VisitExpression(argument); + argument = argument->nextExpression; + } +} + +void HLSLTreeVisitor::VisitMemberAccess(HLSLMemberAccess * node) +{ + VisitExpression(node->object); +} + +void HLSLTreeVisitor::VisitArrayAccess(HLSLArrayAccess * node) +{ + VisitExpression(node->array); + VisitExpression(node->index); +} + +void HLSLTreeVisitor::VisitFunctionCall(HLSLFunctionCall * node) +{ + HLSLExpression * argument = node->argument; + while (argument != NULL) { + VisitExpression(argument); + argument = argument->nextExpression; + } +} + +void HLSLTreeVisitor::VisitStateAssignment(HLSLStateAssignment * node) {} + +void HLSLTreeVisitor::VisitSamplerState(HLSLSamplerState * node) +{ + HLSLStateAssignment * stateAssignment = node->stateAssignments; + while (stateAssignment != NULL) { + VisitStateAssignment(stateAssignment); + stateAssignment = stateAssignment->nextStateAssignment; + } +} + +void HLSLTreeVisitor::VisitPass(HLSLPass * node) +{ + HLSLStateAssignment * stateAssignment = node->stateAssignments; + while (stateAssignment != NULL) { + VisitStateAssignment(stateAssignment); + stateAssignment = stateAssignment->nextStateAssignment; + } +} + +void HLSLTreeVisitor::VisitTechnique(HLSLTechnique * node) +{ + HLSLPass * pass = node->passes; + while (pass != NULL) { + VisitPass(pass); + pass = pass->nextPass; + } +} + +void HLSLTreeVisitor::VisitPipeline(HLSLPipeline * node) +{ + // @@ ? +} + +void HLSLTreeVisitor::VisitFunctions(HLSLRoot * root) +{ + HLSLStatement * statement = root->statement; + while (statement != NULL) { + if (statement->nodeType == HLSLNodeType_Function) { + VisitFunction((HLSLFunction *)statement); + } + + statement = statement->nextStatement; + } +} + +void HLSLTreeVisitor::VisitParameters(HLSLRoot * root) +{ + HLSLStatement * statement = root->statement; + while (statement != NULL) { + if (statement->nodeType == HLSLNodeType_Declaration) { + VisitDeclaration((HLSLDeclaration *)statement); + } + + statement = statement->nextStatement; + } +} + + +class ResetHiddenFlagVisitor : public HLSLTreeVisitor +{ +public: + virtual void VisitTopLevelStatement(HLSLStatement * statement) + { + statement->hidden = true; + + if (statement->nodeType == HLSLNodeType_Buffer) + { + VisitBuffer((HLSLBuffer*)statement); + } + } + + // Hide buffer fields. + virtual void VisitDeclaration(HLSLDeclaration * node) + { + node->hidden = true; + } + + virtual void VisitArgument(HLSLArgument * node) + { + node->hidden = false; // Arguments are visible by default. + } +}; + +class MarkVisibleStatementsVisitor : public HLSLTreeVisitor +{ +public: + HLSLTree * tree; + MarkVisibleStatementsVisitor(HLSLTree * tree) : tree(tree) {} + + virtual void VisitFunction(HLSLFunction * node) + { + node->hidden = false; + HLSLTreeVisitor::VisitFunction(node); + + if (node->forward) + VisitFunction(node->forward); + } + + virtual void VisitFunctionCall(HLSLFunctionCall * node) + { + HLSLTreeVisitor::VisitFunctionCall(node); + + if (node->function->hidden) + { + VisitFunction(const_cast(node->function)); + } + } + + virtual void VisitIdentifierExpression(HLSLIdentifierExpression * node) + { + HLSLTreeVisitor::VisitIdentifierExpression(node); + + if (node->global) + { + HLSLDeclaration * declaration = tree->FindGlobalDeclaration(node->name); + if (declaration != NULL && declaration->hidden) + { + declaration->hidden = false; + VisitDeclaration(declaration); + } + } + } + + virtual void VisitType(HLSLType & type) + { + if (type.baseType == HLSLBaseType_UserDefined) + { + HLSLStruct * globalStruct = tree->FindGlobalStruct(type.typeName); + if (globalStruct != NULL) + { + globalStruct->hidden = false; + VisitStruct(globalStruct); + } + } + } + +}; + + +void PruneTree(HLSLTree* tree, const char* entryName0, const char* entryName1/*=NULL*/) +{ + HLSLRoot* root = tree->GetRoot(); + + // Reset all flags. + ResetHiddenFlagVisitor reset; + reset.VisitRoot(root); + + // Mark all the statements necessary for these entrypoints. + HLSLFunction* entry = tree->FindFunction(entryName0); + if (entry != NULL) + { + MarkVisibleStatementsVisitor mark(tree); + mark.VisitFunction(entry); + } + + if (entryName1 != NULL) + { + entry = tree->FindFunction(entryName1); + if (entry != NULL) + { + MarkVisibleStatementsVisitor mark(tree); + mark.VisitFunction(entry); + } + } + + // Mark buffers visible, if any of their fields is visible. + HLSLStatement * statement = root->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_Buffer) + { + HLSLBuffer* buffer = (HLSLBuffer*)statement; + + HLSLDeclaration* field = buffer->field; + while (field != NULL) + { + ASSERT(field->nodeType == HLSLNodeType_Declaration); + if (!field->hidden) + { + buffer->hidden = false; + break; + } + field = (HLSLDeclaration*)field->nextStatement; + } + } + + statement = statement->nextStatement; + } +} + + +void SortTree(HLSLTree * tree) +{ + // Stable sort so that statements are in this order: + // structs, declarations, functions, techniques. + // but their relative order is preserved. + + HLSLRoot* root = tree->GetRoot(); + + HLSLStatement* structs = NULL; + HLSLStatement* lastStruct = NULL; + HLSLStatement* constDeclarations = NULL; + HLSLStatement* lastConstDeclaration = NULL; + HLSLStatement* declarations = NULL; + HLSLStatement* lastDeclaration = NULL; + HLSLStatement* functions = NULL; + HLSLStatement* lastFunction = NULL; + HLSLStatement* other = NULL; + HLSLStatement* lastOther = NULL; + + HLSLStatement* statement = root->statement; + while (statement != NULL) { + HLSLStatement* nextStatement = statement->nextStatement; + statement->nextStatement = NULL; + + if (statement->nodeType == HLSLNodeType_Struct) { + if (structs == NULL) structs = statement; + if (lastStruct != NULL) lastStruct->nextStatement = statement; + lastStruct = statement; + } + else if (statement->nodeType == HLSLNodeType_Declaration || statement->nodeType == HLSLNodeType_Buffer) { + if (statement->nodeType == HLSLNodeType_Declaration && (((HLSLDeclaration *)statement)->type.flags & HLSLTypeFlag_Const)) { + if (constDeclarations == NULL) constDeclarations = statement; + if (lastConstDeclaration != NULL) lastConstDeclaration->nextStatement = statement; + lastConstDeclaration = statement; + } + else { + if (declarations == NULL) declarations = statement; + if (lastDeclaration != NULL) lastDeclaration->nextStatement = statement; + lastDeclaration = statement; + } + } + else if (statement->nodeType == HLSLNodeType_Function) { + if (functions == NULL) functions = statement; + if (lastFunction != NULL) lastFunction->nextStatement = statement; + lastFunction = statement; + } + else { + if (other == NULL) other = statement; + if (lastOther != NULL) lastOther->nextStatement = statement; + lastOther = statement; + } + + statement = nextStatement; + } + + // Chain all the statements in the order that we want. + HLSLStatement * firstStatement = structs; + HLSLStatement * lastStatement = lastStruct; + + if (constDeclarations != NULL) { + if (firstStatement == NULL) firstStatement = constDeclarations; + else lastStatement->nextStatement = constDeclarations; + lastStatement = lastConstDeclaration; + } + + if (declarations != NULL) { + if (firstStatement == NULL) firstStatement = declarations; + else lastStatement->nextStatement = declarations; + lastStatement = lastDeclaration; + } + + if (functions != NULL) { + if (firstStatement == NULL) firstStatement = functions; + else lastStatement->nextStatement = functions; + lastStatement = lastFunction; + } + + if (other != NULL) { + if (firstStatement == NULL) firstStatement = other; + else lastStatement->nextStatement = other; + lastStatement = lastOther; + } + + root->statement = firstStatement; +} + + + + + +// First and last can be the same. +void AddStatements(HLSLRoot * root, HLSLStatement * before, HLSLStatement * first, HLSLStatement * last) +{ + if (before == NULL) { + last->nextStatement = root->statement; + root->statement = first; + } + else { + last->nextStatement = before->nextStatement; + before->nextStatement = first; + } +} + +void AddSingleStatement(HLSLRoot * root, HLSLStatement * before, HLSLStatement * statement) +{ + AddStatements(root, before, statement, statement); +} + + + +// @@ This is very game-specific. Should be moved to pipeline_parser or somewhere else. +void GroupParameters(HLSLTree * tree) +{ + // Sort parameters based on semantic and group them in cbuffers. + + HLSLRoot* root = tree->GetRoot(); + + HLSLDeclaration * firstPerItemDeclaration = NULL; + HLSLDeclaration * lastPerItemDeclaration = NULL; + + HLSLDeclaration * instanceDataDeclaration = NULL; + + HLSLDeclaration * firstPerPassDeclaration = NULL; + HLSLDeclaration * lastPerPassDeclaration = NULL; + + HLSLDeclaration * firstPerItemSampler = NULL; + HLSLDeclaration * lastPerItemSampler = NULL; + + HLSLDeclaration * firstPerPassSampler = NULL; + HLSLDeclaration * lastPerPassSampler = NULL; + + HLSLStatement * statementBeforeBuffers = NULL; + + HLSLStatement* previousStatement = NULL; + HLSLStatement* statement = root->statement; + while (statement != NULL) + { + HLSLStatement* nextStatement = statement->nextStatement; + + if (statement->nodeType == HLSLNodeType_Struct) // Do not remove this, or it will mess the else clause below. + { + statementBeforeBuffers = statement; + } + else if (statement->nodeType == HLSLNodeType_Declaration) + { + HLSLDeclaration* declaration = (HLSLDeclaration*)statement; + + // We insert buffers after the last const declaration. + if ((declaration->type.flags & HLSLTypeFlag_Const) != 0) + { + statementBeforeBuffers = statement; + } + + // Do not move samplers or static/const parameters. + if ((declaration->type.flags & (HLSLTypeFlag_Static|HLSLTypeFlag_Const)) == 0) + { + // Unlink statement. + statement->nextStatement = NULL; + if (previousStatement != NULL) previousStatement->nextStatement = nextStatement; + else root->statement = nextStatement; + + while(declaration != NULL) + { + HLSLDeclaration* nextDeclaration = declaration->nextDeclaration; + + if (declaration->semantic != NULL && String_EqualNoCase(declaration->semantic, "PER_INSTANCED_ITEM")) + { + ASSERT(instanceDataDeclaration == NULL); + instanceDataDeclaration = declaration; + } + else + { + // Select group based on type and semantic. + HLSLDeclaration ** first, ** last; + if (declaration->semantic == NULL || String_EqualNoCase(declaration->semantic, "PER_ITEM") || String_EqualNoCase(declaration->semantic, "PER_MATERIAL")) + { + if (IsSamplerType(declaration->type)) + { + first = &firstPerItemSampler; + last = &lastPerItemSampler; + } + else + { + first = &firstPerItemDeclaration; + last = &lastPerItemDeclaration; + } + } + else + { + if (IsSamplerType(declaration->type)) + { + first = &firstPerPassSampler; + last = &lastPerPassSampler; + } + else + { + first = &firstPerPassDeclaration; + last = &lastPerPassDeclaration; + } + } + + // Add declaration to new list. + if (*first == NULL) *first = declaration; + else (*last)->nextStatement = declaration; + *last = declaration; + } + + // Unlink from declaration list. + declaration->nextDeclaration = NULL; + + // Reset attributes. + declaration->registerName = NULL; + //declaration->semantic = NULL; // @@ Don't do this! + + declaration = nextDeclaration; + } + } + } + /*else + { + if (statementBeforeBuffers == NULL) { + // This is the location where we will insert our buffers. + statementBeforeBuffers = previousStatement; + } + }*/ + + if (statement->nextStatement == nextStatement) { + previousStatement = statement; + } + statement = nextStatement; + } + + + // Add instance data declaration at the end of the per_item buffer. + if (instanceDataDeclaration != NULL) + { + if (firstPerItemDeclaration == NULL) firstPerItemDeclaration = instanceDataDeclaration; + else lastPerItemDeclaration->nextStatement = instanceDataDeclaration; + } + + + // Add samplers. + if (firstPerItemSampler != NULL) { + AddStatements(root, statementBeforeBuffers, firstPerItemSampler, lastPerItemSampler); + statementBeforeBuffers = lastPerItemSampler; + } + if (firstPerPassSampler != NULL) { + AddStatements(root, statementBeforeBuffers, firstPerPassSampler, lastPerPassSampler); + statementBeforeBuffers = lastPerPassSampler; + } + + + // @@ We are assuming per_item and per_pass buffers don't already exist. @@ We should assert on that. + + if (firstPerItemDeclaration != NULL) + { + // Create buffer statement. + HLSLBuffer * perItemBuffer = tree->AddNode(firstPerItemDeclaration->fileName, firstPerItemDeclaration->line-1); + perItemBuffer->name = tree->AddString("per_item"); + perItemBuffer->registerName = tree->AddString("b0"); + perItemBuffer->field = firstPerItemDeclaration; + + // Set declaration buffer pointers. + HLSLDeclaration * field = perItemBuffer->field; + while (field != NULL) + { + field->buffer = perItemBuffer; + field = (HLSLDeclaration *)field->nextStatement; + } + + // Add buffer to statements. + AddSingleStatement(root, statementBeforeBuffers, perItemBuffer); + statementBeforeBuffers = perItemBuffer; + } + + if (firstPerPassDeclaration != NULL) + { + // Create buffer statement. + HLSLBuffer * perPassBuffer = tree->AddNode(firstPerPassDeclaration->fileName, firstPerPassDeclaration->line-1); + perPassBuffer->name = tree->AddString("per_pass"); + perPassBuffer->registerName = tree->AddString("b1"); + perPassBuffer->field = firstPerPassDeclaration; + + // Set declaration buffer pointers. + HLSLDeclaration * field = perPassBuffer->field; + while (field != NULL) + { + field->buffer = perPassBuffer; + field = (HLSLDeclaration *)field->nextStatement; + } + + // Add buffer to statements. + AddSingleStatement(root, statementBeforeBuffers, perPassBuffer); + } +} + + +class FindArgumentVisitor : public HLSLTreeVisitor +{ +public: + bool found; + const char * name; + + FindArgumentVisitor() + { + found = false; + name = NULL; + } + + bool FindArgument(const char * name, HLSLFunction * function) + { + this->found = false; + this->name = name; + VisitStatements(function->statement); + return found; + } + + virtual void VisitStatements(HLSLStatement * statement) override + { + while (statement != NULL && !found) + { + VisitStatement(statement); + statement = statement->nextStatement; + } + } + + virtual void VisitIdentifierExpression(HLSLIdentifierExpression * node) override + { + if (node->name == name) + { + found = true; + } + } +}; + + +void HideUnusedArguments(HLSLFunction * function) +{ + FindArgumentVisitor visitor; + + // For each argument. + HLSLArgument * arg = function->argument; + while (arg != NULL) + { + if (!visitor.FindArgument(arg->name, function)) + { + arg->hidden = true; + } + + arg = arg->nextArgument; + } +} + +bool EmulateAlphaTest(HLSLTree* tree, const char* entryName, float alphaRef/*=0.5*/) +{ + // Find all return statements of this entry point. + HLSLFunction* entry = tree->FindFunction(entryName); + if (entry != NULL) + { + HLSLStatement ** ptr = &entry->statement; + HLSLStatement * statement = entry->statement; + while (statement != NULL) + { + if (statement->nodeType == HLSLNodeType_ReturnStatement) + { + HLSLReturnStatement * returnStatement = (HLSLReturnStatement *)statement; + HLSLBaseType returnType = returnStatement->expression->expressionType.baseType; + + // Build statement: "if (%s.a < 0.5) discard;" + + HLSLDiscardStatement * discard = tree->AddNode(statement->fileName, statement->line); + + HLSLExpression * alpha = NULL; + if (returnType == HLSLBaseType_Float4) + { + // @@ If return expression is a constructor, grab 4th argument. + // That's not as easy, since we support 'float4(float3, float)' or 'float4(float, float3)', extracting + // the latter is not that easy. + /*if (returnStatement->expression->nodeType == HLSLNodeType_ConstructorExpression) { + HLSLConstructorExpression * constructor = (HLSLConstructorExpression *)returnStatement->expression; + //constructor-> + } + */ + + if (alpha == NULL) { + HLSLMemberAccess * access = tree->AddNode(statement->fileName, statement->line); + access->expressionType = HLSLType(HLSLBaseType_Float); + access->object = returnStatement->expression; // @@ Is reference OK? Or should we clone expression? + access->field = tree->AddString("a"); + access->swizzle = true; + + alpha = access; + } + } + else if (returnType == HLSLBaseType_Float) + { + alpha = returnStatement->expression; // @@ Is reference OK? Or should we clone expression? + } + else + { + return false; + } + + HLSLLiteralExpression * threshold = tree->AddNode(statement->fileName, statement->line); + threshold->expressionType = HLSLType(HLSLBaseType_Float); + threshold->fValue = alphaRef; + threshold->type = HLSLBaseType_Float; + + HLSLBinaryExpression * condition = tree->AddNode(statement->fileName, statement->line); + condition->expressionType = HLSLType(HLSLBaseType_Bool); + condition->binaryOp = HLSLBinaryOp_Less; + condition->expression1 = alpha; + condition->expression2 = threshold; + + // Insert statement. + HLSLIfStatement * st = tree->AddNode(statement->fileName, statement->line); + st->condition = condition; + st->statement = discard; + st->nextStatement = statement; + *ptr = st; + } + + ptr = &statement->nextStatement; + statement = statement->nextStatement; + } + } + + return true; +} + +bool NeedsFlattening(HLSLExpression * expr, int level = 0) { + if (expr == NULL) { + return false; + } + if (expr->nodeType == HLSLNodeType_UnaryExpression) { + HLSLUnaryExpression * unaryExpr = (HLSLUnaryExpression *)expr; + return NeedsFlattening(unaryExpr->expression, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_BinaryExpression) { + HLSLBinaryExpression * binaryExpr = (HLSLBinaryExpression *)expr; + if (IsAssignOp(binaryExpr->binaryOp)) { + return NeedsFlattening(binaryExpr->expression2, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else { + return NeedsFlattening(binaryExpr->expression1, level+1) || NeedsFlattening(binaryExpr->expression2, level+1) || NeedsFlattening(expr->nextExpression, level); + } + } + else if (expr->nodeType == HLSLNodeType_ConditionalExpression) { + HLSLConditionalExpression * conditionalExpr = (HLSLConditionalExpression *)expr; + return NeedsFlattening(conditionalExpr->condition, level+1) || NeedsFlattening(conditionalExpr->trueExpression, level+1) || NeedsFlattening(conditionalExpr->falseExpression, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_CastingExpression) { + HLSLCastingExpression * castingExpr = (HLSLCastingExpression *)expr; + return NeedsFlattening(castingExpr->expression, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_LiteralExpression) { + return NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_IdentifierExpression) { + return NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_ConstructorExpression) { + HLSLConstructorExpression * constructorExpr = (HLSLConstructorExpression *)expr; + return NeedsFlattening(constructorExpr->argument, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_MemberAccess) { + return NeedsFlattening(expr->nextExpression, level+1); + } + else if (expr->nodeType == HLSLNodeType_ArrayAccess) { + HLSLArrayAccess * arrayAccess = (HLSLArrayAccess *)expr; + return NeedsFlattening(arrayAccess->array, level+1) || NeedsFlattening(arrayAccess->index, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else if (expr->nodeType == HLSLNodeType_FunctionCall) { + HLSLFunctionCall * functionCall = (HLSLFunctionCall *)expr; + if (functionCall->function->numOutputArguments > 0) { + if (level > 0) { + return true; + } + } + return NeedsFlattening(functionCall->argument, level+1) || NeedsFlattening(expr->nextExpression, level); + } + else { + //assert(false); + return false; + } +} + + +struct StatementList { + HLSLStatement * head = NULL; + HLSLStatement * tail = NULL; + void append(HLSLStatement * st) { + if (head == NULL) { + tail = head = st; + } + tail->nextStatement = st; + tail = st; + } +}; + + + class ExpressionFlattener : public HLSLTreeVisitor + { + public: + HLSLTree * m_tree; + int tmp_index; + HLSLStatement ** statement_pointer; + HLSLFunction * current_function; + + ExpressionFlattener() + { + m_tree = NULL; + tmp_index = 0; + statement_pointer = NULL; + current_function = NULL; + } + + void FlattenExpressions(HLSLTree * tree) + { + m_tree = tree; + VisitRoot(tree->GetRoot()); + } + + // Visit all statements updating the statement_pointer so that we can insert and replace statements. @@ Add this to the default visitor? + virtual void VisitFunction(HLSLFunction * node) override + { + current_function = node; + statement_pointer = &node->statement; + VisitStatements(node->statement); + statement_pointer = NULL; + current_function = NULL; + } + + virtual void VisitIfStatement(HLSLIfStatement * node) override + { + if (NeedsFlattening(node->condition, 1)) { + assert(false); // @@ Add statements before if statement. + } + + statement_pointer = &node->statement; + VisitStatements(node->statement); + if (node->elseStatement) { + statement_pointer = &node->elseStatement; + VisitStatements(node->elseStatement); + } + } + + virtual void VisitForStatement(HLSLForStatement * node) override + { + if (NeedsFlattening(node->initialization->assignment, 1)) { + assert(false); // @@ Add statements before for statement. + } + if (NeedsFlattening(node->condition, 1) || NeedsFlattening(node->increment, 1)) { + assert(false); // @@ These are tricky to implement. Need to handle all loop exits. + } + + statement_pointer = &node->statement; + VisitStatements(node->statement); + } + + virtual void VisitBlockStatement(HLSLBlockStatement * node) override + { + statement_pointer = &node->statement; + VisitStatements(node->statement); + } + + virtual void VisitStatements(HLSLStatement * statement) override + { + while (statement != NULL) { + VisitStatement(statement); + statement_pointer = &statement->nextStatement; + statement = statement->nextStatement; + } + } + + // This is usually a function call or assignment. + virtual void VisitExpressionStatement(HLSLExpressionStatement * node) override + { + if (NeedsFlattening(node->expression, 0)) + { + StatementList statements; + Flatten(node->expression, statements, false); + + // Link beginning of statement list. + *statement_pointer = statements.head; + + // Link end of statement list. + HLSLStatement * tail = statements.tail; + tail->nextStatement = node->nextStatement; + + // Update statement pointer. + statement_pointer = &tail->nextStatement; + + // @@ Delete node? + } + } + + virtual void VisitDeclaration(HLSLDeclaration * node) override + { + // Skip global declarations. + if (statement_pointer == NULL) return; + + if (NeedsFlattening(node->assignment, 1)) + { + StatementList statements; + HLSLIdentifierExpression * ident = Flatten(node->assignment, statements, true); + + // @@ Delete node->assignment? + + node->assignment = ident; + statements.append(node); + + // Link beginning of statement list. + *statement_pointer = statements.head; + + // Link end of statement list. + HLSLStatement * tail = statements.tail; + tail->nextStatement = node->nextStatement; + + // Update statement pointer. + statement_pointer = &tail->nextStatement; + } + } + + virtual void VisitReturnStatement(HLSLReturnStatement * node) override + { + if (NeedsFlattening(node->expression, 1)) + { + StatementList statements; + HLSLIdentifierExpression * ident = Flatten(node->expression, statements, true); + + // @@ Delete node->expression? + + node->expression = ident; + statements.append(node); + + // Link beginning of statement list. + *statement_pointer = statements.head; + + // Link end of statement list. + HLSLStatement * tail = statements.tail; + tail->nextStatement = node->nextStatement; + + // Update statement pointer. + statement_pointer = &tail->nextStatement; + } + } + + + HLSLDeclaration * BuildTemporaryDeclaration(HLSLExpression * expr) + { + assert(expr->expressionType.baseType != HLSLBaseType_Void); + + HLSLDeclaration * declaration = m_tree->AddNode(expr->fileName, expr->line); + declaration->name = m_tree->AddStringFormat("tmp%d", tmp_index++); + declaration->type = expr->expressionType; + declaration->assignment = expr; + + HLSLIdentifierExpression * ident = (HLSLIdentifierExpression *)expr; + + return declaration; + } + + HLSLExpressionStatement * BuildExpressionStatement(HLSLExpression * expr) + { + HLSLExpressionStatement * statement = m_tree->AddNode(expr->fileName, expr->line); + statement->expression = expr; + return statement; + } + + HLSLIdentifierExpression * AddExpressionStatement(HLSLExpression * expr, StatementList & statements, bool wantIdent) + { + if (wantIdent) { + HLSLDeclaration * declaration = BuildTemporaryDeclaration(expr); + statements.append(declaration); + + HLSLIdentifierExpression * ident = m_tree->AddNode(expr->fileName, expr->line); + ident->name = declaration->name; + ident->expressionType = declaration->type; + return ident; + } + else { + HLSLExpressionStatement * statement = BuildExpressionStatement(expr); + statements.append(statement); + return NULL; + } + } + + HLSLIdentifierExpression * Flatten(HLSLExpression * expr, StatementList & statements, bool wantIdent = true) + { + if (!NeedsFlattening(expr, wantIdent)) { + return AddExpressionStatement(expr, statements, wantIdent); + } + + if (expr->nodeType == HLSLNodeType_UnaryExpression) { + assert(expr->nextExpression == NULL); + + HLSLUnaryExpression * unaryExpr = (HLSLUnaryExpression *)expr; + + HLSLIdentifierExpression * tmp = Flatten(unaryExpr->expression, statements, true); + + HLSLUnaryExpression * newUnaryExpr = m_tree->AddNode(unaryExpr->fileName, unaryExpr->line); + newUnaryExpr->unaryOp = unaryExpr->unaryOp; + newUnaryExpr->expression = tmp; + newUnaryExpr->expressionType = unaryExpr->expressionType; + + return AddExpressionStatement(newUnaryExpr, statements, wantIdent); + } + else if (expr->nodeType == HLSLNodeType_BinaryExpression) { + assert(expr->nextExpression == NULL); + + HLSLBinaryExpression * binaryExpr = (HLSLBinaryExpression *)expr; + + if (IsAssignOp(binaryExpr->binaryOp)) { + // Flatten right hand side only. + HLSLIdentifierExpression * tmp2 = Flatten(binaryExpr->expression2, statements, true); + + HLSLBinaryExpression * newBinaryExpr = m_tree->AddNode(binaryExpr->fileName, binaryExpr->line); + newBinaryExpr->binaryOp = binaryExpr->binaryOp; + newBinaryExpr->expression1 = binaryExpr->expression1; + newBinaryExpr->expression2 = tmp2; + newBinaryExpr->expressionType = binaryExpr->expressionType; + + return AddExpressionStatement(newBinaryExpr, statements, wantIdent); + } + else { + HLSLIdentifierExpression * tmp1 = Flatten(binaryExpr->expression1, statements, true); + HLSLIdentifierExpression * tmp2 = Flatten(binaryExpr->expression2, statements, true); + + HLSLBinaryExpression * newBinaryExpr = m_tree->AddNode(binaryExpr->fileName, binaryExpr->line); + newBinaryExpr->binaryOp = binaryExpr->binaryOp; + newBinaryExpr->expression1 = tmp1; + newBinaryExpr->expression2 = tmp2; + newBinaryExpr->expressionType = binaryExpr->expressionType; + + return AddExpressionStatement(newBinaryExpr, statements, wantIdent); + } + } + else if (expr->nodeType == HLSLNodeType_ConditionalExpression) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_CastingExpression) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_LiteralExpression) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_IdentifierExpression) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_ConstructorExpression) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_MemberAccess) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_ArrayAccess) { + assert(false); + } + else if (expr->nodeType == HLSLNodeType_FunctionCall) { + HLSLFunctionCall * functionCall = (HLSLFunctionCall *)expr; + + // @@ Output function as is? + // @@ We have to flatten function arguments! This is tricky, need to handle input/output arguments. + assert(!NeedsFlattening(functionCall->argument)); + + return AddExpressionStatement(expr, statements, wantIdent); + } + else { + assert(false); + } + return NULL; + } + }; + + +void FlattenExpressions(HLSLTree* tree) { + ExpressionFlattener flattener; + flattener.FlattenExpressions(tree); +} + +} // M4 + diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTree.h projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTree.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/src/HLSLTree.h 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/src/HLSLTree.h 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,1091 @@ +#ifndef HLSL_TREE_H +#define HLSL_TREE_H + +//#include "Engine/StringPool.h" +#include "Engine.h" + +#include +#include +#include +#include + +namespace M4 +{ + +enum HLSLNodeType +{ + HLSLNodeType_Root, + HLSLNodeType_Declaration, + HLSLNodeType_Struct, + HLSLNodeType_StructField, + HLSLNodeType_Buffer, + HLSLNodeType_BufferField, + HLSLNodeType_Function, + HLSLNodeType_Argument, + HLSLNodeType_Macro, + HLSLNodeType_ExpressionStatement, + HLSLNodeType_Expression, + HLSLNodeType_ReturnStatement, + HLSLNodeType_DiscardStatement, + HLSLNodeType_BreakStatement, + HLSLNodeType_ContinueStatement, + HLSLNodeType_IfStatement, + HLSLNodeType_ForStatement, + HLSLNodeType_WhileStatement, + HLSLNodeType_BlockStatement, + HLSLNodeType_UnaryExpression, + HLSLNodeType_BinaryExpression, + HLSLNodeType_ConditionalExpression, + HLSLNodeType_CastingExpression, + HLSLNodeType_LiteralExpression, + HLSLNodeType_IdentifierExpression, + HLSLNodeType_ConstructorExpression, + HLSLNodeType_MemberAccess, + HLSLNodeType_ArrayAccess, + HLSLNodeType_FunctionCall, + HLSLNodeType_StateAssignment, + HLSLNodeType_SamplerState, + HLSLNodeType_Pass, + HLSLNodeType_Technique, + HLSLNodeType_Attribute, + HLSLNodeType_Pipeline, + HLSLNodeType_Stage, +}; + + +enum HLSLBaseType +{ + HLSLBaseType_Unknown, + HLSLBaseType_Void, + HLSLBaseType_Float, + HLSLBaseType_FirstNumeric = HLSLBaseType_Float, + HLSLBaseType_Float2, + HLSLBaseType_Float3, + HLSLBaseType_Float4, + + HLSLBaseType_Float2x4, + HLSLBaseType_Float2x3, + HLSLBaseType_Float2x2, + + HLSLBaseType_Float3x4, + HLSLBaseType_Float3x3, + HLSLBaseType_Float3x2, + + HLSLBaseType_Float4x4, + HLSLBaseType_Float4x3, + HLSLBaseType_Float4x2, + + HLSLBaseType_Bool, + HLSLBaseType_FirstInteger = HLSLBaseType_Bool, + HLSLBaseType_Bool2, + HLSLBaseType_Bool3, + HLSLBaseType_Bool4, + HLSLBaseType_Int, + HLSLBaseType_Int2, + HLSLBaseType_Int3, + HLSLBaseType_Int4, + HLSLBaseType_Uint, + HLSLBaseType_Uint2, + HLSLBaseType_Uint3, + HLSLBaseType_Uint4, + /*HLSLBaseType_Short, // @@ Separate dimension from Base type, this is getting out of control. + HLSLBaseType_Short2, + HLSLBaseType_Short3, + HLSLBaseType_Short4, + HLSLBaseType_Ushort, + HLSLBaseType_Ushort2, + HLSLBaseType_Ushort3, + HLSLBaseType_Ushort4,*/ + HLSLBaseType_LastInteger = HLSLBaseType_Uint4, + HLSLBaseType_LastNumeric = HLSLBaseType_Uint4, + HLSLBaseType_Texture, + HLSLBaseType_Sampler, // @@ use type inference to determine sampler type. + HLSLBaseType_Sampler2D, + HLSLBaseType_Sampler3D, + HLSLBaseType_SamplerCube, + HLSLBaseType_Sampler2DShadow, + HLSLBaseType_Sampler2DMS, + HLSLBaseType_Sampler2DArray, + HLSLBaseType_UserDefined, // struct + HLSLBaseType_Expression, // type argument for defined() sizeof() and typeof(). + HLSLBaseType_Auto, + + HLSLBaseType_Count, + HLSLBaseType_NumericCount = HLSLBaseType_LastNumeric - HLSLBaseType_FirstNumeric + 1 +}; + + + +enum NumericType +{ + NumericType_Float, + NumericType_Bool, + NumericType_Int, + NumericType_Uint, + NumericType_Count, + NumericType_NaN, +}; + + +struct BaseTypeDescription +{ + const char* typeName; + NumericType numericType; + int numComponents; + int numDimensions; + int height; + int binaryOpRank; +}; + +const BaseTypeDescription baseTypeDescriptions[HLSLBaseType_Count] = + { + { "unknown type", NumericType_NaN, 0, 0, 0, -1 }, // HLSLBaseType_Unknown + { "void", NumericType_NaN, 0, 0, 0, -1 }, // HLSLBaseType_Void + { "float", NumericType_Float, 1, 0, 1, 0 }, // HLSLBaseType_Float + { "float2", NumericType_Float, 2, 1, 1, 0 }, // HLSLBaseType_Float2 + { "float3", NumericType_Float, 3, 1, 1, 0 }, // HLSLBaseType_Float3 + { "float4", NumericType_Float, 4, 1, 1, 0 }, // HLSLBaseType_Float4 + + { "float2x4", NumericType_Float, 2, 2, 4, 0 }, // HLSLBaseType_Float2x4 + { "float2x3", NumericType_Float, 2, 2, 3, 0 }, // HLSLBaseType_Float2x3 + { "float2x2", NumericType_Float, 2, 2, 2, 0 }, // HLSLBaseType_Float2x2 + + { "float3x4", NumericType_Float, 3, 2, 4, 0 }, // HLSLBaseType_Float3x4 + { "float3x3", NumericType_Float, 3, 2, 3, 0 }, // HLSLBaseType_Float3x3 + { "float3x2", NumericType_Float, 3, 2, 2, 0 }, // HLSLBaseType_Float3x2 + + { "float4x4", NumericType_Float, 4, 2, 4, 0 }, // HLSLBaseType_Float4x4 + { "float4x3", NumericType_Float, 4, 2, 3, 0 }, // HLSLBaseType_Float4x3 + { "float4x2", NumericType_Float, 4, 2, 2, 0 }, // HLSLBaseType_Float4x2 + + { "bool", NumericType_Bool, 1, 0, 1, 4 }, // HLSLBaseType_Bool + { "bool2", NumericType_Bool, 2, 1, 1, 4 }, // HLSLBaseType_Bool2 + { "bool3", NumericType_Bool, 3, 1, 1, 4 }, // HLSLBaseType_Bool3 + { "bool4", NumericType_Bool, 4, 1, 1, 4 }, // HLSLBaseType_Bool4 + + { "int", NumericType_Int, 1, 0, 1, 3 }, // HLSLBaseType_Int + { "int2", NumericType_Int, 2, 1, 1, 3 }, // HLSLBaseType_Int2 + { "int3", NumericType_Int, 3, 1, 1, 3 }, // HLSLBaseType_Int3 + { "int4", NumericType_Int, 4, 1, 1, 3 }, // HLSLBaseType_Int4 + + { "uint", NumericType_Uint, 1, 0, 1, 2 }, // HLSLBaseType_Uint + { "uint2", NumericType_Uint, 2, 1, 1, 2 }, // HLSLBaseType_Uint2 + { "uint3", NumericType_Uint, 3, 1, 1, 2 }, // HLSLBaseType_Uint3 + { "uint4", NumericType_Uint, 4, 1, 1, 2 }, // HLSLBaseType_Uint4 + + { "texture", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Texture + { "sampler", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Sampler + { "sampler2D", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Sampler2D + { "sampler3D", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Sampler3D + { "samplerCUBE", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_SamplerCube + { "sampler2DShadow", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Sampler2DShadow + { "sampler2DMS", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Sampler2DMS + { "sampler2DArray", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_Sampler2DArray + { "user defined", NumericType_NaN, 1, 0, 0, -1 }, // HLSLBaseType_UserDefined + { "expression", NumericType_NaN, 1, 0, 0, -1 } // HLSLBaseType_Expression + }; + +extern const HLSLBaseType ScalarBaseType[HLSLBaseType_Count]; + +inline bool IsSamplerType(HLSLBaseType baseType) +{ + return baseType == HLSLBaseType_Sampler || + baseType == HLSLBaseType_Sampler2D || + baseType == HLSLBaseType_Sampler3D || + baseType == HLSLBaseType_SamplerCube || + baseType == HLSLBaseType_Sampler2DShadow || + baseType == HLSLBaseType_Sampler2DMS || + baseType == HLSLBaseType_Sampler2DArray; +} + +inline bool IsMatrixType(HLSLBaseType baseType) +{ + return baseType == HLSLBaseType_Float2x4 || baseType == HLSLBaseType_Float2x3 || baseType == HLSLBaseType_Float2x2 || + baseType == HLSLBaseType_Float3x4 || baseType == HLSLBaseType_Float3x3 || baseType == HLSLBaseType_Float3x2 || + baseType == HLSLBaseType_Float4x4 || baseType == HLSLBaseType_Float4x3 || baseType == HLSLBaseType_Float4x2; +} + +inline bool IsScalarType( HLSLBaseType baseType ) +{ + return baseType == HLSLBaseType_Float || + baseType == HLSLBaseType_Bool || + baseType == HLSLBaseType_Int || + baseType == HLSLBaseType_Uint; +} + +inline bool IsVectorType( HLSLBaseType baseType ) +{ + return baseType == HLSLBaseType_Float2 || + baseType == HLSLBaseType_Float3 || + baseType == HLSLBaseType_Float4 || + baseType == HLSLBaseType_Bool2 || + baseType == HLSLBaseType_Bool3 || + baseType == HLSLBaseType_Bool4 || + baseType == HLSLBaseType_Int2 || + baseType == HLSLBaseType_Int3 || + baseType == HLSLBaseType_Int4 || + baseType == HLSLBaseType_Uint2 || + baseType == HLSLBaseType_Uint3 || + baseType == HLSLBaseType_Uint4; +} + + +enum HLSLBinaryOp +{ + HLSLBinaryOp_And, + HLSLBinaryOp_Or, + HLSLBinaryOp_Add, + HLSLBinaryOp_Sub, + HLSLBinaryOp_Mul, + HLSLBinaryOp_Div, + HLSLBinaryOp_Mod, + HLSLBinaryOp_Less, + HLSLBinaryOp_Greater, + HLSLBinaryOp_LessEqual, + HLSLBinaryOp_GreaterEqual, + HLSLBinaryOp_Equal, + HLSLBinaryOp_NotEqual, + HLSLBinaryOp_BitAnd, + HLSLBinaryOp_BitOr, + HLSLBinaryOp_BitXor, + HLSLBinaryOp_Assign, + HLSLBinaryOp_AddAssign, + HLSLBinaryOp_SubAssign, + HLSLBinaryOp_MulAssign, + HLSLBinaryOp_DivAssign, +}; + +inline bool IsCompareOp( HLSLBinaryOp op ) +{ + return op == HLSLBinaryOp_Less || + op == HLSLBinaryOp_Greater || + op == HLSLBinaryOp_LessEqual || + op == HLSLBinaryOp_GreaterEqual || + op == HLSLBinaryOp_Equal || + op == HLSLBinaryOp_NotEqual; +} + +inline bool IsArithmeticOp( HLSLBinaryOp op ) +{ + return op == HLSLBinaryOp_Add || + op == HLSLBinaryOp_Sub || + op == HLSLBinaryOp_Mul || + op == HLSLBinaryOp_Div || + op == HLSLBinaryOp_Mod; +} + +inline bool IsLogicOp( HLSLBinaryOp op ) +{ + return op == HLSLBinaryOp_And || + op == HLSLBinaryOp_Or; +} + +inline bool IsAssignOp( HLSLBinaryOp op ) +{ + return op == HLSLBinaryOp_Assign || + op == HLSLBinaryOp_AddAssign || + op == HLSLBinaryOp_SubAssign || + op == HLSLBinaryOp_MulAssign || + op == HLSLBinaryOp_DivAssign; +} + + +enum HLSLUnaryOp +{ + HLSLUnaryOp_Negative, // -x + HLSLUnaryOp_Positive, // +x + HLSLUnaryOp_Not, // !x + HLSLUnaryOp_PreIncrement, // ++x + HLSLUnaryOp_PreDecrement, // --x + HLSLUnaryOp_PostIncrement, // x++ + HLSLUnaryOp_PostDecrement, // x++ + HLSLUnaryOp_BitNot, // ~x +}; + +enum HLSLArgumentModifier +{ + HLSLArgumentModifier_None, + HLSLArgumentModifier_In, + HLSLArgumentModifier_Out, + HLSLArgumentModifier_Inout, + HLSLArgumentModifier_Uniform, + HLSLArgumentModifier_Const, +}; + +enum HLSLTypeFlags +{ + HLSLTypeFlag_None = 0, + HLSLTypeFlag_Const = 0x01, + HLSLTypeFlag_Static = 0x02, + HLSLTypeFlag_Uniform = 0x04, + //HLSLTypeFlag_Extern = 0x10, + //HLSLTypeFlag_Volatile = 0x20, + //HLSLTypeFlag_Shared = 0x40, + //HLSLTypeFlag_Precise = 0x80, + + HLSLTypeFlag_Input = 0x100, + HLSLTypeFlag_Output = 0x200, + + // Interpolation modifiers. + HLSLTypeFlag_Linear = 0x10000, + HLSLTypeFlag_Centroid = 0x20000, + HLSLTypeFlag_NoInterpolation = 0x40000, + HLSLTypeFlag_NoPerspective = 0x80000, + HLSLTypeFlag_Sample = 0x100000, + + // Misc. + HLSLTypeFlag_NoPromote = 0x200000, +}; + +enum HLSLAttributeType +{ + HLSLAttributeType_Unknown, + HLSLAttributeType_Unroll, + HLSLAttributeType_Branch, + HLSLAttributeType_Flatten, + HLSLAttributeType_NoFastMath, +}; + +enum HLSLAddressSpace +{ + HLSLAddressSpace_Undefined, + HLSLAddressSpace_Constant, + HLSLAddressSpace_Device, + HLSLAddressSpace_Thread, + HLSLAddressSpace_Shared, +}; + + +struct HLSLNode; +struct HLSLRoot; +struct HLSLStatement; +struct HLSLAttribute; +struct HLSLDeclaration; +struct HLSLStruct; +struct HLSLStructField; +struct HLSLBuffer; +struct HLSLFunction; +struct HLSLArgument; +struct HLSLExpressionStatement; +struct HLSLExpression; +struct HLSLBinaryExpression; +struct HLSLLiteralExpression; +struct HLSLIdentifierExpression; +struct HLSLConstructorExpression; +struct HLSLFunctionCall; +struct HLSLArrayAccess; +struct HLSLAttribute; + +struct HLSLType +{ + explicit HLSLType(HLSLBaseType _baseType = HLSLBaseType_Unknown) + { + baseType = _baseType; + samplerType = HLSLBaseType_Float; + typeName = NULL; + array = false; + arraySize = NULL; + flags = 0; + addressSpace = HLSLAddressSpace_Undefined; + } + HLSLBaseType baseType; + HLSLBaseType samplerType; // Half or Float + const char* typeName; // For user defined types. + bool array; + HLSLExpression* arraySize; + int flags; + HLSLAddressSpace addressSpace; +}; + +inline bool IsSamplerType(const HLSLType & type) +{ + return IsSamplerType(type.baseType); +} + +inline bool IsScalarType(const HLSLType & type) +{ + return IsScalarType(type.baseType); +} + +inline bool IsVectorType(const HLSLType & type) +{ + return IsVectorType(type.baseType); +} + + +/** Base class for all nodes in the HLSL AST */ +struct HLSLNode +{ + HLSLNodeType nodeType; + const char* fileName; + int line; +}; + +struct HLSLRoot : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_Root; + HLSLRoot() { statement = NULL; } + HLSLStatement* statement; // First statement. +}; + +struct HLSLStatement : public HLSLNode +{ + HLSLStatement() + { + nextStatement = NULL; + attributes = NULL; + hidden = false; + } + HLSLStatement* nextStatement; // Next statement in the block. + HLSLAttribute* attributes; + mutable bool hidden; +}; + +struct HLSLAttribute : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_Attribute; + HLSLAttribute() + { + attributeType = HLSLAttributeType_Unknown; + argument = NULL; + nextAttribute = NULL; + } + HLSLAttributeType attributeType; + HLSLExpression* argument; + HLSLAttribute* nextAttribute; +}; + +struct HLSLDeclaration : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Declaration; + HLSLDeclaration() + { + name = NULL; + registerName = NULL; + semantic = NULL; + nextDeclaration = NULL; + assignment = NULL; + buffer = NULL; + } + const char* name; + HLSLType type; + const char* registerName; // @@ Store register index? + const char* semantic; + HLSLDeclaration* nextDeclaration; // If multiple variables declared on a line. + HLSLExpression* assignment; + HLSLBuffer* buffer; +}; + +struct HLSLStruct : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Struct; + HLSLStruct() + { + name = NULL; + field = NULL; + } + const char* name; + HLSLStructField* field; // First field in the structure. +}; + +struct HLSLStructField : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_StructField; + HLSLStructField() + { + name = NULL; + semantic = NULL; + sv_semantic = NULL; + nextField = NULL; + hidden = false; + } + const char* name; + HLSLType type; + const char* semantic; + const char* sv_semantic; + HLSLStructField* nextField; // Next field in the structure. + bool hidden; +}; + +/** A cbuffer or tbuffer declaration. */ +struct HLSLBuffer : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Buffer; + HLSLBuffer() + { + name = NULL; + registerName = NULL; + field = NULL; + } + const char* name; + const char* registerName; + HLSLDeclaration* field; +}; + + +/** Function declaration */ +struct HLSLFunction : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Function; + HLSLFunction() + { + name = NULL; + semantic = NULL; + sv_semantic = NULL; + statement = NULL; + argument = NULL; + numArguments = 0; + numOutputArguments = 0; + forward = NULL; + } + const char* name; + HLSLType returnType; + const char* semantic; + const char* sv_semantic; + int numArguments; + int numOutputArguments; // Includes out and inout arguments. + HLSLArgument* argument; + HLSLStatement* statement; + HLSLFunction* forward; // Which HLSLFunction this one forward-declares +}; + +/** Declaration of an argument to a function. */ +struct HLSLArgument : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_Argument; + HLSLArgument() + { + name = NULL; + modifier = HLSLArgumentModifier_None; + semantic = NULL; + sv_semantic = NULL; + defaultValue = NULL; + nextArgument = NULL; + hidden = false; + } + const char* name; + HLSLArgumentModifier modifier; + HLSLType type; + const char* semantic; + const char* sv_semantic; + HLSLExpression* defaultValue; + HLSLArgument* nextArgument; + bool hidden; +}; + +/** Macro declaration */ +struct HLSLMacro : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Macro; + HLSLMacro() + { + name = NULL; + argument = NULL; + numArguments = 0; + macroAliased = NULL; + } + const char* name; + HLSLArgument* argument; + int numArguments; + std::string value; + HLSLMacro* macroAliased; +}; + +/** A expression which forms a complete statement. */ +struct HLSLExpressionStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_ExpressionStatement; + HLSLExpressionStatement() + { + expression = NULL; + } + HLSLExpression* expression; +}; + +struct HLSLReturnStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_ReturnStatement; + HLSLReturnStatement() + { + expression = NULL; + } + HLSLExpression* expression; +}; + +struct HLSLDiscardStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_DiscardStatement; +}; + +struct HLSLBreakStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_BreakStatement; +}; + +struct HLSLContinueStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_ContinueStatement; +}; + +struct HLSLIfStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_IfStatement; + HLSLIfStatement() + { + condition = NULL; + statement = NULL; + elseStatement = NULL; + isStatic = false; + } + HLSLExpression* condition; + HLSLStatement* statement; + HLSLStatement* elseStatement; + bool isStatic; +}; + +struct HLSLForStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_ForStatement; + HLSLForStatement() + { + initialization = NULL; + condition = NULL; + increment = NULL; + statement = NULL; + } + HLSLDeclaration* initialization; + HLSLExpression* initializationWithoutType; + HLSLExpression* condition; + HLSLExpression* increment; + HLSLStatement* statement; +}; + +struct HLSLWhileStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_WhileStatement; + HLSLWhileStatement() + { + condition = NULL; + statement = NULL; + } + HLSLExpression* condition; + HLSLStatement* statement; +}; + +struct HLSLBlockStatement : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_BlockStatement; + HLSLBlockStatement() + { + statement = NULL; + } + HLSLStatement* statement; +}; + + +/** Base type for all types of expressions. */ +struct HLSLExpression : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_Expression; + HLSLExpression() + { + nextExpression = NULL; + } + HLSLType expressionType; + HLSLExpression* nextExpression; // Used when the expression is part of a list, like in a function call. +}; + +struct HLSLUnaryExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_UnaryExpression; + HLSLUnaryExpression() + { + expression = NULL; + } + HLSLUnaryOp unaryOp; + HLSLExpression* expression; +}; + +struct HLSLBinaryExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_BinaryExpression; + HLSLBinaryExpression() + { + expression1 = NULL; + expression2 = NULL; + } + HLSLBinaryOp binaryOp; + HLSLExpression* expression1; + HLSLExpression* expression2; +}; + +/** ? : construct */ +struct HLSLConditionalExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_ConditionalExpression; + HLSLConditionalExpression() + { + condition = NULL; + trueExpression = NULL; + falseExpression = NULL; + } + HLSLExpression* condition; + HLSLExpression* trueExpression; + HLSLExpression* falseExpression; +}; + +struct HLSLCastingExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_CastingExpression; + HLSLCastingExpression() + { + expression = NULL; + } + HLSLType type; + HLSLExpression* expression; +}; + +/** Float, integer, boolean, etc. literal constant. */ +struct HLSLLiteralExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_LiteralExpression; + HLSLBaseType type; // Note, not all types can be literals. + union + { + bool bValue; + float fValue; + int iValue; + }; +}; + +/** An identifier, typically a variable name or structure field name. */ +struct HLSLIdentifierExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_IdentifierExpression; + HLSLIdentifierExpression() + { + name = NULL; + global = false; + } + const char* name; + bool global; // This is a global variable. +}; + +/** float2(1, 2) */ +struct HLSLConstructorExpression : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_ConstructorExpression; + HLSLConstructorExpression() + { + argument = NULL; + } + HLSLType type; + HLSLExpression* argument; +}; + +/** object.member **/ +struct HLSLMemberAccess : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_MemberAccess; + HLSLMemberAccess() + { + object = NULL; + field = NULL; + swizzle = false; + } + HLSLExpression* object; + const char* field; + bool swizzle; +}; + +/** array[index] **/ +struct HLSLArrayAccess : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_ArrayAccess; + HLSLArrayAccess() + { + array = NULL; + index = NULL; + } + HLSLExpression* array; + HLSLExpression* index; +}; + +struct HLSLFunctionCall : public HLSLExpression +{ + static const HLSLNodeType s_type = HLSLNodeType_FunctionCall; + HLSLFunctionCall() + { + function = NULL; + argument = NULL; + numArguments = 0; + } + const HLSLFunction* function; + HLSLExpression* argument; + int numArguments; +}; + +struct HLSLStateAssignment : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_StateAssignment; + HLSLStateAssignment() + { + stateName = NULL; + sValue = NULL; + nextStateAssignment = NULL; + } + + const char* stateName; + int d3dRenderState; + union { + int iValue; + float fValue; + const char * sValue; + }; + HLSLStateAssignment* nextStateAssignment; +}; + +struct HLSLSamplerState : public HLSLExpression // @@ Does this need to be an expression? Does it have a type? I guess type is useful. +{ + static const HLSLNodeType s_type = HLSLNodeType_SamplerState; + HLSLSamplerState() + { + numStateAssignments = 0; + stateAssignments = NULL; + } + + int numStateAssignments; + HLSLStateAssignment* stateAssignments; +}; + +struct HLSLPass : public HLSLNode +{ + static const HLSLNodeType s_type = HLSLNodeType_Pass; + HLSLPass() + { + name = NULL; + numStateAssignments = 0; + stateAssignments = NULL; + nextPass = NULL; + } + + const char* name; + int numStateAssignments; + HLSLStateAssignment* stateAssignments; + HLSLPass* nextPass; +}; + +struct HLSLTechnique : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Technique; + HLSLTechnique() + { + name = NULL; + numPasses = 0; + passes = NULL; + } + + const char* name; + int numPasses; + HLSLPass* passes; +}; + +struct HLSLPipeline : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Pipeline; + HLSLPipeline() + { + name = NULL; + numStateAssignments = 0; + stateAssignments = NULL; + } + + const char* name; + int numStateAssignments; + HLSLStateAssignment* stateAssignments; +}; + +struct HLSLStage : public HLSLStatement +{ + static const HLSLNodeType s_type = HLSLNodeType_Stage; + HLSLStage() + { + name = NULL; + statement = NULL; + inputs = NULL; + outputs = NULL; + } + + const char* name; + HLSLStatement* statement; + HLSLDeclaration* inputs; + HLSLDeclaration* outputs; +}; + +struct matrixCtor { + HLSLBaseType matrixType; + std::vector argumentTypes; + + bool operator==(const matrixCtor & other) const + { + return matrixType == other.matrixType && + argumentTypes == other.argumentTypes; + } + + bool operator<(const matrixCtor & other) const + { + if (matrixType < other.matrixType) + { + return true; + } + else if (matrixType > other.matrixType) + { + return false; + } + + return argumentTypes < other.argumentTypes; + } +}; + + +/** + * Abstract syntax tree for parsed HLSL code. + */ +class HLSLTree +{ + +public: + + explicit HLSLTree(Allocator* allocator); + ~HLSLTree(); + + /** Adds a string to the string pool used by the tree. */ + const char* AddString(const char* string); + const char* AddStringFormat(const char* string, ...); + + /** Returns true if the string is contained within the tree. */ + bool GetContainsString(const char* string) const; + + /** Returns the root block in the tree */ + HLSLRoot* GetRoot() const; + + /** Adds a new node to the tree with the specified type. */ + template + T* AddNode(const char* fileName, int line) + { + HLSLNode* node = new (AllocateMemory(sizeof(T))) T(); + node->nodeType = T::s_type; + node->fileName = fileName; + node->line = line; + return static_cast(node); + } + + HLSLFunction * FindFunction(const char * name); + HLSLDeclaration * FindGlobalDeclaration(const char * name, HLSLBuffer ** buffer_out = NULL); + HLSLStruct * FindGlobalStruct(const char * name); + HLSLTechnique * FindTechnique(const char * name); + HLSLPipeline * FindFirstPipeline(); + HLSLPipeline * FindNextPipeline(HLSLPipeline * current); + HLSLPipeline * FindPipeline(const char * name); + HLSLBuffer * FindBuffer(const char * name); + + bool GetExpressionValue(HLSLExpression * expression, int & value); + int GetExpressionValue(HLSLExpression * expression, float values[4]); + + bool NeedsFunction(const char * name); + bool ReplaceUniformsAssignements(); + void EnumerateMatrixCtorsNeeded(std::vector & matrixCtors); + +private: + + void* AllocateMemory(size_t size); + void AllocatePage(); + +private: + + static const size_t s_nodePageSize = 1024 * 4; + + struct NodePage + { + NodePage* next; + char buffer[s_nodePageSize]; + }; + + Allocator* m_allocator; + StringPool m_stringPool; + HLSLRoot* m_root; + + NodePage* m_firstPage; + NodePage* m_currentPage; + size_t m_currentPageOffset; + +}; + + + +class HLSLTreeVisitor +{ +public: + virtual void VisitType(HLSLType & type); + + virtual void VisitRoot(HLSLRoot * node); + virtual void VisitTopLevelStatement(HLSLStatement * node); + virtual void VisitStatements(HLSLStatement * statement); + virtual void VisitStatement(HLSLStatement * node); + virtual void VisitDeclaration(HLSLDeclaration * node); + virtual void VisitStruct(HLSLStruct * node); + virtual void VisitStructField(HLSLStructField * node); + virtual void VisitBuffer(HLSLBuffer * node); + //virtual void VisitBufferField(HLSLBufferField * node); + virtual void VisitFunction(HLSLFunction * node); + virtual void VisitArgument(HLSLArgument * node); + virtual void VisitExpressionStatement(HLSLExpressionStatement * node); + virtual void VisitExpression(HLSLExpression * node); + virtual void VisitReturnStatement(HLSLReturnStatement * node); + virtual void VisitDiscardStatement(HLSLDiscardStatement * node); + virtual void VisitBreakStatement(HLSLBreakStatement * node); + virtual void VisitContinueStatement(HLSLContinueStatement * node); + virtual void VisitIfStatement(HLSLIfStatement * node); + virtual void VisitForStatement(HLSLForStatement * node); + virtual void VisitWhileStatement(HLSLWhileStatement * node); + virtual void VisitBlockStatement(HLSLBlockStatement * node); + virtual void VisitUnaryExpression(HLSLUnaryExpression * node); + virtual void VisitBinaryExpression(HLSLBinaryExpression * node); + virtual void VisitConditionalExpression(HLSLConditionalExpression * node); + virtual void VisitCastingExpression(HLSLCastingExpression * node); + virtual void VisitLiteralExpression(HLSLLiteralExpression * node); + virtual void VisitIdentifierExpression(HLSLIdentifierExpression * node); + virtual void VisitConstructorExpression(HLSLConstructorExpression * node); + virtual void VisitMemberAccess(HLSLMemberAccess * node); + virtual void VisitArrayAccess(HLSLArrayAccess * node); + virtual void VisitFunctionCall(HLSLFunctionCall * node); + virtual void VisitStateAssignment(HLSLStateAssignment * node); + virtual void VisitSamplerState(HLSLSamplerState * node); + virtual void VisitPass(HLSLPass * node); + virtual void VisitTechnique(HLSLTechnique * node); + virtual void VisitPipeline(HLSLPipeline * node); + + + virtual void VisitFunctions(HLSLRoot * root); + virtual void VisitParameters(HLSLRoot * root); + + HLSLFunction * FindFunction(HLSLRoot * root, const char * name); + HLSLDeclaration * FindGlobalDeclaration(HLSLRoot * root, const char * name); + HLSLStruct * FindGlobalStruct(HLSLRoot * root, const char * name); +}; + + +// Tree transformations: +extern void PruneTree(HLSLTree* tree, const char* entryName0, const char* entryName1 = NULL); +extern void SortTree(HLSLTree* tree); +extern void GroupParameters(HLSLTree* tree); +extern void HideUnusedArguments(HLSLFunction * function); +extern bool EmulateAlphaTest(HLSLTree* tree, const char* entryName, float alphaRef = 0.5f); +extern void FlattenExpressions(HLSLTree* tree); + +extern matrixCtor matrixCtorBuilder(HLSLType type, HLSLExpression *arguments); + + +} // M4 + +#endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/.travis.yml projectm-3.1.0/src/libprojectM/Renderer/hlslparser/.travis.yml --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/hlslparser/.travis.yml 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/hlslparser/.travis.yml 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,7 @@ +os: + - linux + - osx +sudo: required +dist: trusty +language: cpp +script: make diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Makefile.am projectm-3.1.0/src/libprojectM/Renderer/Makefile.am --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,54 @@ + +noinst_LTLIBRARIES = libRenderer.la + +libRenderer_la_SOURCES = \ + SOIL2/image_DXT.c \ + SOIL2/image_helper.c \ + SOIL2/SOIL2.c \ + SOIL2/etc1_utils.c \ + MilkdropWaveform.cpp \ + PerPixelMesh.cpp \ + Pipeline.cpp \ + Renderer.cpp \ + ShaderEngine.cpp \ + Texture.cpp \ + Waveform.cpp \ + Filters.cpp \ + PerlinNoise.cpp \ + PipelineContext.cpp \ + Renderable.cpp \ + BeatDetect.cpp \ + Shader.cpp \ + TextureManager.cpp \ + VideoEcho.cpp \ + RenderItemDistanceMetric.cpp \ + RenderItemMatcher.cpp \ + BeatDetect.hpp PipelineContext.hpp ShaderEngine.hpp\ + RenderItemDistanceMetric.hpp TextureManager.hpp\ + Filters.hpp RenderItemMatcher.hpp Transformation.hpp\ + MilkdropWaveform.hpp RenderItemMergeFunction.hpp Texture.hpp\ + PerPixelMesh.hpp Renderable.hpp VideoEcho.hpp\ + PerlinNoise.hpp Renderer.hpp Waveform.hpp\ + Pipeline.hpp Shader.hpp\ + SOIL2/SOIL2.h SOIL2/stbi_DDS.h\ + SOIL2/etc1_utils.h SOIL2/stbi_DDS_c.h\ + SOIL2/image_DXT.h SOIL2/stbi_ext.h\ + SOIL2/image_helper.h SOIL2/stbi_ext_c.h\ + SOIL2/pkm_helper.h SOIL2/stbi_pkm.h\ + SOIL2/pvr_helper.h SOIL2/stbi_pkm_c.h\ + SOIL2/stb_image.h SOIL2/stbi_pvr.h\ + SOIL2/stb_image_write.h SOIL2/stbi_pvr_c.h\ + hlslparser/src/CodeWriter.cpp hlslparser/src/Engine.h \ + hlslparser/src/HLSLParser.h hlslparser/src/HLSLTree.cpp \ + hlslparser/src/CodeWriter.h hlslparser/src/GLSLGenerator.cpp \ + hlslparser/src/HLSLTokenizer.cpp hlslparser/src/HLSLTree.h \ + hlslparser/src/Engine.cpp hlslparser/src/GLSLGenerator.h hlslparser/src/HLSLParser.cpp \ + hlslparser/src/HLSLTokenizer.h + +libRenderer_la_CPPFLAGS = ${my_CFLAGS} \ + -include $(top_builddir)/config.h \ + -I$(top_srcdir)/src/libprojectM/Renderer/hlslparser/src \ + -I$(top_srcdir)/src/libprojectM + +libRenderer_la_LDFLAGS = \ + ${FTGL_LIBS} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/MilkdropWaveform.cpp projectm-3.1.0/src/libprojectM/Renderer/MilkdropWaveform.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/MilkdropWaveform.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/MilkdropWaveform.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -5,89 +5,114 @@ * Author: pete */ #include - -#ifdef LINUX -#include -#endif -#ifdef EMSCRIPTEN -#include -#endif -#ifdef WIN32 -#include "glew.h" -#endif -#ifdef __APPLE__ -#include -#endif - +#include "projectM-opengl.h" #include - #include "MilkdropWaveform.hpp" #include "math.h" #include "BeatDetect.hpp" +#include "ShaderEngine.hpp" +#include MilkdropWaveform::MilkdropWaveform(): RenderItem(), x(0.5), y(0.5), r(1), g(0), b(0), a(1), mystery(0), mode(Line), scale(10), smoothing(0), rot(0), samples(0),modOpacityStart(0),modOpacityEnd(1), - modulateAlphaByVolume(false), maximizeColors(false), additive(false), dots(false), thick(false), loop(false) {} + modulateAlphaByVolume(false), maximizeColors(false), additive(false), dots(false), thick(false), loop(false) { + + Init(); +} + +MilkdropWaveform::~MilkdropWaveform() { +} + +void MilkdropWaveform::InitVertexAttrib() { + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); + +} + void MilkdropWaveform::Draw(RenderContext &context) { WaveformMath(context); - #ifndef EMSCRIPTEN - glMatrixMode( GL_MODELVIEW ); - #endif - glPushMatrix(); - glLoadIdentity(); + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); - if(modulateAlphaByVolume) ModulateOpacityByVolume(context); - else temp_a = a; - MaximizeColors(context); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * samples * 2, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * samples * 2, wavearray, GL_DYNAMIC_DRAW); - #ifndef USE_GLES1 - if(dots==1) glEnable(GL_LINE_STIPPLE); - #endif - - //Thick wave drawing - if (thick==1) glLineWidth( (context.texsize < 512 ) ? 2 : 2*context.texsize/512); - else glLineWidth( (context.texsize < 512 ) ? 1 : context.texsize/512); - - //Additive wave drawing (vice overwrite) - if (additive==1)glBlendFunc(GL_SRC_ALPHA, GL_ONE); - else glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + if (two_waves) { + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * samples * 2, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * samples * 2, wavearray2, GL_DYNAMIC_DRAW); + } + + glBindBuffer(GL_ARRAY_BUFFER, 0); + + glUseProgram(context.programID_v2f_c4f); + + glm::mat4 mat_first_translation = glm::mat4(1.0); + mat_first_translation[3][0] = -0.5; + mat_first_translation[3][1] = -0.5; + + glm::mat4 mat_scale = glm::mat4(1.0); + mat_scale[0][0] = aspectScale; + + float s = glm::sin(glm::radians(-rot)); + float c = glm::cos(glm::radians(-rot)); + glm::mat4 mat_rotation = glm::mat4( c,-s, 0, 0, + s, c, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1); + + glm::mat4 mat_second_translation = glm::mat4(1.0); + mat_second_translation[3][0] = 0.5; + mat_second_translation[3][1] = 0.5; + + glm::mat4 mat_vertex = context.mat_ortho; + mat_vertex = mat_first_translation * mat_vertex; + mat_vertex = mat_scale * mat_vertex; + mat_vertex = mat_rotation * mat_vertex; + mat_vertex = mat_second_translation * mat_vertex; + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(mat_vertex)); + + if(modulateAlphaByVolume) ModulateOpacityByVolume(context); + else temp_a = a; + MaximizeColors(context); +#ifndef GL_TRANSITION + if(dots==1) glEnable(GL_LINE_STIPPLE); +#endif - glTranslatef(.5, .5, 0); - glRotatef(rot, 0, 0, 1); - glScalef(aspectScale, 1.0, 1.0); - glTranslatef(-.5, -.5, 0); + //Thick wave drawing + if (thick==1) glLineWidth( (context.texsize < 512 ) ? 2 : 2*context.texsize/512); + else glLineWidth( (context.texsize < 512 ) ? 1 : context.texsize/512); + //Additive wave drawing (vice overwrite) + if (additive==1)glBlendFunc(GL_SRC_ALPHA, GL_ONE); + else glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - glVertexPointer(2,GL_FLOAT,0,wavearray); + glBindVertexArray(m_vaoID); - if (loop) - glDrawArrays(GL_LINE_LOOP,0,samples); - else - glDrawArrays(GL_LINE_STRIP,0,samples); + if (loop) + glDrawArrays(GL_LINE_LOOP,0,samples); + else + glDrawArrays(GL_LINE_STRIP,0,samples); - if (two_waves) - { - glVertexPointer(2,GL_FLOAT,0,wavearray2); - if (loop) - glDrawArrays(GL_LINE_LOOP,0,samples); - else - glDrawArrays(GL_LINE_STRIP,0,samples); - } + if (two_waves) + { + if (loop) + glDrawArrays(GL_LINE_LOOP,0,samples); + else + glDrawArrays(GL_LINE_STRIP,0,samples); + } + glBindVertexArray(0); - #ifndef USE_GLES1 +#ifndef GL_TRANSITION if(dots==1) glDisable(GL_LINE_STIPPLE); - #endif +#endif - glPopMatrix(); } void MilkdropWaveform::ModulateOpacityByVolume(RenderContext &context) @@ -107,7 +132,6 @@ void MilkdropWaveform::MaximizeColors(RenderContext &context) { - float wave_r_switch=0, wave_g_switch=0, wave_b_switch=0; //wave color brightening // @@ -158,11 +182,11 @@ } - glColor4f(wave_r_switch, wave_g_switch, wave_b_switch, temp_a * masterAlpha); + glVertexAttrib4f(1, wave_r_switch, wave_g_switch, wave_b_switch, temp_a * masterAlpha); } else { - glColor4f(r, g, b, temp_a * masterAlpha); + glVertexAttrib4f(1, r, g, b, temp_a * masterAlpha); } } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/MilkdropWaveform.hpp projectm-3.1.0/src/libprojectM/Renderer/MilkdropWaveform.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/MilkdropWaveform.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/MilkdropWaveform.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -42,7 +42,9 @@ float smoothing; MilkdropWaveform(); + ~MilkdropWaveform(); void Draw(RenderContext &context); + void InitVertexAttrib(); float modOpacityStart; float modOpacityEnd; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/PerlinNoise.cpp projectm-3.1.0/src/libprojectM/Renderer/PerlinNoise.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/PerlinNoise.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/PerlinNoise.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -11,40 +11,57 @@ PerlinNoise::PerlinNoise() { - for (int x = 0; x < 256;x++) - for (int y = 0; y < 256;y++) - noise_lq[x][y] = noise(x , y); - - for (int x = 0; x < 32;x++) - for (int y = 0; y < 32;y++) - noise_lq_lite[x][y] = noise(4*x,16*y); - - for (int x = 0; x < 256;x++) - for (int y = 0; y < 256;y++) - noise_mq[x][y] = InterpolatedNoise((float)x/(float)2.0,(float)y/(float)2.0); - - for (int x = 0; x < 256;x++) - for (int y = 0; y < 256;y++) - noise_hq[x][y] = InterpolatedNoise((float)x/(float)3.0,(float)y/(float)3.0); - - for (int x = 0; x < 32;x++) - for (int y = 0; y < 32;y++) - for (int z = 0; z < 32;z++) - noise_lq_vol[x][y][z] = noise(x,y,z); - - for (int x = 0; x < 32;x++) - for (int y = 0; y < 32;y++) - for (int z = 0; z < 32;z++) - noise_hq_vol[x][y][z] = noise(x,y,z);//perlin_noise_3d(x,y,z,6121,7,seed3,0.5,64); - - int seed = rand()%1000; - - int size = 512; - int octaves = sqrt((double)size); - - for (int x = 0; x < size;x++) - for (int y = 0; y < size;y++) - noise_perlin[x][y] = perlin_noise_2d(x,y,6321,octaves,seed,0.5,size/4); + for (int x = 0; x < 256;x++) { + for (int y = 0; y < 256;y++) { + noise_lq[x][y][0] = noise(x , y); + noise_lq[x][y][1] = noise_lq[x][y][0]; + noise_lq[x][y][2] = noise_lq[x][y][0]; + } + } + + for (int x = 0; x < 32;x++) { + for (int y = 0; y < 32;y++) { + noise_lq_lite[x][y][0] = noise(4*x,16*y); + noise_lq_lite[x][y][1] = noise_lq_lite[x][y][0]; + noise_lq_lite[x][y][2] = noise_lq_lite[x][y][0]; + } + } + + for (int x = 0; x < 256;x++) { + for (int y = 0; y < 256;y++) { + noise_mq[x][y][0] = InterpolatedNoise((float)x/(float)2.0,(float)y/(float)2.0); + noise_mq[x][y][1] = noise_mq[x][y][0]; + noise_mq[x][y][2] = noise_mq[x][y][0]; + } + } + + for (int x = 0; x < 256;x++) { + for (int y = 0; y < 256;y++) { + noise_hq[x][y][0] = InterpolatedNoise((float)x/(float)3.0,(float)y/(float)3.0); + noise_hq[x][y][1] = noise_hq[x][y][0]; + noise_hq[x][y][2] = noise_hq[x][y][0]; + } + } + + for (int x = 0; x < 32;x++) { + for (int y = 0; y < 32;y++) { + for (int z = 0; z < 32;z++) { + noise_lq_vol[x][y][z][0] = noise(x,y,z); + noise_lq_vol[x][y][z][1] = noise_lq_vol[x][y][z][0]; + noise_lq_vol[x][y][z][2] = noise_lq_vol[x][y][z][0]; + } + } + } + + for (int x = 0; x < 32;x++) { + for (int y = 0; y < 32;y++) { + for (int z = 0; z < 32;z++) { + noise_hq_vol[x][y][z][0] = noise(x,y,z); + noise_hq_vol[x][y][z][1] = noise_hq_vol[x][y][z][0]; + noise_hq_vol[x][y][z][2] = noise_hq_vol[x][y][z][0]; + } + } + } } PerlinNoise::~PerlinNoise() diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/PerlinNoise.hpp projectm-3.1.0/src/libprojectM/Renderer/PerlinNoise.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/PerlinNoise.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/PerlinNoise.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -14,13 +14,12 @@ { public: - float noise_lq[256][256]; - float noise_lq_lite[32][32]; - float noise_mq[256][256]; - float noise_hq[256][256]; - float noise_perlin[512][512]; - float noise_lq_vol[32][32][32]; - float noise_hq_vol[32][32][32]; + float noise_lq[256][256][3]; + float noise_lq_lite[32][32][3]; + float noise_mq[256][256][3]; + float noise_hq[256][256][3]; + float noise_lq_vol[32][32][32][3]; + float noise_hq_vol[32][32][32][3]; PerlinNoise(); @@ -46,14 +45,6 @@ return noise(n); } - static inline float cos_interp(float a, float b, float x) - { - float ft = x * 3.1415927; - float f = (1 - cos(ft)) * .5; - - return a*(1-f) + b*f; - } - static inline float cubic_interp(float v0, float v1, float v2, float v3, float x) { float P = (v3 - v2) - (v0 - v1); @@ -100,53 +91,6 @@ } - static inline float perlin_octave_2d(float x,float y, int width, int seed, float period) - { - - float freq=1/(float)(period); - - int num=(int)(width*freq); - int step_x=(int)(x*freq); - int step_y=(int)(y*freq); - float zone_x=x*freq-step_x; - float zone_y=y*freq-step_y; - int box=step_x+step_y*num; - int noisedata=(box+seed); - - float u=cubic_interp(noise(noisedata-num-1),noise(noisedata-num),noise(noisedata-num+1),noise(noisedata-num+2),zone_x); - float a=cubic_interp(noise(noisedata-1),noise(noisedata),noise(noisedata+1),noise(noisedata+2),zone_x); - float b=cubic_interp(noise(noisedata+num -1),noise(noisedata+num),noise(noisedata+1+num),noise(noisedata+2+num),zone_x); - float v=cubic_interp(noise(noisedata+2*num -1),noise(noisedata+2*num),noise(noisedata+1+2*num),noise(noisedata+2+2*num),zone_x); - - float value=cubic_interp(u,a,b,v,zone_y); - - return value; - } - - - static inline float perlin_octave_2d_cos(float x,float y, int width, int seed, float period) - { - - float freq=1/(float)(period); - - int num=(int)(width*freq); - int step_x=(int)(x*freq); - int step_y=(int)(y*freq); - float zone_x=x*freq-step_x; - float zone_y=y*freq-step_y; - int box=step_x+step_y*num; - int noisedata=(box+seed); - - float a=cos_interp(noise(noisedata),noise(noisedata+1),zone_x); - float b=cos_interp(noise(noisedata+num),noise(noisedata+1+num),zone_x); - - float value=cos_interp(a,b,zone_y); - - return value; - } - - - static inline float perlin_octave_3d(float x,float y, float z,int width, int seed, float period) { float freq=1/(float)(period); @@ -204,21 +148,6 @@ } - static inline float perlin_noise_2d(int x, int y, int width, int octaves, int seed, float persistance, float basePeriod) - { - float p = persistance; - float val = 0.0; - - for (int i = 0; igx = gx; - this->gy = gy; - - this->x_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( int x = 0; x < gx; x++ ) - { - this->x_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } - this->y_mesh= ( float ** ) wipemalloc ( gx * sizeof ( float * ) ); - for ( int x = 0; x < gx; x++ ) - { - this->y_mesh[x] = ( float * ) wipemalloc ( gy * sizeof ( float ) ); - } + staticPerPixel = true; + this->gx = gx; + this->gy = gy; + this->x_mesh = alloc_mesh(gx, gy); + this->y_mesh = alloc_mesh(gx, gy); } Pipeline::~Pipeline() { -if (staticPerPixel) -{ - for ( int x = 0; x < this->gx; x++ ) + if (staticPerPixel) { - free(this->x_mesh[x]); - free(this->y_mesh[x]); + free_mesh(x_mesh); + free_mesh(y_mesh); } - free(x_mesh); - free(y_mesh); -} } -//void Pipeline::Render(const BeatDetect &music, const PipelineContext &context){} PixelPoint Pipeline::PerPixel(PixelPoint p, const PerPixelContext context) {return p;} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Pipeline.hpp projectm-3.1.0/src/libprojectM/Renderer/Pipeline.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Pipeline.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Pipeline.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -42,7 +42,9 @@ float blur1ed; Shader warpShader; + std::string warpShaderFilename; Shader compositeShader; + std::string compositeShaderFilename; std::vector drawables; std::vector compositeDrawables; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/projectM.cg projectm-3.1.0/src/libprojectM/Renderer/projectM.cg --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/projectM.cg 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/projectM.cg 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -#define M_PI 3.14159265359 -#define M_PI_2 6.28318530718 -#define M_INV_PI_2 0.159154943091895 - -#define q1 _qa.x -#define q2 _qa.y -#define q3 _qa.z -#define q4 _qa.w -#define q5 _qb.x -#define q6 _qb.y -#define q7 _qb.z -#define q8 _qb.w -#define q9 _qc.x -#define q10 _qc.y -#define q11 _qc.z -#define q12 _qc.w -#define q13 _qd.x -#define q14 _qd.y -#define q15 _qd.z -#define q16 _qd.w -#define q17 _qe.x -#define q18 _qe.y -#define q19 _qe.z -#define q20 _qe.w -#define q21 _qf.x -#define q22 _qf.y -#define q23 _qf.z -#define q24 _qf.w -#define q25 _qg.x -#define q26 _qg.y -#define q27 _qg.z -#define q28 _qg.w -#define q29 _qh.x -#define q30 _qh.y -#define q31 _qh.z -#define q32 _qh.w - -#define lum(x) (dot(x,float3(0.32,0.49,0.29))) -#define tex2d tex2D -#define tex3d tex3D - -#define sampler sampler2D - -#define getrad sqrt((uv.x-0.5)*2*(uv.x-0.5)*2+(uv.y-0.5)*2*(uv.y-0.5)*2)*.7071067 -#define getang atan2(((uv.y-0.5)*2),((uv.x-0.5)*2)) - -#define GetMain(uv) (tex2D(sampler_main,uv).xyz) -#define GetPixel(uv) (tex2D(sampler_main,uv).xyz) - -#define uv_orig uv - -uniform sampler2D sampler_main; -uniform sampler2D sampler_fw_main; -uniform sampler2D sampler_pw_main; -uniform sampler2D sampler_fc_main; -uniform sampler2D sampler_pc_main; - -uniform sampler2D sampler_noise_lq; -uniform sampler2D sampler_noise_lq_lite; -uniform sampler2D sampler_noise_mq; -uniform sampler2D sampler_noise_hq; -uniform sampler2D sampler_noise_perlin; -uniform sampler3D sampler_noisevol_lq; -uniform sampler3D sampler_noisevol_hq; - -uniform sampler2D sampler_blur1; -uniform sampler2D sampler_blur2; -uniform sampler2D sampler_blur3; - -float4 texsize_noise_lq; -float4 texsize_noise_mq; -float4 texsize_noise_hq; -float4 texsize_noise_perlin; -float4 texsize_noise_lq_lite; - -float4 _qa; -float4 _qb; -float4 _qc; -float4 _qd; -float4 _qe; -float4 _qf; -float4 _qg; -float4 _qh; - -float blur1_min; -float blur1_max; -float blur2_min; -float blur2_max; -float blur3_min; -float blur3_max; - -#define GetBlur1(uv) (tex2D(sampler_blur1,uv).xyz*blur1_max+blur1_min) -#define GetBlur2(uv) (tex2D(sampler_blur2,uv).xyz*blur2_max+blur2_min) -#define GetBlur3(uv) (tex2D(sampler_blur3,uv).xyz*blur3_max+blur3_min) - -float4 slow_roam_cos; -float4 roam_cos; -float4 slow_roam_sin; -float4 roam_sin; - -float time; -float4 rand_preset; -float4 rand_frame; -float progress; -float frame; -float fps; -float bass; -float mid; -float treb; -float vol; -float bass_att; -float mid_att; -float treb_att; -float vol_att; -float4 texsize; -float4 aspect; - -float max( float a, float b ) { - return (a > b ? a : b); -} - -float3 max(float3 a, float4 b) { - return float3( a.x > b.x ? a.x : b.x, - a.y > b.y ? a.y : b.y, - a.z > b.z ? a.z : b.z ); -} - -float3 max(float3 a, float3 b) { - return float3( a.x > b.x ? a.x : b.x, - a.y > b.y ? a.y : b.y, - a.z > b.z ? a.z : b.z ); -} - -struct outtype {float4 color : COLOR;}; -outtype OUT; -float3 ret; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderable.cpp projectm-3.1.0/src/libprojectM/Renderer/Renderable.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderable.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Renderable.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -1,24 +1,10 @@ #include "Common.hpp" - -#ifdef USE_GLES1 - #ifdef EMSCRIPTEN - #include - #else - #include - #endif -#else -#ifdef __APPLE__ -#include -#include -#else -#include -#include -#endif -#endif - #include "Renderable.hpp" +#include "Texture.hpp" #include +#include "ShaderEngine.hpp" +#include typedef float floatPair[2]; typedef float floatTriple[3]; @@ -29,40 +15,71 @@ RenderItem::RenderItem():masterAlpha(1){} -DarkenCenter::DarkenCenter():RenderItem(){} -MotionVectors::MotionVectors():RenderItem(){} -Border::Border():RenderItem(){} +void RenderItem::Init() { + glGenVertexArrays(1, &m_vaoID); + glGenBuffers(1, &m_vboID); + + glBindVertexArray(m_vaoID); + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); + + InitVertexAttrib(); + + glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); +} + +RenderItem::~RenderItem() { + glDeleteBuffers(1, &m_vboID); + glDeleteVertexArrays(1, &m_vaoID); +} + + +DarkenCenter::DarkenCenter():RenderItem(){ + Init(); +} + +MotionVectors::MotionVectors():RenderItem() { + Init(); +} + +Border::Border():RenderItem() { + Init(); +} + +void DarkenCenter::InitVertexAttrib() { + float points_colors[6][6] = { + { 0.5, 0.5, 0, 0, 0, (3.0f/32.0f) * masterAlpha}, + { 0.45, 0.5, 0, 0, 0, 0}, + { 0.5, 0.45, 0, 0, 0, 0}, + { 0.55, 0.5, 0, 0, 0, 0}, + { 0.5, 0.55, 0, 0, 0, 0}, + { 0.45, 0.5, 0, 0, 0, 0}}; + + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); + + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float)*6, (void*)0); // points + glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(float)*6, (void*)(sizeof(float)*2)); // colors + + glBufferData(GL_ARRAY_BUFFER, sizeof(points_colors), points_colors, GL_STATIC_DRAW); + +} + void DarkenCenter::Draw(RenderContext &context) { - //float unit=0.05f; + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glUseProgram(context.programID_v2f_c4f); - float colors[6][4] = {{0, 0, 0, (3.0f/32.0f) * masterAlpha}, - {0, 0, 0, 0}, - {0, 0, 0, 0}, - {0, 0, 0, 0}, - {0, 0, 0, 0}, - {0, 0, 0, 0}}; - - float points[6][2] = {{ 0.5, 0.5}, - { 0.45, 0.5}, - { 0.5, 0.45}, - { 0.55, 0.5}, - { 0.5, 0.55}, - { 0.45, 0.5}}; - - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); - glVertexPointer(2,GL_FLOAT,0,points); - glColorPointer(4,GL_FLOAT,0,colors); + glBindVertexArray(m_vaoID); - glDrawArrays(GL_TRIANGLE_FAN,0,6); + glDrawArrays(GL_TRIANGLE_FAN,0,6); - } + glBindVertexArray(0); +} Shape::Shape():RenderItem() { @@ -97,269 +114,319 @@ border_a = 0.0; /* alpha color value */ + glGenVertexArrays(1, &m_vaoID_texture); + glGenBuffers(1, &m_vboID_texture); + + glGenVertexArrays(1, &m_vaoID_not_texture); + glGenBuffers(1, &m_vboID_not_texture); + + glBindVertexArray(m_vaoID_texture); + glBindBuffer(GL_ARRAY_BUFFER, m_vboID_texture); + + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); + glEnableVertexAttribArray(2); + + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(struct_data), (void*)0); // Positions + glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(struct_data), (void*)(sizeof(float)*2)); // Colors + glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(struct_data), (void*)(sizeof(float)*6)); // Textures + + glBindVertexArray(m_vaoID_not_texture); + glBindBuffer(GL_ARRAY_BUFFER, m_vboID_not_texture); + + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); + + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(struct_data), (void*)0); // points + glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(struct_data), (void*)(sizeof(float)*2)); // Colors + + Init(); } +Shape::~Shape() { + glDeleteBuffers(1, &m_vboID_texture); + glDeleteVertexArrays(1, &m_vaoID_texture); + + glDeleteBuffers(1, &m_vboID_not_texture); + glDeleteVertexArrays(1, &m_vaoID_not_texture); +} + +void Shape::InitVertexAttrib() { + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); // points + glDisableVertexAttribArray(1); +} + + void Shape::Draw(RenderContext &context) { float xval, yval; float t; - // printf("drawing shape %f\n", ang); + float temp_radius= radius*(.707*.707*.707*1.04); + + //Additive Drawing or Overwrite + if ( additive==0) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + else glBlendFunc(GL_SRC_ALPHA, GL_ONE); - float temp_radius= radius*(.707*.707*.707*1.04); - //Additive Drawing or Overwrite - if ( additive==0) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - else glBlendFunc(GL_SRC_ALPHA, GL_ONE); + xval= x; + yval= -(y-1); - xval= x; - yval= -(y-1); + struct_data *buffer_data = new struct_data[sides+2]; - if ( textured) + if ( textured) + { + if (imageUrl !="") + { + TextureSamplerDesc tex = context.textureManager->getTexture(imageUrl, GL_CLAMP_TO_EDGE, GL_LINEAR); + if (tex.first != NULL) { - if (imageUrl !="") - { - GLuint tex= context.textureManager->getTexture(imageUrl); - if (tex != 0) - { - glBindTexture(GL_TEXTURE_2D, tex); - context.aspectRatio=1.0; - } - } - - glMatrixMode(GL_TEXTURE); - glPushMatrix(); - glLoadIdentity(); - - glEnable(GL_TEXTURE_2D); - - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - - floatQuad *colors = new float[sides+2][4]; - floatPair *tex = new float[sides+2][2]; - floatPair *points = new float[sides+2][2]; - - //Define the center point of the shape - colors[0][0] = r; - colors[0][1] = g; - colors[0][2] = b; - colors[0][3] = a * masterAlpha; - tex[0][0] = 0.5; - tex[0][1] = 0.5; - points[0][0] = xval; - points[0][1] = yval; - - for ( int i=1;i< sides+2;i++) - { - colors[i][0]= r2; - colors[i][1]=g2; - colors[i][2]=b2; - colors[i][3]=a2 * masterAlpha; - - t = (i-1)/(float) sides; - tex[i][0] =0.5f + 0.5f*cosf(t*3.1415927f*2 + tex_ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)/ tex_zoom; - tex[i][1] = 0.5f + 0.5f*sinf(t*3.1415927f*2 + tex_ang + 3.1415927f*0.25f)/ tex_zoom; - points[i][0]=temp_radius*cosf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)+xval; - points[i][1]=temp_radius*sinf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)+yval; - - - } - - glVertexPointer(2,GL_FLOAT,0,points); - glColorPointer(4,GL_FLOAT,0,colors); - glTexCoordPointer(2,GL_FLOAT,0,tex); - - glDrawArrays(GL_TRIANGLE_FAN,0,sides+2); - - glDisable(GL_TEXTURE_2D); - glPopMatrix(); - glMatrixMode(GL_MODELVIEW); - - //Reset Texture state since we might have changed it -/* - if(this->renderTarget->useFBO) - { - glBindTexture( GL_TEXTURE_2D, renderTarget->textureID[1] ); - } - else - { - glBindTexture( GL_TEXTURE_2D, renderTarget->textureID[0] ); - } -*/ - - delete[] colors; - delete[] tex; - delete[] points; + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, tex.first->texID); + glBindSampler(0, tex.second->samplerID); + + context.aspectRatio=1.0; } - else - {//Untextured (use color values) + } + + //Define the center point of the shape + buffer_data[0].color_r = r; + buffer_data[0].color_g = g; + buffer_data[0].color_b = b; + buffer_data[0].color_a = a * masterAlpha; + buffer_data[0].tex_x = 0.5; + buffer_data[0].tex_y = 0.5; + buffer_data[0].point_x = xval; + buffer_data[0].point_y = yval; - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + for ( int i=1;i< sides+2;i++) + { + buffer_data[i].color_r=r2; + buffer_data[i].color_g=g2; + buffer_data[i].color_b=b2; + buffer_data[i].color_a=a2 * masterAlpha; + + t = (i-1)/(float) sides; + buffer_data[i].tex_x =0.5f + 0.5f*cosf(t*3.1415927f*2 + tex_ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)/ tex_zoom; + buffer_data[i].tex_y = 0.5f + 0.5f*sinf(t*3.1415927f*2 + tex_ang + 3.1415927f*0.25f)/ tex_zoom; + buffer_data[i].point_x=temp_radius*cosf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)+xval; + buffer_data[i].point_y=temp_radius*sinf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)+yval; - floatQuad *colors = new float[sides+2][4]; - floatPair *points = new float[sides+2][2]; + } - //Define the center point of the shape - colors[0][0]=r; - colors[0][1]=g; - colors[0][2]=b; - colors[0][3]=a * masterAlpha; - points[0][0]=xval; - points[0][1]=yval; + glBindBuffer(GL_ARRAY_BUFFER, m_vboID_texture); + glBufferData(GL_ARRAY_BUFFER, sizeof(struct_data)*(sides+2), NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(struct_data)*(sides+2), buffer_data, GL_DYNAMIC_DRAW); + glUseProgram(context.programID_v2f_c4f_t2f); - for ( int i=1;i< sides+2;i++) - { - colors[i][0]=r2; - colors[i][1]=g2; - colors[i][2]=b2; - colors[i][3]=a2 * masterAlpha; - t = (i-1)/(float) sides; - points[i][0]=temp_radius*cosf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)+xval; - points[i][1]=temp_radius*sinf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)+yval; + glUniformMatrix4fv(context.uniform_v2f_c4f_t2f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + glUniform1i(context.uniform_v2f_c4f_t2f_frag_texture_sampler, 0); - } + glBindVertexArray(m_vaoID_texture); + glDrawArrays(GL_TRIANGLE_FAN, 0, sides+2); + glBindVertexArray(0); + } + else + {//Untextured (use color values) - glVertexPointer(2,GL_FLOAT,0,points); - glColorPointer(4,GL_FLOAT,0,colors); + //Define the center point of the shape + buffer_data[0].color_r=r; + buffer_data[0].color_g=g; + buffer_data[0].color_b=b; + buffer_data[0].color_a=a * masterAlpha; + buffer_data[0].point_x=xval; + buffer_data[0].point_y=yval; + + + for ( int i=1;i< sides+2;i++) + { + buffer_data[i].color_r=r2; + buffer_data[i].color_g=g2; + buffer_data[i].color_b=b2; + buffer_data[i].color_a=a2 * masterAlpha; + t = (i-1)/(float) sides; + buffer_data[i].point_x=temp_radius*cosf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)+xval; + buffer_data[i].point_y=temp_radius*sinf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)+yval; + } + + glBindBuffer(GL_ARRAY_BUFFER, m_vboID_not_texture); + + glBufferData(GL_ARRAY_BUFFER, sizeof(struct_data)*(sides+2), NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(struct_data)*(sides+2), buffer_data, GL_DYNAMIC_DRAW); + + glUseProgram(context.programID_v2f_c4f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + + glBindVertexArray(m_vaoID_not_texture); + glDrawArrays(GL_TRIANGLE_FAN,0,sides+2); + glBindVertexArray(0); + } - glDrawArrays(GL_TRIANGLE_FAN,0,sides+2); - //draw first n-1 triangular pieces + floatPair *points = new float[sides+1][2]; - delete[] colors; - delete[] points; - } - if (thickOutline==1) glLineWidth(context.texsize < 512 ? 1 : 2*context.texsize/512); + for ( int i=0;i< sides;i++) + { + t = (i-1)/(float) sides; + points[i][0]= temp_radius*cosf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)+xval; + points[i][1]= temp_radius*sinf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)+yval; + } - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); - floatPair *points = new float[sides+1][2]; + glBufferData(GL_ARRAY_BUFFER, sizeof(floatPair)*(sides), NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(floatPair)*(sides), points, GL_DYNAMIC_DRAW); - glColor4f( border_r, border_g, border_b, border_a * masterAlpha); + glBindBuffer(GL_ARRAY_BUFFER, 0); - for ( int i=0;i< sides;i++) - { - t = (i-1)/(float) sides; - points[i][0]= temp_radius*cosf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)*(context.aspectCorrect ? context.aspectRatio : 1.0)+xval; - points[i][1]= temp_radius*sinf(t*3.1415927f*2 + ang + 3.1415927f*0.25f)+yval; + glUseProgram(context.programID_v2f_c4f); - } + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); - glVertexPointer(2,GL_FLOAT,0,points); - glDrawArrays(GL_LINE_LOOP,0,sides); + glVertexAttrib4f(1, border_r, border_g, border_b, border_a * masterAlpha); - if (thickOutline==1) glLineWidth(context.texsize < 512 ? 1 : context.texsize/512); + if (thickOutline==1) glLineWidth(context.texsize < 512 ? 1 : 2*context.texsize/512); - delete[] points; + glBindVertexArray(m_vaoID); + glDrawArrays(GL_LINE_LOOP,0,sides); + glBindVertexArray(0); + glBindTexture(GL_TEXTURE_2D, 0); + glBindSampler(0, 0); + if (thickOutline==1) glLineWidth(context.texsize < 512 ? 1 : context.texsize/512); + + delete[] buffer_data; + delete[] points; +} + +void MotionVectors::InitVertexAttrib() { + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); } void MotionVectors::Draw(RenderContext &context) { - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - float intervalx=1.0/x_num; float intervaly=1.0/y_num; glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#ifndef EMSCRIPTEN - glPointSize(length); -#endif - glColor4f(r, g, b, a * masterAlpha); - if (x_num + y_num < 600) - { - int size = x_num * y_num ; + { + int size = x_num * y_num ; - floatPair *points = new float[size][2]; + floatPair *points = new float[size][2]; - for (int x=0;x<(int)x_num;x++) - { - for(int y=0;y<(int)y_num;y++) + for (int x=0;x<(int)x_num;x++) { - float lx, ly, lz; - lx = x_offset+x*intervalx; - ly = y_offset+y*intervaly; + for(int y=0;y<(int)y_num;y++) + { + float lx, ly, lz; + lx = x_offset+x*intervalx; + ly = y_offset+y*intervaly; - points[(x * (int)y_num) + y][0] = lx; - points[(x * (int)y_num) + y][1] = ly; + points[(x * (int)y_num) + y][0] = lx; + points[(x * (int)y_num) + y][1] = ly; + } } - } - glVertexPointer(2,GL_FLOAT,0,points); - glDrawArrays(GL_POINTS,0,size); + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); - delete[] points; + glBufferData(GL_ARRAY_BUFFER, sizeof(floatPair) * size, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(floatPair) * size, points, GL_DYNAMIC_DRAW); + + glBindBuffer(GL_ARRAY_BUFFER, 0); + + delete[] points; + + + glUseProgram(context.programID_v2f_c4f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + + #ifndef GL_TRANSITION + if (length <= 0.0) { + glPointSize(1.0); + } else { + glPointSize(length); + } + #endif + + glUniform1f(context.uniform_v2f_c4f_vertex_point_size, length); + glVertexAttrib4f(1, r, g, b, a * masterAlpha); + + glBindVertexArray(m_vaoID); + + glDrawArrays(GL_POINTS,0,size); + + glBindVertexArray(0); } } +void Border::InitVertexAttrib() { + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 0, (void*)0); + glDisableVertexAttribArray(1); +} + void Border::Draw(RenderContext &context) { - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - //Draw Borders - float of=outer_size*.5; - float iff=inner_size*.5; - float texof=1.0-of; + //Draw Borders + float of=outer_size*.5; + float iff=inner_size*.5; + float texof=1.0-of; - //no additive drawing for borders - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glColor4f(outer_r, outer_g, outer_b, outer_a * masterAlpha); + float points[40] = { + // Outer + 0,0, of,0, + 0,1, of,texof, + 1,1, texof,texof, + 1,0, texof,of, + of,0, of,of, + + // Inner + of,of, of+iff,of, + of,texof, of+iff,texof-iff, + texof,texof, texof-iff,texof-iff, + texof,of, texof-iff,of+iff, + of+iff,of, of+iff,of+iff, + }; + + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); + + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 40, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 40, points, GL_DYNAMIC_DRAW); + + glBindBuffer(GL_ARRAY_BUFFER, 0); + + glUseProgram(context.programID_v2f_c4f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + + glVertexAttrib4f(1, outer_r, outer_g, outer_b, outer_a * masterAlpha); + + //no additive drawing for borders + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + glBindVertexArray(m_vaoID); + + glDrawArrays(GL_TRIANGLE_STRIP, 0, 10); + + glVertexAttrib4f(1, inner_r, inner_g, inner_b, inner_a * masterAlpha); + + // 1st pass for inner + glDrawArrays(GL_TRIANGLE_STRIP, 10, 10); - float pointsA[4][2] = {{0,0},{0,1},{of,0},{of,1}}; - glVertexPointer(2,GL_FLOAT,0,pointsA); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - float pointsB[4][2] = {{of,0},{of,of},{texof,0},{texof,of}}; - glVertexPointer(2,GL_FLOAT,0,pointsB); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - float pointsC[4][2] = {{texof,0},{texof,1},{1,0},{1,1}}; - glVertexPointer(2,GL_FLOAT,0,pointsC); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - float pointsD[4][2] = {{of,1},{of,texof},{texof,1},{texof,texof}}; - glVertexPointer(2,GL_FLOAT,0,pointsD); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - glColor4f(inner_r, inner_g, inner_b, inner_a * masterAlpha); - - // glRect doesn't exist in GLES I think - // TODO: replace glRect -#ifndef USE_GLES1 - glRectd(of, of, of+iff, texof); - glRectd(of+iff, of, texof-iff, of+iff); - glRectd(texof-iff, of, texof, texof); - glRectd(of+iff, texof, texof-iff, texof-iff); -#endif - - float pointsE[4][2] = {{of,of},{of,texof},{of+iff,of},{of+iff,texof}}; - glVertexPointer(2,GL_FLOAT,0,pointsE); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - float pointsF[4][2] = {{of+iff,of},{of+iff,of+iff},{texof-iff,of},{texof-iff,of+iff}}; - glVertexPointer(2,GL_FLOAT,0,pointsF); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - float pointsG[4][2] = {{texof-iff,of},{texof-iff,texof},{texof,of},{texof,texof}}; - glVertexPointer(2,GL_FLOAT,0,pointsG); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); - - float pointsH[4][2] = {{of+iff,texof},{of+iff,texof-iff},{texof-iff,texof},{texof-iff,texof-iff}}; - glVertexPointer(2,GL_FLOAT,0,pointsH); - glDrawArrays(GL_TRIANGLE_STRIP,0,4); + // 2nd pass for inner + glDrawArrays(GL_TRIANGLE_STRIP, 10, 10); + glBindVertexArray(0); } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderable.hpp projectm-3.1.0/src/libprojectM/Renderer/Renderable.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderable.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Renderable.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -3,6 +3,9 @@ #include #include #include "TextureManager.hpp" +#include "projectM-opengl.h" +#include + class BeatDetect; @@ -15,6 +18,13 @@ bool aspectCorrect; BeatDetect *beatDetect; TextureManager *textureManager; + GLuint programID_v2f_c4f; + GLuint programID_v2f_c4f_t2f; + GLint uniform_v2f_c4f_vertex_tranformation; + GLint uniform_v2f_c4f_vertex_point_size; + GLint uniform_v2f_c4f_t2f_vertex_tranformation; + GLint uniform_v2f_c4f_t2f_frag_texture_sampler; + glm::mat4 mat_ortho; RenderContext(); }; @@ -22,9 +32,18 @@ class RenderItem { public: + RenderItem(); + ~RenderItem(); + float masterAlpha; + virtual void InitVertexAttrib() = 0; virtual void Draw(RenderContext &context) = 0; - RenderItem(); + +protected: + virtual void Init(); + + GLuint m_vboID; + GLuint m_vaoID; }; typedef std::vector RenderItemList; @@ -33,6 +52,7 @@ { public: DarkenCenter(); + void InitVertexAttrib(); void Draw(RenderContext &context); }; @@ -71,7 +91,28 @@ Shape(); + ~Shape(); + void InitVertexAttrib(); virtual void Draw(RenderContext &context); + +private: + + struct struct_data { + float point_x; + float point_y; + float color_r; + float color_g; + float color_b; + float color_a; + float tex_x; + float tex_y; + }; + + GLuint m_vboID_texture; + GLuint m_vaoID_texture; + + GLuint m_vboID_not_texture; + GLuint m_vaoID_not_texture; }; class Text : RenderItem @@ -91,6 +132,7 @@ float x_offset; float y_offset; + void InitVertexAttrib(); void Draw(RenderContext &context); MotionVectors(); }; @@ -110,6 +152,7 @@ float inner_b; float inner_a; + void InitVertexAttrib(); void Draw(RenderContext &context); Border(); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderContext.cpp projectm-3.1.0/src/libprojectM/Renderer/RenderContext.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderContext.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/RenderContext.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,7 @@ +// + +#include "RenderContext.hpp" + +RenderContext::RenderContext() +: time(0),texsize(512), aspectRatio(1), aspectCorrect(false){}; + diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderContext.hpp projectm-3.1.0/src/libprojectM/Renderer/RenderContext.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderContext.hpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/RenderContext.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,22 @@ + +#ifndef RenderContext_hpp +#define RenderContext_hpp +#include "TextureManager.hpp" + +class BeatDetect; +class ShaderEngine; + +class RenderContext +{ +public: + float time; + int texsize; + float aspectRatio; + bool aspectCorrect; + BeatDetect *beatDetect; + TextureManager *textureManager; + + RenderContext(); +}; + +#endif /* RenderContext_hpp */ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderer.cpp projectm-3.1.0/src/libprojectM/Renderer/Renderer.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderer.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Renderer.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -10,495 +10,494 @@ #include #include "omptl/omptl" #include "omptl/omptl_algorithm" -#include "UserTexture.hpp" +#include +#include + + +Pipeline* Renderer::currentPipe; + class Preset; -Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetect *beatDetect, std::string _presetURL, - std::string _titlefontURL, std::string _menufontURL) : - title_fontURL(_titlefontURL), menu_fontURL(_menufontURL), presetURL(_presetURL), m_presetName("None"), vw(width), - vh(height), texsize(texsize), mesh(gx, gy) -{ - int x; - int y; - - this->totalframes = 1; - this->noSwitch = false; - this->showfps = false; - this->showtitle = false; - this->showpreset = false; - this->showhelp = false; - this->showstats = false; - this->studio = false; - this->realfps = 0; - - this->drawtitle = 0; - - //this->title = "Unknown"; - - /** Other stuff... */ - this->correction = true; - this->aspect = (float) height / (float) width;; - - /// @bug put these on member init list - this->renderTarget = new RenderTarget(texsize, width, height); - this->textureManager = new TextureManager(presetURL); - this->beatDetect = beatDetect; +Renderer::Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string _presetURL, + std::string _titlefontURL, std::string _menufontURL, const std::string& datadir) : + title_fontURL(_titlefontURL), menu_fontURL(_menufontURL), presetURL(_presetURL), m_presetName("None"), vw(width), + vh(height), mesh(gx, gy), m_datadir(datadir) +{ + this->totalframes = 1; + this->noSwitch = false; + this->showfps = false; + this->showtitle = false; + this->showpreset = false; + this->showhelp = false; + this->showstats = false; + this->studio = false; + this->realfps = 0; + + this->drawtitle = 0; + + //this->title = "Unknown"; + + /** Other stuff... */ + this->correction = true; + + /// @bug put these on member init list + this->textureManager = NULL; + this->beatDetect = _beatDetect; + + textureRenderToTexture = 0; #ifdef USE_FTGL - /** Load the standard fonts if they do exist */ - struct stat buffer; + /** Load the standard fonts if they do exist */ + struct stat buffer; + + if (stat( title_fontURL.c_str(), &buffer )) { + std::cout << "Could not open font file: " << title_fontURL << std::endl; + exit(1); + } + if (stat( menu_fontURL.c_str(), &buffer )) { + std::cout << "Could not open font file: " << menu_fontURL << std::endl; + exit(1); + } + + title_font = new FTGLPixmapFont(title_fontURL.c_str()); + other_font = new FTGLPixmapFont(menu_fontURL.c_str()); + poly_font = new FTGLExtrdFont(title_fontURL.c_str()); + + if(title_font->Error()) { + fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str()); + } else { + title_font->UseDisplayList(true); + } - if (stat( title_fontURL.c_str(), &buffer )) { - std::cout << "Could not open font file: " << title_fontURL << std::endl; - exit(1); - } - if (stat( menu_fontURL.c_str(), &buffer )) { - std::cout << "Could not open font file: " << menu_fontURL << std::endl; - exit(1); - } - - title_font = new FTGLPixmapFont(title_fontURL.c_str()); - other_font = new FTGLPixmapFont(menu_fontURL.c_str()); - poly_font = new FTGLExtrdFont(title_fontURL.c_str()); - - if(title_font->Error()) { - fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str()); - } else { - title_font->UseDisplayList(true); - } - - other_font->UseDisplayList(true); - - if(poly_font->Error()) { - fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str()); - } else { - poly_font->UseDisplayList(true); - poly_font->Depth(20); - poly_font->FaceSize(72); - } + other_font->UseDisplayList(true); + + if(poly_font->Error()) { + fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str()); + } else { + poly_font->UseDisplayList(true); + poly_font->Depth(20); + poly_font->FaceSize(72); + } #endif /** USE_FTGL */ - int size = (mesh.height - 1) *mesh.width * 5 * 2; - p = ( float * ) wipemalloc ( size * sizeof ( float ) ); + int size = (mesh.height - 1) *mesh.width * 4 * 2; + p = ( float * ) wipemalloc ( size * sizeof ( float ) ); - for (int j = 0; j < mesh.height - 1; j++) - { - int base = j * mesh.width * 2 * 5; + for (int j = 0; j < mesh.height - 1; j++) + { + int base = j * mesh.width * 4 * 2; - for (int i = 0; i < mesh.width; i++) - { - int index = j * mesh.width + i; - int index2 = (j + 1) * mesh.width + i; + for (int i = 0; i < mesh.width; i++) + { + int index = j * mesh.width + i; + int index2 = (j + 1) * mesh.width + i; - int strip = base + i * 10; - p[strip + 2] = mesh.identity[index].x; - p[strip + 3] = mesh.identity[index].y; - p[strip + 4] = 0; + int strip = base + i * 8; + p[strip + 0] = mesh.identity[index].x; + p[strip + 1] = mesh.identity[index].y; - p[strip + 7] = mesh.identity[index2].x; - p[strip + 8] = mesh.identity[index2].y; - p[strip + 9] = 0; - } - } + p[strip + 4] = mesh.identity[index2].x; + p[strip + 5] = mesh.identity[index2].y; + } + } + renderContext.programID_v2f_c4f = shaderEngine.programID_v2f_c4f; + renderContext.programID_v2f_c4f_t2f = shaderEngine.programID_v2f_c4f_t2f; -#ifdef USE_CG - shaderEngine.setParams(renderTarget->texsize, renderTarget->textureID[1], aspect, beatDetect, textureManager); -#endif + renderContext.uniform_v2f_c4f_vertex_tranformation = shaderEngine.uniform_v2f_c4f_vertex_tranformation; + renderContext.uniform_v2f_c4f_vertex_point_size = shaderEngine.uniform_v2f_c4f_vertex_point_size; + renderContext.uniform_v2f_c4f_t2f_vertex_tranformation = shaderEngine.uniform_v2f_c4f_t2f_vertex_tranformation; + renderContext.uniform_v2f_c4f_t2f_frag_texture_sampler = shaderEngine.uniform_v2f_c4f_t2f_frag_texture_sampler; + + // Interpolation VAO/VBO's + glGenBuffers(1, &m_vbo_Interpolation); + glGenVertexArrays(1, &m_vao_Interpolation); + + glBindVertexArray(m_vao_Interpolation); + glBindBuffer(GL_ARRAY_BUFFER, m_vbo_Interpolation); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)0); // Positions + + glDisableVertexAttribArray(1); + + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)(sizeof(float)*2)); // Textures + glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + + // CompositeOutput VAO/VBO's + glGenBuffers(1, &m_vbo_CompositeOutput); + glGenVertexArrays(1, &m_vao_CompositeOutput); + + float composite_buffer_data[8][2] = + { + { -0.5, -0.5 }, + { 0, 1 }, + { -0.5, 0.5 }, + { 0, 0 }, + { 0.5, 0.5 }, + { 1, 0 }, + { 0.5, -0.5 }, + { 1, 1 } }; + + + glBindVertexArray(m_vao_CompositeOutput); + glBindBuffer(GL_ARRAY_BUFFER, m_vbo_CompositeOutput); + + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 8 * 2, composite_buffer_data, GL_STATIC_DRAW); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)0); // Positions + + glDisableVertexAttribArray(1); + + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)(sizeof(float)*2)); // Textures + + glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + + + + // CompositeShaderOutput VAO/VBO's + glGenBuffers(1, &m_vbo_CompositeShaderOutput); + glGenVertexArrays(1, &m_vao_CompositeShaderOutput); + + glBindVertexArray(m_vao_CompositeShaderOutput); + glBindBuffer(GL_ARRAY_BUFFER, m_vbo_CompositeShaderOutput); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(composite_shader_vertex), (void*)0); // Positions + + glEnableVertexAttribArray(1); + glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(composite_shader_vertex), (void*)(sizeof(float)*2)); // Colors + + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(composite_shader_vertex), (void*)(sizeof(float)*6)); // UV + + glEnableVertexAttribArray(3); + glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, sizeof(composite_shader_vertex), (void*)(sizeof(float)*8)); // RAD ANG + + glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); } -void Renderer::SetPipeline(Pipeline &pipeline) +std::string Renderer::SetPipeline(Pipeline &pipeline) { - currentPipe = &pipeline; -#ifdef USE_CG - shaderEngine.reset(); - shaderEngine.loadShader(pipeline.warpShader); - shaderEngine.loadShader(pipeline.compositeShader); -#endif + currentPipe = &pipeline; + shaderEngine.reset(); + if (!shaderEngine.loadPresetShaders(pipeline)) { + return "Shader compilation error"; + } + + return std::string(); } void Renderer::ResetTextures() { - textureManager->Clear(); + textureManager->Clear(); - delete (renderTarget); - renderTarget = new RenderTarget(texsize, vw, vh); - reset(vw, vh); + reset(vw, vh); - textureManager->Preload(); + textureManager->Preload(); } void Renderer::SetupPass1(const Pipeline &pipeline, const PipelineContext &pipelineContext) { - //glMatrixMode(GL_PROJECTION); - //glPushMatrix(); - //glMatrixMode(GL_MODELVIEW); - //glPushMatrix(); - - totalframes++; - renderTarget->lock(); - glViewport(0, 0, renderTarget->texsize, renderTarget->texsize); - - glEnable(GL_TEXTURE_2D); - - //If using FBO, switch to FBO texture - - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glOrtho(0.0, 1, 0.0, 1, -40, 40); - -#ifndef EMSCRIPTEN - glMatrixMode(GL_MODELVIEW); -#endif - glLoadIdentity(); + totalframes++; + glViewport(0, 0, texsizeX, texsizeY); -#ifdef USE_CG - shaderEngine.RenderBlurTextures(pipeline, pipelineContext, renderTarget->texsize); -#endif + renderContext.mat_ortho = glm::ortho(0.0f, 1.0f, 0.0f, 1.0f, -40.0f, 40.0f); } void Renderer::RenderItems(const Pipeline &pipeline, const PipelineContext &pipelineContext) { - renderContext.time = pipelineContext.time; - renderContext.texsize = texsize; - renderContext.aspectCorrect = correction; - renderContext.aspectRatio = aspect; - renderContext.textureManager = textureManager; - renderContext.beatDetect = beatDetect; + renderContext.time = pipelineContext.time; + renderContext.texsize = nearestPower2(std::max(texsizeX, texsizeY)); + renderContext.aspectCorrect = correction; + renderContext.aspectRatio = aspect; + renderContext.textureManager = textureManager; + renderContext.beatDetect = beatDetect; - for (std::vector::const_iterator pos = pipeline.drawables.begin(); pos != pipeline.drawables.end(); ++pos) + for (std::vector::const_iterator pos = pipeline.drawables.begin(); pos != pipeline.drawables.end(); ++pos) { if (*pos != NULL) { - (*pos)->Draw(renderContext); + (*pos)->Draw(renderContext); } } } void Renderer::FinishPass1() { - draw_title_to_texture(); - /** Restore original view state */ - //glMatrixMode(GL_MODELVIEW); - //glPopMatrix(); - - //glMatrixMode(GL_PROJECTION); - //glPopMatrix(); - - renderTarget->unlock(); + draw_title_to_texture(); + textureManager->updateMainTexture(); } void Renderer::Pass2(const Pipeline &pipeline, const PipelineContext &pipelineContext) { - //BEGIN PASS 2 - // - //end of texture rendering - //now we copy the texture from the FBO or framebuffer to - //video texture memory and render fullscreen. - - /** Reset the viewport size */ -#ifdef USE_FBO - if (renderTarget->renderToTexture) - { - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, this->renderTarget->fbuffer[1]); - glViewport(0, 0, this->renderTarget->texsize, this->renderTarget->texsize); - } - else -#endif - glViewport(0, 0, this->vw, this->vh); + //BEGIN PASS 2 + // + //end of texture rendering + //now we copy the texture from the FBO or framebuffer to + //video texture memory and render fullscreen. - glBindTexture(GL_TEXTURE_2D, this->renderTarget->textureID[0]); - -#ifndef EMSCRIPTEN - glMatrixMode(GL_PROJECTION); -#endif - glLoadIdentity(); - glOrtho(-0.5, 0.5, -0.5, 0.5, -40, 40); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glLineWidth(this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize / 512.0); + /** Reset the viewport size */ + if (textureRenderToTexture) + { + glViewport(0, 0, texsizeX, texsizeY); + } + else + glViewport(0, 0, this->vw, this->vh); - CompositeOutput(pipeline, pipelineContext); + if (shaderEngine.enableCompositeShader(currentPipe->compositeShader, pipeline, pipelineContext)) { + CompositeShaderOutput(pipeline, pipelineContext); + } else { + CompositeOutput(pipeline, pipelineContext); + } +/* FTGL does not support OpenGL ES #ifndef EMSCRIPTEN - glMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_MODELVIEW); #endif - glLoadIdentity(); - glTranslatef(-0.5, -0.5, 0); + glLoadIdentity(); + glTranslatef(-0.5, -0.5, 0); - // When console refreshes, there is a chance the preset has been changed by the user - refreshConsole(); - draw_title_to_screen(false); - if (this->showhelp % 2) - draw_help(); - if (this->showtitle % 2) - draw_title(); - if (this->showfps % 2) - draw_fps(this->realfps); - if (this->showpreset % 2) - draw_preset(); - if (this->showstats % 2) - draw_stats(); - glTranslatef(0.5, 0.5, 0); - -#ifdef USE_FBO - if (renderTarget->renderToTexture) - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); -#endif + // When console refreshes, there is a chance the preset has been changed by the user + refreshConsole(); + draw_title_to_screen(false); + if (this->showhelp % 2) + draw_help(); + if (this->showtitle % 2) + draw_title(); + if (this->showfps % 2) + draw_fps(this->realfps); + if (this->showpreset % 2) + draw_preset(); + if (this->showstats % 2) + draw_stats(); + glTranslatef(0.5, 0.5, 0); +*/ + + if (textureRenderToTexture) { + glBindTexture(GL_TEXTURE_2D, textureRenderToTexture); + glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, texsizeX, texsizeY); + glBindTexture(GL_TEXTURE_2D, 0); + } } void Renderer::RenderFrame(const Pipeline &pipeline, const PipelineContext &pipelineContext) { + shaderEngine.RenderBlurTextures(pipeline, pipelineContext); -#ifdef USE_FBO - // when not 'renderToTexture', the user may use its own couple FBO/texture - // so retrieve this external FBO if it exists, (0 means no FBO) and unbind it - GLint externalFBO = 0; - if (!renderTarget->renderToTexture) - { - glGetIntegerv(GL_FRAMEBUFFER_BINDING, &externalFBO); - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - } -#endif + SetupPass1(pipeline, pipelineContext); - SetupPass1(pipeline, pipelineContext); + Interpolation(pipeline, pipelineContext); -#ifdef USE_CG - shaderEngine.enableShader(currentPipe->warpShader, pipeline, pipelineContext); -#endif - Interpolation(pipeline); -#ifdef USE_CG - shaderEngine.disableShader(); -#endif + RenderItems(pipeline, pipelineContext); - RenderItems(pipeline, pipelineContext); - FinishPass1(); + FinishPass1(); -#ifdef USE_FBO - // when not 'renderToTexture', the user may use its own couple FBO/texture - // if it exists (0 means no external FBO) - // then rebind it just before calling the final pass: Pass2 - if (!renderTarget->renderToTexture && externalFBO != 0) - glBindFramebufferEXT (GL_FRAMEBUFFER_EXT, externalFBO); -#endif - - Pass2(pipeline, pipelineContext); + Pass2(pipeline, pipelineContext); } -void Renderer::Interpolation(const Pipeline &pipeline) +void Renderer::Interpolation(const Pipeline &pipeline, const PipelineContext &pipelineContext) { - if (this->renderTarget->useFBO) - glBindTexture(GL_TEXTURE_2D, renderTarget->textureID[1]); - else - glBindTexture(GL_TEXTURE_2D, renderTarget->textureID[0]); - - //Texture wrapping( clamp vs. wrap) - if (pipeline.textureWrap == 0) - { -#ifdef USE_GLES1 - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); -#else - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); -#endif - } - else - { - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - } - - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); - - glBlendFunc(GL_SRC_ALPHA, GL_ZERO); - - glColor4f(1.0, 1.0, 1.0, pipeline.screenDecay); + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, textureManager->getMainTexture()->texID); - glEnable(GL_TEXTURE_2D); + //Texture wrapping( clamp vs. wrap) + if (pipeline.textureWrap == 0) + { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + } + else + { + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); + } + int size = (mesh.height - 1) * mesh.width * 4 * 2; - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); + if (pipeline.staticPerPixel) + { + for (int j = 0; j < mesh.height - 1; j++) + { + int base = j * mesh.width * 2 * 4; + + for (int i = 0; i < mesh.width; i++) + { + int strip = base + i * 8; + p[strip + 2] = pipeline.x_mesh[i][j]; + p[strip + 3] = pipeline.y_mesh[i][j]; + + p[strip + 6] = pipeline.x_mesh[i][j+1]; + p[strip + 7] = pipeline.y_mesh[i][j+1]; + } + } + } + else + { + mesh.Reset(); + omptl::transform(mesh.p.begin(), mesh.p.end(), mesh.identity.begin(), mesh.p.begin(), &Renderer::PerPixel); - //glVertexPointer(2, GL_FLOAT, 0, p); - //glTexCoordPointer(2, GL_FLOAT, 0, t); -#ifndef EMSCRIPTEN - glInterleavedArrays(GL_T2F_V3F,0,p); -#endif + for (int j = 0; j < mesh.height - 1; j++) + { + int base = j * mesh.width * 2 * 4; - if (pipeline.staticPerPixel) - { - for (int j = 0; j < mesh.height - 1; j++) - { - int base = j * mesh.width * 2 * 5; + for (int i = 0; i < mesh.width; i++) + { + int strip = base + i * 8; + int index = j * mesh.width + i; + int index2 = (j + 1) * mesh.width + i; - for (int i = 0; i < mesh.width; i++) - { - int strip = base + i * 10; - p[strip] = pipeline.x_mesh[i][j]; - p[strip + 1] = pipeline.y_mesh[i][j]; + p[strip + 2] = mesh.p[index].x; + p[strip + 3] = mesh.p[index].y; - p[strip + 5] = pipeline.x_mesh[i][j+1]; - p[strip + 6] = pipeline.y_mesh[i][j+1]; - } - } + p[strip + 6] = mesh.p[index2].x; + p[strip + 7] = mesh.p[index2].y; - } - else - { - mesh.Reset(); - omptl::transform(mesh.p.begin(), mesh.p.end(), mesh.identity.begin(), mesh.p.begin(), &Renderer::PerPixel); - for (int j = 0; j < mesh.height - 1; j++) - { - int base = j * mesh.width * 2 * 5; + } + } + } - for (int i = 0; i < mesh.width; i++) - { - int strip = base + i * 10; - int index = j * mesh.width + i; - int index2 = (j + 1) * mesh.width + i; + glBindBuffer(GL_ARRAY_BUFFER, m_vbo_Interpolation); - p[strip] = mesh.p[index].x; - p[strip + 1] = mesh.p[index].y; + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * size, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * size, p, GL_DYNAMIC_DRAW); - p[strip + 5] = mesh.p[index2].x; - p[strip + 6] = mesh.p[index2].y; + glBindBuffer(GL_ARRAY_BUFFER, 0); + shaderEngine.enableWarpShader(currentPipe->warpShader, pipeline, pipelineContext, renderContext.mat_ortho); - } - } + glVertexAttrib4f(1, 1.0, 1.0, 1.0, pipeline.screenDecay); - } + glBlendFunc(GL_SRC_ALPHA, GL_ZERO); - for (int j = 0; j < mesh.height - 1; j++) - glDrawArrays(GL_TRIANGLE_STRIP,j* mesh.width* 2,mesh.width*2); + glBindVertexArray(m_vao_Interpolation); + for (int j = 0; j < mesh.height - 1; j++) + glDrawArrays(GL_TRIANGLE_STRIP,j* mesh.width* 2,mesh.width*2); - glDisable(GL_TEXTURE_2D); + glBindVertexArray(0); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBindTexture(GL_TEXTURE_2D, 0); } -Pipeline* Renderer::currentPipe; Renderer::~Renderer() { - int x; - - if (renderTarget) - delete (renderTarget); - if (textureManager) - delete (textureManager); + if (textureManager) + delete (textureManager); - //std::cerr << "grid assign end" << std::endl; + //std::cerr << "grid assign end" << std::endl; - free(p); + free(p); #ifdef USE_FTGL - // std::cerr << "freeing title fonts" << std::endl; - if (title_font) - delete title_font; - if (poly_font) - delete poly_font; - if (other_font) - delete other_font; - // std::cerr << "freeing title fonts finished" << std::endl; -#endif - // std::cerr << "exiting destructor" << std::endl; + // std::cerr << "freeing title fonts" << std::endl; + if (title_font) + delete title_font; + if (poly_font) + delete poly_font; + if (other_font) + delete other_font; + // std::cerr << "freeing title fonts finished" << std::endl; +#endif + // std::cerr << "exiting destructor" << std::endl; + + glDeleteBuffers(1, &m_vbo_Interpolation); + glDeleteVertexArrays(1, &m_vao_Interpolation); + + glDeleteBuffers(1, &m_vbo_CompositeOutput); + glDeleteVertexArrays(1, &m_vao_CompositeOutput); + + glDeleteTextures(1, &textureRenderToTexture); } void Renderer::reset(int w, int h) { - aspect = (float) h / (float) w; - this -> vw = w; - this -> vh = h; + aspect = (float) h / (float) w; + this -> vw = w; + this -> vh = h; -#if USE_CG - shaderEngine.setAspect(aspect); -#endif + glCullFace(GL_BACK); -#ifndef EMSCRIPTEN - glShadeModel(GL_SMOOTH); +#ifndef GL_TRANSITION + glEnable(GL_LINE_SMOOTH); #endif - glCullFace(GL_BACK); - //glFrontFace( GL_CCW ); - - glClearColor(0, 0, 0, 0); + glClearColor(0, 0, 0, 0); - glViewport(0, 0, w, h); + glViewport(0, 0, w, h); - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); + glEnable(GL_BLEND); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); + texsizeX = w; + texsizeY = h; - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + // snap to 16x16 blocks + texsizeX = ((texsizeX-15)/16)*16; + texsizeY = ((texsizeY-15)/16)*16; -#ifndef USE_GLES1 - glDrawBuffer(GL_BACK); - glReadBuffer(GL_BACK); -#endif - glEnable(GL_BLEND); - - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - - glEnable(GL_LINE_SMOOTH); + m_fAspectX = (texsizeY > texsizeX) ? (float)texsizeX/(float)texsizeY : 1.0f; + m_fAspectY = (texsizeX > texsizeY) ? (float)texsizeY/(float)texsizeX : 1.0f; + m_fInvAspectX = 1.0f/m_fAspectX; + m_fInvAspectY = 1.0f/m_fAspectY; - glEnable(GL_POINT_SMOOTH); - glClear(GL_COLOR_BUFFER_BIT); + InitCompositeShaderVertex(); -#ifndef USE_GLES1 - glLineStipple(2, 0xAAAA); -#endif + if (textureManager != NULL) { + delete textureManager; + } + textureManager = new TextureManager(presetURL, texsizeX, texsizeY, m_datadir); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + shaderEngine.setParams(texsizeX, texsizeY, beatDetect, textureManager); + shaderEngine.reset(); + shaderEngine.loadPresetShaders(*currentPipe); - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); - //glHint(GL_POINT_SMOOTH_HINT, GL_NICEST); - //glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - - if (!this->renderTarget->useFBO) - { - this->renderTarget->fallbackRescale(w, h); - } + glClear(GL_COLOR_BUFFER_BIT); } GLuint Renderer::initRenderToTexture() { - return renderTarget->initRenderToTexture(); + if (textureRenderToTexture == 0) { + glGenTextures(1, &textureRenderToTexture); + glBindTexture(GL_TEXTURE_2D, textureRenderToTexture); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, texsizeX, texsizeY, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glBindTexture(GL_TEXTURE_2D, 0); + } + + return textureRenderToTexture; } void Renderer::draw_title_to_texture() { #ifdef USE_FTGL - if (this->drawtitle > 100) - { - draw_title_to_screen(true); - this->drawtitle = 0; - } + if (this->drawtitle > 100) + { + draw_title_to_screen(true); + this->drawtitle = 0; + } #endif /** USE_FTGL */ } @@ -508,90 +507,86 @@ { #ifdef USE_FTGL - if (this->drawtitle > 0) - { - - //setUpLighting(); + if (this->drawtitle > 0) + { - //glEnable(GL_POLYGON_SMOOTH); - //glEnable( GL_CULL_FACE); - glEnable(GL_DEPTH_TEST); - glClear(GL_DEPTH_BUFFER_BIT); + glEnable(GL_DEPTH_TEST); + glClear(GL_DEPTH_BUFFER_BIT); - int draw; - if (drawtitle >= 80) - draw = 80; - else - draw = drawtitle; + int draw; + if (drawtitle >= 80) + draw = 80; + else + draw = drawtitle; - float easein = ((80 - draw) * .0125); - float easein2 = easein * easein; + float easein = ((80 - draw) * .0125); + float easein2 = easein * easein; - if (drawtitle == 1) - { - title_y = (float) rand() / RAND_MAX; - title_y *= 2; - title_y -= 1; - title_y *= .6; - } - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - //glBlendFunc(GL_SRC_ALPHA_SATURATE,GL_ONE); - glColor4f(1.0, 1.0, 1.0, 1.0); + if (drawtitle == 1) + { + title_y = (float) rand() / RAND_MAX; + title_y *= 2; + title_y -= 1; + title_y *= .6; + } + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + //glBlendFunc(GL_SRC_ALPHA_SATURATE,GL_ONE); + glColor4f(1.0, 1.0, 1.0, 1.0); - glMatrixMode(GL_PROJECTION); - glPushMatrix(); - glLoadIdentity(); + glMatrixMode(GL_PROJECTION); + glPushMatrix(); + glLoadIdentity(); - glFrustum(-1, 1, -1 * (float) vh / (float) vw, 1 * (float) vh / (float) vw, 1, 1000); - if (flip) - glScalef(1, -1, 1); - glMatrixMode(GL_MODELVIEW); - glPushMatrix(); - glLoadIdentity(); + glFrustum(-1, 1, -1 * (float) vh / (float) vw, 1 * (float) vh / (float) vw, 1, 1000); + if (flip) + glScalef(1, -1, 1); + glMatrixMode(GL_MODELVIEW); + glPushMatrix(); + glLoadIdentity(); - glTranslatef(-850, title_y * 850 * vh / vw, easein2 * 900 - 900); + glTranslatef(-850, title_y * 850 * vh / vw, easein2 * 900 - 900); - glRotatef(easein2 * 360, 1, 0, 0); + glRotatef(easein2 * 360, 1, 0, 0); - poly_font->Render(this->title.c_str()); + poly_font->Render(this->title.c_str()); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - this->drawtitle++; + this->drawtitle++; - glPopMatrix(); - glMatrixMode(GL_PROJECTION); - glPopMatrix(); + glPopMatrix(); + glMatrixMode(GL_PROJECTION); + glPopMatrix(); - glMatrixMode(GL_MODELVIEW); + glMatrixMode(GL_MODELVIEW); - glDisable(GL_CULL_FACE); - glDisable(GL_DEPTH_TEST); + glDisable(GL_CULL_FACE); + glDisable(GL_DEPTH_TEST); - glDisable(GL_COLOR_MATERIAL); + glDisable(GL_COLOR_MATERIAL); - glDisable(GL_LIGHTING); - glDisable(GL_POLYGON_SMOOTH); - } + glDisable(GL_LIGHTING); + glDisable(GL_POLYGON_SMOOTH); + } #endif /** USE_FTGL */ } void Renderer::draw_title() { #ifdef USE_FTGL - //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); + //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glColor4f(1.0, 1.0, 1.0, 1.0); - // glPushMatrix(); - // glTranslatef(this->vw*.001,this->vh*.03, -1); - // glScalef(this->vw*.015,this->vh*.025,0); - - glRasterPos2f(0.01, 0.05); - title_font->FaceSize((unsigned) (20 * (this->vh / 512.0))); - - title_font->Render(this->title.c_str()); - // glPopMatrix(); - //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + glColor4f(1.0, 1.0, 1.0, 1.0); + // glPushMatrix(); + // glTranslatef(this->vw*.001,this->vh*.03, -1); + // glScalef(this->vw*.015,this->vh*.025,0); + + glRasterPos2f(0.01, 0.05); + title_font->FaceSize((unsigned) (20 * (this->vh / 512.0))); + + title_font->Render(this->title.c_str()); + // glPopMatrix(); + //glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); #endif /** USE_FTGL */ } @@ -599,25 +594,25 @@ void Renderer::draw_preset() { #ifdef USE_FTGL - //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); + //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glColor4f(1.0, 1.0, 1.0, 1.0); - // glPushMatrix(); - //glTranslatef(this->vw*.001,this->vh*-.01, -1); - //glScalef(this->vw*.003,this->vh*.004,0); + glColor4f(1.0, 1.0, 1.0, 1.0); + // glPushMatrix(); + //glTranslatef(this->vw*.001,this->vh*-.01, -1); + //glScalef(this->vw*.003,this->vh*.004,0); - glRasterPos2f(0.01, 0.01); + glRasterPos2f(0.01, 0.01); - title_font->FaceSize((unsigned) (12 * (this->vh / 512.0))); - if (this->noSwitch) - title_font->Render("[LOCKED] "); - title_font->FaceSize((unsigned) (20 * (this->vh / 512.0))); + title_font->FaceSize((unsigned) (12 * (this->vh / 512.0))); + if (this->noSwitch) + title_font->Render("[LOCKED] "); + title_font->FaceSize((unsigned) (20 * (this->vh / 512.0))); - title_font->Render(this->presetName().c_str()); + title_font->Render(this->presetName().c_str()); - //glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + //glPopMatrix(); + // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); #endif /** USE_FTGL */ } @@ -625,56 +620,56 @@ { #ifdef USE_FTGL - //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); + //glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - glColor4f(1.0, 1.0, 1.0, 1.0); - glPushMatrix(); - glTranslatef(0, 1, 0); - //glScalef(this->vw*.02,this->vh*.02 ,0); + glColor4f(1.0, 1.0, 1.0, 1.0); + glPushMatrix(); + glTranslatef(0, 1, 0); + //glScalef(this->vw*.02,this->vh*.02 ,0); - title_font->FaceSize((unsigned) (18 * (this->vh / 512.0))); + title_font->FaceSize((unsigned) (18 * (this->vh / 512.0))); - glRasterPos2f(0.01, -0.05); - title_font->Render("Help"); + glRasterPos2f(0.01, -0.05); + title_font->Render("Help"); - glRasterPos2f(0.01, -0.09); - title_font->Render("----------------------------"); + glRasterPos2f(0.01, -0.09); + title_font->Render("----------------------------"); - glRasterPos2f(0.01, -0.13); - title_font->Render("F1: This help menu"); + glRasterPos2f(0.01, -0.13); + title_font->Render("F1: This help menu"); - glRasterPos2f(0.01, -0.17); - title_font->Render("F2: Show song title"); + glRasterPos2f(0.01, -0.17); + title_font->Render("F2: Show song title"); - glRasterPos2f(0.01, -0.21); - title_font->Render("F3: Show preset name"); + glRasterPos2f(0.01, -0.21); + title_font->Render("F3: Show preset name"); - glRasterPos2f(0.01, -0.25); - title_font->Render("F4: Show Rendering Settings"); + glRasterPos2f(0.01, -0.25); + title_font->Render("F4: Show Rendering Settings"); - glRasterPos2f(0.01, -0.29); - title_font->Render("F5: Show FPS"); + glRasterPos2f(0.01, -0.29); + title_font->Render("F5: Show FPS"); - glRasterPos2f(0.01, -0.35); - title_font->Render("F: Fullscreen"); + glRasterPos2f(0.01, -0.35); + title_font->Render("F: Fullscreen"); - glRasterPos2f(0.01, -0.39); - title_font->Render("L: Lock/Unlock Preset"); + glRasterPos2f(0.01, -0.39); + title_font->Render("L: Lock/Unlock Preset"); - glRasterPos2f(0.01, -0.43); - title_font->Render("M: Show Menu"); + glRasterPos2f(0.01, -0.43); + title_font->Render("M: Show Menu"); - glRasterPos2f(0.01, -0.49); - title_font->Render("R: Random preset"); - glRasterPos2f(0.01, -0.53); - title_font->Render("N: Next preset"); + glRasterPos2f(0.01, -0.49); + title_font->Render("R: Random preset"); + glRasterPos2f(0.01, -0.53); + title_font->Render("N: Next preset"); - glRasterPos2f(0.01, -0.57); - title_font->Render("P: Previous preset"); + glRasterPos2f(0.01, -0.57); + title_font->Render("P: Previous preset"); - glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + glPopMatrix(); + // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); #endif /** USE_FTGL */ } @@ -683,53 +678,53 @@ { #ifdef USE_FTGL - char buffer[128]; - float offset = (this->showfps % 2 ? -0.05 : 0.0); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glColor4f(1.0, 1.0, 1.0, 1.0); - glPushMatrix(); - glTranslatef(0.01, 1, 0); - glRasterPos2f(0, -.05 + offset); - other_font->Render(this->correction ? " aspect: corrected" : " aspect: stretched"); - sprintf(buffer, " (%f)", this->aspect); - other_font->Render(buffer); - - glRasterPos2f(0, -.09 + offset); - other_font->FaceSize((unsigned) (18 * (vh / 512.0))); - - sprintf(buffer, " texsize: %d", renderTarget->texsize); - other_font->Render(buffer); - - glRasterPos2f(0, -.13 + offset); - sprintf(buffer, " viewport: %d x %d", vw, vh); - - other_font->Render(buffer); - glRasterPos2f(0, -.17 + offset); - other_font->Render((renderTarget->useFBO ? " FBO: on" : " FBO: off")); - - glRasterPos2f(0, -.21 + offset); - sprintf(buffer, " mesh: %d x %d", mesh.width, mesh.height); - other_font->Render(buffer); - - glRasterPos2f(0, -.25 + offset); - sprintf(buffer, " textures: %.1fkB", textureManager->getTextureMemorySize() / 1000.0f); - other_font->Render(buffer); -#ifdef USE_CG - glRasterPos2f(0, -.29 + offset); - sprintf(buffer, "shader profile: %s", shaderEngine.profileName.c_str()); - other_font->Render(buffer); - - glRasterPos2f(0, -.33 + offset); - sprintf(buffer, " warp shader: %s", currentPipe->warpShader.enabled ? "on" : "off"); - other_font->Render(buffer); - - glRasterPos2f(0, -.37 + offset); - sprintf(buffer, " comp shader: %s", currentPipe->compositeShader.enabled ? "on" : "off"); - other_font->Render(buffer); -#endif - glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + char buffer[128]; + float offset = (this->showfps % 2 ? -0.05 : 0.0); + // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); + + glColor4f(1.0, 1.0, 1.0, 1.0); + glPushMatrix(); + glTranslatef(0.01, 1, 0); + glRasterPos2f(0, -.05 + offset); + other_font->Render(this->correction ? " aspect: corrected" : " aspect: stretched"); + sprintf(buffer, " (%f)", this->aspect); + other_font->Render(buffer); + + glRasterPos2f(0, -.09 + offset); + other_font->FaceSize((unsigned) (18 * (vh / 512.0))); + + sprintf(buffer, " texsize: %d", renderTarget->texsize); + other_font->Render(buffer); + + glRasterPos2f(0, -.13 + offset); + sprintf(buffer, " viewport: %d x %d", vw, vh); + + other_font->Render(buffer); + glRasterPos2f(0, -.17 + offset); + other_font->Render((renderTarget->useFBO ? " FBO: on" : " FBO: off")); + + glRasterPos2f(0, -.21 + offset); + sprintf(buffer, " mesh: %d x %d", mesh.width, mesh.height); + other_font->Render(buffer); + + glRasterPos2f(0, -.25 + offset); + sprintf(buffer, " textures: %.1fkB", textureManager->getTextureMemorySize() / 1000.0f); + other_font->Render(buffer); + + glRasterPos2f(0, -.29 + offset); + sprintf(buffer, "shader profile: %s", shaderEngine.profileName.c_str()); + other_font->Render(buffer); + + glRasterPos2f(0, -.33 + offset); + sprintf(buffer, " warp shader: %s", currentPipe->warpShader.enabled ? "on" : "off"); + other_font->Render(buffer); + + glRasterPos2f(0, -.37 + offset); + sprintf(buffer, " comp shader: %s", currentPipe->compositeShader.enabled ? "on" : "off"); + other_font->Render(buffer); + + glPopMatrix(); + // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); #endif /** USE_FTGL */ @@ -737,19 +732,19 @@ void Renderer::draw_fps(float realfps) { #ifdef USE_FTGL - char bufferfps[20]; - sprintf(bufferfps, "%.1f fps", realfps); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); - - glColor4f(1.0, 1.0, 1.0, 1.0); - glPushMatrix(); - glTranslatef(0.01, 1, 0); - glRasterPos2f(0, -0.05); - title_font->FaceSize((unsigned) (20 * (this->vh / 512.0))); - title_font->Render(bufferfps); + char bufferfps[20]; + sprintf(bufferfps, "%.1f fps", realfps); + // glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ZERO); + + glColor4f(1.0, 1.0, 1.0, 1.0); + glPushMatrix(); + glTranslatef(0.01, 1, 0); + glRasterPos2f(0, -0.05); + title_font->FaceSize((unsigned) (20 * (this->vh / 512.0))); + title_font->Render(bufferfps); - glPopMatrix(); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); + glPopMatrix(); + // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); #endif /** USE_FTGL */ } @@ -757,57 +752,281 @@ void Renderer::CompositeOutput(const Pipeline &pipeline, const PipelineContext &pipelineContext) { - glMatrixMode(GL_TEXTURE); - glLoadIdentity(); + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, textureManager->getMainTexture()->texID); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - //Overwrite anything on the screen - glBlendFunc(GL_ONE, GL_ZERO); - glColor4f(1.0, 1.0, 1.0, 1.0f); + renderContext.mat_ortho = glm::ortho(-0.5f, 0.5f, -0.5f, 0.5f, -40.0f, 40.0f); - glEnable(GL_TEXTURE_2D); + shaderEngine.enableCompositeShader(currentPipe->compositeShader, pipeline, pipelineContext); -#ifdef USE_CG - shaderEngine.enableShader(currentPipe->compositeShader, pipeline, pipelineContext); -#endif + glUniformMatrix4fv(shaderEngine.uniform_v2f_c4f_t2f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(renderContext.mat_ortho)); + glUniform1i(shaderEngine.uniform_v2f_c4f_t2f_frag_texture_sampler, 0); - float tex[4][2] = - { - { 0, 1 }, - { 0, 0 }, - { 1, 0 }, - { 1, 1 } }; - - float points[4][2] = - { - { -0.5, -0.5 }, - { -0.5, 0.5 }, - { 0.5, 0.5 }, - { 0.5, -0.5 } }; - - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - - glVertexPointer(2, GL_FLOAT, 0, points); - glTexCoordPointer(2, GL_FLOAT, 0, tex); - - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + //Overwrite anything on the screen + glBlendFunc(GL_ONE, GL_ZERO); + glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0); - glDisable(GL_TEXTURE_2D); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBindVertexArray(m_vao_CompositeOutput); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); -#ifdef USE_CG - shaderEngine.disableShader(); -#endif + glBindVertexArray(0); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + for (std::vector::const_iterator pos = pipeline.compositeDrawables.begin(); pos + != pipeline.compositeDrawables.end(); ++pos) + (*pos)->Draw(renderContext); + + glBindTexture(GL_TEXTURE_2D, 0); +} - for (std::vector::const_iterator pos = pipeline.compositeDrawables.begin(); pos - != pipeline.compositeDrawables.end(); ++pos) - (*pos)->Draw(renderContext); +/** + * Calculates the nearest power of two to the given number using the + * appropriate rule + */ +int Renderer::nearestPower2( int value ) { + int x = value; + int power = 0; + + while ( ( x & 0x01 ) != 1 ) { + x >>= 1; + } + + if ( x == 1 ) { + return value; + } else { + x = value; + while ( x != 0 ) { + x >>= 1; + power++; + } + if ( ( ( 1 << power ) - value ) <= ( value - ( 1 << ( power - 1 ) ) ) ) { + return 1 << power; + } else { + return 1 << ( power - 1 ); + } + } + return 0; } +float Renderer::SquishToCenter(float x, float fExp) +{ + if (x > 0.5f) + return powf(x*2-1, fExp)*0.5f + 0.5f; + + return (1-powf(1-x*2, fExp))*0.5f; +} + +void Renderer::UvToMathSpace(float u, float v, float* rad, float* ang) +{ + // (screen space = -1..1 on both axes; corresponds to UV space) + // uv space = [0..1] on both axes + // "math" space = what the preset authors are used to: + // upper left = [0,0] + // bottom right = [1,1] + // rad == 1 at corners of screen + // ang == 0 at three o'clock, and increases counter-clockwise (to 6.28). + float px = (u*2-1) * m_fAspectX; // probably 1.0 + float py = (v*2-1) * m_fAspectY; // probably <1 + + *rad = sqrtf(px*px + py*py) / sqrtf(m_fAspectX*m_fAspectX + m_fAspectY*m_fAspectY); + *ang = atan2f(py, px); + if (*ang < 0) + *ang += 6.2831853071796f; +} + +void Renderer::InitCompositeShaderVertex() { + + // BUILD VERTEX LIST for final composite blit + memset(m_comp_verts, 0, sizeof(composite_shader_vertex)*FCGSX*FCGSY); + float fDivX = 1.0f / (float)(FCGSX-2); + float fDivY = 1.0f / (float)(FCGSY-2); + for (int j=0; jx = sx; + pComp->y = sy; + + float rad, ang; + UvToMathSpace( u, v, &rad, &ang ); + // fix-ups: + if (i==FCGSX/2-1) { + if (j < FCGSY/2-1) + ang = 3.1415926535898f*1.5f; + else if (j == FCGSY/2-1) + ang = 3.1415926535898f*1.25f; + else if (j == FCGSY/2) + ang = 3.1415926535898f*0.75f; + else + ang = 3.1415926535898f*0.5f; + } + else if (i==FCGSX/2) { + if (j < FCGSY/2-1) + ang = 3.1415926535898f*1.5f; + else if (j == FCGSY/2-1) + ang = 3.1415926535898f*1.75f; + else if (j == FCGSY/2) + ang = 3.1415926535898f*0.25f; + else + ang = 3.1415926535898f*0.5f; + } + else if (j==FCGSY/2-1) { + if (i < FCGSX/2-1) + ang = 3.1415926535898f*1.0f; + else if (i == FCGSX/2-1) + ang = 3.1415926535898f*1.25f; + else if (i == FCGSX/2) + ang = 3.1415926535898f*1.75f; + else + ang = 3.1415926535898f*2.0f; + } + else if (j==FCGSY/2) { + if (i < FCGSX/2-1) + ang = 3.1415926535898f*1.0f; + else if (i == FCGSX/2-1) + ang = 3.1415926535898f*0.75f; + else if (i == FCGSX/2) + ang = 3.1415926535898f*0.25f; + else + ang = 3.1415926535898f*0.0f; + } + pComp->tu = u; + pComp->tv = v; + + pComp->rad = rad; + pComp->ang = ang; + } + } + + // build index list for final composite blit - + // order should be friendly for interpolation of 'ang' value! + int* cur_index = &m_comp_indices[0]; + for (int y=0; y shade[i][1]) ? shade[i][0] : shade[i][1]); + if (shade[i][2] > max) max = shade[i][2]; + for (int k=0; k<3; k++) + { + shade[i][k] /= max; + shade[i][k] = 0.5f + 0.5f*shade[i][k]; + } + } + + // interpolate the 4 colors & apply to all the verts + for (int j=0; jx*0.5f + 0.5f; + float y = pComp->y*0.5f + 0.5f; + + float col[3] = { 1, 1, 1 }; + for (int c=0; c<3; c++) + col[c] = shade[0][c]*( x)*( y) + + shade[1][c]*(1-x)*( y) + + shade[2][c]*( x)*(1-y) + + shade[3][c]*(1-x)*(1-y); + + pComp->Diffuse[0] = col[0]; + pComp->Diffuse[1] = col[1]; + pComp->Diffuse[2] = col[2]; + pComp->Diffuse[3] = 1.0; + } + } + + + int primCount = (FCGSX-2)*(FCGSY-2)*6; + composite_shader_vertex tempv[primCount]; + memset(tempv, 0, sizeof(composite_shader_vertex) * primCount); + int src_idx = 0; + for (int i=0; i #include - -#ifdef USE_GLES1 - #include -#else - #ifdef __APPLE__ - #include - #else - #include - #include - #endif -#endif +#include "projectM-opengl.h" +#include "Pipeline.hpp" +#include "PerPixelMesh.hpp" +#include "Transformation.hpp" +#include "ShaderEngine.hpp" #ifdef USE_FTGL #ifdef WIN32 @@ -28,13 +21,21 @@ #endif #endif /** USE_FTGL */ +// for final composite grid: +#define FCGSX 32 // final composite gridsize - # verts - should be EVEN. +#define FCGSY 24 // final composite gridsize - # verts - should be EVEN. + // # of grid *cells* is two less, + // since we have redundant verts along the center line in X and Y (...for clean 'ang' interp) +typedef struct +{ + float x, y; // screen position + Z-buffer depth + float Diffuse[4]; // diffuse color + float tu, tv; // DYNAMIC + float rad, ang; // STATIC +} composite_shader_vertex; -#include "Pipeline.hpp" -#include "PerPixelMesh.hpp" -#include "Transformation.hpp" -#include "ShaderEngine.hpp" -class UserTexture; +class Texture; class BeatDetect; class TextureManager; @@ -59,10 +60,14 @@ std::string title; int drawtitle; - int texsize; - + int texsizeX; + int texsizeY; + float m_fAspectX; + float m_fAspectY; + float m_fInvAspectX; + float m_fInvAspectY; - Renderer( int width, int height, int gx, int gy, int texsize, BeatDetect *beatDetect, std::string presetURL, std::string title_fontURL, std::string menu_fontURL); + Renderer(int width, int height, int gx, int gy, BeatDetect *_beatDetect, std::string presetURL, std::string title_fontURL, std::string menu_fontURL, const std::string& datadir = ""); ~Renderer(); void RenderFrame(const Pipeline &pipeline, const PipelineContext &pipelineContext); @@ -71,7 +76,7 @@ GLuint initRenderToTexture(); - void SetPipeline(Pipeline &pipeline); + std::string SetPipeline(Pipeline &pipeline); void setPresetName(const std::string& theValue) { @@ -86,16 +91,14 @@ private: PerPixelMesh mesh; - RenderTarget *renderTarget; BeatDetect *beatDetect; TextureManager *textureManager; static Pipeline* currentPipe; RenderContext renderContext; //per pixel equation variables -#ifdef USE_CG ShaderEngine shaderEngine; -#endif std::string m_presetName; + std::string m_datadir; float* p; @@ -109,6 +112,15 @@ std::string menu_fontURL; std::string presetURL; + GLuint m_vbo_Interpolation; + GLuint m_vao_Interpolation; + + GLuint m_vbo_CompositeOutput; + GLuint m_vao_CompositeOutput; + + GLuint m_vbo_CompositeShaderOutput; + GLuint m_vao_CompositeShaderOutput; + #ifdef USE_FTGL FTGLPixmapFont *title_font; FTGLPixmapFont *other_font; @@ -116,10 +128,11 @@ #endif /** USE_FTGL */ void SetupPass1(const Pipeline &pipeline, const PipelineContext &pipelineContext); - void Interpolation(const Pipeline &pipeline); + void Interpolation(const Pipeline &pipeline, const PipelineContext &pipelineContext); void RenderItems(const Pipeline &pipeline, const PipelineContext &pipelineContext); void FinishPass1(); void Pass2 (const Pipeline &pipeline, const PipelineContext &pipelineContext); + void CompositeShaderOutput(const Pipeline &pipeline, const PipelineContext &pipelineContext); void CompositeOutput(const Pipeline &pipeline, const PipelineContext &pipelineContext); inline static PixelPoint PerPixel(PixelPoint p, PerPixelContext &context) @@ -137,6 +150,16 @@ void draw_title_to_screen(bool flip); void draw_title_to_texture(); + int nearestPower2( int value ); + + GLuint textureRenderToTexture; + + void InitCompositeShaderVertex(); + float SquishToCenter(float x, float fExp); + void UvToMathSpace(float u, float v, float* rad, float* ang); + composite_shader_vertex m_comp_verts[FCGSX*FCGSY]; + int m_comp_indices[(FCGSX-2)*(FCGSY-2)*6]; + }; #endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderer.xcodeproj/project.pbxproj projectm-3.1.0/src/libprojectM/Renderer/Renderer.xcodeproj/project.pbxproj --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Renderer.xcodeproj/project.pbxproj 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Renderer.xcodeproj/project.pbxproj 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,449 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 48; + objects = { + +/* Begin PBXBuildFile section */ + 16BFF38B1F7A9A180063C312 /* BeatDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF37A1F77B5EE0063C312 /* BeatDetect.cpp */; }; + 16BFF38C1F7A9A180063C312 /* FBO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3701F77B5EC0063C312 /* FBO.cpp */; }; + 16BFF38D1F7A9A180063C312 /* Filters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3731F77B5EC0063C312 /* Filters.cpp */; }; + 16BFF38E1F7A9A180063C312 /* MilkdropWaveform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3761F77B5ED0063C312 /* MilkdropWaveform.cpp */; }; + 16BFF38F1F7A9A180063C312 /* PerlinNoise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3771F77B5ED0063C312 /* PerlinNoise.cpp */; }; + 16BFF3901F7A9A180063C312 /* PerPixelMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF37E1F77B5EF0063C312 /* PerPixelMesh.cpp */; }; + 16BFF3911F7A9A180063C312 /* Pipeline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3621F77B5EA0063C312 /* Pipeline.cpp */; }; + 16BFF3921F7A9A180063C312 /* PipelineContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3811F77B5F00063C312 /* PipelineContext.cpp */; }; + 16BFF3931F7A9A180063C312 /* Renderable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3631F77B5EB0063C312 /* Renderable.cpp */; }; + 16BFF3941F7A9A180063C312 /* Renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3641F77B5EB0063C312 /* Renderer.cpp */; }; + 16BFF3951F7A9A180063C312 /* RenderItemDistanceMetric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3741F77B5EC0063C312 /* RenderItemDistanceMetric.cpp */; }; + 16BFF3961F7A9A180063C312 /* RenderItemMatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3661F77B5EB0063C312 /* RenderItemMatcher.cpp */; }; + 16BFF3971F7A9A180063C312 /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF35F1F77B5EA0063C312 /* Shader.cpp */; }; + 16BFF3981F7A9A180063C312 /* ShaderEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF37B1F77B5EE0063C312 /* ShaderEngine.cpp */; }; + 16BFF3991F7A9A180063C312 /* TextureManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF36A1F77B5EB0063C312 /* TextureManager.cpp */; }; + 16BFF39A1F7A9A180063C312 /* UserTexture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3791F77B5EE0063C312 /* UserTexture.cpp */; }; + 16BFF39B1F7A9A180063C312 /* VideoEcho.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF3781F77B5ED0063C312 /* VideoEcho.cpp */; }; + 16BFF39C1F7A9A180063C312 /* Waveform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 16BFF37C1F77B5EE0063C312 /* Waveform.cpp */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 16BFF3591F77B5EA0063C312 /* config.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; }; + 16BFF35A1F77B5EA0063C312 /* Transformation.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Transformation.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF35B1F77B5EA0063C312 /* RenderItemDistanceMetric.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = RenderItemDistanceMetric.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF35C1F77B5EA0063C312 /* PerPixelMesh.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PerPixelMesh.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF35D1F77B5EA0063C312 /* Pipeline.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Pipeline.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF35E1F77B5EA0063C312 /* PipelineContext.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PipelineContext.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF35F1F77B5EA0063C312 /* Shader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Shader.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3601F77B5EA0063C312 /* VideoEcho.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = VideoEcho.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3611F77B5EA0063C312 /* MilkdropWaveform.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = MilkdropWaveform.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3621F77B5EA0063C312 /* Pipeline.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Pipeline.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3631F77B5EB0063C312 /* Renderable.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Renderable.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3641F77B5EB0063C312 /* Renderer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Renderer.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3651F77B5EB0063C312 /* Renderer.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Renderer.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3661F77B5EB0063C312 /* RenderItemMatcher.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderItemMatcher.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3671F77B5EB0063C312 /* Shader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Shader.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3681F77B5EB0063C312 /* Waveform.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Waveform.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3691F77B5EB0063C312 /* Renderable.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Renderable.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF36A1F77B5EB0063C312 /* TextureManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TextureManager.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF36B1F77B5EB0063C312 /* BeatDetect.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = BeatDetect.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF36C1F77B5EB0063C312 /* SOIL2 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SOIL2; sourceTree = SOURCE_ROOT; }; + 16BFF36D1F77B5EB0063C312 /* RenderItemMatcher.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = RenderItemMatcher.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF36E1F77B5EB0063C312 /* UserTexture.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = UserTexture.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF36F1F77B5EC0063C312 /* TextureManager.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = TextureManager.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3701F77B5EC0063C312 /* FBO.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FBO.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3721F77B5EC0063C312 /* PerlinNoise.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = PerlinNoise.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3731F77B5EC0063C312 /* Filters.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Filters.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3741F77B5EC0063C312 /* RenderItemDistanceMetric.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = RenderItemDistanceMetric.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3751F77B5ED0063C312 /* FBO.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = FBO.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3761F77B5ED0063C312 /* MilkdropWaveform.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MilkdropWaveform.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3771F77B5ED0063C312 /* PerlinNoise.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PerlinNoise.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3781F77B5ED0063C312 /* VideoEcho.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VideoEcho.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3791F77B5EE0063C312 /* UserTexture.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = UserTexture.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF37A1F77B5EE0063C312 /* BeatDetect.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = BeatDetect.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF37B1F77B5EE0063C312 /* ShaderEngine.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ShaderEngine.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF37C1F77B5EE0063C312 /* Waveform.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Waveform.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF37D1F77B5EF0063C312 /* Filters.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Filters.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF37E1F77B5EF0063C312 /* PerPixelMesh.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PerPixelMesh.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF37F1F77B5EF0063C312 /* RenderItemMergeFunction.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = RenderItemMergeFunction.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3801F77B5F00063C312 /* ShaderEngine.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ShaderEngine.hpp; sourceTree = SOURCE_ROOT; }; + 16BFF3811F77B5F00063C312 /* PipelineContext.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PipelineContext.cpp; sourceTree = SOURCE_ROOT; }; + 16BFF3821F7A99840063C312 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + 16BFF3871F7A99EB0063C312 /* liblibRenderer xcode.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "liblibRenderer xcode.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 16BFF39D1F7A9BF20063C312 /* projectM.cg */ = {isa = PBXFileReference; lastKnownFileType = text; path = projectM.cg; sourceTree = ""; }; + 16BFF39E1F7A9BFB0063C312 /* blur.cg */ = {isa = PBXFileReference; lastKnownFileType = text; path = blur.cg; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 16BFF3841F7A99EB0063C312 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 16BFF3441F77B4240063C312 = { + isa = PBXGroup; + children = ( + 16BFF39D1F7A9BF20063C312 /* projectM.cg */, + 16BFF39E1F7A9BFB0063C312 /* blur.cg */, + 16BFF3821F7A99840063C312 /* Makefile */, + 16BFF3581F77B5E00063C312 /* Source */, + 16BFF34E1F77B4240063C312 /* Products */, + ); + sourceTree = ""; + }; + 16BFF34E1F77B4240063C312 /* Products */ = { + isa = PBXGroup; + children = ( + 16BFF3871F7A99EB0063C312 /* liblibRenderer xcode.a */, + ); + name = Products; + sourceTree = ""; + }; + 16BFF3581F77B5E00063C312 /* Source */ = { + isa = PBXGroup; + children = ( + 16BFF37A1F77B5EE0063C312 /* BeatDetect.cpp */, + 16BFF36B1F77B5EB0063C312 /* BeatDetect.hpp */, + 16BFF3591F77B5EA0063C312 /* config.h */, + 16BFF3701F77B5EC0063C312 /* FBO.cpp */, + 16BFF3751F77B5ED0063C312 /* FBO.hpp */, + 16BFF3731F77B5EC0063C312 /* Filters.cpp */, + 16BFF37D1F77B5EF0063C312 /* Filters.hpp */, + 16BFF3761F77B5ED0063C312 /* MilkdropWaveform.cpp */, + 16BFF3611F77B5EA0063C312 /* MilkdropWaveform.hpp */, + 16BFF3771F77B5ED0063C312 /* PerlinNoise.cpp */, + 16BFF3721F77B5EC0063C312 /* PerlinNoise.hpp */, + 16BFF37E1F77B5EF0063C312 /* PerPixelMesh.cpp */, + 16BFF35C1F77B5EA0063C312 /* PerPixelMesh.hpp */, + 16BFF3621F77B5EA0063C312 /* Pipeline.cpp */, + 16BFF35D1F77B5EA0063C312 /* Pipeline.hpp */, + 16BFF3811F77B5F00063C312 /* PipelineContext.cpp */, + 16BFF35E1F77B5EA0063C312 /* PipelineContext.hpp */, + 16BFF3631F77B5EB0063C312 /* Renderable.cpp */, + 16BFF3691F77B5EB0063C312 /* Renderable.hpp */, + 16BFF3641F77B5EB0063C312 /* Renderer.cpp */, + 16BFF3651F77B5EB0063C312 /* Renderer.hpp */, + 16BFF3741F77B5EC0063C312 /* RenderItemDistanceMetric.cpp */, + 16BFF35B1F77B5EA0063C312 /* RenderItemDistanceMetric.hpp */, + 16BFF3661F77B5EB0063C312 /* RenderItemMatcher.cpp */, + 16BFF36D1F77B5EB0063C312 /* RenderItemMatcher.hpp */, + 16BFF37F1F77B5EF0063C312 /* RenderItemMergeFunction.hpp */, + 16BFF35F1F77B5EA0063C312 /* Shader.cpp */, + 16BFF3671F77B5EB0063C312 /* Shader.hpp */, + 16BFF37B1F77B5EE0063C312 /* ShaderEngine.cpp */, + 16BFF3801F77B5F00063C312 /* ShaderEngine.hpp */, + 16BFF36C1F77B5EB0063C312 /* SOIL2 */, + 16BFF36A1F77B5EB0063C312 /* TextureManager.cpp */, + 16BFF36F1F77B5EC0063C312 /* TextureManager.hpp */, + 16BFF35A1F77B5EA0063C312 /* Transformation.hpp */, + 16BFF3791F77B5EE0063C312 /* UserTexture.cpp */, + 16BFF36E1F77B5EB0063C312 /* UserTexture.hpp */, + 16BFF3781F77B5ED0063C312 /* VideoEcho.cpp */, + 16BFF3601F77B5EA0063C312 /* VideoEcho.hpp */, + 16BFF37C1F77B5EE0063C312 /* Waveform.cpp */, + 16BFF3681F77B5EB0063C312 /* Waveform.hpp */, + ); + path = Source; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 16BFF3851F7A99EB0063C312 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXLegacyTarget section */ + 16BFF3541F77B5510063C312 /* libRenderer make */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(ACTION)"; + buildConfigurationList = 16BFF3551F77B5510063C312 /* Build configuration list for PBXLegacyTarget "libRenderer make" */; + buildPhases = ( + ); + buildToolPath = /usr/bin/make; + dependencies = ( + ); + name = "libRenderer make"; + passBuildSettingsInEnvironment = 1; + productName = libRenderer; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXNativeTarget section */ + 16BFF3861F7A99EB0063C312 /* libRenderer xcode */ = { + isa = PBXNativeTarget; + buildConfigurationList = 16BFF3881F7A99EB0063C312 /* Build configuration list for PBXNativeTarget "libRenderer xcode" */; + buildPhases = ( + 16BFF3831F7A99EB0063C312 /* Sources */, + 16BFF3841F7A99EB0063C312 /* Frameworks */, + 16BFF3851F7A99EB0063C312 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "libRenderer xcode"; + productName = "libRenderer xcode"; + productReference = 16BFF3871F7A99EB0063C312 /* liblibRenderer xcode.a */; + productType = "com.apple.product-type.library.static"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 16BFF3451F77B4240063C312 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0900; + ORGANIZATIONNAME = projectM; + TargetAttributes = { + 16BFF3541F77B5510063C312 = { + CreatedOnToolsVersion = 9.0; + ProvisioningStyle = Automatic; + }; + 16BFF3861F7A99EB0063C312 = { + CreatedOnToolsVersion = 9.0; + ProvisioningStyle = Automatic; + }; + }; + }; + buildConfigurationList = 16BFF3481F77B4240063C312 /* Build configuration list for PBXProject "Renderer" */; + compatibilityVersion = "Xcode 8.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 16BFF3441F77B4240063C312; + productRefGroup = 16BFF34E1F77B4240063C312 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 16BFF3541F77B5510063C312 /* libRenderer make */, + 16BFF3861F7A99EB0063C312 /* libRenderer xcode */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXSourcesBuildPhase section */ + 16BFF3831F7A99EB0063C312 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 16BFF3941F7A9A180063C312 /* Renderer.cpp in Sources */, + 16BFF38B1F7A9A180063C312 /* BeatDetect.cpp in Sources */, + 16BFF38C1F7A9A180063C312 /* FBO.cpp in Sources */, + 16BFF38D1F7A9A180063C312 /* Filters.cpp in Sources */, + 16BFF38E1F7A9A180063C312 /* MilkdropWaveform.cpp in Sources */, + 16BFF38F1F7A9A180063C312 /* PerlinNoise.cpp in Sources */, + 16BFF3901F7A9A180063C312 /* PerPixelMesh.cpp in Sources */, + 16BFF3911F7A9A180063C312 /* Pipeline.cpp in Sources */, + 16BFF3921F7A9A180063C312 /* PipelineContext.cpp in Sources */, + 16BFF3931F7A9A180063C312 /* Renderable.cpp in Sources */, + 16BFF3951F7A9A180063C312 /* RenderItemDistanceMetric.cpp in Sources */, + 16BFF3961F7A9A180063C312 /* RenderItemMatcher.cpp in Sources */, + 16BFF3971F7A9A180063C312 /* Shader.cpp in Sources */, + 16BFF3981F7A9A180063C312 /* ShaderEngine.cpp in Sources */, + 16BFF3991F7A9A180063C312 /* TextureManager.cpp in Sources */, + 16BFF39A1F7A9A180063C312 /* UserTexture.cpp in Sources */, + 16BFF39B1F7A9A180063C312 /* VideoEcho.cpp in Sources */, + 16BFF39C1F7A9A180063C312 /* Waveform.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 16BFF34F1F77B4240063C312 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.12; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 16BFF3501F77B4240063C312 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.12; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + 16BFF3561F77B5510063C312 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEBUGGING_SYMBOLS = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 16BFF3571F77B5510063C312 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + 16BFF3891F7A99EB0063C312 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/.. /usr/local/include/**"; + }; + name = Debug; + }; + 16BFF38A1F7A99EB0063C312 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = YES; + CODE_SIGN_STYLE = Automatic; + EXECUTABLE_PREFIX = lib; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "${PROJECT_DIR}/.. /usr/local/include/**"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 16BFF3481F77B4240063C312 /* Build configuration list for PBXProject "Renderer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16BFF34F1F77B4240063C312 /* Debug */, + 16BFF3501F77B4240063C312 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16BFF3551F77B5510063C312 /* Build configuration list for PBXLegacyTarget "libRenderer make" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16BFF3561F77B5510063C312 /* Debug */, + 16BFF3571F77B5510063C312 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 16BFF3881F7A99EB0063C312 /* Build configuration list for PBXNativeTarget "libRenderer xcode" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 16BFF3891F7A99EB0063C312 /* Debug */, + 16BFF38A1F7A99EB0063C312 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 16BFF3451F77B4240063C312 /* Project object */; +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemDistanceMetric.hpp projectm-3.1.0/src/libprojectM/Renderer/RenderItemDistanceMetric.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemDistanceMetric.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/RenderItemDistanceMetric.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -19,6 +19,7 @@ /// when they are dissimilar. If two render items cannot be compared, NOT_COMPARABLE_VALUE is returned. class RenderItemDistanceMetric : public std::binary_function { public: + virtual ~RenderItemDistanceMetric() { } const static double NOT_COMPARABLE_VALUE; virtual double operator()(const RenderItem * r1, const RenderItem * r2) const = 0; virtual TypeIdPair typeIdPair() const = 0; @@ -103,7 +104,11 @@ public: MasterRenderItemDistance() {} - virtual ~MasterRenderItemDistance() {} + virtual ~MasterRenderItemDistance() { + for (DistanceMetricMap::iterator it = _distanceMetricMap.begin(); it != _distanceMetricMap.end(); ++it) + delete (it->second); + _distanceMetricMap.clear(); + } inline void addMetric(RenderItemDistanceMetric * fun) { _distanceMetricMap[fun->typeIdPair()] = fun; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemMatcher.cpp projectm-3.1.0/src/libprojectM/Renderer/RenderItemMatcher.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemMatcher.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/RenderItemMatcher.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -31,4 +31,4 @@ _results.matches.push_back(std::make_pair(lhs_src[i], rhs_src[j])); } } -} \ No newline at end of file +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemMatcher.hpp projectm-3.1.0/src/libprojectM/Renderer/RenderItemMatcher.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemMatcher.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/RenderItemMatcher.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -35,7 +35,7 @@ /// Computes an optimal matching between two renderable item sets. /// @param lhs the "left-hand side" list of render items. /// @param rhs the "right-hand side" list of render items. - /// @returns a list of match pairs, possibly self referencing, and an error estimate of the matching. + /// Sets a list of match pairs, possibly self referencing, and an error estimate of the matching. inline virtual void operator()(const RenderItemList & lhs, const RenderItemList & rhs) const { // Ensure the first argument is greater than next to aid the helper function's logic. diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemMergeFunction.hpp projectm-3.1.0/src/libprojectM/Renderer/RenderItemMergeFunction.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/RenderItemMergeFunction.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/RenderItemMergeFunction.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -39,6 +39,7 @@ /// when they are dissimilar. If two render items cannot be compared, NOT_COMPARABLE_VALUE is returned. class RenderItemMergeFunction { public: + virtual ~RenderItemMergeFunction() {} virtual RenderItem * operator()(const RenderItem * r1, const RenderItem * r2, double ratio) const = 0; virtual TypeIdPair typeIdPair() const = 0; }; @@ -201,7 +202,11 @@ public: MasterRenderItemMerge() {} - virtual ~MasterRenderItemMerge() {} + virtual ~MasterRenderItemMerge() { + for (MergeFunctionMap::iterator it = _mergeFunctionMap.begin(); it != _mergeFunctionMap.end(); ++it) + delete (it->second); + _mergeFunctionMap.clear(); + } inline void add(RenderItemMergeFunction * fun) { _mergeFunctionMap[fun->typeIdPair()] = fun; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Shader.cpp projectm-3.1.0/src/libprojectM/Renderer/Shader.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Shader.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Shader.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -7,6 +7,4 @@ #include "Shader.hpp" -Shader::Shader() - : enabled(false) - {} +Shader::Shader() {} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/ShaderEngine.cpp projectm-3.1.0/src/libprojectM/Renderer/ShaderEngine.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/ShaderEngine.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/ShaderEngine.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -5,695 +5,1320 @@ * Author: pete */ #include -#include "PerlinNoise.hpp" +#include #include "ShaderEngine.hpp" #include "BeatDetect.hpp" - -ShaderEngine::ShaderEngine() -{ -#ifdef USE_CG - SetupCg(); +#include "Texture.hpp" +#include "HLSLParser.h" +#include "GLSLGenerator.h" +#include // glm::mat4 +#include // glm::translate, glm::rotate, glm::scale, glm::perspective +#include +#include +#include + +#ifdef USE_GLES + #define GLSL_VERSION "300 es" +#else + #define GLSL_VERSION "330" #endif -} -ShaderEngine::~ShaderEngine() -{ - // TODO Auto-generated destructor stub -} -#ifdef USE_CG +#define FRAND ((rand() % 7381)/7380.0f) -void ShaderEngine::setParams(const int texsize, const unsigned int texId, const float aspect, BeatDetect *beatDetect, - TextureManager *textureManager) -{ - mainTextureId = texId; - this->beatDetect = beatDetect; - this->textureManager = textureManager; - this->aspect = aspect; - this->texsize = texsize; - - textureManager->setTexture("main", texId, texsize, texsize); - - glGenTextures(1, &blur1_tex); - glBindTexture(GL_TEXTURE_2D, blur1_tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, texsize/2, texsize/2, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - - glGenTextures(1, &blur2_tex); - glBindTexture(GL_TEXTURE_2D, blur2_tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, texsize / 4, texsize / 4, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - - glGenTextures(1, &blur3_tex); - glBindTexture(GL_TEXTURE_2D, blur3_tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, texsize / 8, texsize / 8, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL ); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - - blur1_enabled = false; - blur2_enabled = false; - blur3_enabled = false; - - //std::cout << "Generating Noise Textures" << std::endl; - - PerlinNoise *noise = new PerlinNoise; - - glGenTextures(1, &noise_texture_lq_lite); - glBindTexture(GL_TEXTURE_2D, noise_texture_lq_lite); - glTexImage2D(GL_TEXTURE_2D, 0, 4, 32, 32, 0, GL_LUMINANCE, GL_FLOAT, noise->noise_lq_lite); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noise_lq_lite", noise_texture_lq_lite, 32, 32); - - glGenTextures(1, &noise_texture_lq); - glBindTexture(GL_TEXTURE_2D, noise_texture_lq); - glTexImage2D(GL_TEXTURE_2D, 0, 4, 256, 256, 0, GL_LUMINANCE, GL_FLOAT, noise->noise_lq); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noise_lq", noise_texture_lq, 256, 256); - - glGenTextures(1, &noise_texture_mq); - glBindTexture(GL_TEXTURE_2D, noise_texture_mq); - glTexImage2D(GL_TEXTURE_2D, 0, 4, 256, 256, 0, GL_LUMINANCE, GL_FLOAT, noise->noise_mq); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noise_mq", noise_texture_mq, 256, 256); - - glGenTextures(1, &noise_texture_hq); - glBindTexture(GL_TEXTURE_2D, noise_texture_hq); - glTexImage2D(GL_TEXTURE_2D, 0, 4, 256, 256, 0, GL_LUMINANCE, GL_FLOAT, noise->noise_hq); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noise_hq", noise_texture_hq, 256, 256); - - glGenTextures(1, &noise_texture_perlin); - glBindTexture(GL_TEXTURE_2D, noise_texture_perlin); - glTexImage2D(GL_TEXTURE_2D, 0, 4, 512, 512, 0, GL_LUMINANCE, GL_FLOAT, noise->noise_perlin); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noise_perlin", noise_texture_perlin, 512, 512); - - /* - glGenTextures( 1, &noise_texture_lq_vol ); - glBindTexture( GL_TEXTURE_3D, noise_texture_lq_vol ); - glTexImage3D(GL_TEXTURE_3D,0,4,32,32,32,0,GL_LUMINANCE,GL_FLOAT,noise->noise_lq_vol); - glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noisevol_lq", noise_texture_lq_vol, 256, 256); - - glGenTextures( 1, &noise_texture_hq_vol ); - glBindTexture( GL_TEXTURE_3D, noise_texture_hq_vol ); - glTexImage3D(GL_TEXTURE_3D,0,4,32,32,32,0,GL_LUMINANCE,GL_FLOAT,noise->noise_hq_vol); - glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT); - textureManager->setTexture("noisevol_hq", noise_texture_hq_vol, 8, 8); - */ -} +std::string presetWarpVertexShader( + "#version " + GLSL_VERSION + "\n" + "layout(location = 0) in vec2 vertex_position;\n" + "layout(location = 1) in vec4 vertex_color;\n" + "layout(location = 2) in vec2 vertex_texture;\n" + "" + "uniform mat4 vertex_transformation;\n" + "" + "out vec4 frag_COLOR;\n" + "out vec4 frag_TEXCOORD0;\n" + "out vec2 frag_TEXCOORD1;\n" + "" + "void main(){\n" + " vec4 position = vertex_transformation * vec4(vertex_position, 0.0, 1.0);\n" + " gl_Position = position;\n" + " frag_COLOR = vertex_color;\n" + " frag_TEXCOORD0.xy = vertex_texture;\n" + " frag_TEXCOORD0.zw = position.xy;\n" + " frag_TEXCOORD1 = vec2(0.0, 0.0);\n" + "}\n"); + +std::string presetCompVertexShader( + "#version " + GLSL_VERSION + "\n" + "layout(location = 0) in vec2 vertex_position;\n" + "layout(location = 1) in vec4 vertex_color;\n" + "layout(location = 2) in vec2 vertex_texture;\n" + "layout(location = 3) in vec2 vertex_rad_ang;\n" + "" + "out vec4 frag_COLOR;\n" + "out vec2 frag_TEXCOORD0;\n" + "out vec2 frag_TEXCOORD1;\n" + "" + "void main(){\n" + " vec4 position = vec4(vertex_position, 0.0, 1.0);\n" + " gl_Position = position;\n" + " frag_COLOR = vertex_color;\n" + " frag_TEXCOORD0 = vertex_texture;\n" + " frag_TEXCOORD1 = vertex_rad_ang;\n" + "}\n"); + + +const std::string ShaderEngine::v2f_c4f_vert( + "#version " + GLSL_VERSION + "\n" + "" + "layout(location = 0) in vec2 vertex_position;\n" + "layout(location = 1) in vec4 vertex_color;\n" + "" + "uniform mat4 vertex_transformation;\n" + "uniform float vertex_point_size;\n" + "" + "out vec4 fragment_color;\n" + "" + "void main(){\n" + " gl_Position = vertex_transformation * vec4(vertex_position, 0.0, 1.0);\n" + " gl_PointSize = vertex_point_size;\n" + " fragment_color = vertex_color;\n" + "}\n"); + +const std::string ShaderEngine::v2f_c4f_frag( + "#version " + GLSL_VERSION + "\n" + "precision mediump float;\n" + "" + "in vec4 fragment_color;\n" + "out vec4 color;\n" + "" + "void main(){\n" + " color = fragment_color;\n" + "}\n"); + +const std::string ShaderEngine::v2f_c4f_t2f_vert( + "#version " + GLSL_VERSION + "\n" + "layout(location = 0) in vec2 vertex_position;\n" + "layout(location = 1) in vec4 vertex_color;\n" + "layout(location = 2) in vec2 vertex_texture;\n" + "" + "uniform mat4 vertex_transformation;\n" + "" + "out vec4 fragment_color;\n" + "out vec2 fragment_texture;\n" + "" + "void main(){\n" + " gl_Position = vertex_transformation * vec4(vertex_position, 0.0, 1.0);\n" + " fragment_color = vertex_color;\n" + " fragment_texture = vertex_texture;\n" + "}\n"); + +const std::string ShaderEngine::v2f_c4f_t2f_frag( + "#version " + GLSL_VERSION + "\n" + "precision mediump float;\n" + "" + "in vec4 fragment_color;\n" + "in vec2 fragment_texture;\n" + "" + "uniform sampler2D texture_sampler;\n" + "" + "out vec4 color;\n" + "" + "void main(){\n" + " color = fragment_color * texture(texture_sampler, fragment_texture.st);\n" + "}\n"); + + +std::string PresetShaderIncludes = "" +"#define M_PI 3.14159265359\n" +"#define M_PI_2 6.28318530718\n" +"#define M_INV_PI_2 0.159154943091895\n" + +"uniform float4 rand_frame; // random float4, updated each frame\n" +"uniform float4 rand_preset; // random float4, updated once per *preset*\n" +"uniform float4 _c0; // .xy: multiplier to use on UV's to paste an image fullscreen, *aspect-aware*; .zw = inverse.\n" +"uniform float4 _c1, _c2, _c3, _c4;\n" +"uniform float4 _c5; //.xy = scale,bias for reading blur1; .zw = scale,bias for reading blur2; \n" +"uniform float4 _c6; //.xy = scale,bias for reading blur3; .zw = blur1_min,blur1_max\n" +"uniform float4 _c7; // .xy ~= float2(1024,768); .zw ~= float2(1/1024.0, 1/768.0)\n" +"uniform float4 _c8; // .xyzw ~= 0.5 + 0.5*cos(time * float4(~0.3, ~1.3, ~5, ~20))\n" +"uniform float4 _c9; // .xyzw ~= same, but using sin()\n" +"uniform float4 _c10; // .xyzw ~= 0.5 + 0.5*cos(time * float4(~0.005, ~0.008, ~0.013, ~0.022))\n" +"uniform float4 _c11; // .xyzw ~= same, but using sin()\n" +"uniform float4 _c12; // .xyz = mip info for main image (.x=#across, .y=#down, .z=avg); .w = unused\n" +"uniform float4 _c13; //.xy = blur2_min,blur2_max; .zw = blur3_min, blur3_max.\n" +"uniform float4 _qa; // q vars bank 1 [q1-q4]\n" +"uniform float4 _qb; // q vars bank 2 [q5-q8]\n" +"uniform float4 _qc; // q vars ...\n" +"uniform float4 _qd; // q vars\n" +"uniform float4 _qe; // q vars\n" +"uniform float4 _qf; // q vars\n" +"uniform float4 _qg; // q vars\n" +"uniform float4 _qh; // q vars bank 8 [q29-q32]\n" + +"// note: in general, don't use the current time w/the *dynamic* rotations!\n" +"uniform float4x3 rot_s1; // four random, static rotations. randomized @ preset load time.\n" +"uniform float4x3 rot_s2; // minor translation component (<1).\n" +"uniform float4x3 rot_s3;\n" +"uniform float4x3 rot_s4;\n" + +"uniform float4x3 rot_d1; // four random, slowly changing rotations.\n" +"uniform float4x3 rot_d2; \n" +"uniform float4x3 rot_d3;\n" +"uniform float4x3 rot_d4;\n" +"uniform float4x3 rot_f1; // faster-changing.\n" +"uniform float4x3 rot_f2;\n" +"uniform float4x3 rot_f3;\n" +"uniform float4x3 rot_f4;\n" +"uniform float4x3 rot_vf1; // very-fast-changing.\n" +"uniform float4x3 rot_vf2;\n" +"uniform float4x3 rot_vf3;\n" +"uniform float4x3 rot_vf4;\n" +"uniform float4x3 rot_uf1; // ultra-fast-changing.\n" +"uniform float4x3 rot_uf2;\n" +"uniform float4x3 rot_uf3;\n" +"uniform float4x3 rot_uf4;\n" + +"uniform float4x3 rot_rand1; // random every frame\n" +"uniform float4x3 rot_rand2;\n" +"uniform float4x3 rot_rand3;\n" +"uniform float4x3 rot_rand4;\n" + +"#define time _c2.x\n" +"#define fps _c2.y\n" +"#define frame _c2.z\n" +"#define progress _c2.w\n" +"#define bass _c3.x\n" +"#define mid _c3.y\n" +"#define treb _c3.z\n" +"#define vol _c3.w\n" +"#define bass_att _c4.x\n" +"#define mid_att _c4.y\n" +"#define treb_att _c4.z\n" +"#define vol_att _c4.w\n" +"#define q1 _qa.x\n" +"#define q2 _qa.y\n" +"#define q3 _qa.z\n" +"#define q4 _qa.w\n" +"#define q5 _qb.x\n" +"#define q6 _qb.y\n" +"#define q7 _qb.z\n" +"#define q8 _qb.w\n" +"#define q9 _qc.x\n" +"#define q10 _qc.y\n" +"#define q11 _qc.z\n" +"#define q12 _qc.w\n" +"#define q13 _qd.x\n" +"#define q14 _qd.y\n" +"#define q15 _qd.z\n" +"#define q16 _qd.w\n" +"#define q17 _qe.x\n" +"#define q18 _qe.y\n" +"#define q19 _qe.z\n" +"#define q20 _qe.w\n" +"#define q21 _qf.x\n" +"#define q22 _qf.y\n" +"#define q23 _qf.z\n" +"#define q24 _qf.w\n" +"#define q25 _qg.x\n" +"#define q26 _qg.y\n" +"#define q27 _qg.z\n" +"#define q28 _qg.w\n" +"#define q29 _qh.x\n" +"#define q30 _qh.y\n" +"#define q31 _qh.z\n" +"#define q32 _qh.w\n" + +"#define aspect _c0\n" +"#define texsize _c7 // .xy = (w,h); .zw = (1/(float)w, 1/(float)h)\n" +"#define roam_cos _c8\n" +"#define roam_sin _c9\n" +"#define slow_roam_cos _c10\n" +"#define slow_roam_sin _c11\n" +"#define mip_x _c12.x\n" +"#define mip_y _c12.y\n" +"#define mip_xy _c12.xy\n" +"#define mip_avg _c12.z\n" +"#define blur1_min _c6.z\n" +"#define blur1_max _c6.w\n" +"#define blur2_min _c13.x\n" +"#define blur2_max _c13.y\n" +"#define blur3_min _c13.z\n" +"#define blur3_max _c13.w\n" + +"#define sampler_FC_main sampler_fc_main\n" +"#define sampler_PC_main sampler_pc_main\n" +"#define sampler_FW_main sampler_fw_main\n" +"#define sampler_PW_main sampler_pw_main\n" + +"#define GetMain(uv) (tex2D(sampler_main,uv).xyz)\n" +"#define GetPixel(uv) (tex2D(sampler_main,uv).xyz)\n" +"#define GetBlur1(uv) (tex2D(sampler_blur1,uv).xyz*_c5.x + _c5.y)\n" +"#define GetBlur2(uv) (tex2D(sampler_blur2,uv).xyz*_c5.z + _c5.w)\n" +"#define GetBlur3(uv) (tex2D(sampler_blur3,uv).xyz*_c6.x + _c6.y)\n" + +"#define lum(x) (dot(x,float3(0.32,0.49,0.29)))\n" +"#define tex2d tex2D\n" +"#define tex3d tex3D\n" +; + + +std::string blur_vert( + "#version " + GLSL_VERSION + "\n" + "layout(location = 0) in vec2 vertex_position;\n" + "layout(location = 1) in vec2 vertex_texture;\n" + "" + "out vec2 fragment_texture;\n" + "" + "void main(){\n" + " gl_Position = vec4(vertex_position, 0.0, 1.0);\n" + " fragment_texture = vertex_texture;\n" + "}\n"); + + +std::string blur1_frag( + "#version " + GLSL_VERSION + "\n" + "precision mediump float;\n" + "" + "in vec2 fragment_texture;\n" + "" + "uniform sampler2D texture_sampler;\n" + "uniform vec4 _c0; // source texsize (.xy), and inverse (.zw)\n" + "uniform vec4 _c1; // w1..w4\n" + "uniform vec4 _c2; // d1..d4\n" + "uniform vec4 _c3; // scale, bias, w_div\n" + "" + "out vec4 color;\n" + "" + "void main(){\n" + "" + " // LONG HORIZ. PASS 1:\n" + " #define srctexsize _c0\n" + " #define w1 _c1.x\n" + " #define w2 _c1.y\n" + " #define w3 _c1.z\n" + " #define w4 _c1.w\n" + " #define d1 _c2.x\n" + " #define d2 _c2.y\n" + " #define d3 _c2.z\n" + " #define d4 _c2.w\n" + " #define fscale _c3.x\n" + " #define fbias _c3.y\n" + " #define w_div _c3.z\n" + "" + " // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels.\n" + " vec2 uv2 = fragment_texture.xy + srctexsize.zw*vec2(1,1); // + moves blur UP, LEFT by 1-pixel increments\n" + "" + " vec3 blur = \n" + " ( texture( texture_sampler, uv2 + vec2( d1*srctexsize.z,0) ).xyz\n" + " + texture( texture_sampler, uv2 + vec2(-d1*srctexsize.z,0) ).xyz)*w1 +\n" + " ( texture( texture_sampler, uv2 + vec2( d2*srctexsize.z,0) ).xyz\n" + " + texture( texture_sampler, uv2 + vec2(-d2*srctexsize.z,0) ).xyz)*w2 +\n" + " ( texture( texture_sampler, uv2 + vec2( d3*srctexsize.z,0) ).xyz\n" + " + texture( texture_sampler, uv2 + vec2(-d3*srctexsize.z,0) ).xyz)*w3 +\n" + " ( texture( texture_sampler, uv2 + vec2( d4*srctexsize.z,0) ).xyz\n" + " + texture( texture_sampler, uv2 + vec2(-d4*srctexsize.z,0) ).xyz)*w4\n" + " ;\n" + " blur.xyz *= w_div;\n" + "" + " blur.xyz = blur.xyz*fscale + fbias;\n" + "" + " color.xyz = blur;\n" + " color.w = 1;\n" + "}\n"); + +std::string blur2_frag( + "#version " + GLSL_VERSION + "\n" + "precision mediump float;\n" + "" + "in vec2 fragment_texture;\n" + "" + "uniform sampler2D texture_sampler;\n" + "uniform vec4 _c0; // source texsize (.xy), and inverse (.zw)\n" + "uniform vec4 _c5; // w1,w2,d1,d2\n" + "uniform vec4 _c6; // w_div, edge_darken_c1, edge_darken_c2, edge_darken_c3\n" + "" + "out vec4 color;\n" + "" + "void main(){\n" + "" + " //SHORT VERTICAL PASS 2:\n" + " #define srctexsize _c0\n" + " #define w1 _c5.x\n" + " #define w2 _c5.y\n" + " #define d1 _c5.z\n" + " #define d2 _c5.w\n" + " #define edge_darken_c1 _c6.y\n" + " #define edge_darken_c2 _c6.z\n" + " #define edge_darken_c3 _c6.w\n" + " #define w_div _c6.x\n" + "" + " // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels.\n" + " vec2 uv2 = fragment_texture.xy + srctexsize.zw*vec2(0,0); // + moves blur UP, LEFT by TWO-pixel increments! (since texture is 1/2 the size of blur1_ps)\n" + "" + " vec3 blur = \n" + " ( texture( texture_sampler, uv2 + vec2(0, d1*srctexsize.w) ).xyz\n" + " + texture( texture_sampler, uv2 + vec2(0,-d1*srctexsize.w) ).xyz)*w1 +\n" + " ( texture( texture_sampler, uv2 + vec2(0, d2*srctexsize.w) ).xyz\n" + " + texture( texture_sampler, uv2 + vec2(0,-d2*srctexsize.w) ).xyz)*w2\n" + " ;\n" + " blur.xyz *= w_div;\n" + "" + " // tone it down at the edges: (only happens on 1st X pass!)\n" + " float t = min( min(fragment_texture.x, fragment_texture.y), 1-max(fragment_texture.x, fragment_texture.y) );\n" + " t = sqrt(t);\n" + " t = edge_darken_c1 + edge_darken_c2*clamp(t*edge_darken_c3, 0.0, 1.0);\n" + " blur.xyz *= t;\n" + "" + " color.xyz = blur;\n" + " color.w = 1;\n" + "}\n"); + -bool ShaderEngine::LoadCgProgram(Shader &shader) + +ShaderEngine::ShaderEngine() : presetCompShaderLoaded(false), presetWarpShaderLoaded(false) { - //if (p != NULL) cgDestroyProgram(p); - //p = NULL; - std::string program = shader.programSource; - - if (program.length() > 0) - { - size_t found = program.rfind('}'); - if (found != std::string::npos) - { - //std::cout << "last '}' found at: " << int(found) << std::endl; - program.replace(int(found), 1, "OUT.color.xyz=ret.xyz;\nOUT.color.w=1;\nreturn OUT;\n}"); - } - else - return false; - found = program.rfind('{'); - if (found != std::string::npos) - { - //std::cout << "first '{' found at: " << int(found) << std::endl; - program.replace(int(found), 1, "{\nfloat rad=getrad;\nfloat ang=getang;\n"); - } - else - return false; - found = program.find("shader_body"); - if (found != std::string::npos) - { - //std::cout << "first 'shader_body' found at: " << int(found) << std::endl; - program.replace(int(found), 11, "outtype projectm(float2 uv : TEXCOORD0)\n"); - } - else - return false; - - shader.textures.clear(); - - found = 0; - found = program.find("sampler_", found); - while (found != std::string::npos) - { - found += 8; - size_t end = program.find_first_of(" ;,\n\r)", found); - - if (end != std::string::npos) - { - - std::string sampler = program.substr((int) found, (int) end - found); - UserTexture* texture = new UserTexture(sampler); - - texture->texID = textureManager->getTexture(texture->name); - if (texture->texID != 0) - { - texture->width = textureManager->getTextureWidth(texture->name); - texture->height = textureManager->getTextureHeight(texture->name); - } - else - { - if (sampler.substr(0, 4) == "rand") - { - std::string random_name = textureManager->getRandomTextureName(texture->name); - if (random_name.size() > 0) - { - texture->texID = textureManager->getTexture(random_name); - texture->width = textureManager->getTextureWidth(random_name); - texture->height = textureManager->getTextureHeight(random_name); - } - } - else - { - std::string extensions[6]; - extensions[0] = ".jpg"; - extensions[1] = ".dds"; - extensions[2] = ".png"; - extensions[3] = ".tga"; - extensions[4] = ".bmp"; - extensions[5] = ".dib"; - - for (int x = 0; x < 6; x++) - { - - std::string filename = texture->name + extensions[x]; - texture->texID = textureManager->getTexture(filename); - if (texture->texID != 0) - { - texture->width = textureManager->getTextureWidth(filename); - texture->height = textureManager->getTextureHeight(filename); - break; - } - } - - } - } - if (texture->texID != 0 && shader.textures.find(texture->qname) == shader.textures.end()) - shader.textures[texture->qname] = texture; - - else - delete (texture); - - } - - found = program.find("sampler_", found); - } - textureManager->clearRandomTextures(); - - found = 0; - found = program.find("texsize_", found); - while (found != std::string::npos) - { - found += 8; - size_t end = program.find_first_of(" ;.,\n\r)", found); - - if (end != std::string::npos) - { - std::string tex = program.substr((int) found, (int) end - found); - if (shader.textures.find(tex) != shader.textures.end()) - { - UserTexture* texture = shader.textures[tex]; - texture->texsizeDefined = true; - //std::cout << "texsize_" << tex << " found" << std::endl; - } - } - found = program.find("texsize_", found); - } - - found = program.find("GetBlur3"); - if (found != std::string::npos) - blur1_enabled = blur2_enabled = blur3_enabled = true; - else - { - found = program.find("GetBlur2"); - if (found != std::string::npos) - blur1_enabled = blur2_enabled = true; - else - { - found = program.find("GetBlur1"); - if (found != std::string::npos) - blur1_enabled = true; - } - } - - std::string temp; - - temp.append(cgTemplate); - temp.append(program); - - //std::cout << "Cg: Compilation Results:" << std::endl << std::endl; - //std::cout << program << std::endl; - - CGprogram p = cgCreateProgram(myCgContext, CG_SOURCE, temp.c_str(),//temp.c_str(), - myCgProfile, "projectm", NULL); - - checkForCgCompileError("creating shader program"); - if (p == NULL) - return false; - - cgGLLoadProgram(p); - - if (checkForCgCompileError("loading shader program")) - { - p = NULL; - return false; - } + programID_v2f_c4f = CompileShaderProgram(v2f_c4f_vert, v2f_c4f_frag, "v2f_c4f"); + programID_v2f_c4f_t2f = CompileShaderProgram(v2f_c4f_t2f_vert, v2f_c4f_t2f_frag, "v2f_c4f_t2f"); - programs[&shader] = p; + programID_blur1 = CompileShaderProgram(blur_vert, blur1_frag, "blur1"); + programID_blur2 = CompileShaderProgram(blur_vert, blur2_frag, "blur2"); - return true; - } - else - return false; -} + uniform_v2f_c4f_vertex_tranformation = glGetUniformLocation(programID_v2f_c4f, "vertex_transformation"); + uniform_v2f_c4f_vertex_point_size = glGetUniformLocation(programID_v2f_c4f, "vertex_point_size"); + uniform_v2f_c4f_t2f_vertex_tranformation = glGetUniformLocation(programID_v2f_c4f_t2f, "vertex_transformation"); + uniform_v2f_c4f_t2f_frag_texture_sampler = glGetUniformLocation(programID_v2f_c4f_t2f, "texture_sampler"); + + uniform_blur1_sampler = glGetUniformLocation(programID_blur1, "texture_sampler"); + uniform_blur1_c0 = glGetUniformLocation(programID_blur1, "_c0"); + uniform_blur1_c1 = glGetUniformLocation(programID_blur1, "_c1"); + uniform_blur1_c2 = glGetUniformLocation(programID_blur1, "_c2"); + uniform_blur1_c3 = glGetUniformLocation(programID_blur1, "_c3"); + + uniform_blur2_sampler = glGetUniformLocation(programID_blur2, "texture_sampler"); + uniform_blur2_c0 = glGetUniformLocation(programID_blur2, "_c0"); + uniform_blur2_c5 = glGetUniformLocation(programID_blur2, "_c5"); + uniform_blur2_c6 = glGetUniformLocation(programID_blur2, "_c6"); + + // Initialize Blur vao/vbo + float pointsBlur[16] = { + -1.0, -1.0, 0.0, 1.0, + 1.0, -1.0, 1.0, 1.0, + -1.0, 1.0, 0.0, 0.0, + 1.0, 1.0, 1.0, 0.0}; + + glGenBuffers(1, &vboBlur); + glGenVertexArrays(1, &vaoBlur); + + glBindVertexArray(vaoBlur); + glBindBuffer(GL_ARRAY_BUFFER, vboBlur); + + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 8 * 2, pointsBlur, GL_STATIC_DRAW); -bool ShaderEngine::checkForCgCompileError(const char *situation) -{ - CGerror error; - const char *string = cgGetLastErrorString(&error); - error = cgGetError(); - if (error != CG_NO_ERROR) - { - std::cout << "Cg: Compilation Error" << std::endl; - std::cout << "Cg: %" << situation << " - " << string << std::endl; - if (error == CG_COMPILER_ERROR) - { - std::cout << "Cg: " << cgGetLastListing(myCgContext) << std::endl; + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)0); // Positions - } - return true; - } + glEnableVertexAttribArray(1); + glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)(sizeof(float)*2)); // Textures - return false; + glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); } -void ShaderEngine::checkForCgError(const char *situation) +ShaderEngine::~ShaderEngine() { - CGerror error; - const char *string = cgGetLastErrorString(&error); + glDeleteProgram(programID_v2f_c4f); + glDeleteProgram(programID_v2f_c4f_t2f); - if (error != CG_NO_ERROR) - { - std::cout << "Cg: %" << situation << " - " << string << std::endl; - if (error == CG_COMPILER_ERROR) - { - std::cout << "Cg: " << cgGetLastListing(myCgContext) << std::endl; - } - exit(1); - } -} + glDeleteProgram(programID_blur1); + glDeleteProgram(programID_blur2); -void ShaderEngine::SetupCg() -{ - std::string line; - std::ifstream myfile(CMAKE_INSTALL_PREFIX "/share/projectM/shaders/projectM.cg"); - if (myfile.is_open()) - { - while (!myfile.eof()) - { - std::getline(myfile, line); - cgTemplate.append(line + "\n"); - } - myfile.close(); - } + glDeleteBuffers(1, &vboBlur); + glDeleteVertexArrays(1, &vaoBlur); - else - std::cout << "Unable to load shader template \"" << CMAKE_INSTALL_PREFIX "/share/projectM/shaders/projectM.cg\"" << std::endl; + disablePresetShaders(); +} - std::ifstream myfile2(CMAKE_INSTALL_PREFIX "/share/projectM/shaders/blur.cg"); - if (myfile2.is_open()) - { - while (!myfile2.eof()) - { - std::getline(myfile2, line); - blurProgram.append(line + "\n"); - } - myfile2.close(); - } +bool ShaderEngine::checkCompileStatus(GLuint shader, const std::string & shaderTitle) { + GLint status; + glGetShaderiv(shader, GL_COMPILE_STATUS, &status); + if (status == GL_TRUE) + return true; // success + + int InfoLogLength; + glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &InfoLogLength); + if ( InfoLogLength > 0 ){ + std::vector FragmentShaderErrorMessage(InfoLogLength+1); + glGetShaderInfoLog(shader, InfoLogLength, NULL, &FragmentShaderErrorMessage[0]); + std::cerr << "Failed to compile shader '" << shaderTitle << "'. Error: " << &FragmentShaderErrorMessage[0] << std::endl; + } - else - std::cout << "Unable to load blur template" << std::endl; + return false; +} - myCgContext = cgCreateContext(); - checkForCgError("creating context"); - cgGLSetDebugMode(CG_FALSE); - cgSetParameterSettingMode(myCgContext, CG_DEFERRED_PARAMETER_SETTING); +void ShaderEngine::setParams(const int _texsizeX, const int _texsizeY, BeatDetect *_beatDetect, + TextureManager *_textureManager) +{ + this->beatDetect = _beatDetect; + this->textureManager = _textureManager; - myCgProfile = cgGLGetLatestProfile(CG_GL_FRAGMENT); - - // HACK breaks with buggy ati video drivers such as my own - // -carmelo.piccione@gmail.com 7/26/2010 - //cgGLSetOptimalOptions(myCgProfile); - checkForCgError("selecting fragment profile"); + aspectX = 1; + aspectY = 1; + if (_texsizeX > _texsizeY) + aspectY = (float)_texsizeY/(float)_texsizeX; + else + aspectX = (float)_texsizeX/(float)_texsizeY; - profileName = cgGetProfileString(myCgProfile); - std::cout << "Cg: Initialized profile: " << profileName << std::endl; -//std::cout<< blurProgram.c_str()<texsizeX = _texsizeX; + this->texsizeY = _texsizeY; +} - checkForCgCompileError("creating blur1 program"); - if (blur1Program == NULL) - exit(1); - cgGLLoadProgram(blur1Program); - checkForCgError("loading blur1 program"); +// compile a user-defined shader from a preset. returns program ID if successful. +GLuint ShaderEngine::compilePresetShader(const PresentShaderType shaderType, Shader &pmShader, const std::string &shaderFilename) { + std::string program = pmShader.programSource; + + if (program.length() <= 0) + return GL_FALSE; + + // replace "}" with return statement (this can probably be optimized for the GLSL conversion...) + size_t found = program.rfind('}'); + if (found != std::string::npos) + { + //std::cout << "last '}' found at: " << int(found) << std::endl; + program.replace(int(found), 1, "_return_value = float4(ret.xyz, 1.0);\n" + "}\n"); + } + else + return GL_FALSE; + + // replace shader_body with entry point function + found = program.find("shader_body"); + if (found != std::string::npos) + { + //std::cout << "first 'shader_body' found at: " << int(found) << std::endl; + if (shaderType == PresentWarpShader) { + program.replace(int(found), 11, "void PS(float4 _vDiffuse : COLOR, float4 _uv : TEXCOORD0, float2 _rad_ang : TEXCOORD1, out float4 _return_value : COLOR)\n"); + + } else { + program.replace(int(found), 11, "void PS(float4 _vDiffuse : COLOR, float2 _uv : TEXCOORD0, float2 _rad_ang : TEXCOORD1, out float4 _return_value : COLOR)\n"); + + } + } + else + return GL_FALSE; + + // replace "{" with some variable declarations + found = program.find('{',found); + if (found != std::string::npos) + { + //std::cout << "first '{' found at: " << int(found) << std::endl; + const char *progMain = \ + "{\n" + "float3 ret = 0;\n"; + program.replace(int(found), 1, progMain); + } + else + return GL_FALSE; + + pmShader.textures.clear(); + + + // Add builtin textures + pmShader.textures["main"] = textureManager->getTexture("main", GL_REPEAT, GL_LINEAR); + pmShader.textures["fc_main"] = textureManager->getTexture("main", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["pc_main"] = textureManager->getTexture("main", GL_CLAMP_TO_EDGE, GL_NEAREST); + pmShader.textures["fw_main"] = textureManager->getTexture("main", GL_REPEAT, GL_LINEAR); + pmShader.textures["pw_main"] = textureManager->getTexture("main", GL_REPEAT, GL_NEAREST); + + pmShader.textures["noise_lq"] = textureManager->getTexture("noise_lq", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["noise_lq_lite"] = textureManager->getTexture("noise_lq_lite", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["noise_mq"] = textureManager->getTexture("noise_mq", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["noise_hq"] = textureManager->getTexture("noise_hq", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["noisevol_lq"] = textureManager->getTexture("noisevol_lq", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["noisevol_hq"] = textureManager->getTexture("noisevol_hq", GL_CLAMP_TO_EDGE, GL_LINEAR); + + + + // set up texture samplers for all samplers references in the shader program + found = 0; + found = program.find("sampler_", found); + while (found != std::string::npos) + { + found += 8; + size_t end = program.find_first_of(" ;,\n\r)", found); + + if (end != std::string::npos) + { + std::string sampler = program.substr((int) found, (int) end - found); + std::string lowerCaseName(sampler); + std::transform(lowerCaseName.begin(), lowerCaseName.end(), lowerCaseName.begin(), tolower); + + TextureSamplerDesc texDesc = textureManager->getTexture(sampler, GL_REPEAT, GL_LINEAR); + + if (texDesc.first == NULL) + { + if (lowerCaseName.substr(0, 4) == "rand" || lowerCaseName.substr(2, 5) == "_rand") + { + texDesc = textureManager->getRandomTextureName(sampler); + } + else + { + texDesc = textureManager->tryLoadingTexture(sampler); + } + } + + if (texDesc.first == NULL) + { + std::cerr << "Texture loading error for: " << sampler << std::endl; + } + else + { + std::map::const_iterator iter = pmShader.textures.cbegin(); + for ( ; iter != pmShader.textures.cend(); ++iter) + { + if (iter->first == sampler) + break; + } + + if (iter == pmShader.textures.cend()) + pmShader.textures[sampler] = texDesc; + } + } + + found = program.find("sampler_", found); + } + + textureManager->clearRandomTextures(); + + found = program.find("GetBlur3"); + if (found != std::string::npos) + { + blur1_enabled = blur2_enabled = blur3_enabled = true; + pmShader.textures["blur3"] = textureManager->getTexture("blur3", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["blur2"] = textureManager->getTexture("blur2", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["blur1"] = textureManager->getTexture("blur1", GL_CLAMP_TO_EDGE, GL_LINEAR); + } + else + { + found = program.find("GetBlur2"); + if (found != std::string::npos) + { + blur1_enabled = blur2_enabled = true; + pmShader.textures["blur2"] = textureManager->getTexture("blur2", GL_CLAMP_TO_EDGE, GL_LINEAR); + pmShader.textures["blur1"] = textureManager->getTexture("blur1", GL_CLAMP_TO_EDGE, GL_LINEAR); + } + else + { + found = program.find("GetBlur1"); + if (found != std::string::npos) + { + blur1_enabled = true; + pmShader.textures["blur1"] = textureManager->getTexture("blur1", GL_CLAMP_TO_EDGE, GL_LINEAR); + } + } + } + + std::string fullSource; + + // prepend our HLSL template to the actual program source + fullSource.append(PresetShaderIncludes); + + if (shaderType == PresentWarpShader) { + fullSource.append( "#define rad _rad_ang.x\n" + "#define ang _rad_ang.y\n" + "#define uv _uv.xy\n" + "#define uv_orig _uv.zw\n"); + } else { + fullSource.append( "#define rad _rad_ang.x\n" + "#define ang _rad_ang.y\n" + "#define uv _uv.xy\n" + "#define uv_orig _uv.xy\n" + "#define hue_shader _vDiffuse.xyz\n"); + } + + + fullSource.append(program); + + std::string shaderTypeString; + switch(shaderType) { + case PresentWarpShader: shaderTypeString = "Warp"; break; + case PresentCompositeShader: shaderTypeString = "Comp"; break; + case PresentBlur1Shader: shaderTypeString = "Blur1"; break; + case PresentBlur2Shader: shaderTypeString = "Blur2"; break; + default: shaderTypeString = "Other"; + } + + M4::GLSLGenerator generator; + M4::Allocator allocator; + + M4::HLSLTree tree( &allocator ); + M4::HLSLParser parser(&allocator, &tree); + + // preprocess define macros + std::string sourcePreprocessed; + if (!parser.ApplyPreprocessor(shaderFilename.c_str(), fullSource.c_str(), fullSource.size(), sourcePreprocessed)) { + std::cerr << "Failed to preprocess HLSL(step1) " << shaderTypeString << " shader" << std::endl; + +#if !DUMP_SHADERS_ON_ERROR + std::cerr << "Source: " << std::endl << fullSource << std::endl; +#else + std::ofstream out("/tmp/shader_" + shaderTypeString + "_step1.txt"); + out << fullSource; + out.close(); +#endif + return GL_FALSE; + } - blur2Program = cgCreateProgram(myCgContext, CG_SOURCE, blurProgram.c_str(), myCgProfile, "blurVert", NULL); + // Remove previous shader declarations + std::smatch matches; + while(std::regex_search(sourcePreprocessed, matches, std::regex("sampler(2D|3D|)(\\s+|\\().*"))) { + sourcePreprocessed.replace(matches.position(), matches.length(), ""); + } + + // Remove previous texsize declarations + while(std::regex_search(sourcePreprocessed, matches, std::regex("float4\\s+texsize_.*"))) { + sourcePreprocessed.replace(matches.position(), matches.length(), ""); + } + + // Declare samplers + std::set texsizes; + std::map::const_iterator iter_samplers = pmShader.textures.cbegin(); + for ( ; iter_samplers != pmShader.textures.cend(); ++iter_samplers) + { + Texture * texture = iter_samplers->second.first; + + if (texture->type == GL_TEXTURE_3D) { + sourcePreprocessed.insert(0, "uniform sampler3D sampler_" + iter_samplers->first + ";\n"); + } else { + sourcePreprocessed.insert(0, "uniform sampler2D sampler_" + iter_samplers->first + ";\n"); + } + + texsizes.insert(iter_samplers->first); + texsizes.insert(texture->name); + } + + // Declare texsizes + std::set::const_iterator iter_texsizes = texsizes.cbegin(); + for ( ; iter_texsizes != texsizes.cend(); ++iter_texsizes) + { + sourcePreprocessed.insert(0, "uniform float4 texsize_" + *iter_texsizes + ";\n"); + } + + + // transpile from HLSL (aka preset shader aka directX shader) to GLSL (aka OpenGL shader lang) + + // parse + if( !parser.Parse(shaderFilename.c_str(), sourcePreprocessed.c_str(), sourcePreprocessed.size()) ) { + std::cerr << "Failed to parse HLSL(step2) " << shaderTypeString << " shader" << std::endl; + +#if !DUMP_SHADERS_ON_ERROR + std::cerr << "Source: " << std::endl << sourcePreprocessed << std::endl; +#else + std::ofstream out2("/tmp/shader_" + shaderTypeString + "_step2.txt"); + out2 << sourcePreprocessed; + out2.close(); +#endif + return GL_FALSE; + } - checkForCgCompileError("creating blur2 program"); - if (blur2Program == NULL) - exit(1); - cgGLLoadProgram(blur2Program); + // generate GLSL + if (!generator.Generate(&tree, M4::GLSLGenerator::Target_FragmentShader, M4::GLSLGenerator::Version_140, "PS")) { + std::cerr << "Failed to transpile HLSL(step3) " << shaderTypeString << " shader to GLSL" << std::endl; +#if !DUMP_SHADERS_ON_ERROR + std::cerr << "Source: " << std::endl << sourcePreprocessed << std::endl; +#else + std::ofstream out2("/tmp/shader_" + shaderTypeString + "_step2.txt"); + out2 << sourcePreprocessed; + out2.close(); +#endif + return GL_FALSE; + } - checkForCgError("loading blur2 program"); + // now we have GLSL source for the preset shader program (hopefully it's valid!) + // copmile the preset shader fragment shader with the standard vertex shader and cross our fingers + GLuint ret = 0; + if (shaderType == PresentWarpShader) { + ret = CompileShaderProgram(presetWarpVertexShader, generator.GetResult(), shaderTypeString); // returns new program + } else { + ret = CompileShaderProgram(presetCompVertexShader, generator.GetResult(), shaderTypeString); // returns new program + } + + if (ret != GL_FALSE) { + std::cerr << "Successfull compilation of " << shaderTypeString << std::endl; + } else { + std::cerr << "Compilation error (step3) of " << shaderTypeString << std::endl; + +#if !DUMP_SHADERS_ON_ERROR + std::cerr << "Source:" << std::endl << generator.GetResult() << std::endl; +#else + std::ofstream out3("/tmp/shader_" + shaderTypeString + "_step3.txt"); + out3 << generator.GetResult(); + out3.close(); +#endif + } + return ret; } -void ShaderEngine::SetupCgVariables(CGprogram program, const Pipeline &pipeline, const PipelineContext &context) -{ - float slow_roam_cos[4] = { 0.5 + 0.5 * cos(context.time * 0.005), 0.5 + 0.5 * cos(context.time * 0.008), 0.5 + 0.5 * cos(context.time * 0.013), 0.5 + 0.5 * cos(context.time * 0.022) }; - float roam_cos[4] = { 0.5 + 0.5 * cos(context.time * 0.3), 0.5 + 0.5 * cos(context.time * 1.3), 0.5 + 0.5 * cos(context.time * 5), 0.5 + 0.5 * cos(context.time * 20) }; - float slow_roam_sin[4] = { 0.5 + 0.5 * sin(context.time * 0.005), 0.5 + 0.5 * sin(context.time * 0.008), 0.5 + 0.5 * sin(context.time * 0.013), 0.5 + 0.5 * sin(context.time * 0.022) }; - float roam_sin[4] = { 0.5 + 0.5 * sin(context.time * 0.3), 0.5 + 0.5 * sin(context.time * 1.3), 0.5 + 0.5 * sin(context.time * 5), 0.5 + 0.5 * sin(context.time * 20) }; - - cgGLSetParameter4fv(cgGetNamedParameter(program, "slow_roam_cos"), slow_roam_cos); - cgGLSetParameter4fv(cgGetNamedParameter(program, "roam_cos"), roam_cos); - cgGLSetParameter4fv(cgGetNamedParameter(program, "slow_roam_sin"), slow_roam_sin); - cgGLSetParameter4fv(cgGetNamedParameter(program, "roam_sin"), roam_sin); - - cgGLSetParameter1f(cgGetNamedParameter(program, "time"), context.time); - cgGLSetParameter4f(cgGetNamedParameter(program, "rand_preset"), rand_preset[0], rand_preset[1], rand_preset[2], rand_preset[3]); - cgGLSetParameter4f(cgGetNamedParameter(program, "rand_frame"), (rand() % 100) * .01, (rand() % 100) * .01, (rand()% 100) * .01, (rand() % 100) * .01); - cgGLSetParameter1f(cgGetNamedParameter(program, "fps"), context.fps); - cgGLSetParameter1f(cgGetNamedParameter(program, "frame"), context.frame); - cgGLSetParameter1f(cgGetNamedParameter(program, "progress"), context.progress); - - cgGLSetParameter1f(cgGetNamedParameter(program, "blur1_min"), pipeline.blur1n); - cgGLSetParameter1f(cgGetNamedParameter(program, "blur1_max"), pipeline.blur1x); - cgGLSetParameter1f(cgGetNamedParameter(program, "blur2_min"), pipeline.blur2n); - cgGLSetParameter1f(cgGetNamedParameter(program, "blur2_max"), pipeline.blur2x); - cgGLSetParameter1f(cgGetNamedParameter(program, "blur3_min"), pipeline.blur3n); - cgGLSetParameter1f(cgGetNamedParameter(program, "blur3_max"), pipeline.blur3x); - - cgGLSetParameter1f(cgGetNamedParameter(program, "bass"), beatDetect->bass); - cgGLSetParameter1f(cgGetNamedParameter(program, "mid"), beatDetect->mid); - cgGLSetParameter1f(cgGetNamedParameter(program, "treb"), beatDetect->treb); - cgGLSetParameter1f(cgGetNamedParameter(program, "bass_att"), beatDetect->bass_att); - cgGLSetParameter1f(cgGetNamedParameter(program, "mid_att"), beatDetect->mid_att); - cgGLSetParameter1f(cgGetNamedParameter(program, "treb_att"), beatDetect->treb_att); - cgGLSetParameter1f(cgGetNamedParameter(program, "vol"), beatDetect->vol); - cgGLSetParameter1f(cgGetNamedParameter(program, "vol_att"), beatDetect->vol); - - cgGLSetParameter4f(cgGetNamedParameter(program, "texsize"), texsize, texsize, 1 / (float) texsize, 1 - / (float) texsize); - cgGLSetParameter4f(cgGetNamedParameter(program, "aspect"), 1 / aspect, 1, aspect, 1); - - if (blur1_enabled) - { - cgGLSetTextureParameter(cgGetNamedParameter(program, "sampler_blur1"), blur1_tex); - cgGLEnableTextureParameter(cgGetNamedParameter(program, "sampler_blur1")); - } - if (blur2_enabled) - { - cgGLSetTextureParameter(cgGetNamedParameter(program, "sampler_blur2"), blur2_tex); - cgGLEnableTextureParameter(cgGetNamedParameter(program, "sampler_blur2")); - } - if (blur3_enabled) - { - cgGLSetTextureParameter(cgGetNamedParameter(program, "sampler_blur3"), blur3_tex); - cgGLEnableTextureParameter(cgGetNamedParameter(program, "sampler_blur3")); - } +void ShaderEngine::SetupShaderVariables(GLuint program, const Pipeline &pipeline, const PipelineContext &context) +{ + // pass info from projectM to the shader uniforms + // these are the inputs: http://www.geisswerks.com/milkdrop/milkdrop_preset_authoring.html#3f6 + float time_since_preset_start = context.time - context.presetStartTime; + float time_since_preset_start_wrapped = time_since_preset_start - (int)(time_since_preset_start/10000)*10000; + float mip_x = logf((float)texsizeX)/logf(2.0f); + float mip_y = logf((float)texsizeX)/logf(2.0f); + float mip_avg = 0.5f*(mip_x + mip_y); + + glUniform4f(glGetUniformLocation(program, "rand_frame"), (rand() % 100) * .01, (rand() % 100) * .01, (rand()% 100) * .01, (rand() % 100) * .01); + glUniform4f(glGetUniformLocation(program, "rand_preset"), rand_preset[0], rand_preset[1], rand_preset[2], rand_preset[3]); + + glUniform4f(glGetUniformLocation(program, "_c0"), aspectX, aspectY, 1 / aspectX, 1 / aspectY); + glUniform4f(glGetUniformLocation(program, "_c1"), 0.0, 0.0, 0.0, 0.0); + glUniform4f(glGetUniformLocation(program, "_c2"), time_since_preset_start_wrapped, context.fps, context.frame, context.progress); + glUniform4f(glGetUniformLocation(program, "_c3"), beatDetect->bass/100, beatDetect->mid/100, beatDetect->treb/100, beatDetect->vol/100); + glUniform4f(glGetUniformLocation(program, "_c4"), beatDetect->bass_att/100, beatDetect->mid_att/100, beatDetect->treb_att/100, beatDetect->vol_att/100); + glUniform4f(glGetUniformLocation(program, "_c5"), pipeline.blur1x-pipeline.blur1n, pipeline.blur1n, pipeline.blur2x-pipeline.blur2n, pipeline.blur2n); + glUniform4f(glGetUniformLocation(program, "_c6"), pipeline.blur3x-pipeline.blur3n, pipeline.blur3n, pipeline.blur1n, pipeline.blur1x); + glUniform4f(glGetUniformLocation(program, "_c7"), texsizeX, texsizeY, 1 / (float) texsizeX, 1 / (float) texsizeY); + + glUniform4f(glGetUniformLocation(program, "_c8"), 0.5f+0.5f*cosf(context.time* 0.329f+1.2f), + 0.5f+0.5f*cosf(context.time* 1.293f+3.9f), + 0.5f+0.5f*cosf(context.time* 5.070f+2.5f), + 0.5f+0.5f*cosf(context.time*20.051f+5.4f)); + + glUniform4f(glGetUniformLocation(program, "_c9"), 0.5f+0.5f*sinf(context.time* 0.329f+1.2f), + 0.5f+0.5f*sinf(context.time* 1.293f+3.9f), + 0.5f+0.5f*sinf(context.time* 5.070f+2.5f), + 0.5f+0.5f*sinf(context.time*20.051f+5.4f)); + + glUniform4f(glGetUniformLocation(program, "_c10"), 0.5f+0.5f*cosf(context.time*0.0050f+2.7f), + 0.5f+0.5f*cosf(context.time*0.0085f+5.3f), + 0.5f+0.5f*cosf(context.time*0.0133f+4.5f), + 0.5f+0.5f*cosf(context.time*0.0217f+3.8f)); + + glUniform4f(glGetUniformLocation(program, "_c11"), 0.5f+0.5f*sinf(context.time*0.0050f+2.7f), + 0.5f+0.5f*sinf(context.time*0.0085f+5.3f), + 0.5f+0.5f*sinf(context.time*0.0133f+4.5f), + 0.5f+0.5f*sinf(context.time*0.0217f+3.8f)); + + glUniform4f(glGetUniformLocation(program, "_c12"), mip_x, mip_y, mip_avg, 0 ); + glUniform4f(glGetUniformLocation(program, "_c13"), pipeline.blur2n, pipeline.blur2x, pipeline.blur3n, pipeline.blur3x); + + + glm::mat4 temp_mat[24]; + + // write matrices + for (int i=0; i<20; i++) + { + glm::mat4 mx, my, mz, mxlate; + + mx = glm::rotate(glm::mat4(1.0f), rot_base[i].x + rot_speed[i].x*context.time, glm::vec3(1.0f, 0.0f, 0.0f)); + my = glm::rotate(glm::mat4(1.0f), rot_base[i].y + rot_speed[i].y*context.time, glm::vec3(0.0f, 1.0f, 0.0f)); + mz = glm::rotate(glm::mat4(1.0f), rot_base[i].z + rot_speed[i].z*context.time, glm::vec3(0.0f, 0.0f, 1.0f)); + + mxlate = glm::translate(glm::mat4(1.0f), glm::vec3(xlate[i].x, xlate[i].y, xlate[i].z)); + + temp_mat[i] = mxlate * mx; + temp_mat[i] = mz * temp_mat[i]; + temp_mat[i] = my * temp_mat[i]; + } + + // the last 4 are totally random, each frame + for (int i=20; i<24; i++) + { + glm::mat4 mx, my, mz, mxlate; + + mx = glm::rotate(glm::mat4(1.0f), FRAND * 6.28f, glm::vec3(1.0f, 0.0f, 0.0f)); + my = glm::rotate(glm::mat4(1.0f), FRAND * 6.28f, glm::vec3(0.0f, 1.0f, 0.0f)); + mz = glm::rotate(glm::mat4(1.0f), FRAND * 6.28f, glm::vec3(0.0f, 0.0f, 1.0f)); + + mxlate = glm::translate(glm::mat4(1.0f), glm::vec3(FRAND, FRAND, FRAND)); + + temp_mat[i] = mxlate * mx; + temp_mat[i] = mz * temp_mat[i]; + temp_mat[i] = my * temp_mat[i]; + } + + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[0]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[1]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[2]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_s4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[3]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[4]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[5]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[6]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_d4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[7]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[8]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[9]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[10]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_f4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[11]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[12]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[13]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[14]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_vf4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[15]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[16]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[17]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[18]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_uf4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[19]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand1"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[20]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand2"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[21]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand3"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[22]))); + glUniformMatrix4x3fv(glGetUniformLocation(program, "rot_rand4"), 1, GL_FALSE, glm::value_ptr(glm::mat4x3(temp_mat[23]))); + + // set program uniform "_q[a-h]" values (_qa.x, _qa.y, _qa.z, _qa.w, _qb.x, _qb.y ... ) alias q[1-32] + for (int i=0; i < 32; i+=4) { + std::string varName = "_q"; + varName.push_back('a' + i/4); + glUniform4f(glGetUniformLocation(program, varName.c_str()), pipeline.q[i], pipeline.q[i+1], pipeline.q[i+2], pipeline.q[i+3]); + } } -void ShaderEngine::SetupUserTexture(CGprogram program, const UserTexture* texture) +void ShaderEngine::SetupTextures(GLuint program, const Shader &shader) { - std::string samplerName = "sampler_" + texture->qname; - CGparameter param = cgGetNamedParameter(program, samplerName.c_str()); - checkForCgError("getting parameter"); - cgGLSetTextureParameter(param, texture->texID); - checkForCgError("setting parameter"); - cgGLEnableTextureParameter(param); - checkForCgError("enabling parameter"); - //std::cout<texID<<" "<texsizeDefined) - { - std::string texsizeName = "texsize_" + texture->name; - cgGLSetParameter4f(cgGetNamedParameter(program, texsizeName.c_str()), texture->width, texture->height, 1 - / (float) texture->width, 1 / (float) texture->height); - checkForCgError("setting parameter texsize"); - } -} + uint texNum = 0; + std::map texsizes; -void ShaderEngine::SetupUserTextureState( const UserTexture* texture) -{ - glBindTexture(GL_TEXTURE_2D, texture->texID); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, texture->bilinear ? GL_LINEAR : GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, texture->bilinear ? GL_LINEAR : GL_NEAREST); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, texture->wrap ? GL_REPEAT : GL_CLAMP); - glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, texture->wrap ? GL_REPEAT : GL_CLAMP); + // Set samplers + for (std::map::const_iterator iter_samplers = shader.textures.begin(); iter_samplers + != shader.textures.end(); ++iter_samplers) + { + std::string texName = iter_samplers->first; + Texture * texture = iter_samplers->second.first; + Sampler * sampler = iter_samplers->second.second; + std::string samplerName = "sampler_" + texName; + + // https://www.khronos.org/opengl/wiki/Sampler_(GLSL)#Binding_textures_to_samplers + GLint param = glGetUniformLocation(program, samplerName.c_str()); + if (param < 0) { + // unused uniform have been optimized out by glsl compiler + continue; + } + + texsizes[texName] = texture; + texsizes[texture->name] = texture; + + glActiveTexture(GL_TEXTURE0 + texNum); + glBindTexture(texture->type, texture->texID); + glBindSampler(texNum, sampler->samplerID); + + glUniform1i(param, texNum); + texNum++; + } + + + // Set texsizes + std::map::const_iterator iter_textures = texsizes.cbegin(); + for ( ; iter_textures != texsizes.cend(); ++iter_textures) + { + Texture * texture = iter_textures->second; + + std::string texsizeName = "texsize_" + iter_textures->first; + GLint textSizeParam = glGetUniformLocation(program, texsizeName.c_str()); + if (textSizeParam >= 0) { + glUniform4f(textSizeParam, texture->width, texture->height, + 1 / (float) texture->width, 1 / (float) texture->height); + } else { + // unused uniform have been optimized out by glsl compiler + continue; + } + } } -void ShaderEngine::SetupCgQVariables(CGprogram program, const Pipeline &q) -{ - cgGLSetParameter4f(cgGetNamedParameter(program, "_qa"), q.q[0], q.q[1], q.q[2], q.q[3]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qb"), q.q[4], q.q[5], q.q[6], q.q[7]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qc"), q.q[8], q.q[9], q.q[10], q.q[11]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qd"), q.q[12], q.q[13], q.q[14], q.q[15]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qe"), q.q[16], q.q[17], q.q[18], q.q[19]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qf"), q.q[20], q.q[21], q.q[22], q.q[23]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qg"), q.q[24], q.q[25], q.q[26], q.q[27]); - cgGLSetParameter4f(cgGetNamedParameter(program, "_qh"), q.q[28], q.q[29], q.q[30], q.q[31]); -} -void ShaderEngine::setAspect(float aspect) +void ShaderEngine::RenderBlurTextures(const Pipeline &pipeline, const PipelineContext &pipelineContext) { - this->aspect = aspect; -} -void ShaderEngine::RenderBlurTextures(const Pipeline &pipeline, const PipelineContext &pipelineContext, - const int texsize) -{ - if (blur1_enabled || blur2_enabled || blur3_enabled) - { - float tex[4][2] = - { - { 0, 1 }, - { 0, 0 }, - { 1, 0 }, - { 1, 1 } }; - - glBlendFunc(GL_ONE, GL_ZERO); - glColor4f(1.0, 1.0, 1.0, 1.0f); + uint passes = 0; + if (blur3_enabled) { + passes = 6; + } else if (blur2_enabled) { + passes = 4; + } else if (blur1_enabled) { + passes = 2; + } else { + return; + } + + const float w[8] = { 4.0f, 3.8f, 3.5f, 2.9f, 1.9f, 1.2f, 0.7f, 0.3f }; //<- user can specify these + float edge_darken = pipeline.blur1ed; + float blur_min[3], blur_max[3]; + + blur_min[0] = pipeline.blur1n; + blur_min[1] = pipeline.blur2n; + blur_min[2] = pipeline.blur3n; + blur_max[0] = pipeline.blur1x; + blur_max[1] = pipeline.blur2x; + blur_max[2] = pipeline.blur3x; + + // check that precision isn't wasted in later blur passes [...min-max gap can't grow!] + // also, if min-max are close to each other, push them apart: + const float fMinDist = 0.1f; + if (blur_max[0] - blur_min[0] < fMinDist) { + float avg = (blur_min[0] + blur_max[0])*0.5f; + blur_min[0] = avg - fMinDist*0.5f; + blur_max[0] = avg - fMinDist*0.5f; + } + blur_max[1] = std::min(blur_max[0], blur_max[1]); + blur_min[1] = std::max(blur_min[0], blur_min[1]); + if (blur_max[1] - blur_min[1] < fMinDist) { + float avg = (blur_min[1] + blur_max[1])*0.5f; + blur_min[1] = avg - fMinDist*0.5f; + blur_max[1] = avg - fMinDist*0.5f; + } + blur_max[2] = std::min(blur_max[1], blur_max[2]); + blur_min[2] = std::max(blur_min[1], blur_min[2]); + if (blur_max[2] - blur_min[2] < fMinDist) { + float avg = (blur_min[2] + blur_max[2])*0.5f; + blur_min[2] = avg - fMinDist*0.5f; + blur_max[2] = avg - fMinDist*0.5f; + } + + float fscale[3]; + float fbias[3]; + + // figure out the progressive scale & bias needed, at each step, + // to go from one [min..max] range to the next. + float temp_min, temp_max; + fscale[0] = 1.0f / (blur_max[0] - blur_min[0]); + fbias [0] = -blur_min[0] * fscale[0]; + temp_min = (blur_min[1] - blur_min[0]) / (blur_max[0] - blur_min[0]); + temp_max = (blur_max[1] - blur_min[0]) / (blur_max[0] - blur_min[0]); + fscale[1] = 1.0f / (temp_max - temp_min); + fbias [1] = -temp_min * fscale[1]; + temp_min = (blur_min[2] - blur_min[1]) / (blur_max[1] - blur_min[1]); + temp_max = (blur_max[2] - blur_min[1]) / (blur_max[1] - blur_min[1]); + fscale[2] = 1.0f / (temp_max - temp_min); + fbias [2] = -temp_min * fscale[2]; + + const std::vector & blurTextures = textureManager->getBlurTextures(); + const Texture * mainTexture = textureManager->getMainTexture(); + + glBlendFunc(GL_ONE, GL_ZERO); + glBindVertexArray(vaoBlur); + + for (uint i=0; iwidth, blurTextures[i]->height); + + // hook up correct source texture - assume there is only one, at stage 0 + glActiveTexture(GL_TEXTURE0); + if (i == 0) { + glBindTexture(GL_TEXTURE_2D, mainTexture->texID); + } else { + glBindTexture(GL_TEXTURE_2D, blurTextures[i-1]->texID); + } + + float srcw = (i==0) ? mainTexture->width : blurTextures[i-1]->width; + float srch = (i==0) ? mainTexture->height : blurTextures[i-1]->height; + + + float fscale_now = fscale[i/2]; + float fbias_now = fbias[i/2]; + + // set constants + if (i%2==0) + { + // pass 1 (long horizontal pass) + //------------------------------------- + const float w1 = w[0] + w[1]; + const float w2 = w[2] + w[3]; + const float w3 = w[4] + w[5]; + const float w4 = w[6] + w[7]; + const float d1 = 0 + 2*w[1]/w1; + const float d2 = 2 + 2*w[3]/w2; + const float d3 = 4 + 2*w[5]/w3; + const float d4 = 6 + 2*w[7]/w4; + const float w_div = 0.5f/(w1+w2+w3+w4); + //------------------------------------- + //float4 _c0; // source texsize (.xy), and inverse (.zw) + //float4 _c1; // w1..w4 + //float4 _c2; // d1..d4 + //float4 _c3; // scale, bias, w_div, 0 + //------------------------------------- + glUniform4f(uniform_blur1_c0, srcw, srch, 1.0f/srcw, 1.0f/srch); + glUniform4f(uniform_blur1_c1, w1,w2,w3,w4); + glUniform4f(uniform_blur1_c2, d1,d2,d3,d4); + glUniform4f(uniform_blur1_c3, fscale_now, fbias_now, w_div, 0.0); + } + else + { + // pass 2 (short vertical pass) + //------------------------------------- + const float w1 = w[0]+w[1] + w[2]+w[3]; + const float w2 = w[4]+w[5] + w[6]+w[7]; + const float d1 = 0 + 2*((w[2]+w[3])/w1); + const float d2 = 2 + 2*((w[6]+w[7])/w2); + const float w_div = 1.0f/((w1+w2)*2); + //------------------------------------- + //float4 _c0; // source texsize (.xy), and inverse (.zw) + //float4 _c5; // w1,w2,d1,d2 + //float4 _c6; // w_div, edge_darken_c1, edge_darken_c2, edge_darken_c3 + //------------------------------------- + glUniform4f(uniform_blur2_c0, srcw, srch, 1.0f/srcw, 1.0f/srch); + glUniform4f(uniform_blur2_c5, w1,w2,d1,d2); + // note: only do this first time; if you do it many times, + // then the super-blurred levels will have big black lines along the top & left sides. + if (i==1) + glUniform4f(uniform_blur2_c6, w_div, (1-edge_darken), edge_darken, 5.0f); //darken edges + else + glUniform4f(uniform_blur2_c6, w_div, 1.0f, 0.0f, 5.0f); // don't darken + } + + // draw fullscreen quad + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + + // save to blur texture + glBindTexture(GL_TEXTURE_2D, blurTextures[i]->texID); + glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, blurTextures[i]->width, blurTextures[i]->height); + } - glBindTexture(GL_TEXTURE_2D, mainTextureId); - glEnable(GL_TEXTURE_2D); + glBindVertexArray(0); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - glTexCoordPointer(2, GL_FLOAT, 0, tex); + glBindTexture(GL_TEXTURE_2D, 0); +} - cgGLEnableProfile(myCgProfile); - checkForCgError("enabling profile"); +bool ShaderEngine::linkProgram(GLuint programID) { + glLinkProgram(programID); - if (blur1_enabled) - { - cgGLSetParameter4f(cgGetNamedParameter(blur1Program, "srctexsize"), texsize/2, texsize/2, 2 / (float) texsize, - 2 / (float) texsize); - cgGLSetParameter4f(cgGetNamedParameter(blur2Program, "srctexsize"), texsize/2 , texsize/2, 2 / (float) texsize, - 2 / (float) texsize); + GLint program_linked; + glGetProgramiv(programID, GL_LINK_STATUS, &program_linked); + if (program_linked == GL_TRUE) { + return true; // success + } + int InfoLogLength; + glGetProgramiv(programID, GL_INFO_LOG_LENGTH, &InfoLogLength); + if ( InfoLogLength > 0 ){ + std::vector ProgramErrorMessage(InfoLogLength+1); + glGetProgramInfoLog(programID, InfoLogLength, NULL, &ProgramErrorMessage[0]); + std::cerr << "Failed to link program: " << &ProgramErrorMessage[0] << std::endl; + } + return false; +} - float pointsold[4][2] = - { - { 0, 1 }, - { 0, 0 }, - { 1, 0 }, - { 1, 1 } }; - float points[4][2] = - { - { 0, 0.5 }, - { 0, 0 }, - { 0.5, 0 }, - { 0.5, 0.5 } }; - cgGLBindProgram(blur1Program); - checkForCgError("binding blur1 program"); +bool ShaderEngine::loadPresetShaders(Pipeline &pipeline) { - glVertexPointer(2, GL_FLOAT, 0, points); - glBlendFunc(GL_ONE,GL_ZERO); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + bool ok = true; + // blur programs + blur1_enabled = false; + blur2_enabled = false; + blur3_enabled = false; + + // compile and link warp and composite shaders from pipeline + if (!pipeline.warpShader.programSource.empty()) { + programID_presetWarp = loadPresetShader(PresentWarpShader, pipeline.warpShader, pipeline.warpShaderFilename); + if (programID_presetWarp != GL_FALSE) { + uniform_vertex_transf_warp_shader = glGetUniformLocation(programID_presetWarp, "vertex_transformation"); + presetWarpShaderLoaded = true; + } else { + ok = false; + } + } + + if (!pipeline.compositeShader.programSource.empty()) { + programID_presetComp = loadPresetShader(PresentCompositeShader, pipeline.compositeShader, pipeline.compositeShaderFilename); + if (programID_presetComp != GL_FALSE) { + presetCompShaderLoaded = true; + } else { + ok = false; + } + } - glBindTexture(GL_TEXTURE_2D, blur1_tex); - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, texsize/2, texsize/2); +// std::cout << "Preset composite shader active: " << presetCompShaderLoaded << ", preset warp shader active: " << presetWarpShaderLoaded << std::endl; + return ok; +} - } +GLuint ShaderEngine::loadPresetShader(const ShaderEngine::PresentShaderType shaderType, Shader &presetShader, std::string &shaderFilename) { + GLuint program = compilePresetShader(shaderType, presetShader, shaderFilename); - if (blur2_enabled) - { - cgGLSetParameter4f(cgGetNamedParameter(blur1Program, "srctexsize"), texsize/2, texsize/2, 2 / (float) texsize, - 2 / (float) texsize); - cgGLSetParameter4f(cgGetNamedParameter(blur2Program, "srctexsize"), texsize/2, texsize/2, 2 / (float) texsize, - 2 / (float) texsize); + if (program == GL_FALSE) { + // failed to compile + return GL_FALSE; + } + return program; +} +// deactivate preset shaders +void ShaderEngine::disablePresetShaders() { + if (presetCompShaderLoaded) + glDeleteProgram(programID_presetComp); + + if (presetWarpShaderLoaded) + glDeleteProgram(programID_presetWarp); + + presetCompShaderLoaded = false; + presetWarpShaderLoaded = false; +} - float points[4][2] = - { - { 0, 0.25 }, - { 0, 0 }, - { 0.25, 0 }, - { 0.25, 0.25 } }; +void ShaderEngine::reset() +{ + disablePresetShaders(); + rand_preset[0] = FRAND; + rand_preset[1] = FRAND; + rand_preset[2] = FRAND; + rand_preset[3] = FRAND; + + uint k = 0; + do + { + for (int i=0; i<4; i++) + { + float xlate_mult = 1; + float rot_mult = 0.9f*powf(k/8.0f, 3.2f); + xlate[k].x = (FRAND*2-1)*xlate_mult; + xlate[k].y = (FRAND*2-1)*xlate_mult; + xlate[k].z = (FRAND*2-1)*xlate_mult; + rot_base[k].x = FRAND*6.28f; + rot_base[k].y = FRAND*6.28f; + rot_base[k].z = FRAND*6.28f; + rot_speed[k].x = (FRAND*2-1)*rot_mult; + rot_speed[k].y = (FRAND*2-1)*rot_mult; + rot_speed[k].z = (FRAND*2-1)*rot_mult; + k++; + } + } + while (k < sizeof(xlate)/sizeof(xlate[0])); +} - glVertexPointer(2, GL_FLOAT, 0, points); - glBlendFunc(GL_ONE,GL_ZERO); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); +GLuint ShaderEngine::CompileShaderProgram(const std::string & VertexShaderCode, const std::string & FragmentShaderCode, const std::string & shaderTypeString){ + // Create the shaders + GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER); + GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER); + GLint Result = GL_FALSE; + int InfoLogLength; - glBindTexture(GL_TEXTURE_2D, blur2_tex); - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, texsize/4, texsize/4); + // Compile Vertex Shader + char const * VertexSourcePointer = VertexShaderCode.c_str(); + glShaderSource(VertexShaderID, 1, &VertexSourcePointer , NULL); + glCompileShader(VertexShaderID); + checkCompileStatus(VertexShaderID, "Vertex: " + shaderTypeString); - } - if (blur3_enabled) - { - cgGLSetParameter4f(cgGetNamedParameter(blur2Program, "srctexsize"), texsize/4, texsize/4, 4 / (float) texsize, - 4/ (float) texsize); - cgGLSetParameter4f(cgGetNamedParameter(blur2Program, "srctexsize"), texsize / 4, texsize / 4, 4 - / (float) texsize, 4 / (float) texsize); - float points[4][2] = - { - { 0, 0.125 }, - { 0, 0 }, - { 0.125, 0 }, - { 0.125, 0.125 } }; + // Compile Fragment Shader + char const * FragmentSourcePointer = FragmentShaderCode.c_str(); + glShaderSource(FragmentShaderID, 1, &FragmentSourcePointer , NULL); + glCompileShader(FragmentShaderID); + checkCompileStatus(FragmentShaderID, "Fragment: " + shaderTypeString); - glVertexPointer(2, GL_FLOAT, 0, points); - glBlendFunc(GL_ONE,GL_ZERO); - glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + + // Link the program + GLuint programID = glCreateProgram(); + + glAttachShader(programID, VertexShaderID); + glAttachShader(programID, FragmentShaderID); + bool linkOK = linkProgram(programID); + glDetachShader(programID, VertexShaderID); + glDetachShader(programID, FragmentShaderID); + glDeleteShader(VertexShaderID); + glDeleteShader(FragmentShaderID); - glBindTexture(GL_TEXTURE_2D, blur3_tex); - glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, texsize/8, texsize/8); + return linkOK ? programID : GL_FALSE; +} +void ShaderEngine::validateProgram(const GLuint programID) { + GLint Result = GL_FALSE; + int InfoLogLength; + + glValidateProgram(programID); + + // Check the program + glGetProgramiv(programID, GL_VALIDATE_STATUS, &Result); + glGetProgramiv(programID, GL_INFO_LOG_LENGTH, &InfoLogLength); + if ( InfoLogLength > 0 ){ + std::vector ProgramErrorMessage(InfoLogLength+1); + glGetProgramInfoLog(programID, InfoLogLength, NULL, &ProgramErrorMessage[0]); + fprintf(stderr, "%s\n", &ProgramErrorMessage[0]); + } +} - } +// use the appropriate shader program for rendering the interpolation. +// it will use the preset shader if available, otherwise the textured shader +bool ShaderEngine::enableWarpShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext, const glm::mat4 & mat_ortho) { + if (presetWarpShaderLoaded) { + glUseProgram(programID_presetWarp); + SetupTextures(programID_presetWarp, shader); - cgGLUnbindProgram(myCgProfile); - checkForCgError("unbinding blur2 program"); + SetupShaderVariables(programID_presetWarp, pipeline, pipelineContext); + glUniformMatrix4fv(uniform_vertex_transf_warp_shader, 1, GL_FALSE, glm::value_ptr(mat_ortho)); - cgGLDisableProfile(myCgProfile); - checkForCgError("disabling blur profile"); +#if OGL_DEBUG + validateProgram(programID_presetWarp); +#endif - glDisable(GL_TEXTURE_2D); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + return true; + } - } -} + glUseProgram(programID_v2f_c4f_t2f); -void ShaderEngine::loadShader(Shader &shader) -{ - if (shader.enabled) - { - cgDestroyProgram(programs[&shader]); - programs.erase(&shader); - } - shader.enabled = LoadCgProgram(shader); -} + glUniformMatrix4fv(uniform_v2f_c4f_t2f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(mat_ortho)); + glUniform1i(uniform_v2f_c4f_t2f_frag_texture_sampler, 0); -void ShaderEngine::disableShader() -{ - if (enabled) - { - cgGLUnbindProgram(myCgProfile); - checkForCgError("disabling fragment profile"); - cgGLDisableProfile(myCgProfile); - checkForCgError("disabling fragment profile"); - } - enabled = false; + return false; } -void ShaderEngine::enableShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext) -{ - enabled = false; - if (shader.enabled) - { - - for (std::map::const_iterator pos = shader.textures.begin(); pos != shader.textures.end(); ++pos) - SetupUserTextureState( pos->second); +bool ShaderEngine::enableCompositeShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext) { + if (presetCompShaderLoaded) { + glUseProgram(programID_presetComp); + SetupTextures(programID_presetComp, shader); - CGprogram program = programs[&shader]; - for (std::map::const_iterator pos = shader.textures.begin(); pos - != shader.textures.end(); ++pos) - SetupUserTexture(program, pos->second); + SetupShaderVariables(programID_presetComp, pipeline, pipelineContext); - cgGLEnableProfile(myCgProfile); - checkForCgError("enabling warp profile"); +#if OGL_DEBUG + validateProgram(programID_presetComp); +#endif - cgGLBindProgram(program); - checkForCgError("binding warp program"); + return true; + } - SetupCgVariables(program, pipeline, pipelineContext); - SetupCgQVariables(program, pipeline); + glUseProgram(programID_v2f_c4f_t2f); - enabled = true; - } + return false; } -void ShaderEngine::reset() -{ - rand_preset[0] = (rand() % 100) * .01; - rand_preset[1] = (rand() % 100) * .01; - rand_preset[2] = (rand() % 100) * .01; - rand_preset[3] = (rand() % 100) * .01; -} -#endif diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/ShaderEngine.hpp projectm-3.1.0/src/libprojectM/Renderer/ShaderEngine.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/ShaderEngine.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/ShaderEngine.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -9,105 +9,112 @@ #define SHADERENGINE_HPP_ #include "Common.hpp" +#include "projectM-opengl.h" -#ifdef USE_GLES1 -#include -#else -#ifdef __APPLE__ -#include -#include -#else -#include -#include -#endif -#endif - - -#ifdef USE_CG -#include /* Can't include this? Is Cg Toolkit installed! */ -#include -#endif - - +class ShaderEngine; #include "Pipeline.hpp" #include "PipelineContext.hpp" -class ShaderEngine; #include "TextureManager.hpp" +#include "BeatDetect.hpp" #include #include #include +#include #include "Shader.hpp" -class ShaderEngine -{ -#ifdef USE_CG - - - unsigned int mainTextureId; - int texsize; - float aspect; - BeatDetect *beatDetect; - TextureManager *textureManager; - - GLuint noise_texture_lq_lite; - GLuint noise_texture_lq; - GLuint noise_texture_mq; - GLuint noise_texture_hq; - GLuint noise_texture_perlin; - GLuint noise_texture_lq_vol; - GLuint noise_texture_hq_vol; - - bool blur1_enabled; - bool blur2_enabled; - bool blur3_enabled; - GLuint blur1_tex; - GLuint blur2_tex; - GLuint blur3_tex; - - float rand_preset[4]; +#include - CGcontext myCgContext; - CGprofile myCgProfile; - CGprogram blur1Program; - CGprogram blur2Program; - bool enabled; - - std::map programs; - - std::string cgTemplate; - std::string blurProgram; - - bool LoadCgProgram(Shader &shader); - bool checkForCgCompileError(const char *situation); - void checkForCgError(const char *situation); - - void SetupCg(); - void SetupCgVariables(CGprogram program, const Pipeline &pipeline, const PipelineContext &pipelineContext); - void SetupCgQVariables(CGprogram program, const Pipeline &pipeline); - - void SetupUserTexture(CGprogram program, const UserTexture* texture); - void SetupUserTextureState(const UserTexture* texture); - - - -#endif +class ShaderEngine +{ public: - ShaderEngine(); - virtual ~ShaderEngine(); -#ifdef USE_CG - void RenderBlurTextures(const Pipeline &pipeline, const PipelineContext &pipelineContext, const int texsize); - void loadShader(Shader &shader); - - void setParams(const int texsize, const unsigned int texId, const float aspect, BeatDetect *beatDetect, TextureManager *textureManager); - void enableShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext); - void disableShader(); - void reset(); - void setAspect(float aspect); - std::string profileName; + enum PresentShaderType + { + PresentCompositeShader, + PresentWarpShader, + PresentBlur1Shader, + PresentBlur2Shader, + }; + + ShaderEngine(); + virtual ~ShaderEngine(); + bool loadPresetShaders(Pipeline &pipeline); + bool enableWarpShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext, const glm::mat4 & mat_ortho); + bool enableCompositeShader(Shader &shader, const Pipeline &pipeline, const PipelineContext &pipelineContext); + void RenderBlurTextures(const Pipeline &pipeline, const PipelineContext &pipelineContext); + void setParams(const int _texsizeX, const int texsizeY, BeatDetect *beatDetect, TextureManager *_textureManager); + void reset(); + + static GLuint CompileShaderProgram(const std::string & VertexShaderCode, const std::string & FragmentShaderCode, const std::string & shaderTypeString); + static bool checkCompileStatus(GLuint shader, const std::string & shaderTitle); + static bool linkProgram(GLuint programID); + + + GLuint programID_v2f_c4f; + GLuint programID_v2f_c4f_t2f; + + GLint uniform_v2f_c4f_vertex_tranformation; + GLint uniform_v2f_c4f_vertex_point_size; + GLint uniform_v2f_c4f_t2f_vertex_tranformation; + GLint uniform_v2f_c4f_t2f_frag_texture_sampler; + + const static std::string v2f_c4f_vert; + const static std::string v2f_c4f_frag; + const static std::string v2f_c4f_t2f_vert; + const static std::string v2f_c4f_t2f_frag; + +private: + int texsizeX; + int texsizeY; + float aspectX; + float aspectY; + BeatDetect *beatDetect; + TextureManager *textureManager; + GLint uniform_vertex_transf_warp_shader; + + GLuint programID_warp_fallback; + GLuint programID_comp_fallback; + GLuint programID_blur1; + GLuint programID_blur2; + + bool blur1_enabled; + bool blur2_enabled; + bool blur3_enabled; + + GLint uniform_blur1_sampler; + GLint uniform_blur1_c0; + GLint uniform_blur1_c1; + GLint uniform_blur1_c2; + GLint uniform_blur1_c3; + + GLint uniform_blur2_sampler; + GLint uniform_blur2_c0; + GLint uniform_blur2_c5; + GLint uniform_blur2_c6; + + GLuint vboBlur; + GLuint vaoBlur; + + float rand_preset[4]; + glm::vec3 xlate[20]; + glm::vec3 rot_base[20]; + glm::vec3 rot_speed[20]; + + void SetupShaderVariables(GLuint program, const Pipeline &pipeline, const PipelineContext &pipelineContext); + void SetupTextures(GLuint program, const Shader &shader); + GLuint compilePresetShader(const ShaderEngine::PresentShaderType shaderType, Shader &shader, const std::string &shaderFilename); + + void disablePresetShaders(); + GLuint loadPresetShader(const PresentShaderType shaderType, Shader &shader, std::string &shaderFilename); + + void deletePresetShader(Shader &shader); + void validateProgram(const GLuint programID); + + + // programs generated from preset shader code + GLuint programID_presetComp, programID_presetWarp; -#endif + bool presetCompShaderLoaded, presetWarpShaderLoaded; }; #endif /* SHADERENGINE_HPP_ */ - diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Shader.hpp projectm-3.1.0/src/libprojectM/Renderer/Shader.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Shader.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Shader.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -10,17 +10,16 @@ #include #include -#include "UserTexture.hpp" +#include "Texture.hpp" class Shader { public: - std::map textures; + std::map textures; - bool enabled; - - std::string programSource; + std::string programSource; + std::string presetPath; Shader(); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/SOIL2/SOIL2.c projectm-3.1.0/src/libprojectM/Renderer/SOIL2/SOIL2.c --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/SOIL2/SOIL2.c 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/SOIL2/SOIL2.c 2018-10-16 14:16:32.000000000 +0000 @@ -364,12 +364,14 @@ const char *filename, int force_channels, unsigned int reuse_texture_ID, - unsigned int flags + unsigned int flags, + int *width, + int *height ) { /* variables */ unsigned char* img; - int width, height, channels; + int channels; unsigned int tex_id; /* does the user want direct uploading of the image as a DDS file? */ if( flags & SOIL_FLAG_DDS_LOAD_DIRECT ) @@ -407,7 +409,7 @@ } /* try to load the image */ - img = SOIL_load_image( filename, &width, &height, &channels, force_channels ); + img = SOIL_load_image( filename, width, height, &channels, force_channels ); /* channels holds the original number of channels, which may have been forced */ if( (force_channels >= 1) && (force_channels <= 4) ) { @@ -421,7 +423,7 @@ } /* OK, make it a texture! */ tex_id = SOIL_internal_create_OGL_texture( - img, &width, &height, channels, + img, width, height, channels, reuse_texture_ID, flags, GL_TEXTURE_2D, GL_TEXTURE_2D, GL_MAX_TEXTURE_SIZE ); @@ -496,12 +498,14 @@ int buffer_length, int force_channels, unsigned int reuse_texture_ID, - unsigned int flags + unsigned int flags, + int * width, + int * height ) { /* variables */ unsigned char* img; - int width, height, channels; + int channels; unsigned int tex_id; /* does the user want direct uploading of the image as a DDS file? */ if( flags & SOIL_FLAG_DDS_LOAD_DIRECT ) @@ -547,7 +551,7 @@ /* try to load the image */ img = SOIL_load_image_from_memory( buffer, buffer_length, - &width, &height, &channels, + width, height, &channels, force_channels ); /* channels holds the original number of channels, which may have been forced */ if( (force_channels >= 1) && (force_channels <= 4) ) @@ -562,7 +566,7 @@ } /* OK, make it a texture! */ tex_id = SOIL_internal_create_OGL_texture( - img, &width, &height, channels, + img, width, height, channels, reuse_texture_ID, flags, GL_TEXTURE_2D, GL_TEXTURE_2D, GL_MAX_TEXTURE_SIZE ); diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/SOIL2/SOIL2.h projectm-3.1.0/src/libprojectM/Renderer/SOIL2/SOIL2.h --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/SOIL2/SOIL2.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/SOIL2/SOIL2.h 2018-10-16 14:16:32.000000000 +0000 @@ -166,8 +166,9 @@ const char *filename, int force_channels, unsigned int reuse_texture_ID, - unsigned int flags - ); + unsigned int flags, + int *width, + int *height); /** Loads 6 images from disk into an OpenGL cubemap texture. @@ -249,7 +250,9 @@ int buffer_length, int force_channels, unsigned int reuse_texture_ID, - unsigned int flags + unsigned int flags, + int * width, + int * height ); /** diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Texture.cpp projectm-3.1.0/src/libprojectM/Renderer/Texture.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Texture.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Texture.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,72 @@ +#include "Texture.hpp" + +Sampler::Sampler(const GLint _wrap_mode, const GLint _filter_mode) : + wrap_mode(_wrap_mode), + filter_mode(_filter_mode) +{ + glGenSamplers(1, &samplerID); + glSamplerParameteri(samplerID, GL_TEXTURE_MIN_FILTER, _filter_mode); + glSamplerParameteri(samplerID, GL_TEXTURE_MAG_FILTER, _filter_mode); + glSamplerParameteri(samplerID, GL_TEXTURE_WRAP_S, _wrap_mode); + glSamplerParameteri(samplerID, GL_TEXTURE_WRAP_T, _wrap_mode); +} + + +Sampler::~Sampler() +{ + glDeleteSamplers(1, &samplerID); +} + + + +Texture::Texture(const std::string &_name, const int _width, const int _height, const bool _userTexture) : + type(GL_TEXTURE_2D), + name(_name), + width(_width), + height(_height), + userTexture(_userTexture) +{ + glGenTextures(1, &texID); + glBindTexture(GL_TEXTURE_2D, texID); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _width, _height, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL); + glBindTexture(GL_TEXTURE_2D, 0); +} + +Texture::Texture(const std::string &_name, const GLuint _texID, const GLenum _type, const int _width, const int _height, const bool _userTexture) : + texID(_texID), + type(_type), + name(_name), + width(_width), + height(_height), + userTexture(_userTexture) +{ +} + + +Texture::~Texture() +{ + glDeleteTextures(1, &texID); + + for(std::vector::const_iterator iter = samplers.begin(); iter != samplers.end(); iter++) + { + delete (*iter); + } +} + + +Sampler* Texture::getSampler(const GLint _wrap_mode, const GLint _filter_mode) +{ + for(std::vector::const_iterator iter = samplers.begin(); iter != samplers.end(); iter++) + { + if ((*iter)->wrap_mode == _wrap_mode && (*iter)->filter_mode == _filter_mode) + { + return *iter; + } + } + + // Sampler not found -> adding it + Sampler * sampler = new Sampler(_wrap_mode, _filter_mode); + samplers.push_back(sampler); + + return sampler; +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Texture.hpp projectm-3.1.0/src/libprojectM/Renderer/Texture.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Texture.hpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Texture.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,43 @@ +#ifndef TEXTURE_HPP_ +#define TEXTURE_HPP_ + +#include +#include +#include "projectM-opengl.h" + + +class Sampler +{ +public: + GLuint samplerID; + GLint wrap_mode; + GLint filter_mode; + + Sampler(const GLint _wrap_mode, const GLint _filter_mode); + ~Sampler(); +}; + + +class Texture +{ +public: + + GLuint texID; + GLenum type; + + std::string name; + int width; + int height; + bool userTexture; + std::vector samplers; + + Texture(const std::string & _name, const int _width, const int _height, const bool _userTexture); + Texture(const std::string & _name, const GLuint _texID, const GLenum _type, const int _width, const int _height, const bool _userTexture); + ~Texture(); + + Sampler *getSampler(const GLint _wrap_mode, const GLint _filter_mode); +}; + +typedef std::pair TextureSamplerDesc; + +#endif /* TEXTURE_HPP_ */ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/TextureManager.cpp projectm-3.1.0/src/libprojectM/Renderer/TextureManager.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/TextureManager.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/TextureManager.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -1,286 +1,445 @@ -#ifdef LINUX -#include -#endif -#ifdef EMSCRIPTEN -#include -#endif -#ifdef WIN32 -#include "glew.h" -#endif -#ifdef __APPLE__ -#include -#endif +#include +#include + +#include "projectM-opengl.h" -#ifdef USE_DEVIL -#include -#else #include "SOIL2/SOIL2.h" -#endif #ifdef WIN32 #include "win32-dirent.h" #endif -#ifdef LINUX +#ifdef __unix__ #include #endif #ifdef EMSCRIPTEN #include #endif -#ifdef MACOS +#ifdef __APPLE__ #include #endif #include "TextureManager.hpp" #include "Common.hpp" #include "IdleTextures.hpp" +#include "Texture.hpp" +#include "PerlinNoise.hpp" +#define NUM_BLUR_TEX 6 -TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetURL) -{ -#ifdef USE_DEVIL -ilInit(); -iluInit(); -ilutInit(); -ilutRenderer(ILUT_OPENGL); -#endif - Preload(); - loadTextureDir(); +TextureManager::TextureManager(const std::string _presetsURL, const int texsizeX, const int texsizeY, std::string datadir): + presetsURL(_presetsURL) +{ + extensions.push_back(".jpg"); + extensions.push_back(".dds"); + extensions.push_back(".png"); + extensions.push_back(".tga"); + extensions.push_back(".bmp"); + extensions.push_back(".dib"); + + Preload(); + // if not data directory specified from user code + // we use the built-in default directory (unix prefix based) + if (datadir.empty()) + datadir = DATADIR_PATH; + + loadTextureDir(datadir + "/presets"); + loadTextureDir(datadir + "/textures"); + loadTextureDir(_presetsURL); + + // Create main texture ans associated samplers + mainTexture = new Texture("main", texsizeX, texsizeY, false); + mainTexture->getSampler(GL_REPEAT, GL_LINEAR); + mainTexture->getSampler(GL_REPEAT, GL_NEAREST); + mainTexture->getSampler(GL_CLAMP_TO_EDGE, GL_LINEAR); + mainTexture->getSampler(GL_CLAMP_TO_EDGE, GL_NEAREST); + textures["main"] = mainTexture; + + // Initialize blur textures + int w = texsizeX; + int h = texsizeY; + for (int i=0; igetSampler(GL_CLAMP_TO_EDGE, GL_LINEAR); + textures[texname] = textureBlur; + blurTextures.push_back(textureBlur); + } + + PerlinNoise noise; + + GLuint noise_texture_lq_lite; + glGenTextures(1, &noise_texture_lq_lite); + glBindTexture(GL_TEXTURE_2D, noise_texture_lq_lite); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 32, 32, 0, GL_RGB, GL_FLOAT, noise.noise_lq_lite); + Texture * textureNoise_lq_lite = new Texture("noise_lq_lite", noise_texture_lq_lite, GL_TEXTURE_2D, 32, 32, false); + textureNoise_lq_lite->getSampler(GL_REPEAT, GL_LINEAR); + textures["noise_lq_lite"] = textureNoise_lq_lite; + + GLuint noise_texture_lq; + glGenTextures(1, &noise_texture_lq); + glBindTexture(GL_TEXTURE_2D, noise_texture_lq); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGB, GL_FLOAT, noise.noise_lq); + Texture * textureNoise_lq = new Texture("noise_lq", noise_texture_lq, GL_TEXTURE_2D, 256, 256, false); + textureNoise_lq->getSampler(GL_REPEAT, GL_LINEAR); + textures["noise_lq"] = textureNoise_lq; + + GLuint noise_texture_mq; + glGenTextures(1, &noise_texture_mq); + glBindTexture(GL_TEXTURE_2D, noise_texture_mq); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGB, GL_FLOAT, noise.noise_mq); + Texture * textureNoise_mq = new Texture("noise_mq", noise_texture_mq, GL_TEXTURE_2D, 256, 256, false); + textureNoise_mq->getSampler(GL_REPEAT, GL_LINEAR); + textures["noise_mq"] = textureNoise_mq; + + GLuint noise_texture_hq; + glGenTextures(1, &noise_texture_hq); + glBindTexture(GL_TEXTURE_2D, noise_texture_hq); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 256, 256, 0, GL_RGB, GL_FLOAT, noise.noise_hq); + Texture * textureNoise_hq = new Texture("noise_hq", noise_texture_hq, GL_TEXTURE_2D, 256, 256, false); + textureNoise_hq->getSampler(GL_REPEAT, GL_LINEAR); + textures["noise_hq"] = textureNoise_hq; + + GLuint noise_texture_lq_vol; + glGenTextures( 1, &noise_texture_lq_vol ); + glBindTexture( GL_TEXTURE_3D, noise_texture_lq_vol ); + glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 32 ,32 ,32 ,0 ,GL_RGB ,GL_FLOAT ,noise.noise_lq_vol); + Texture * textureNoise_lq_vol = new Texture("noisevol_lq", noise_texture_lq_vol, GL_TEXTURE_3D, 32, 32, false); + textureNoise_lq_vol->getSampler(GL_REPEAT, GL_LINEAR); + textures["noisevol_lq"] = textureNoise_lq_vol; + + GLuint noise_texture_hq_vol; + glGenTextures( 1, &noise_texture_hq_vol ); + glBindTexture( GL_TEXTURE_3D, noise_texture_hq_vol ); + glTexImage3D(GL_TEXTURE_3D, 0, GL_RGBA, 32, 32, 32, 0, GL_RGB, GL_FLOAT, noise.noise_hq_vol); + Texture * textureNoise_hq_vol = new Texture("noisevol_hq", noise_texture_hq_vol, GL_TEXTURE_3D, 32, 32, false); + textureNoise_hq_vol->getSampler(GL_REPEAT, GL_LINEAR); + textures["noisevol_hq"] = textureNoise_hq_vol; } TextureManager::~TextureManager() { - Clear(); + Clear(); } void TextureManager::Preload() { + int width, height; -#ifdef USE_DEVIL - ILuint image; - ilGenImages(1, &image); - ilBindImage(image); - ilLoadL(IL_TYPE_UNKNOWN,(ILvoid*) M_data, M_bytes); - GLuint tex = ilutGLBindTexImage(); -#else - unsigned int tex = SOIL_load_OGL_texture_from_memory( - M_data, - M_bytes, - SOIL_LOAD_AUTO, - SOIL_CREATE_NEW_ID, - - SOIL_FLAG_POWER_OF_TWO - | SOIL_FLAG_MULTIPLY_ALPHA - // | SOIL_FLAG_COMPRESS_TO_DXT - ); -#endif - - textures["M.tga"]=tex; - -#ifdef USE_DEVIL - ilLoadL(IL_TYPE_UNKNOWN,(ILvoid*) project_data,project_bytes); - tex = ilutGLBindTexImage(); -#else - tex = SOIL_load_OGL_texture_from_memory( - project_data, - project_bytes, - SOIL_LOAD_AUTO, - SOIL_CREATE_NEW_ID, - - SOIL_FLAG_POWER_OF_TWO - | SOIL_FLAG_MULTIPLY_ALPHA - //| SOIL_FLAG_COMPRESS_TO_DXT - ); -#endif - - // textures["project.tga"]=tex; + unsigned int tex = SOIL_load_OGL_texture_from_memory( + M_data, + M_bytes, + SOIL_LOAD_AUTO, + SOIL_CREATE_NEW_ID, + SOIL_FLAG_POWER_OF_TWO + | SOIL_FLAG_MULTIPLY_ALPHA + ,&width,&height); + + + Texture * newTex = new Texture("M", tex, GL_TEXTURE_2D, width, height, true); + newTex->getSampler(GL_CLAMP_TO_EDGE, GL_LINEAR); + textures["M"] = newTex; + + // tex = SOIL_load_OGL_texture_from_memory( + // project_data, + // project_bytes, + // SOIL_LOAD_AUTO, + // SOIL_CREATE_NEW_ID, + // SOIL_FLAG_POWER_OF_TWO + // | SOIL_FLAG_MULTIPLY_ALPHA + // ,&width,&height); + + // newTex = new Texture("project", tex, GL_TEXTURE_2D, width, height, true); + // newTex->getSampler(GL_CLAMP_TO_EDGE, GL_LINEAR); + // textures["project"] = newTex; + + tex = SOIL_load_OGL_texture_from_memory( + headphones_data, + headphones_bytes, + SOIL_LOAD_AUTO, + SOIL_CREATE_NEW_ID, + SOIL_FLAG_POWER_OF_TWO + | SOIL_FLAG_MULTIPLY_ALPHA + ,&width,&height); + + newTex = new Texture("headphones", tex, GL_TEXTURE_2D, width, height, true); + newTex->getSampler(GL_CLAMP_TO_EDGE, GL_LINEAR); + textures["headphones"] = newTex; +} -#ifdef USE_DEVIL - ilLoadL(IL_TYPE_UNKNOWN,(ILvoid*) headphones_data, headphones_bytes); - tex = ilutGLBindTexImage(); -#else - tex = SOIL_load_OGL_texture_from_memory( - headphones_data, - headphones_bytes, - SOIL_LOAD_AUTO, - SOIL_CREATE_NEW_ID, - - SOIL_FLAG_POWER_OF_TWO - | SOIL_FLAG_MULTIPLY_ALPHA - // | SOIL_FLAG_COMPRESS_TO_DXT - ); -#endif +void TextureManager::Clear() +{ + for(std::map::const_iterator iter = textures.begin(); iter != textures.end(); iter++) + delete(iter->second); - textures["headphones.tga"]=tex; + textures.clear(); } -void TextureManager::Clear() + +TextureSamplerDesc TextureManager::getTexture(const std::string fullName, const GLenum defaultWrap, const GLenum defaultFilter) { + std::string fileName = fullName; + std::string unqualifiedName; + GLint wrap_mode; + GLint filter_mode; + // Remove extension + std::string lowerCaseFileName(fullName); + std::transform(lowerCaseFileName.begin(), lowerCaseFileName.end(), lowerCaseFileName.begin(), tolower); + for (size_t x = 0; x < extensions.size(); x++) + { + size_t found = lowerCaseFileName.find(extensions[x]); + if (found != std::string::npos) + { + fileName.replace(int(found), extensions[x].size(), ""); + break; + } + } - for(std::map::const_iterator iter = textures.begin(); iter != textures.end(); iter++) + ExtractTextureSettings(fileName, wrap_mode, filter_mode, unqualifiedName); + if (textures.find(unqualifiedName) == textures.end()) { - glDeleteTextures(1,&iter->second); + return TextureSamplerDesc(NULL, NULL); + } + + if (fileName == unqualifiedName) { + // Warp and filter mode not specified in sampler name + // applying default + wrap_mode = defaultWrap; + filter_mode = defaultFilter; } - textures.clear(); + + Texture * texture = textures[unqualifiedName]; + Sampler * sampler = texture->getSampler(wrap_mode, filter_mode); + + return TextureSamplerDesc(texture, sampler); } -void TextureManager::setTexture(const std::string name, const unsigned int texId, const int width, const int height) + +TextureSamplerDesc TextureManager::tryLoadingTexture(const std::string name) { - textures[name] = texId; - widths[name] = width; - heights[name] = height; -} + TextureSamplerDesc texDesc; + GLint wrap_mode; + GLint filter_mode; + std::string unqualifiedName; + + ExtractTextureSettings(name, wrap_mode, filter_mode, unqualifiedName); -//void TextureManager::unloadTextures(const PresetOutputs::cshape_container &shapes) -//{ - /* - for (PresetOutputs::cshape_container::const_iterator pos = shapes.begin(); - pos != shapes.end(); ++pos) + for (size_t x = 0; x < extensions.size(); x++) { + std::string filename = unqualifiedName + extensions[x]; + std::string fullURL = presetsURL + PATH_SEPARATOR + filename; - if( (*pos)->enabled==1) - { + texDesc = loadTexture(name, fullURL); - if ( (*pos)->textured) - { - std::string imageUrl = (*pos)->getImageUrl(); - if (imageUrl != "") - { - std::string fullUrl = presetURL + "/" + imageUrl; - ReleaseTexture(LoadTexture(fullUrl.c_str())); - } - } - } + if (texDesc.first != NULL) + { + break; + } } - */ -//} -GLuint TextureManager::getTexture(const std::string filename) -{ - std::string fullURL = presetURL + PATH_SEPARATOR + filename; - return getTextureFullpath(filename,fullURL); + return texDesc; } -GLuint TextureManager::getTextureFullpath(const std::string filename, const std::string imageURL) +TextureSamplerDesc TextureManager::loadTexture(const std::string name, const std::string fileName) { + int width, height; - if (textures.find(filename)!= textures.end()) - { - return textures[filename]; - } - else - { - -#ifdef USE_DEVIL - GLuint tex = ilutGLLoadImage((char *)imageURL.c_str()); -#else - int width, height; + unsigned int tex = SOIL_load_OGL_texture( + fileName.c_str(), + SOIL_LOAD_AUTO, + SOIL_CREATE_NEW_ID, + SOIL_FLAG_MULTIPLY_ALPHA + ,&width,&height); - unsigned int tex = SOIL_load_OGL_texture( - imageURL.c_str(), - SOIL_LOAD_AUTO, - SOIL_CREATE_NEW_ID, + if (tex == 0) + { + return TextureSamplerDesc(NULL, NULL); + } - //SOIL_FLAG_POWER_OF_TWO - // SOIL_FLAG_MIPMAPS - SOIL_FLAG_MULTIPLY_ALPHA - //| SOIL_FLAG_COMPRESS_TO_DXT - //| SOIL_FLAG_DDS_LOAD_DIRECT - //,&width,&height); - ); + GLint wrap_mode; + GLint filter_mode; + std::string unqualifiedName; -#endif - textures[filename]=tex; - widths[filename]=width; - heights[filename]=height; - return tex; + ExtractTextureSettings(name, wrap_mode, filter_mode, unqualifiedName); + Texture * newTexture = new Texture(unqualifiedName, tex, GL_TEXTURE_2D, width, height, true); + Sampler * sampler = newTexture->getSampler(wrap_mode, filter_mode); + textures[name] = newTexture; - } + return TextureSamplerDesc(newTexture, sampler); } -int TextureManager::getTextureWidth(const std::string imageURL) -{ - return widths[imageURL]; -} -int TextureManager::getTextureHeight(const std::string imageURL) +void TextureManager::loadTextureDir(const std::string &dirname) { - return heights[imageURL]; -} + DIR * m_dir; -unsigned int TextureManager::getTextureMemorySize() -{ - return 0; + // Allocate a new a stream given the current directory name + if ((m_dir = opendir(dirname.c_str())) == NULL) + { + std::cout<<"No Textures Loaded from "<d_name); + + if (filename.length() > 0 && filename[0] == '.') + continue; + + std::string lowerCaseFileName(filename); + std::transform(lowerCaseFileName.begin(), lowerCaseFileName.end(), lowerCaseFileName.begin(), tolower); + + // Remove extension + for (size_t x = 0; x < extensions.size(); x++) + { + size_t found = lowerCaseFileName.find(extensions[x]); + if (found != std::string::npos) + { + std::string name = filename; + name.replace(int(found), extensions[x].size(), ""); + + // Create full path name + std::string fullname = dirname + PATH_SEPARATOR + filename; + loadTexture(name, fullname); + + break; + } + } + } + + if (m_dir) + { + closedir(m_dir); + m_dir = 0; + } } -void TextureManager::loadTextureDir() +TextureSamplerDesc TextureManager::getRandomTextureName(std::string random_id) { - std::string dirname = CMAKE_INSTALL_PREFIX "/share/projectM/textures"; + GLint wrap_mode; + GLint filter_mode; + std::string unqualifiedName; - DIR * m_dir; + ExtractTextureSettings(random_id, wrap_mode, filter_mode, unqualifiedName); - // Allocate a new a stream given the current directory name - if ((m_dir = opendir(dirname.c_str())) == NULL) - { - std::cout<<"No Textures Loaded from "< user_texture_names; + size_t separator = unqualifiedName.find("_"); + std::string textureNameFilter; - struct dirent * dir_entry; + if (separator != std::string::npos) + { + textureNameFilter = unqualifiedName.substr(separator+1); + unqualifiedName = unqualifiedName.substr(0, separator); + } - while ((dir_entry = readdir(m_dir)) != NULL) - { + for(std::map::const_iterator iter = textures.begin(); iter != textures.end(); iter++) + { + if (iter->second->userTexture) { + if (textureNameFilter.empty() || iter->first.find(textureNameFilter) == 0) + user_texture_names.push_back(iter->first); + } + } - // Convert char * to friendly string - std::string filename(dir_entry->d_name); + if (user_texture_names.size() > 0) + { + std::string random_name = user_texture_names[rand() % user_texture_names.size()]; + random_textures.push_back(random_id); - if (filename.length() > 0 && filename[0] == '.') - continue; + Texture * randomTexture = new Texture(*textures[random_name]); + Sampler * sampler = randomTexture->getSampler(wrap_mode, filter_mode); + randomTexture->name = unqualifiedName; + textures[random_id] = randomTexture; - // Create full path name - std::string fullname = dirname + PATH_SEPARATOR + filename; + return TextureSamplerDesc(randomTexture, sampler); + } - unsigned int texId = getTextureFullpath(filename, fullname); - if(texId != 0) - { - user_textures.push_back(texId); - textures[filename]=texId; - user_texture_names.push_back(filename); - } - } + return TextureSamplerDesc(NULL, NULL); +} - if (m_dir) - { - closedir(m_dir); - m_dir = 0; - } +void TextureManager::clearRandomTextures() +{ + for (std::vector::iterator pos = random_textures.begin(); pos != random_textures.end(); ++pos) + { + textures.erase(*pos); + } + random_textures.clear(); } -std::string TextureManager::getRandomTextureName(std::string random_id) +void TextureManager::ExtractTextureSettings(const std::string qualifiedName, GLint & _wrap_mode, GLint & _filter_mode, std::string & name) { - if (user_texture_names.size() > 0) - { - std::string random_name = user_texture_names[rand() % user_texture_names.size()]; - random_textures.push_back(random_id); - textures[random_id] = textures[random_name]; - return random_name; - } - else return ""; + std::string lowerQualifiedName(qualifiedName); + std::transform(lowerQualifiedName.begin(), lowerQualifiedName.end(), lowerQualifiedName.begin(), tolower); + + _wrap_mode = GL_REPEAT; + _filter_mode = GL_LINEAR; + + if (lowerQualifiedName.substr(0,3) == "fc_") + { + name = qualifiedName.substr(3); + _filter_mode = GL_LINEAR; + _wrap_mode = GL_CLAMP_TO_EDGE; + } + else if (lowerQualifiedName.substr(0,3) == "fw_") + { + name = qualifiedName.substr(3); + _filter_mode = GL_LINEAR; + _wrap_mode = GL_REPEAT; + } + else if (lowerQualifiedName.substr(0,3) == "pc_") + { + name = qualifiedName.substr(3); + _filter_mode = GL_NEAREST; + _wrap_mode = GL_CLAMP_TO_EDGE; + } + else if (lowerQualifiedName.substr(0,3) == "pw_") + { + name = qualifiedName.substr(3); + _filter_mode = GL_NEAREST; + _wrap_mode = GL_REPEAT; + } + else + { + name = qualifiedName; + } } -void TextureManager::clearRandomTextures() -{ - for (std::vector::iterator pos = random_textures.begin(); pos != random_textures.end(); ++pos) - { - textures.erase(*pos); - widths.erase(*pos); - heights.erase(*pos); - } - random_textures.clear(); +const Texture * TextureManager::getMainTexture() const { + return mainTexture; +} + +const std::vector & TextureManager::getBlurTextures() const { + return blurTextures; +} + +void TextureManager::updateMainTexture() +{ + glBindTexture(GL_TEXTURE_2D, mainTexture->texID); + glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, mainTexture->width, mainTexture->height); + glBindTexture(GL_TEXTURE_2D, 0); } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/TextureManager.hpp projectm-3.1.0/src/libprojectM/Renderer/TextureManager.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/TextureManager.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/TextureManager.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -5,30 +5,38 @@ #include #include #include +#include "projectM-opengl.h" +#include "Texture.hpp" + class TextureManager { - std::string presetURL; - std::map textures; - std::map heights; - std::map widths; - std::vector user_textures; - std::vector user_texture_names; + std::string presetsURL; + std::map textures; + std::vector blurTextures; + Texture * mainTexture; + std::vector random_textures; + void loadTextureDir(const std::string & dirname); + TextureSamplerDesc loadTexture(const std::string name, const std::string imageUrl); + void ExtractTextureSettings(const std::string qualifiedName, GLint &_wrap_mode, GLint &_filter_mode, std::string & name); + std::vector extensions; + public: + TextureManager(std::string _presetsURL, const int texsizeX, const int texsizeY, + std::string datadir = ""); ~TextureManager(); - TextureManager(std::string _presetURL); - //void unloadTextures(const PresetOutputs::cshape_container &shapes); + void Clear(); void Preload(); - unsigned int getTexture(const std::string filenamne); - unsigned int getTextureFullpath(const std::string filename, const std::string imageUrl); - unsigned int getTextureMemorySize(); - int getTextureWidth(const std::string imageUrl); - int getTextureHeight(const std::string imageUrl); - void setTexture(const std::string name, const unsigned int texId, const int width, const int height); - void loadTextureDir(); - std::string getRandomTextureName(std::string rand_name); + TextureSamplerDesc tryLoadingTexture(const std::string name); + TextureSamplerDesc getTexture(const std::string fullName, const GLenum defaultWrap, const GLenum defaultFilter); + const Texture * getMainTexture() const; + const std::vector & getBlurTextures() const; + + void updateMainTexture(); + + TextureSamplerDesc getRandomTextureName(std::string rand_name); void clearRandomTextures(); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/UserTexture.cpp projectm-3.1.0/src/libprojectM/Renderer/UserTexture.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/UserTexture.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/UserTexture.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -/* - * UserTexture.cpp - * - * Created on: Jul 16, 2008 - * Author: pete - */ - -#include "UserTexture.hpp" - -UserTexture::UserTexture(std::string qualifiedName): qname(qualifiedName) -{ - - if (qualifiedName.substr(0,3) == "fc_") - { - name = qualifiedName.substr(3); - bilinear = true; - wrap = false; - } - else if (qualifiedName.substr(0,3) == "fw_") - { - name = qualifiedName.substr(3); - bilinear = true; - wrap = true; - } - else if (qualifiedName.substr(0,3) == "pc_") - { - name = qualifiedName.substr(3); - bilinear = false; - wrap = false; - } - else if (qualifiedName.substr(0,3) == "pw_") - { - name = qualifiedName.substr(3); - bilinear = false; - wrap = true; - } - else - { - name = qualifiedName; - bilinear = true; - wrap = true; - } - - texsizeDefined = false; -} - -UserTexture::~UserTexture() -{ - // TODO Auto-generated destructor stub -} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/UserTexture.hpp projectm-3.1.0/src/libprojectM/Renderer/UserTexture.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/UserTexture.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/UserTexture.hpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -/* - * UserTexture.hpp - * - * Created on: Jul 16, 2008 - * Author: pete - */ - -#ifndef USERTEXTURE_HPP_ -#define USERTEXTURE_HPP_ - -#include - -class UserTexture -{ -public: - - bool wrap; - bool bilinear; - - bool texsizeDefined; - - int width; - int height; - - unsigned int texID; - - std::string qname; - std::string name; - - UserTexture(std::string qualifiedName); - virtual ~UserTexture(); -}; - -#endif /* USERTEXTURE_HPP_ */ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/VideoEcho.cpp projectm-3.1.0/src/libprojectM/Renderer/VideoEcho.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/VideoEcho.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/VideoEcho.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -5,89 +5,102 @@ * Author: pete */ -#include "Common.hpp" - -#ifdef USE_GLES1 -#include -#else -#ifdef __APPLE__ -#include -#include -#else -#include -#include -#endif -#endif - #include "VideoEcho.hpp" +#include "ShaderEngine.hpp" +#include VideoEcho::VideoEcho(): a(0), zoom(1), orientation(Normal) { - // TODO Auto-generated constructor stub - + Init(); } VideoEcho::~VideoEcho() { - // TODO Auto-generated destructor stub +} + +void VideoEcho::InitVertexAttrib() { + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)0); // Positions + + glDisableVertexAttribArray(1); + + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)(sizeof(float)*2)); // Textures } void VideoEcho::Draw(RenderContext &context) { + int flipx=1, flipy=1; + switch (orientation) + { + case Normal: flipx=1;flipy=1;break; + case FlipX: flipx=-1;flipy=1;break; + case FlipY: flipx=1;flipy=-1;break; + case FlipXY: flipx=-1;flipy=-1;break; + default: flipx=1;flipy=1; break; + } + float buffer_data[8][2] = { + {-0.5f*flipx, -0.5f*flipy}, + {0.0, 1.0}, - glEnable(GL_TEXTURE_2D); + {-0.5f*flipx, 0.5f*flipy}, + {0.0, 0.0}, + { 0.5f*flipx, 0.5f*flipy}, + {1.0, 0.0}, - float tex[4][2] = {{0, 1}, - {0, 0}, - {1, 0}, - {1, 1}}; + { 0.5f*flipx, -0.5f*flipy}, + {1.0, 1.0} + }; - float points[4][2] = {{-0.5, -0.5}, - {-0.5, 0.5}, - { 0.5, 0.5}, - { 0.5, -0.5}}; + glm::mat4 mat_first_translation = glm::mat4(1.0); + mat_first_translation[3][0] = -0.5; + mat_first_translation[3][1] = -0.5; - glEnableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glm::mat4 mat_scale = glm::mat4(1.0); + mat_scale[0][0] = 1.0/zoom; + mat_scale[1][1] = 1.0/zoom; - glVertexPointer(2,GL_FLOAT,0,points); - glTexCoordPointer(2,GL_FLOAT,0,tex); + glm::mat4 mat_second_translation = glm::mat4(1.0); + mat_second_translation[3][0] = 0.5; + mat_second_translation[3][1] = 0.5; - //Now Blend the Video Echo - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + for (int i = 1; i < 8; i+=2) { + glm::vec4 texture = glm::vec4(buffer_data[i][0], buffer_data[i][1], 0, 1); + texture = mat_first_translation * texture; + texture = mat_scale * texture; + texture = mat_second_translation * texture; - glMatrixMode(GL_TEXTURE); + buffer_data[i][0] = texture[0]; + buffer_data[i][1] = texture[1]; + } - //draw video echo - glColor4f(1.0, 1.0, 1.0, a * masterAlpha); - glTranslatef(.5, .5, 0); - glScalef(1.0/zoom, 1.0/zoom, 1); - glTranslatef(-.5, -.5, 0); - int flipx=1, flipy=1; - switch (orientation) - { - case Normal: flipx=1;flipy=1;break; - case FlipX: flipx=-1;flipy=1;break; - case FlipY: flipx=1;flipy=-1;break; - case FlipXY: flipx=-1;flipy=-1;break; - default: flipx=1;flipy=1; break; - } + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); + + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 16, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 16, buffer_data, GL_DYNAMIC_DRAW); + + glBindBuffer(GL_ARRAY_BUFFER, 0); + + glUseProgram(context.programID_v2f_c4f_t2f); + + glUniformMatrix4fv(context.uniform_v2f_c4f_t2f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); + glUniform1i(context.uniform_v2f_c4f_t2f_frag_texture_sampler, 0); + + + //Now Blend the Video Echo + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - float pointsFlip[4][2] = {{-0.5*flipx, -0.5*flipy}, - {-0.5*flipx, 0.5*flipy}, - { 0.5*flipx, 0.5*flipy}, - { 0.5*flipx, -0.5*flipy}}; + glVertexAttrib4f(1, 1.0, 1.0, 1.0, a * masterAlpha); - glVertexPointer(2,GL_FLOAT,0,pointsFlip); - glDrawArrays(GL_TRIANGLE_FAN,0,4); + glBindVertexArray(m_vaoID); - glDisable(GL_TEXTURE_2D); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + //draw video echo + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glBindVertexArray(0); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/VideoEcho.hpp projectm-3.1.0/src/libprojectM/Renderer/VideoEcho.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/VideoEcho.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/VideoEcho.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -8,7 +8,9 @@ #ifndef VIDEOECHO_HPP_ #define VIDEOECHO_HPP_ +#include "projectM-opengl.h" #include "Renderable.hpp" +#include "Common.hpp" enum Orientation { @@ -25,6 +27,7 @@ float zoom; Orientation orientation; + void InitVertexAttrib(); void Draw(RenderContext &context); }; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Waveform.cpp projectm-3.1.0/src/libprojectM/Renderer/Waveform.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Waveform.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Waveform.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -5,22 +5,12 @@ * Author: pete */ -#ifdef LINUX -#include -#endif -#ifdef WIN32 -#include "glew.h" -#endif -#ifdef __APPLE__ -#include -#endif -#ifdef EMSCRIPTEN -#include -#endif - +#include "projectM-opengl.h" #include "Waveform.hpp" #include #include "BeatDetect.hpp" +#include "ShaderEngine.hpp" +#include typedef float floatPair[2]; typedef float floatTriple[3]; @@ -39,91 +29,90 @@ smoothing = 0; /* smooth factor of waveform */ sep = 0; + Init(); } -void Waveform::Draw(RenderContext &context) - { - - //if (samples > 2048) samples = 2048; - - if (additive) glBlendFunc(GL_SRC_ALPHA, GL_ONE); - else glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); +void Waveform::InitVertexAttrib() { + glEnableVertexAttribArray(0); + glEnableVertexAttribArray(1); -// webGL doesn't do glPointSize -#ifndef EMSCRIPTEN - if (thick) - { - glLineWidth(context.texsize <= 512 ? 2 : 2*context.texsize/512); - glPointSize(context.texsize <= 512 ? 2 : 2*context.texsize/512); - - } - else glPointSize(context.texsize <= 512 ? 1 : context.texsize/512); -#endif + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(ColoredPoint), (void*)0); // points + glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(ColoredPoint), (void*)(sizeof(float)*2)); // colors +} - float *value1 = new float[samples]; - float *value2 = new float[samples]; - context.beatDetect->pcm->getPCM( value1, samples, 0, spectrum, smoothing, 0); - context.beatDetect->pcm->getPCM( value2, samples, 1, spectrum, smoothing, 0); - // printf("%f\n",pcmL[0]); +void Waveform::Draw(RenderContext &context) + { + float *value1 = new float[samples]; + float *value2 = new float[samples]; + context.beatDetect->pcm->getPCM( value1, samples, 0, spectrum, smoothing, 0); + context.beatDetect->pcm->getPCM( value2, samples, 1, spectrum, smoothing, 0); + float mult= scaling*( spectrum ? 0.015f :1.0f); - float mult= scaling*( spectrum ? 0.015f :1.0f); + std::transform(&value1[0],&value1[samples],&value1[0],std::bind2nd(std::multiplies(),mult)); + std::transform(&value2[0],&value2[samples],&value2[0],std::bind2nd(std::multiplies(),mult)); + WaveformContext waveContext(samples, context.beatDetect); - std::transform(&value1[0],&value1[samples],&value1[0],std::bind2nd(std::multiplies(),mult)); - std::transform(&value2[0],&value2[samples],&value2[0],std::bind2nd(std::multiplies(),mult)); + for(int x=0;x< samples;x++) + { + waveContext.sample = x/(float)(samples - 1); + waveContext.sample_int = x; + waveContext.left = value1[x]; + waveContext.right = value2[x]; - WaveformContext waveContext(samples, context.beatDetect); + points[x] = PerPoint(points[x],waveContext); + } - for(int x=0;x< samples;x++) - { - waveContext.sample = x/(float)(samples - 1); - waveContext.sample_int = x; - waveContext.left = value1[x]; - waveContext.right = value2[x]; + std::vector points_transf = points; - points[x] = PerPoint(points[x],waveContext); - } + for (std::vector::iterator iter = points_transf.begin(); iter != points_transf.end(); ++iter) { + (*iter).y = -( (*iter).y-1); + (*iter).a *= masterAlpha; + } - floatQuad *colors = new float[samples][4]; - floatPair *p = new float[samples][2]; + glBindBuffer(GL_ARRAY_BUFFER, m_vboID); - for(int x=0;x< samples;x++) - { - colors[x][0] = points[x].r; - colors[x][1] = points[x].g; - colors[x][2] = points[x].b; - colors[x][3] = points[x].a * masterAlpha; + glBufferData(GL_ARRAY_BUFFER, sizeof(ColoredPoint) * samples, NULL, GL_DYNAMIC_DRAW); + glBufferData(GL_ARRAY_BUFFER, sizeof(ColoredPoint) * samples, &points_transf[0], GL_DYNAMIC_DRAW); - p[x][0] = points[x].x; - p[x][1] = -(points[x].y-1); + glBindBuffer(GL_ARRAY_BUFFER, 0); - } + glUseProgram(context.programID_v2f_c4f); - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glUniformMatrix4fv(context.uniform_v2f_c4f_vertex_tranformation, 1, GL_FALSE, glm::value_ptr(context.mat_ortho)); - glVertexPointer(2,GL_FLOAT,0,p); - glColorPointer(4,GL_FLOAT,0,colors); + if (additive) glBlendFunc(GL_SRC_ALPHA, GL_ONE); + else glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - if (dots) glDrawArrays(GL_POINTS,0,samples); - else glDrawArrays(GL_LINE_STRIP,0,samples); + if (thick) + { + glLineWidth(context.texsize <= 512 ? 2 : 2*context.texsize/512); - glPointSize(context.texsize < 512 ? 1 : context.texsize/512); - glLineWidth(context.texsize < 512 ? 1 : context.texsize/512); -#ifndef USE_GLES1 - glDisable(GL_LINE_STIPPLE); +#ifndef GL_TRANSITION + glPointSize(context.texsize <= 512 ? 2 : 2*context.texsize/512); #endif - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - // glPopMatrix(); + glUniform1f(context.uniform_v2f_c4f_vertex_point_size, context.texsize <= 512 ? 2 : 2*context.texsize/512); + } + else + { +#ifndef GL_TRANSITION + glPointSize(context.texsize <= 512 ? 1 : context.texsize/512); +#endif + glUniform1f(context.uniform_v2f_c4f_vertex_point_size, context.texsize <= 512 ? 1 : context.texsize/512); + } - delete[] colors; - delete[] p; - delete[] value1; - delete[] value2; + glBindVertexArray(m_vaoID); - } + if (dots) glDrawArrays(GL_POINTS,0,samples); + else glDrawArrays(GL_LINE_STRIP,0,samples); + glBindVertexArray(0); + glLineWidth(context.texsize < 512 ? 1 : context.texsize/512); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + delete[] value1; + delete[] value2; + } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Waveform.hpp projectm-3.1.0/src/libprojectM/Renderer/Waveform.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/Renderer/Waveform.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/Renderer/Waveform.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -53,6 +53,7 @@ int sep; /* no idea what this is yet... */ Waveform(int samples); + void InitVertexAttrib(); void Draw(RenderContext &context); private: diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/sdltoprojectM.h projectm-3.1.0/src/libprojectM/sdltoprojectM.h --- projectm-2.2.0~git28bb9/src/libprojectM/sdltoprojectM.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/sdltoprojectM.h 2018-10-16 14:16:32.000000000 +0000 @@ -41,13 +41,13 @@ #ifdef WIN32 #include #else -#include +#include #endif -inline projectMEvent sdl2pmEvent( SDL_Event event ) { \ +inline projectMEvent sdl2pmEvent( SDL_Event *event ) { \ - switch ( event.type ) { \ - case SDL_VIDEORESIZE: + switch ( event->type ) { \ + case SDL_WINDOWEVENT_RESIZED: return PROJECTM_VIDEORESIZE; \ case SDL_KEYUP: \ return PROJECTM_KEYUP; \ @@ -58,8 +58,8 @@ } \ } \ -inline projectMKeycode sdl2pmKeycode( SDLKey keysym ) { \ - switch ( keysym ) { \ +inline projectMKeycode sdl2pmKeycode( SDL_Keycode keycode ) { \ + switch ( keycode ) { \ case SDLK_F1: \ return PROJECTM_K_F1; \ case SDLK_F2: \ @@ -158,7 +158,7 @@ } \ } \ -inline projectMModifier sdl2pmModifier( SDLMod mod ) { \ +inline projectMModifier sdl2pmModifier( SDL_Keymod mod ) { \ return PROJECTM_KMOD_LSHIFT; \ } \ diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/TimeKeeper.cpp projectm-3.1.0/src/libprojectM/TimeKeeper.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/TimeKeeper.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/TimeKeeper.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -96,6 +96,16 @@ return _presetFrameA; } +int TimeKeeper::PresetTimeB() + { + return _presetTimeB; + } + +int TimeKeeper::PresetTimeA() + { + return _presetTimeA; + } + double TimeKeeper::sampledPresetDuration() { #ifdef WIN32 return _presetDuration; diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/TimeKeeper.hpp projectm-3.1.0/src/libprojectM/TimeKeeper.hpp --- projectm-2.2.0~git28bb9/src/libprojectM/TimeKeeper.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/TimeKeeper.hpp 2018-10-16 14:16:32.000000000 +0000 @@ -35,6 +35,9 @@ int PresetFrameA(); int PresetFrameB(); + int PresetTimeA(); + int PresetTimeB(); + double sampledPresetDuration(); void ChangePresetDuration(int seconds) { _presetDuration = seconds; } diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/wipemalloc.cpp projectm-3.1.0/src/libprojectM/wipemalloc.cpp --- projectm-2.2.0~git28bb9/src/libprojectM/wipemalloc.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/wipemalloc.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -25,20 +25,85 @@ */ #include "wipemalloc.h" +#include - void *wipemalloc( size_t count ) { + +void *wipemalloc( size_t count ) +{ void *mem = malloc( count ); - if ( mem != NULL ) { + if ( mem != NULL ) + { memset( mem, 0, count ); - } else { + } + else + { printf( "wipemalloc() failed to allocate %d bytes\n", (int)count ); - } + } return mem; - } +} + /** Safe memory deallocator */ - void wipefree( void *ptr ) { - if ( ptr != NULL ) { +void wipefree( void *ptr ) +{ + if ( ptr != NULL ) free( ptr ); - } - } +} + + +void *wipe_aligned_alloc( size_t align, size_t size ) +{ + void *mem = NULL; + +#if HAVE_ALIGNED_ALLOC==1 + + mem = aligned_alloc( align, size ); + +#elif HAVE_POSIX_MEMALIGN==1 + + if (posix_memalign(&mem, align, size)) + mem = NULL; + +#else + + // only support powers of 2 for align + assert( (align & (align-1)) == 0 ); + assert( (size % align) == 0 ); + void *allocated = malloc(size + align - 1 + sizeof(void*)); + if (allocated) + { + mem = (void*) (((size_t)allocated + sizeof(void*) + align -1) & ~(align-1)); + ((void**)mem)[-1] = allocated; + } + +#endif + + if (mem) + { + memset( mem, 0, size ); + } + else + { + printf( "wipe_aligned_alloc() failed to allocate %d bytes\n", (int)size ); + } + return mem; +} + + +void wipe_aligned_free( void *p ) +{ +#if HAVE_ALIGNED_ALLOC==1 || HAVE_POSIX_MEMALIGN==1 + + if (p != NULL) + free(p); + +#else + + if (p != NULL) + { + void *allocated = ((void**)p)[-1]; + free(allocated); + } + +#endif +} diff -Nru projectm-2.2.0~git28bb9/src/libprojectM/wipemalloc.h projectm-3.1.0/src/libprojectM/wipemalloc.h --- projectm-2.2.0~git28bb9/src/libprojectM/wipemalloc.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/libprojectM/wipemalloc.h 2018-10-16 14:16:32.000000000 +0000 @@ -57,4 +57,8 @@ void *wipemalloc( size_t count ); void wipefree( void *ptr ); +/** wipe_aligned_malloc() must be matched with aligned_free() */ + void *wipe_aligned_alloc( size_t align, size_t count); + inline void *wipe_aligned_alloc( size_t count ) { return wipe_aligned_alloc(16,count); } + void wipe_aligned_free( void *ptr ); #endif /** !_WIPEMALLOC_H */ diff -Nru projectm-2.2.0~git28bb9/src/Makefile.am projectm-3.1.0/src/Makefile.am --- projectm-2.2.0~git28bb9/src/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,17 @@ +if ENABLE_SDL + PROJECTM_SDL_SUBDIR = projectM-sdl +endif + +if ENABLE_QT + PROJECTM_QT_SUBDIR = projectM-qt projectM-pulseaudio +endif + +if ENABLE_EMSCRIPTEN + PROJECTM_EMSCRIPTEN_SUBDIR = projectM-emscripten +endif + +SUBDIRS=libprojectM NativePresets ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR} ${PROJECTM_EMSCRIPTEN_SUBDIR} + +# system headers/libraries/data to install +# for compatibility reasons here as nobase_include +nobase_include_HEADERS = libprojectM/projectM.hpp libprojectM/Common.hpp libprojectM/dlldefs.h libprojectM/event.h libprojectM/fatal.h libprojectM/PCM.hpp diff -Nru projectm-2.2.0~git28bb9/src/NativePresets/cmake/CPack-projectM.cmake projectm-3.1.0/src/NativePresets/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/NativePresets/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/NativePresets/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/NativePresets/CMakeLists.txt projectm-3.1.0/src/NativePresets/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/NativePresets/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/NativePresets/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -project(NativePresets) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -include(FindPkgConfig.cmake) - -Include(cmake/CPack-projectM.cmake) - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(LIBPROJECTM_FOUND true) -else(${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) -endif(${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -if (LIBPROJECTM_FOUND) - MESSAGE(STATUS "[NativePresets] projectM detected.") -else (LIBPROJECTM_FOUND) - MESSAGE(FATAL_ERROR "projectM not detected! Please install the projectM module or build from top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - - -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') - - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) -ADD_LIBRARY(RovastarDriftingChaos SHARED RovastarDriftingChaos.cpp) -ADD_LIBRARY(RovastarDarkSecret SHARED RovastarDarkSecret.cpp) -ADD_LIBRARY(RovastarFractalSpiral SHARED RovastarFractalSpiral.cpp) -ADD_LIBRARY(RovastarFractopiaFrantic SHARED RovastarFractopiaFrantic.cpp) -ADD_LIBRARY(MstressJuppyDancer SHARED MstressJuppyDancer.cpp) - -# Doesn't build yet -#ADD_LIBRARY(RLGFractalDrop7c SHARED RLGFractalDrop7c.cpp) - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -LINK_DIRECTORIES(${PROJECTM_LINK} ${Renderer_BINARY_DIR} ${NativePresetFactory_BINARY_DIR}) - -include_directories(${PROJECTM_INCLUDE} ${Renderer_SOURCE_DIR} ${NativePresetFactory_SOURCE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR}) - -target_link_libraries(RovastarDarkSecret Renderer NativePresetFactory projectM) -target_link_libraries(RovastarFractopiaFrantic Renderer NativePresetFactory projectM) -target_link_libraries(RovastarFractalSpiral Renderer NativePresetFactory projectM) -target_link_libraries(RovastarDriftingChaos Renderer NativePresetFactory projectM) -target_link_libraries(MstressJuppyDancer Renderer NativePresetFactory projectM) -# Doesn't build yet -#target_link_libraries(RLGFractalDrop7c Renderer NativePresetFactory projectM) diff -Nru projectm-2.2.0~git28bb9/src/NativePresets/FindPkgConfig.cmake projectm-3.1.0/src/NativePresets/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/NativePresets/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/NativePresets/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/NativePresets/.gitignore projectm-3.1.0/src/NativePresets/.gitignore --- projectm-2.2.0~git28bb9/src/NativePresets/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/NativePresets/.gitignore 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1 @@ +*.dylib \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/NativePresets/Makefile.am projectm-3.1.0/src/NativePresets/Makefile.am --- projectm-2.2.0~git28bb9/src/NativePresets/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/NativePresets/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,44 @@ +AM_CPPFLAGS = ${my_CFLAGS} \ +-include $(top_builddir)/config.h \ +-I${top_srcdir}/src/libprojectM \ +-I${top_srcdir}/src/libprojectM/Renderer \ +-I${top_srcdir}/src/libprojectM/NativePresetFactory + +AM_CFLAGS = ${my_CFLAGS} \ +-fvisibility=hidden \ +-ffunction-sections \ +-fdata-sections + +presetsdir = $(pkgdatadir)/presets + +# native presets are shared object files. +# they should get installed to $presetsdir/ +presets_LTLIBRARIES = \ + libMstressJuppyDancer.la \ + libRLGFractalDrop7c.la \ + libRovastarDarkSecret.la \ + libRovastarDriftingChaos.la \ + libRovastarFractalSpiral.la \ + libRovastarFractopiaFrantic.la + +libMstressJuppyDancer_la_SOURCES = MstressJuppyDancer.cpp +libRLGFractalDrop7c_la_SOURCES = RLGFractalDrop7c.cpp +libRovastarDarkSecret_la_SOURCES = RovastarDarkSecret.cpp +libRovastarDriftingChaos_la_SOURCES = RovastarDriftingChaos.cpp +libRovastarFractalSpiral_la_SOURCES = RovastarFractalSpiral.cpp +libRovastarFractopiaFrantic_la_SOURCES = RovastarFractopiaFrantic.cpp + +libMstressJuppyDancer_la_LDFLAGS = -avoid-version +libRLGFractalDrop7c_la_LDFLAGS = -avoid-version +libRovastarDarkSecret_la_LDFLAGS = -avoid-version +libRovastarDriftingChaos_la_LDFLAGS = -avoid-version +libRovastarFractalSpiral_la_LDFLAGS = -avoid-version +libRovastarFractopiaFrantic_la_LDFLAGS = -avoid-version + + +libMstressJuppyDancer_la_LIBADD = ../libprojectM/libprojectM.la +libRLGFractalDrop7c_la_LIBADD = ../libprojectM/libprojectM.la +libRovastarDarkSecret_la_LIBADD = ../libprojectM/libprojectM.la +libRovastarDriftingChaos_la_LIBADD = ../libprojectM/libprojectM.la +libRovastarFractalSpiral_la_LIBADD = ../libprojectM/libprojectM.la +libRovastarFractopiaFrantic_la_LIBADD = ../libprojectM/libprojectM.la diff -Nru projectm-2.2.0~git28bb9/src/NativePresets/RLGFractalDrop7c.cpp projectm-3.1.0/src/NativePresets/RLGFractalDrop7c.cpp --- projectm-2.2.0~git28bb9/src/NativePresets/RLGFractalDrop7c.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/NativePresets/RLGFractalDrop7c.cpp 2018-10-16 14:16:32.000000000 +0000 @@ -11,6 +11,7 @@ #include "MilkdropCompatability.hpp" #include "VideoEcho.hpp" #include "NativePreset.hpp" +#include "MilkdropWaveform.hpp" class RLGFractalDrop7c : public Pipeline { @@ -140,7 +141,7 @@ shape4.ang = time; } - virtual Point PerPixel(Point p, const PerPixelContext context) + virtual PixelPoint PerPixel(PixelPoint p, const PerPixelContext context) { Transforms::Zoom(p,context,1.029902,1.00); return p; @@ -149,7 +150,7 @@ }; -typedef NativePreset RLGFractalDrop7Preset; +typedef NativePreset RLGFractalDrop7Preset; extern "C" RLGFractalDrop7Preset * create(const char * url) { return new RLGFractalDrop7Preset(std::string(url)); diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/build/fonts/CMakeLists.txt projectm-3.1.0/src/projectM-emscripten/build/fonts/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-emscripten/build/fonts/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/build/fonts/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(fonts) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-emscripten/build/fonts/VeraMono.ttf and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-emscripten/build/fonts/VeraMono.ttf differ Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-emscripten/build/fonts/Vera.ttf and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-emscripten/build/fonts/Vera.ttf differ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/CMakeLists.txt projectm-3.1.0/src/projectM-emscripten/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-emscripten/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -PROJECT(projectM-emscripten) - -# no fucking idea wtf dont care -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) -INCLUDE(../cmake/CPack-projectM.cmake) - -SET(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM/Renderer) - -# we're producing an executable called projectEM, it has one source input -ADD_EXECUTABLE(projectEM projectM_SDL_emscripten.cpp - ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM/PresetFactory.cpp - ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM/KeyHandler.cpp -) - -# openGL -SET(OPENGL_gl_LIBRARY "fake_gl_lib.a") -FIND_PACKAGE(OpenGL) - -# link in projectM -# i have no idea if this is correct -TARGET_LINK_LIBRARIES(projectEM projectM ${OPENGL_LIBRARIES}) -SET(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE}) -LINK_DIRECTORIES(${PROJECTM_LINK}) - -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s LEGACY_GL_EMULATION=1 ") - -SET_TARGET_PROPERTIES(projectEM PROPERTIES LINK_FLAGS " -s REGAL_SYS_EMSCRIPTEN=1 --embed-file build/presets -o build/projectEM.html --emrun") -#SET_TARGET_PROPERTIES(projectEM PROPERTIES LINK_FLAGS "--emrun") diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/Makefile.am projectm-3.1.0/src/projectM-emscripten/Makefile.am --- projectm-2.2.0~git28bb9/src/projectM-emscripten/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/Makefile.am 2018-10-16 14:16:32.000000000 +0000 @@ -0,0 +1,25 @@ +AM_CPPFLAGS = \ +${my_CFLAGS} \ +-include $(top_builddir)/config.h \ +-DSYSCONFDIR=\""$(sysconfdir)"\" \ +-I${top_srcdir}/src/libprojectM \ +-I${top_srcdir}/src/libprojectM/Renderer \ +${SDL_CFLAGS} + +REALSRCDIR=${top_srcdir}/src/projectM-sdl + +EMSCRIPTEN_FLAGS = -s USE_SDL=2 -s USE_WEBGL2=1 -s WASM=0 + +bin_PROGRAMS = projectW.bc +projectW_bc_SOURCES = $(REALSRCDIR)/pmSDL.cpp $(REALSRCDIR)/projectM_SDL_main.cpp $(REALSRCDIR)/pmSDL.hpp +projectW_bc_LDADD = ${SDL_LIBS} ${top_srcdir}/src/libprojectM/libprojectM.la +projectW_bc_LDFLAGS = $(EMSCRIPTEN_FLAGS) +projectW_bc_PROGRAM = projectW.bc + +projectW.html: generate-html + +generate-html: + emcc ALLOW_MEMORY_GROWTH=1 $(EMSCRIPTEN_FLAGS) projectW.bc + +run: projectW.html + emrun projectW.html diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/README projectm-3.1.0/src/projectM-emscripten/README --- projectm-2.2.0~git28bb9/src/projectM-emscripten/README 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/README 2018-10-16 14:16:32.000000000 +0000 @@ -1,7 +1,27 @@ -HOW2COMPILE: +Running on the web. -emcc -I../libprojectm -I../libprojectM/Renderer -Llib \ - ../libprojectM/KeyHandler.cpp projectM_SDL_emscripten.cpp \ - -lRenderer -lprojectM -lMilkdropPresetFactory -lprojectM -lRenderer \ - -s USE_SDL=2 -s LEGACY_GL_EMULATION=1 \ - -o build/projectEM.html \ No newline at end of file +# Easy way: +* `make run` + + + + +# Hard way: + +## Prepare +* Activate the emsdk (https://github.com/juj/emsdk#installation-instructions) +* make sure you are in the root directory of this project +* on fresh repositories: `./autogen.sh` + +## Compile +* `emconfigure ./configure --enable-emscripten --enable-gles --enable-sdl` +* `emmake make -j4` + +## Create wasm & html files +* `cd src/projectM-emscripten` +* `emcc -s USE_SDL=2 -s ALLOW_MEMORY_GROWTH=1 projectW.bc -o projectW.html` + +Does not work? Try: + +* `mkdir vendor && cp /usr/local/Cellar/glm/xx/include/glm ./vendor/` +* `emmake make -j4 -lvendor` diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/begin_code.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/begin_code.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/begin_code.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/begin_code.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file begin_code.h - * - * This file sets things up for C dynamic library function definitions, - * static inlined functions, and structures aligned at 4-byte alignment. - * If you don't like ugly C preprocessor code, don't look at this file. :) - */ - -/* This shouldn't be nested -- included it around code only. */ -#ifdef _begin_code_h -#error Nested inclusion of begin_code.h -#endif -#define _begin_code_h - -#ifndef SDL_DEPRECATED -# if (__GNUC__ >= 4) /* technically, this arrived in gcc 3.1, but oh well. */ -# define SDL_DEPRECATED __attribute__((deprecated)) -# else -# define SDL_DEPRECATED -# endif -#endif - -/* Some compilers use a special export keyword */ -#ifndef DECLSPEC -# if defined(__WIN32__) || defined(__WINRT__) -# ifdef __BORLANDC__ -# ifdef BUILD_SDL -# define DECLSPEC -# else -# define DECLSPEC __declspec(dllimport) -# endif -# else -# define DECLSPEC __declspec(dllexport) -# endif -# else -# if defined(__GNUC__) && __GNUC__ >= 4 -# define DECLSPEC __attribute__ ((visibility("default"))) -# elif defined(__GNUC__) && __GNUC__ >= 2 -# define DECLSPEC __declspec(dllexport) -# else -# define DECLSPEC -# endif -# endif -#endif - -/* By default SDL uses the C calling convention */ -#ifndef SDLCALL -#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__) -#define SDLCALL __cdecl -#else -#define SDLCALL -#endif -#endif /* SDLCALL */ - -/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */ -#ifdef __SYMBIAN32__ -#undef DECLSPEC -#define DECLSPEC -#endif /* __SYMBIAN32__ */ - -/* Force structure packing at 4 byte alignment. - This is necessary if the header is included in code which has structure - packing set to an alternate value, say for loading structures from disk. - The packing is reset to the previous value in close_code.h - */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) -#ifdef _MSC_VER -#pragma warning(disable: 4103) -#endif -#ifdef __BORLANDC__ -#pragma nopackwarning -#endif -#ifdef _M_X64 -/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */ -#pragma pack(push,8) -#else -#pragma pack(push,4) -#endif -#endif /* Compiler needs structure packing set */ - -#ifndef SDL_INLINE -#if defined(__GNUC__) -#define SDL_INLINE __inline__ -#elif defined(_MSC_VER) || defined(__BORLANDC__) || \ - defined(__DMC__) || defined(__SC__) || \ - defined(__WATCOMC__) || defined(__LCC__) || \ - defined(__DECC) -#define SDL_INLINE __inline -#ifndef __inline__ -#define __inline__ __inline -#endif -#else -#define SDL_INLINE inline -#ifndef __inline__ -#define __inline__ inline -#endif -#endif -#endif /* SDL_INLINE not defined */ - -#ifndef SDL_FORCE_INLINE -#if defined(_MSC_VER) -#define SDL_FORCE_INLINE __forceinline -#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) ) -#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__ -#else -#define SDL_FORCE_INLINE static SDL_INLINE -#endif -#endif /* SDL_FORCE_INLINE not defined */ - -/* Apparently this is needed by several Windows compilers */ -#if !defined(__MACH__) -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif /* NULL */ -#endif /* ! Mac OS X - breaks precompiled headers */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/close_code.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/close_code.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/close_code.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/close_code.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file close_code.h - * - * This file reverses the effects of begin_code.h and should be included - * after you finish any function and structure declarations in your headers - */ - -#undef _begin_code_h - -/* Reset structure packing at previous byte alignment */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__) || defined(__BORLANDC__) -#ifdef __BORLANDC__ -#pragma nopackwarning -#endif -#pragma pack(pop) -#endif /* Compiler needs structure packing set */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_assert.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_assert.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_assert.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_assert.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_assert_h -#define _SDL_assert_h - -#include "SDL_config.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef SDL_ASSERT_LEVEL -#ifdef SDL_DEFAULT_ASSERT_LEVEL -#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL -#elif defined(_DEBUG) || defined(DEBUG) || \ - (defined(__GNUC__) && !defined(__OPTIMIZE__)) -#define SDL_ASSERT_LEVEL 2 -#else -#define SDL_ASSERT_LEVEL 1 -#endif -#endif /* SDL_ASSERT_LEVEL */ - -/* -These are macros and not first class functions so that the debugger breaks -on the assertion line and not in some random guts of SDL, and so each -assert can have unique static variables associated with it. -*/ - -#if defined(_MSC_VER) -/* Don't include intrin.h here because it contains C++ code */ - extern void __cdecl __debugbreak(void); - #define SDL_TriggerBreakpoint() __debugbreak() -#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) - #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) -#elif defined(HAVE_SIGNAL_H) - #include - #define SDL_TriggerBreakpoint() raise(SIGTRAP) -#else - /* How do we trigger breakpoints on this platform? */ - #define SDL_TriggerBreakpoint() -#endif - -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */ -# define SDL_FUNCTION __func__ -#elif ((__GNUC__ >= 2) || defined(_MSC_VER)) -# define SDL_FUNCTION __FUNCTION__ -#else -# define SDL_FUNCTION "???" -#endif -#define SDL_FILE __FILE__ -#define SDL_LINE __LINE__ - -/* -sizeof (x) makes the compiler still parse the expression even without -assertions enabled, so the code is always checked at compile time, but -doesn't actually generate code for it, so there are no side effects or -expensive checks at run time, just the constant size of what x WOULD be, -which presumably gets optimized out as unused. -This also solves the problem of... - - int somevalue = blah(); - SDL_assert(somevalue == 1); - -...which would cause compiles to complain that somevalue is unused if we -disable assertions. -*/ - -#ifdef _MSC_VER /* stupid /W4 warnings. */ -#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__) -#else -#define SDL_NULL_WHILE_LOOP_CONDITION (0) -#endif - -#define SDL_disabled_assert(condition) \ - do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION) - -typedef enum -{ - SDL_ASSERTION_RETRY, /**< Retry the assert immediately. */ - SDL_ASSERTION_BREAK, /**< Make the debugger trigger a breakpoint. */ - SDL_ASSERTION_ABORT, /**< Terminate the program. */ - SDL_ASSERTION_IGNORE, /**< Ignore the assert. */ - SDL_ASSERTION_ALWAYS_IGNORE /**< Ignore the assert from now on. */ -} SDL_assert_state; - -typedef struct SDL_assert_data -{ - int always_ignore; - unsigned int trigger_count; - const char *condition; - const char *filename; - int linenum; - const char *function; - const struct SDL_assert_data *next; -} SDL_assert_data; - -#if (SDL_ASSERT_LEVEL > 0) - -/* Never call this directly. Use the SDL_assert* macros. */ -extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *, - const char *, - const char *, int) -#if defined(__clang__) -#if __has_feature(attribute_analyzer_noreturn) -/* this tells Clang's static analysis that we're a custom assert function, - and that the analyzer should assume the condition was always true past this - SDL_assert test. */ - __attribute__((analyzer_noreturn)) -#endif -#endif -; - -/* the do {} while(0) avoids dangling else problems: - if (x) SDL_assert(y); else blah(); - ... without the do/while, the "else" could attach to this macro's "if". - We try to handle just the minimum we need here in a macro...the loop, - the static vars, and break points. The heavy lifting is handled in - SDL_ReportAssertion(), in SDL_assert.c. -*/ -#define SDL_enabled_assert(condition) \ - do { \ - while ( !(condition) ) { \ - static struct SDL_assert_data assert_data = { \ - 0, 0, #condition, 0, 0, 0, 0 \ - }; \ - const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \ - SDL_FUNCTION, \ - SDL_FILE, \ - SDL_LINE); \ - if (state == SDL_ASSERTION_RETRY) { \ - continue; /* go again. */ \ - } else if (state == SDL_ASSERTION_BREAK) { \ - SDL_TriggerBreakpoint(); \ - } \ - break; /* not retrying. */ \ - } \ - } while (SDL_NULL_WHILE_LOOP_CONDITION) - -#endif /* enabled assertions support code */ - -/* Enable various levels of assertions. */ -#if SDL_ASSERT_LEVEL == 0 /* assertions disabled */ -# define SDL_assert(condition) SDL_disabled_assert(condition) -# define SDL_assert_release(condition) SDL_disabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 1 /* release settings. */ -# define SDL_assert(condition) SDL_disabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 2 /* normal settings. */ -# define SDL_assert(condition) SDL_enabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 3 /* paranoid settings. */ -# define SDL_assert(condition) SDL_enabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_enabled_assert(condition) -#else -# error Unknown assertion level. -#endif - -/* this assertion is never disabled at any level. */ -#define SDL_assert_always(condition) SDL_enabled_assert(condition) - - -typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)( - const SDL_assert_data* data, void* userdata); - -/** - * \brief Set an application-defined assertion handler. - * - * This allows an app to show its own assertion UI and/or force the - * response to an assertion failure. If the app doesn't provide this, SDL - * will try to do the right thing, popping up a system-specific GUI dialog, - * and probably minimizing any fullscreen windows. - * - * This callback may fire from any thread, but it runs wrapped in a mutex, so - * it will only fire from one thread at a time. - * - * Setting the callback to NULL restores SDL's original internal handler. - * - * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! - * - * \return SDL_assert_state value of how to handle the assertion failure. - * - * \param handler Callback function, called when an assertion fails. - * \param userdata A pointer passed to the callback as-is. - */ -extern DECLSPEC void SDLCALL SDL_SetAssertionHandler( - SDL_AssertionHandler handler, - void *userdata); - -/** - * \brief Get the default assertion handler. - * - * This returns the function pointer that is called by default when an - * assertion is triggered. This is an internal function provided by SDL, - * that is used for assertions when SDL_SetAssertionHandler() hasn't been - * used to provide a different function. - * - * \return The default SDL_AssertionHandler that is called when an assert triggers. - */ -extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void); - -/** - * \brief Get the current assertion handler. - * - * This returns the function pointer that is called when an assertion is - * triggered. This is either the value last passed to - * SDL_SetAssertionHandler(), or if no application-specified function is - * set, is equivalent to calling SDL_GetDefaultAssertionHandler(). - * - * \param puserdata Pointer to a void*, which will store the "userdata" - * pointer that was passed to SDL_SetAssertionHandler(). - * This value will always be NULL for the default handler. - * If you don't care about this data, it is safe to pass - * a NULL pointer to this function to ignore it. - * \return The SDL_AssertionHandler that is called when an assert triggers. - */ -extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata); - -/** - * \brief Get a list of all assertion failures. - * - * Get all assertions triggered since last call to SDL_ResetAssertionReport(), - * or the start of the program. - * - * The proper way to examine this data looks something like this: - * - * - * const SDL_assert_data *item = SDL_GetAssertionReport(); - * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", - * item->condition, item->function, item->filename, - * item->linenum, item->trigger_count, - * item->always_ignore ? "yes" : "no"); - * item = item->next; - * } - * - * - * \return List of all assertions. - * \sa SDL_ResetAssertionReport - */ -extern DECLSPEC const SDL_assert_data * SDLCALL SDL_GetAssertionReport(void); - -/** - * \brief Reset the list of all assertion failures. - * - * Reset list of all assertions triggered. - * - * \sa SDL_GetAssertionReport - */ -extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_assert_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_atomic.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_atomic.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_atomic.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_atomic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_atomic.h - * - * Atomic operations. - * - * IMPORTANT: - * If you are not an expert in concurrent lockless programming, you should - * only be using the atomic lock and reference counting functions in this - * file. In all other cases you should be protecting your data structures - * with full mutexes. - * - * The list of "safe" functions to use are: - * SDL_AtomicLock() - * SDL_AtomicUnlock() - * SDL_AtomicIncRef() - * SDL_AtomicDecRef() - * - * Seriously, here be dragons! - * ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - * - * You can find out a little more about lockless programming and the - * subtle issues that can arise here: - * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx - * - * There's also lots of good information here: - * http://www.1024cores.net/home/lock-free-algorithms - * http://preshing.com/ - * - * These operations may or may not actually be implemented using - * processor specific atomic operations. When possible they are - * implemented as true processor specific atomic operations. When that - * is not possible the are implemented using locks that *do* use the - * available atomic operations. - * - * All of the atomic operations that modify memory are full memory barriers. - */ - -#ifndef _SDL_atomic_h_ -#define _SDL_atomic_h_ - -#include "SDL_stdinc.h" -#include "SDL_platform.h" - -#include "begin_code.h" - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name SDL AtomicLock - * - * The atomic locks are efficient spinlocks using CPU instructions, - * but are vulnerable to starvation and can spin forever if a thread - * holding a lock has been terminated. For this reason you should - * minimize the code executed inside an atomic lock and never do - * expensive things like API or system calls while holding them. - * - * The atomic locks are not safe to lock recursively. - * - * Porting Note: - * The spin lock functions and type are required and can not be - * emulated because they are used in the atomic emulation code. - */ -/* @{ */ - -typedef int SDL_SpinLock; - -/** - * \brief Try to lock a spin lock by setting it to a non-zero value. - * - * \param lock Points to the lock. - * - * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock); - -/** - * \brief Lock a spin lock by setting it to a non-zero value. - * - * \param lock Points to the lock. - */ -extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock); - -/** - * \brief Unlock a spin lock by setting it to 0. Always returns immediately - * - * \param lock Points to the lock. - */ -extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); - -/* @} *//* SDL AtomicLock */ - - -/** - * The compiler barrier prevents the compiler from reordering - * reads and writes to globally visible variables across the call. - */ -#if defined(_MSC_VER) && (_MSC_VER > 1200) -void _ReadWriteBarrier(void); -#pragma intrinsic(_ReadWriteBarrier) -#define SDL_CompilerBarrier() _ReadWriteBarrier() -#elif defined(__GNUC__) -#define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") -#else -#define SDL_CompilerBarrier() \ -{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); } -#endif - -/** - * Memory barriers are designed to prevent reads and writes from being - * reordered by the compiler and being seen out of order on multi-core CPUs. - * - * A typical pattern would be for thread A to write some data and a flag, - * and for thread B to read the flag and get the data. In this case you - * would insert a release barrier between writing the data and the flag, - * guaranteeing that the data write completes no later than the flag is - * written, and you would insert an acquire barrier between reading the - * flag and reading the data, to ensure that all the reads associated - * with the flag have completed. - * - * In this pattern you should always see a release barrier paired with - * an acquire barrier and you should gate the data reads/writes with a - * single flag variable. - * - * For more information on these semantics, take a look at the blog post: - * http://preshing.com/20120913/acquire-and-release-semantics - */ -#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") -#elif defined(__GNUC__) && defined(__arm__) -#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") -#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) -#ifdef __thumb__ -/* The mcr instruction isn't available in thumb mode, use real functions */ -extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(); -extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(); -#else -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") -#endif /* __thumb__ */ -#else -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("" : : : "memory") -#endif /* __GNUC__ && __arm__ */ -#else -/* This is correct for the x86 and x64 CPUs, and we'll expand this over time. */ -#define SDL_MemoryBarrierRelease() SDL_CompilerBarrier() -#define SDL_MemoryBarrierAcquire() SDL_CompilerBarrier() -#endif - -/** - * \brief A type representing an atomic integer value. It is a struct - * so people don't accidentally use numeric operations on it. - */ -typedef struct { int value; } SDL_atomic_t; - -/** - * \brief Set an atomic variable to a new value if it is currently an old value. - * - * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. - * - * \note If you don't know what this function is for, you shouldn't use it! -*/ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval); - -/** - * \brief Set an atomic variable to a value. - * - * \return The previous value of the atomic variable. - */ -extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v); - -/** - * \brief Get the value of an atomic variable - */ -extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a); - -/** - * \brief Add to an atomic variable. - * - * \return The previous value of the atomic variable. - * - * \note This same style can be used for any number operation - */ -extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); - -/** - * \brief Increment an atomic variable used as a reference count. - */ -#ifndef SDL_AtomicIncRef -#define SDL_AtomicIncRef(a) SDL_AtomicAdd(a, 1) -#endif - -/** - * \brief Decrement an atomic variable used as a reference count. - * - * \return SDL_TRUE if the variable reached zero after decrementing, - * SDL_FALSE otherwise - */ -#ifndef SDL_AtomicDecRef -#define SDL_AtomicDecRef(a) (SDL_AtomicAdd(a, -1) == 1) -#endif - -/** - * \brief Set a pointer to a new value if it is currently an old value. - * - * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise. - * - * \note If you don't know what this function is for, you shouldn't use it! -*/ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval); - -/** - * \brief Set a pointer to a value atomically. - * - * \return The previous value of the pointer. - */ -extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v); - -/** - * \brief Get the value of a pointer atomically. - */ -extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif - -#include "close_code.h" - -#endif /* _SDL_atomic_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_audio.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_audio.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_audio.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_audio.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,506 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_audio.h - * - * Access to the raw audio mixing buffer for the SDL library. - */ - -#ifndef _SDL_audio_h -#define _SDL_audio_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_endian.h" -#include "SDL_mutex.h" -#include "SDL_thread.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Audio format flags. - * - * These are what the 16 bits in SDL_AudioFormat currently mean... - * (Unspecified bits are always zero). - * - * \verbatim - ++-----------------------sample is signed if set - || - || ++-----------sample is bigendian if set - || || - || || ++---sample is float if set - || || || - || || || +---sample bit size---+ - || || || | | - 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 - \endverbatim - * - * There are macros in SDL 2.0 and later to query these bits. - */ -typedef Uint16 SDL_AudioFormat; - -/** - * \name Audio flags - */ -/* @{ */ - -#define SDL_AUDIO_MASK_BITSIZE (0xFF) -#define SDL_AUDIO_MASK_DATATYPE (1<<8) -#define SDL_AUDIO_MASK_ENDIAN (1<<12) -#define SDL_AUDIO_MASK_SIGNED (1<<15) -#define SDL_AUDIO_BITSIZE(x) (x & SDL_AUDIO_MASK_BITSIZE) -#define SDL_AUDIO_ISFLOAT(x) (x & SDL_AUDIO_MASK_DATATYPE) -#define SDL_AUDIO_ISBIGENDIAN(x) (x & SDL_AUDIO_MASK_ENDIAN) -#define SDL_AUDIO_ISSIGNED(x) (x & SDL_AUDIO_MASK_SIGNED) -#define SDL_AUDIO_ISINT(x) (!SDL_AUDIO_ISFLOAT(x)) -#define SDL_AUDIO_ISLITTLEENDIAN(x) (!SDL_AUDIO_ISBIGENDIAN(x)) -#define SDL_AUDIO_ISUNSIGNED(x) (!SDL_AUDIO_ISSIGNED(x)) - -/** - * \name Audio format flags - * - * Defaults to LSB byte order. - */ -/* @{ */ -#define AUDIO_U8 0x0008 /**< Unsigned 8-bit samples */ -#define AUDIO_S8 0x8008 /**< Signed 8-bit samples */ -#define AUDIO_U16LSB 0x0010 /**< Unsigned 16-bit samples */ -#define AUDIO_S16LSB 0x8010 /**< Signed 16-bit samples */ -#define AUDIO_U16MSB 0x1010 /**< As above, but big-endian byte order */ -#define AUDIO_S16MSB 0x9010 /**< As above, but big-endian byte order */ -#define AUDIO_U16 AUDIO_U16LSB -#define AUDIO_S16 AUDIO_S16LSB -/* @} */ - -/** - * \name int32 support - */ -/* @{ */ -#define AUDIO_S32LSB 0x8020 /**< 32-bit integer samples */ -#define AUDIO_S32MSB 0x9020 /**< As above, but big-endian byte order */ -#define AUDIO_S32 AUDIO_S32LSB -/* @} */ - -/** - * \name float32 support - */ -/* @{ */ -#define AUDIO_F32LSB 0x8120 /**< 32-bit floating point samples */ -#define AUDIO_F32MSB 0x9120 /**< As above, but big-endian byte order */ -#define AUDIO_F32 AUDIO_F32LSB -/* @} */ - -/** - * \name Native audio byte ordering - */ -/* @{ */ -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define AUDIO_U16SYS AUDIO_U16LSB -#define AUDIO_S16SYS AUDIO_S16LSB -#define AUDIO_S32SYS AUDIO_S32LSB -#define AUDIO_F32SYS AUDIO_F32LSB -#else -#define AUDIO_U16SYS AUDIO_U16MSB -#define AUDIO_S16SYS AUDIO_S16MSB -#define AUDIO_S32SYS AUDIO_S32MSB -#define AUDIO_F32SYS AUDIO_F32MSB -#endif -/* @} */ - -/** - * \name Allow change flags - * - * Which audio format changes are allowed when opening a device. - */ -/* @{ */ -#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001 -#define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002 -#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004 -#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE) -/* @} */ - -/* @} *//* Audio flags */ - -/** - * This function is called when the audio device needs more data. - * - * \param userdata An application-specific parameter saved in - * the SDL_AudioSpec structure - * \param stream A pointer to the audio data buffer. - * \param len The length of that buffer in bytes. - * - * Once the callback returns, the buffer will no longer be valid. - * Stereo samples are stored in a LRLRLR ordering. - */ -typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream, - int len); - -/** - * The calculated values in this structure are calculated by SDL_OpenAudio(). - */ -typedef struct SDL_AudioSpec -{ - int freq; /**< DSP frequency -- samples per second */ - SDL_AudioFormat format; /**< Audio data format */ - Uint8 channels; /**< Number of channels: 1 mono, 2 stereo */ - Uint8 silence; /**< Audio buffer silence value (calculated) */ - Uint16 samples; /**< Audio buffer size in samples (power of 2) */ - Uint16 padding; /**< Necessary for some compile environments */ - Uint32 size; /**< Audio buffer size in bytes (calculated) */ - SDL_AudioCallback callback; - void *userdata; -} SDL_AudioSpec; - - -struct SDL_AudioCVT; -typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, - SDL_AudioFormat format); - -/** - * A structure to hold a set of audio conversion filters and buffers. - */ -#ifdef __GNUC__ -/* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't - pad it out to 88 bytes to guarantee ABI compatibility between compilers. - vvv - The next time we rev the ABI, make sure to size the ints and add padding. -*/ -#define SDL_AUDIOCVT_PACKED __attribute__((packed)) -#else -#define SDL_AUDIOCVT_PACKED -#endif -/* */ -typedef struct SDL_AudioCVT -{ - int needed; /**< Set to 1 if conversion possible */ - SDL_AudioFormat src_format; /**< Source audio format */ - SDL_AudioFormat dst_format; /**< Target audio format */ - double rate_incr; /**< Rate conversion increment */ - Uint8 *buf; /**< Buffer to hold entire audio data */ - int len; /**< Length of original audio buffer */ - int len_cvt; /**< Length of converted audio buffer */ - int len_mult; /**< buffer must be len*len_mult big */ - double len_ratio; /**< Given len, final size is len*len_ratio */ - SDL_AudioFilter filters[10]; /**< Filter list */ - int filter_index; /**< Current audio conversion function */ -} SDL_AUDIOCVT_PACKED SDL_AudioCVT; - - -/* Function prototypes */ - -/** - * \name Driver discovery functions - * - * These functions return the list of built in audio drivers, in the - * order that they are normally initialized by default. - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void); -extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); -/* @} */ - -/** - * \name Initialization and cleanup - * - * \internal These functions are used internally, and should not be used unless - * you have a specific need to specify the audio driver you want to - * use. You should normally use SDL_Init() or SDL_InitSubSystem(). - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); -extern DECLSPEC void SDLCALL SDL_AudioQuit(void); -/* @} */ - -/** - * This function returns the name of the current audio driver, or NULL - * if no driver has been initialized. - */ -extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); - -/** - * This function opens the audio device with the desired parameters, and - * returns 0 if successful, placing the actual hardware parameters in the - * structure pointed to by \c obtained. If \c obtained is NULL, the audio - * data passed to the callback function will be guaranteed to be in the - * requested format, and will be automatically converted to the hardware - * audio format if necessary. This function returns -1 if it failed - * to open the audio device, or couldn't set up the audio thread. - * - * When filling in the desired audio spec structure, - * - \c desired->freq should be the desired audio frequency in samples-per- - * second. - * - \c desired->format should be the desired audio format. - * - \c desired->samples is the desired size of the audio buffer, in - * samples. This number should be a power of two, and may be adjusted by - * the audio driver to a value more suitable for the hardware. Good values - * seem to range between 512 and 8096 inclusive, depending on the - * application and CPU speed. Smaller values yield faster response time, - * but can lead to underflow if the application is doing heavy processing - * and cannot fill the audio buffer in time. A stereo sample consists of - * both right and left channels in LR ordering. - * Note that the number of samples is directly related to time by the - * following formula: \code ms = (samples*1000)/freq \endcode - * - \c desired->size is the size in bytes of the audio buffer, and is - * calculated by SDL_OpenAudio(). - * - \c desired->silence is the value used to set the buffer to silence, - * and is calculated by SDL_OpenAudio(). - * - \c desired->callback should be set to a function that will be called - * when the audio device is ready for more data. It is passed a pointer - * to the audio buffer, and the length in bytes of the audio buffer. - * This function usually runs in a separate thread, and so you should - * protect data structures that it accesses by calling SDL_LockAudio() - * and SDL_UnlockAudio() in your code. - * - \c desired->userdata is passed as the first parameter to your callback - * function. - * - * The audio device starts out playing silence when it's opened, and should - * be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready - * for your audio callback function to be called. Since the audio driver - * may modify the requested size of the audio buffer, you should allocate - * any local mixing buffers after you open the audio device. - */ -extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, - SDL_AudioSpec * obtained); - -/** - * SDL Audio Device IDs. - * - * A successful call to SDL_OpenAudio() is always device id 1, and legacy - * SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls - * always returns devices >= 2 on success. The legacy calls are good both - * for backwards compatibility and when you don't care about multiple, - * specific, or capture devices. - */ -typedef Uint32 SDL_AudioDeviceID; - -/** - * Get the number of available devices exposed by the current driver. - * Only valid after a successfully initializing the audio subsystem. - * Returns -1 if an explicit list of devices can't be determined; this is - * not an error. For example, if SDL is set up to talk to a remote audio - * server, it can't list every one available on the Internet, but it will - * still allow a specific host to be specified to SDL_OpenAudioDevice(). - * - * In many common cases, when this function returns a value <= 0, it can still - * successfully open the default device (NULL for first argument of - * SDL_OpenAudioDevice()). - */ -extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture); - -/** - * Get the human-readable name of a specific audio device. - * Must be a value between 0 and (number of audio devices-1). - * Only valid after a successfully initializing the audio subsystem. - * The values returned by this function reflect the latest call to - * SDL_GetNumAudioDevices(); recall that function to redetect available - * hardware. - * - * The string returned by this function is UTF-8 encoded, read-only, and - * managed internally. You are not to free it. If you need to keep the - * string for any length of time, you should make your own copy of it, as it - * will be invalid next time any of several other SDL functions is called. - */ -extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index, - int iscapture); - - -/** - * Open a specific audio device. Passing in a device name of NULL requests - * the most reasonable default (and is equivalent to calling SDL_OpenAudio()). - * - * The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but - * some drivers allow arbitrary and driver-specific strings, such as a - * hostname/IP address for a remote audio server, or a filename in the - * diskaudio driver. - * - * \return 0 on error, a valid device ID that is >= 2 on success. - * - * SDL_OpenAudio(), unlike this function, always acts on device ID 1. - */ -extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char - *device, - int iscapture, - const - SDL_AudioSpec * - desired, - SDL_AudioSpec * - obtained, - int - allowed_changes); - - - -/** - * \name Audio state - * - * Get the current audio state. - */ -/* @{ */ -typedef enum -{ - SDL_AUDIO_STOPPED = 0, - SDL_AUDIO_PLAYING, - SDL_AUDIO_PAUSED -} SDL_AudioStatus; -extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void); - -extern DECLSPEC SDL_AudioStatus SDLCALL -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); -/* @} *//* Audio State */ - -/** - * \name Pause audio functions - * - * These functions pause and unpause the audio callback processing. - * They should be called with a parameter of 0 after opening the audio - * device to start playing sound. This is so you can safely initialize - * data for your callback function after opening the audio device. - * Silence will be written to the audio device during the pause. - */ -/* @{ */ -extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); -extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev, - int pause_on); -/* @} *//* Pause audio functions */ - -/** - * This function loads a WAVE from the data source, automatically freeing - * that source if \c freesrc is non-zero. For example, to load a WAVE file, - * you could do: - * \code - * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); - * \endcode - * - * If this function succeeds, it returns the given SDL_AudioSpec, - * filled with the audio data format of the wave data, and sets - * \c *audio_buf to a malloc()'d buffer containing the audio data, - * and sets \c *audio_len to the length of that audio buffer, in bytes. - * You need to free the audio buffer with SDL_FreeWAV() when you are - * done with it. - * - * This function returns NULL and sets the SDL error message if the - * wave file cannot be opened, uses an unknown data format, or is - * corrupt. Currently raw and MS-ADPCM WAVE files are supported. - */ -extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, - int freesrc, - SDL_AudioSpec * spec, - Uint8 ** audio_buf, - Uint32 * audio_len); - -/** - * Loads a WAV from a file. - * Compatibility convenience function. - */ -#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \ - SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) - -/** - * This function frees data previously allocated with SDL_LoadWAV_RW() - */ -extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf); - -/** - * This function takes a source format and rate and a destination format - * and rate, and initializes the \c cvt structure with information needed - * by SDL_ConvertAudio() to convert a buffer of audio data from one format - * to the other. - * - * \return -1 if the format conversion is not supported, 0 if there's - * no conversion needed, or 1 if the audio filter is set up. - */ -extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, - SDL_AudioFormat src_format, - Uint8 src_channels, - int src_rate, - SDL_AudioFormat dst_format, - Uint8 dst_channels, - int dst_rate); - -/** - * Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(), - * created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of - * audio data in the source format, this function will convert it in-place - * to the desired format. - * - * The data conversion may expand the size of the audio data, so the buffer - * \c cvt->buf should be allocated after the \c cvt structure is initialized by - * SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long. - */ -extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt); - -#define SDL_MIX_MAXVOLUME 128 -/** - * This takes two audio buffers of the playing audio format and mixes - * them, performing addition, volume adjustment, and overflow clipping. - * The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME - * for full audio volume. Note this does not change hardware volume. - * This is provided for convenience -- you can mix your own audio data. - */ -extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src, - Uint32 len, int volume); - -/** - * This works like SDL_MixAudio(), but you specify the audio format instead of - * using the format of audio device 1. Thus it can be used when no audio - * device is open at all. - */ -extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, - const Uint8 * src, - SDL_AudioFormat format, - Uint32 len, int volume); - -/** - * \name Audio lock functions - * - * The lock manipulated by these functions protects the callback function. - * During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that - * the callback function is not running. Do not call these from the callback - * function or you will cause deadlock. - */ -/* @{ */ -extern DECLSPEC void SDLCALL SDL_LockAudio(void); -extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev); -extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); -extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev); -/* @} *//* Audio lock functions */ - -/** - * This function shuts down audio processing and closes the audio device. - */ -extern DECLSPEC void SDLCALL SDL_CloseAudio(void); -extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_audio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_bits.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_bits.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_bits.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_bits.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_bits.h - * - * Functions for fiddling with bits and bitmasks. - */ - -#ifndef _SDL_bits_h -#define _SDL_bits_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_bits.h - */ - -/** - * Get the index of the most significant bit. Result is undefined when called - * with 0. This operation can also be stated as "count leading zeroes" and - * "log base 2". - * - * \return Index of the most significant bit, or -1 if the value is 0. - */ -SDL_FORCE_INLINE int -SDL_MostSignificantBitIndex32(Uint32 x) -{ -#if defined(__GNUC__) && __GNUC__ >= 4 - /* Count Leading Zeroes builtin in GCC. - * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html - */ - if (x == 0) { - return -1; - } - return 31 - __builtin_clz(x); -#else - /* Based off of Bit Twiddling Hacks by Sean Eron Anderson - * , released in the public domain. - * http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog - */ - const Uint32 b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000}; - const int S[] = {1, 2, 4, 8, 16}; - - int msbIndex = 0; - int i; - - if (x == 0) { - return -1; - } - - for (i = 4; i >= 0; i--) - { - if (x & b[i]) - { - x >>= S[i]; - msbIndex |= S[i]; - } - } - - return msbIndex; -#endif -} - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_bits_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_blendmode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_blendmode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_blendmode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_blendmode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_blendmode.h - * - * Header file declaring the SDL_BlendMode enumeration - */ - -#ifndef _SDL_blendmode_h -#define _SDL_blendmode_h - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The blend mode used in SDL_RenderCopy() and drawing operations. - */ -typedef enum -{ - SDL_BLENDMODE_NONE = 0x00000000, /**< no blending - dstRGBA = srcRGBA */ - SDL_BLENDMODE_BLEND = 0x00000001, /**< alpha blending - dstRGB = (srcRGB * srcA) + (dstRGB * (1-srcA)) - dstA = srcA + (dstA * (1-srcA)) */ - SDL_BLENDMODE_ADD = 0x00000002, /**< additive blending - dstRGB = (srcRGB * srcA) + dstRGB - dstA = dstA */ - SDL_BLENDMODE_MOD = 0x00000004 /**< color modulate - dstRGB = srcRGB * dstRGB - dstA = dstA */ -} SDL_BlendMode; - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_clipboard.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_clipboard.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_clipboard.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_clipboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_clipboard.h - * - * Include file for SDL clipboard handling - */ - -#ifndef _SDL_clipboard_h -#define _SDL_clipboard_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* Function prototypes */ - -/** - * \brief Put UTF-8 text into the clipboard - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text); - -/** - * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free() - * - * \sa SDL_SetClipboardText() - */ -extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void); - -/** - * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_clipboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_config.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_config.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_config.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_config.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -#include "SDL_platform.h" - -/** - * \file SDL_config.h - */ - -/* Add any platform that doesn't build using the configure system. */ -#ifdef USING_PREMAKE_CONFIG_H -#include "SDL_config_premake.h" -#elif defined(__WIN32__) -#include "SDL_config_windows.h" -#elif defined(__WINRT__) -#include "SDL_config_winrt.h" -#elif defined(__MACOSX__) -#include "SDL_config_macosx.h" -#elif defined(__IPHONEOS__) -#include "SDL_config_iphoneos.h" -#elif defined(__ANDROID__) -#include "SDL_config_android.h" -#elif defined(__PSP__) -#include "SDL_config_psp.h" -#else -/* This is a minimal configuration just to get SDL running on new platforms */ -#include "SDL_config_minimal.h" -#endif /* platform config */ - -#ifdef USING_GENERATED_CONFIG_H -#error Wrong SDL_config.h, check your include path? -#endif - -#endif /* _SDL_config_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_config_macosx.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_config_macosx.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_config_macosx.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_config_macosx.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,184 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_config_macosx_h -#define _SDL_config_macosx_h - -#include "SDL_platform.h" - -/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ -#include - -/* This is a set of defines to configure the SDL features */ - -#ifdef __LP64__ - #define SIZEOF_VOIDP 8 -#else - #define SIZEOF_VOIDP 4 -#endif - -/* Useful headers */ -#define HAVE_ALLOCA_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STRING_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MATH_H 1 -#define HAVE_SIGNAL_H 1 - -/* C library functions */ -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 -#define HAVE_ALLOCA 1 -#define HAVE_GETENV 1 -#define HAVE_SETENV 1 -#define HAVE_PUTENV 1 -#define HAVE_UNSETENV 1 -#define HAVE_QSORT 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 -#define HAVE_MEMSET 1 -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCMP 1 -#define HAVE_STRLEN 1 -#define HAVE_STRLCPY 1 -#define HAVE_STRLCAT 1 -#define HAVE_STRDUP 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOULL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 -#define HAVE_VSSCANF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_CEIL 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_LOG 1 -#define HAVE_POW 1 -#define HAVE_SCALBN 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SIGACTION 1 -#define HAVE_SETJMP 1 -#define HAVE_NANOSLEEP 1 -#define HAVE_SYSCONF 1 -#define HAVE_SYSCTLBYNAME 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_COREAUDIO 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#define SDL_JOYSTICK_IOKIT 1 -#define SDL_HAPTIC_IOKIT 1 - -/* Enable various shared object loading systems */ -#define SDL_LOADSO_DLOPEN 1 - -/* Enable various threading systems */ -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 - -/* Enable various timer systems */ -#define SDL_TIMER_UNIX 1 - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_COCOA 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 -#undef SDL_VIDEO_DRIVER_X11 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib" -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 -#define SDL_VIDEO_DRIVER_X11_XRANDR 1 -#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1 -#define SDL_VIDEO_DRIVER_X11_XSHAPE 1 -#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1 -#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1 - -#ifdef MAC_OS_X_VERSION_10_8 -/* - * No matter the versions targeted, this is the 10.8 or later SDK, so you have - * to use the external Xquartz, which is a more modern Xlib. Previous SDKs - * used an older Xlib. - */ -#define SDL_VIDEO_DRIVER_X11_XINPUT2 1 -#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 -#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1 -#endif - -#ifndef SDL_VIDEO_RENDER_OGL -#define SDL_VIDEO_RENDER_OGL 1 -#endif - -/* Enable OpenGL support */ -#ifndef SDL_VIDEO_OPENGL -#define SDL_VIDEO_OPENGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_CGL -#define SDL_VIDEO_OPENGL_CGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_GLX -#define SDL_VIDEO_OPENGL_GLX 1 -#endif - -/* Enable system power support */ -#define SDL_POWER_MACOSX 1 - -/* enable filesystem support */ -#define SDL_FILESYSTEM_COCOA 1 - -/* Enable assembly routines */ -#define SDL_ASSEMBLY_ROUTINES 1 -#ifdef __ppc__ -#define SDL_ALTIVEC_BLITTERS 1 -#endif - -#endif /* _SDL_config_macosx_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_copying.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_copying.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_copying.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_copying.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_cpuinfo.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_cpuinfo.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_cpuinfo.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_cpuinfo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_cpuinfo.h - * - * CPU feature detection for SDL. - */ - -#ifndef _SDL_cpuinfo_h -#define _SDL_cpuinfo_h - -#include "SDL_stdinc.h" - -/* Need to do this here because intrin.h has C++ code in it */ -/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ -#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64)) -#include -#ifndef _WIN64 -#define __MMX__ -#define __3dNOW__ -#endif -#define __SSE__ -#define __SSE2__ -#elif defined(__MINGW64_VERSION_MAJOR) -#include -#else -#ifdef __ALTIVEC__ -#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) -#include -#undef pixel -#endif -#endif -#ifdef __MMX__ -#include -#endif -#ifdef __3dNOW__ -#include -#endif -#ifdef __SSE__ -#include -#endif -#ifdef __SSE2__ -#include -#endif -#endif - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* This is a guess for the cacheline size used for padding. - * Most x86 processors have a 64 byte cache line. - * The 64-bit PowerPC processors have a 128 byte cache line. - * We'll use the larger value to be generally safe. - */ -#define SDL_CACHELINE_SIZE 128 - -/** - * This function returns the number of CPU cores available. - */ -extern DECLSPEC int SDLCALL SDL_GetCPUCount(void); - -/** - * This function returns the L1 cache line size of the CPU - * - * This is useful for determining multi-threaded structure padding - * or SIMD prefetch sizes. - */ -extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void); - -/** - * This function returns true if the CPU has the RDTSC instruction. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void); - -/** - * This function returns true if the CPU has AltiVec features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void); - -/** - * This function returns true if the CPU has MMX features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void); - -/** - * This function returns true if the CPU has 3DNow! features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void); - -/** - * This function returns true if the CPU has SSE features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void); - -/** - * This function returns true if the CPU has SSE2 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void); - -/** - * This function returns true if the CPU has SSE3 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void); - -/** - * This function returns true if the CPU has SSE4.1 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void); - -/** - * This function returns true if the CPU has SSE4.2 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void); - -/** - * This function returns true if the CPU has AVX features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); - -/** - * This function returns the amount of RAM configured in the system, in MB. - */ -extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_cpuinfo_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_endian.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_endian.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_endian.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_endian.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_endian.h - * - * Functions for reading and writing endian-specific values - */ - -#ifndef _SDL_endian_h -#define _SDL_endian_h - -#include "SDL_stdinc.h" - -/** - * \name The two types of endianness - */ -/* @{ */ -#define SDL_LIL_ENDIAN 1234 -#define SDL_BIG_ENDIAN 4321 -/* @} */ - -#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */ -#ifdef __linux__ -#include -#define SDL_BYTEORDER __BYTE_ORDER -#else /* __linux __ */ -#if defined(__hppa__) || \ - defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ - defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ - defined(__sparc__) -#define SDL_BYTEORDER SDL_BIG_ENDIAN -#else -#define SDL_BYTEORDER SDL_LIL_ENDIAN -#endif -#endif /* __linux __ */ -#endif /* !SDL_BYTEORDER */ - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_endian.h - */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - int result; - - __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); - return (Uint16)result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - return SDL_static_cast(Uint16, ((x << 8) | (x >> 8))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswap %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswapl %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - Uint32 result; - - __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x)); - __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x)); - __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); - return result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) | - ((x >> 8) & 0x0000FF00) | (x >> 24))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - union - { - struct - { - Uint32 a, b; - } s; - Uint64 u; - } v; - v.u = x; - __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a), - "1"(v.s. - b)); - return v.u; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - __asm__("bswapq %0": "=r"(x):"0"(x)); - return x; -} -#else -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - Uint32 hi, lo; - - /* Separate into high and low 32-bit values and swap them */ - lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF); - x >>= 32; - hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF); - x = SDL_Swap32(lo); - x <<= 32; - x |= SDL_Swap32(hi); - return (x); -} -#endif - - -SDL_FORCE_INLINE float -SDL_SwapFloat(float x) -{ - union - { - float f; - Uint32 ui32; - } swapper; - swapper.f = x; - swapper.ui32 = SDL_Swap32(swapper.ui32); - return swapper.f; -} - - -/** - * \name Swap to native - * Byteswap item from the specified endianness to the native endianness. - */ -/* @{ */ -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define SDL_SwapLE16(X) (X) -#define SDL_SwapLE32(X) (X) -#define SDL_SwapLE64(X) (X) -#define SDL_SwapFloatLE(X) (X) -#define SDL_SwapBE16(X) SDL_Swap16(X) -#define SDL_SwapBE32(X) SDL_Swap32(X) -#define SDL_SwapBE64(X) SDL_Swap64(X) -#define SDL_SwapFloatBE(X) SDL_SwapFloat(X) -#else -#define SDL_SwapLE16(X) SDL_Swap16(X) -#define SDL_SwapLE32(X) SDL_Swap32(X) -#define SDL_SwapLE64(X) SDL_Swap64(X) -#define SDL_SwapFloatLE(X) SDL_SwapFloat(X) -#define SDL_SwapBE16(X) (X) -#define SDL_SwapBE32(X) (X) -#define SDL_SwapBE64(X) (X) -#define SDL_SwapFloatBE(X) (X) -#endif -/* @} *//* Swap to native */ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_endian_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_error.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_error.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_error.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_error.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_error.h - * - * Simple error message routines for SDL. - */ - -#ifndef _SDL_error_h -#define _SDL_error_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* Public functions */ -/* SDL_SetError() unconditionally returns -1. */ -extern DECLSPEC int SDLCALL SDL_SetError(const char *fmt, ...); -extern DECLSPEC const char *SDLCALL SDL_GetError(void); -extern DECLSPEC void SDLCALL SDL_ClearError(void); - -/** - * \name Internal error functions - * - * \internal - * Private error reporting function - used internally. - */ -/* @{ */ -#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM) -#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED) -#define SDL_InvalidParamError(param) SDL_SetError("Parameter '%s' is invalid", (param)) -typedef enum -{ - SDL_ENOMEM, - SDL_EFREAD, - SDL_EFWRITE, - SDL_EFSEEK, - SDL_UNSUPPORTED, - SDL_LASTERROR -} SDL_errorcode; -/* SDL_Error() unconditionally returns -1. */ -extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code); -/* @} *//* Internal error functions */ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_error_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_events.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_events.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_events.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_events.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,723 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_events.h - * - * Include file for SDL event handling. - */ - -#ifndef _SDL_events_h -#define _SDL_events_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_keyboard.h" -#include "SDL_mouse.h" -#include "SDL_joystick.h" -#include "SDL_gamecontroller.h" -#include "SDL_quit.h" -#include "SDL_gesture.h" -#include "SDL_touch.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* General keyboard/mouse state definitions */ -#define SDL_RELEASED 0 -#define SDL_PRESSED 1 - -/** - * \brief The types of events that can be delivered. - */ -typedef enum -{ - SDL_FIRSTEVENT = 0, /**< Unused (do not remove) */ - - /* Application events */ - SDL_QUIT = 0x100, /**< User-requested quit */ - - /* These application events have special meaning on iOS, see README-ios.txt for details */ - SDL_APP_TERMINATING, /**< The application is being terminated by the OS - Called on iOS in applicationWillTerminate() - Called on Android in onDestroy() - */ - SDL_APP_LOWMEMORY, /**< The application is low on memory, free memory if possible. - Called on iOS in applicationDidReceiveMemoryWarning() - Called on Android in onLowMemory() - */ - SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background - Called on iOS in applicationWillResignActive() - Called on Android in onPause() - */ - SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time - Called on iOS in applicationDidEnterBackground() - Called on Android in onPause() - */ - SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground - Called on iOS in applicationWillEnterForeground() - Called on Android in onResume() - */ - SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive - Called on iOS in applicationDidBecomeActive() - Called on Android in onResume() - */ - - /* Window events */ - SDL_WINDOWEVENT = 0x200, /**< Window state change */ - SDL_SYSWMEVENT, /**< System specific event */ - - /* Keyboard events */ - SDL_KEYDOWN = 0x300, /**< Key pressed */ - SDL_KEYUP, /**< Key released */ - SDL_TEXTEDITING, /**< Keyboard text editing (composition) */ - SDL_TEXTINPUT, /**< Keyboard text input */ - - /* Mouse events */ - SDL_MOUSEMOTION = 0x400, /**< Mouse moved */ - SDL_MOUSEBUTTONDOWN, /**< Mouse button pressed */ - SDL_MOUSEBUTTONUP, /**< Mouse button released */ - SDL_MOUSEWHEEL, /**< Mouse wheel motion */ - - /* Joystick events */ - SDL_JOYAXISMOTION = 0x600, /**< Joystick axis motion */ - SDL_JOYBALLMOTION, /**< Joystick trackball motion */ - SDL_JOYHATMOTION, /**< Joystick hat position change */ - SDL_JOYBUTTONDOWN, /**< Joystick button pressed */ - SDL_JOYBUTTONUP, /**< Joystick button released */ - SDL_JOYDEVICEADDED, /**< A new joystick has been inserted into the system */ - SDL_JOYDEVICEREMOVED, /**< An opened joystick has been removed */ - - /* Game controller events */ - SDL_CONTROLLERAXISMOTION = 0x650, /**< Game controller axis motion */ - SDL_CONTROLLERBUTTONDOWN, /**< Game controller button pressed */ - SDL_CONTROLLERBUTTONUP, /**< Game controller button released */ - SDL_CONTROLLERDEVICEADDED, /**< A new Game controller has been inserted into the system */ - SDL_CONTROLLERDEVICEREMOVED, /**< An opened Game controller has been removed */ - SDL_CONTROLLERDEVICEREMAPPED, /**< The controller mapping was updated */ - - /* Touch events */ - SDL_FINGERDOWN = 0x700, - SDL_FINGERUP, - SDL_FINGERMOTION, - - /* Gesture events */ - SDL_DOLLARGESTURE = 0x800, - SDL_DOLLARRECORD, - SDL_MULTIGESTURE, - - /* Clipboard events */ - SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */ - - /* Drag and drop events */ - SDL_DROPFILE = 0x1000, /**< The system requests a file open */ - - /* Render events */ - SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset */ - - /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use, - * and should be allocated with SDL_RegisterEvents() - */ - SDL_USEREVENT = 0x8000, - - /** - * This last event is only for bounding internal arrays - */ - SDL_LASTEVENT = 0xFFFF -} SDL_EventType; - -/** - * \brief Fields shared by every event - */ -typedef struct SDL_CommonEvent -{ - Uint32 type; - Uint32 timestamp; -} SDL_CommonEvent; - -/** - * \brief Window state change event data (event.window.*) - */ -typedef struct SDL_WindowEvent -{ - Uint32 type; /**< ::SDL_WINDOWEVENT */ - Uint32 timestamp; - Uint32 windowID; /**< The associated window */ - Uint8 event; /**< ::SDL_WindowEventID */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint32 data1; /**< event dependent data */ - Sint32 data2; /**< event dependent data */ -} SDL_WindowEvent; - -/** - * \brief Keyboard button event structure (event.key.*) - */ -typedef struct SDL_KeyboardEvent -{ - Uint32 type; /**< ::SDL_KEYDOWN or ::SDL_KEYUP */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 repeat; /**< Non-zero if this is a key repeat */ - Uint8 padding2; - Uint8 padding3; - SDL_Keysym keysym; /**< The key that was pressed or released */ -} SDL_KeyboardEvent; - -#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32) -/** - * \brief Keyboard text editing event structure (event.edit.*) - */ -typedef struct SDL_TextEditingEvent -{ - Uint32 type; /**< ::SDL_TEXTEDITING */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; /**< The editing text */ - Sint32 start; /**< The start cursor of selected editing text */ - Sint32 length; /**< The length of selected editing text */ -} SDL_TextEditingEvent; - - -#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32) -/** - * \brief Keyboard text input event structure (event.text.*) - */ -typedef struct SDL_TextInputEvent -{ - Uint32 type; /**< ::SDL_TEXTINPUT */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTINPUTEVENT_TEXT_SIZE]; /**< The input text */ -} SDL_TextInputEvent; - -/** - * \brief Mouse motion event structure (event.motion.*) - */ -typedef struct SDL_MouseMotionEvent -{ - Uint32 type; /**< ::SDL_MOUSEMOTION */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Uint32 state; /**< The current button state */ - Sint32 x; /**< X coordinate, relative to window */ - Sint32 y; /**< Y coordinate, relative to window */ - Sint32 xrel; /**< The relative motion in the X direction */ - Sint32 yrel; /**< The relative motion in the Y direction */ -} SDL_MouseMotionEvent; - -/** - * \brief Mouse button event structure (event.button.*) - */ -typedef struct SDL_MouseButtonEvent -{ - Uint32 type; /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Uint8 button; /**< The mouse button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 clicks; /**< 1 for single-click, 2 for double-click, etc. */ - Uint8 padding1; - Sint32 x; /**< X coordinate, relative to window */ - Sint32 y; /**< Y coordinate, relative to window */ -} SDL_MouseButtonEvent; - -/** - * \brief Mouse wheel event structure (event.wheel.*) - */ -typedef struct SDL_MouseWheelEvent -{ - Uint32 type; /**< ::SDL_MOUSEWHEEL */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Sint32 x; /**< The amount scrolled horizontally, positive to the right and negative to the left */ - Sint32 y; /**< The amount scrolled vertically, positive away from the user and negative toward the user */ -} SDL_MouseWheelEvent; - -/** - * \brief Joystick axis motion event structure (event.jaxis.*) - */ -typedef struct SDL_JoyAxisEvent -{ - Uint32 type; /**< ::SDL_JOYAXISMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 axis; /**< The joystick axis index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 value; /**< The axis value (range: -32768 to 32767) */ - Uint16 padding4; -} SDL_JoyAxisEvent; - -/** - * \brief Joystick trackball motion event structure (event.jball.*) - */ -typedef struct SDL_JoyBallEvent -{ - Uint32 type; /**< ::SDL_JOYBALLMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 ball; /**< The joystick trackball index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 xrel; /**< The relative motion in the X direction */ - Sint16 yrel; /**< The relative motion in the Y direction */ -} SDL_JoyBallEvent; - -/** - * \brief Joystick hat position change event structure (event.jhat.*) - */ -typedef struct SDL_JoyHatEvent -{ - Uint32 type; /**< ::SDL_JOYHATMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 hat; /**< The joystick hat index */ - Uint8 value; /**< The hat position value. - * \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP - * \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT - * \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN - * - * Note that zero means the POV is centered. - */ - Uint8 padding1; - Uint8 padding2; -} SDL_JoyHatEvent; - -/** - * \brief Joystick button event structure (event.jbutton.*) - */ -typedef struct SDL_JoyButtonEvent -{ - Uint32 type; /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 button; /**< The joystick button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; -} SDL_JoyButtonEvent; - -/** - * \brief Joystick device event structure (event.jdevice.*) - */ -typedef struct SDL_JoyDeviceEvent -{ - Uint32 type; /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */ - Uint32 timestamp; - Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED event */ -} SDL_JoyDeviceEvent; - - -/** - * \brief Game controller axis motion event structure (event.caxis.*) - */ -typedef struct SDL_ControllerAxisEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERAXISMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 axis; /**< The controller axis (SDL_GameControllerAxis) */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 value; /**< The axis value (range: -32768 to 32767) */ - Uint16 padding4; -} SDL_ControllerAxisEvent; - - -/** - * \brief Game controller button event structure (event.cbutton.*) - */ -typedef struct SDL_ControllerButtonEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 button; /**< The controller button (SDL_GameControllerButton) */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; -} SDL_ControllerButtonEvent; - - -/** - * \brief Controller device event structure (event.cdevice.*) - */ -typedef struct SDL_ControllerDeviceEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */ - Uint32 timestamp; - Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */ -} SDL_ControllerDeviceEvent; - - -/** - * \brief Touch finger event structure (event.tfinger.*) - */ -typedef struct SDL_TouchFingerEvent -{ - Uint32 type; /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device id */ - SDL_FingerID fingerId; - float x; /**< Normalized in the range 0...1 */ - float y; /**< Normalized in the range 0...1 */ - float dx; /**< Normalized in the range 0...1 */ - float dy; /**< Normalized in the range 0...1 */ - float pressure; /**< Normalized in the range 0...1 */ -} SDL_TouchFingerEvent; - - -/** - * \brief Multiple Finger Gesture Event (event.mgesture.*) - */ -typedef struct SDL_MultiGestureEvent -{ - Uint32 type; /**< ::SDL_MULTIGESTURE */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device index */ - float dTheta; - float dDist; - float x; - float y; - Uint16 numFingers; - Uint16 padding; -} SDL_MultiGestureEvent; - - -/** - * \brief Dollar Gesture Event (event.dgesture.*) - */ -typedef struct SDL_DollarGestureEvent -{ - Uint32 type; /**< ::SDL_DOLLARGESTURE */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device id */ - SDL_GestureID gestureId; - Uint32 numFingers; - float error; - float x; /**< Normalized center of gesture */ - float y; /**< Normalized center of gesture */ -} SDL_DollarGestureEvent; - - -/** - * \brief An event used to request a file open by the system (event.drop.*) - * This event is disabled by default, you can enable it with SDL_EventState() - * \note If you enable this event, you must free the filename in the event. - */ -typedef struct SDL_DropEvent -{ - Uint32 type; /**< ::SDL_DROPFILE */ - Uint32 timestamp; - char *file; /**< The file name, which should be freed with SDL_free() */ -} SDL_DropEvent; - - -/** - * \brief The "quit requested" event - */ -typedef struct SDL_QuitEvent -{ - Uint32 type; /**< ::SDL_QUIT */ - Uint32 timestamp; -} SDL_QuitEvent; - -/** - * \brief OS Specific event - */ -typedef struct SDL_OSEvent -{ - Uint32 type; /**< ::SDL_QUIT */ - Uint32 timestamp; -} SDL_OSEvent; - -/** - * \brief A user-defined event type (event.user.*) - */ -typedef struct SDL_UserEvent -{ - Uint32 type; /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */ - Uint32 timestamp; - Uint32 windowID; /**< The associated window if any */ - Sint32 code; /**< User defined event code */ - void *data1; /**< User defined data pointer */ - void *data2; /**< User defined data pointer */ -} SDL_UserEvent; - - -struct SDL_SysWMmsg; -typedef struct SDL_SysWMmsg SDL_SysWMmsg; - -/** - * \brief A video driver dependent system event (event.syswm.*) - * This event is disabled by default, you can enable it with SDL_EventState() - * - * \note If you want to use this event, you should include SDL_syswm.h. - */ -typedef struct SDL_SysWMEvent -{ - Uint32 type; /**< ::SDL_SYSWMEVENT */ - Uint32 timestamp; - SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */ -} SDL_SysWMEvent; - -/** - * \brief General event structure - */ -typedef union SDL_Event -{ - Uint32 type; /**< Event type, shared with all events */ - SDL_CommonEvent common; /**< Common event data */ - SDL_WindowEvent window; /**< Window event data */ - SDL_KeyboardEvent key; /**< Keyboard event data */ - SDL_TextEditingEvent edit; /**< Text editing event data */ - SDL_TextInputEvent text; /**< Text input event data */ - SDL_MouseMotionEvent motion; /**< Mouse motion event data */ - SDL_MouseButtonEvent button; /**< Mouse button event data */ - SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ - SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ - SDL_JoyBallEvent jball; /**< Joystick ball event data */ - SDL_JoyHatEvent jhat; /**< Joystick hat event data */ - SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ - SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ - SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ - SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ - SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ - SDL_QuitEvent quit; /**< Quit request event data */ - SDL_UserEvent user; /**< Custom event data */ - SDL_SysWMEvent syswm; /**< System dependent window event data */ - SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ - SDL_MultiGestureEvent mgesture; /**< Gesture event data */ - SDL_DollarGestureEvent dgesture; /**< Gesture event data */ - SDL_DropEvent drop; /**< Drag and drop event data */ - - /* This is necessary for ABI compatibility between Visual C++ and GCC - Visual C++ will respect the push pack pragma and use 52 bytes for - this structure, and GCC will use the alignment of the largest datatype - within the union, which is 8 bytes. - - So... we'll add padding to force the size to be 56 bytes for both. - */ - Uint8 padding[56]; -} SDL_Event; - - -/* Function prototypes */ - -/** - * Pumps the event loop, gathering events from the input devices. - * - * This function updates the event queue and internal input device state. - * - * This should only be run in the thread that sets the video mode. - */ -extern DECLSPEC void SDLCALL SDL_PumpEvents(void); - -/* @{ */ -typedef enum -{ - SDL_ADDEVENT, - SDL_PEEKEVENT, - SDL_GETEVENT -} SDL_eventaction; - -/** - * Checks the event queue for messages and optionally returns them. - * - * If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to - * the back of the event queue. - * - * If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will not be removed from the queue. - * - * If \c action is ::SDL_GETEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will be removed from the queue. - * - * \return The number of events actually stored, or -1 if there was an error. - * - * This function is thread-safe. - */ -extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, - SDL_eventaction action, - Uint32 minType, Uint32 maxType); -/* @} */ - -/** - * Checks to see if certain event types are in the event queue. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type); -extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType); - -/** - * This function clears events from the event queue - */ -extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type); -extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType); - -/** - * \brief Polls for currently pending events. - * - * \return 1 if there are any pending events, or 0 if there are none available. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - */ -extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event); - -/** - * \brief Waits indefinitely for the next available event. - * - * \return 1, or 0 if there was an error while waiting for events. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - */ -extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event); - -/** - * \brief Waits until the specified timeout (in milliseconds) for the next - * available event. - * - * \return 1, or 0 if there was an error while waiting for events. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - * \param timeout The timeout (in milliseconds) to wait for next event. - */ -extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event, - int timeout); - -/** - * \brief Add an event to the event queue. - * - * \return 1 on success, 0 if the event was filtered, or -1 if the event queue - * was full or there was some other error. - */ -extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event); - -typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event); - -/** - * Sets up a filter to process all events before they change internal state and - * are posted to the internal event queue. - * - * The filter is prototyped as: - * \code - * int SDL_EventFilter(void *userdata, SDL_Event * event); - * \endcode - * - * If the filter returns 1, then the event will be added to the internal queue. - * If it returns 0, then the event will be dropped from the queue, but the - * internal state will still be updated. This allows selective filtering of - * dynamically arriving events. - * - * \warning Be very careful of what you do in the event filter function, as - * it may run in a different thread! - * - * There is one caveat when dealing with the ::SDL_QuitEvent event type. The - * event filter is only called when the window manager desires to close the - * application window. If the event filter returns 1, then the window will - * be closed, otherwise the window will remain open if possible. - * - * If the quit event is generated by an interrupt signal, it will bypass the - * internal queue and be delivered to the application at the next event poll. - */ -extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter, - void *userdata); - -/** - * Return the current event filter - can be used to "chain" filters. - * If there is no event filter set, this function returns SDL_FALSE. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter, - void **userdata); - -/** - * Add a function which is called when an event is added to the queue. - */ -extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter, - void *userdata); - -/** - * Remove an event watch function added with SDL_AddEventWatch() - */ -extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter, - void *userdata); - -/** - * Run the filter function on the current event queue, removing any - * events for which the filter returns 0. - */ -extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, - void *userdata); - -/* @{ */ -#define SDL_QUERY -1 -#define SDL_IGNORE 0 -#define SDL_DISABLE 0 -#define SDL_ENABLE 1 - -/** - * This function allows you to set the state of processing certain events. - * - If \c state is set to ::SDL_IGNORE, that event will be automatically - * dropped from the event queue and will not event be filtered. - * - If \c state is set to ::SDL_ENABLE, that event will be processed - * normally. - * - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the - * current processing state of the specified event. - */ -extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state); -/* @} */ -#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY) - -/** - * This function allocates a set of user-defined events, and returns - * the beginning event number for that set of events. - * - * If there aren't enough user-defined events left, this function - * returns (Uint32)-1 - */ -extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_events_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_filesystem.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_filesystem.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_filesystem.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_filesystem.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_filesystem.h - * - * \brief Include file for filesystem SDL API functions - */ - -#ifndef _SDL_filesystem_h -#define _SDL_filesystem_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Get the path where the application resides. - * - * Get the "base path". This is the directory where the application was run - * from, which is probably the installation directory, and may or may not - * be the process's current working directory. - * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). - * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. - * - * Some platforms can't determine the application's path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \return String of base dir in UTF-8 encoding, or NULL on error. - * - * \sa SDL_GetPrefPath - */ -extern DECLSPEC char *SDLCALL SDL_GetBasePath(void); - -/** - * \brief Get the user-and-app-specific path where files can be written. - * - * Get the "pref dir". This is meant to be where users can write personal - * files (preferences and save games, etc) that are specific to your - * application. This directory is unique per user, per application. - * - * This function will decide the appropriate location in the native filesystem, - * create the directory if necessary, and return a string of the absolute - * path to the directory in UTF-8 encoding. - * - * On Windows, the string might look like: - * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\" - * - * On Linux, the string might look like: - * "/home/bob/.local/share/My Program Name/" - * - * On Mac OS X, the string might look like: - * "/Users/bob/Library/Application Support/My Program Name/" - * - * (etc.) - * - * You specify the name of your organization (if it's not a real organization, - * your name or an Internet domain you own might do) and the name of your - * application. These should be untranslated proper names. - * - * Both the org and app strings may become part of a directory name, so - * please follow these rules: - * - * - Try to use the same org string (including case-sensitivity) for - * all your applications that use this function. - * - Always use a unique app string for each one, and make sure it never - * changes for an app once you've decided on it. - * - Unicode characters are legal, as long as it's UTF-8 encoded, but... - * - ...only use letters, numbers, and spaces. Avoid punctuation like - * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. - * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). - * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. - * - * You should assume the path returned by this function is the only safe - * place to write files (and that SDL_GetBasePath(), while it might be - * writable, or even the parent of the returned path, aren't where you - * should be writing things). - * - * Some platforms can't determine the pref path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \param org The name of your organization. - * \param app The name of your application. - * \return UTF-8 string of user dir in platform-dependent notation. NULL - * if there's a problem (creating directory failed, etc). - * - * \sa SDL_GetBasePath - */ -extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_system_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_gamecontroller.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_gamecontroller.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_gamecontroller.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_gamecontroller.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,316 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_gamecontroller.h - * - * Include file for SDL game controller event handling - */ - -#ifndef _SDL_gamecontroller_h -#define _SDL_gamecontroller_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_rwops.h" -#include "SDL_joystick.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_gamecontroller.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system - * for game controllers, and load appropriate drivers. - * - * If you would like to receive controller updates while the application - * is in the background, you should set the following hint before calling - * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS - */ - -/* The gamecontroller structure used to identify an SDL game controller */ -struct _SDL_GameController; -typedef struct _SDL_GameController SDL_GameController; - - -typedef enum -{ - SDL_CONTROLLER_BINDTYPE_NONE = 0, - SDL_CONTROLLER_BINDTYPE_BUTTON, - SDL_CONTROLLER_BINDTYPE_AXIS, - SDL_CONTROLLER_BINDTYPE_HAT -} SDL_GameControllerBindType; - -/** - * Get the SDL joystick layer binding for this controller button/axis mapping - */ -typedef struct SDL_GameControllerButtonBind -{ - SDL_GameControllerBindType bindType; - union - { - int button; - int axis; - struct { - int hat; - int hat_mask; - } hat; - } value; - -} SDL_GameControllerButtonBind; - - -/** - * To count the number of game controllers in the system for the following: - * int nJoysticks = SDL_NumJoysticks(); - * int nGameControllers = 0; - * for ( int i = 0; i < nJoysticks; i++ ) { - * if ( SDL_IsGameController(i) ) { - * nGameControllers++; - * } - * } - * - * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: - * guid,name,mappings - * - * Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones. - * Under Windows there is a reserved GUID of "xinput" that covers any XInput devices. - * The mapping format for joystick is: - * bX - a joystick button, index X - * hX.Y - hat X with value Y - * aX - axis X of the joystick - * Buttons can be used as a controller axis and vice versa. - * - * This string shows an example of a valid mapping for a controller - * "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", - * - */ - -/** - * Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform() - * A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt - * - * If \c freerw is non-zero, the stream will be closed after being read. - * - * \return number of mappings added, -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW( SDL_RWops * rw, int freerw ); - -/** - * Load a set of mappings from a file, filtered by the current SDL_GetPlatform() - * - * Convenience macro. - */ -#define SDL_GameControllerAddMappingsFromFile(file) SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1) - -/** - * Add or update an existing mapping configuration - * - * \return 1 if mapping is added, 0 if updated, -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping( const char* mappingString ); - -/** - * Get a mapping string for a GUID - * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available - */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid ); - -/** - * Get a mapping string for an open GameController - * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available - */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMapping( SDL_GameController * gamecontroller ); - -/** - * Is the joystick on this index supported by the game controller interface? - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); - - -/** - * Get the implementation dependent name of a game controller. - * This can be called before any controllers are opened. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); - -/** - * Open a game controller for use. - * The index passed as an argument refers to the N'th game controller on the system. - * This index is the value which will identify this controller in future controller - * events. - * - * \return A controller identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index); - -/** - * Return the name for this currently opened controller - */ -extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); - -/** - * Returns SDL_TRUE if the controller has been opened and currently connected, - * or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller); - -/** - * Get the underlying joystick object used by a controller - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller); - -/** - * Enable/disable controller event polling. - * - * If controller events are disabled, you must call SDL_GameControllerUpdate() - * yourself and check the state of the controller when you want controller - * information. - * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. - */ -extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state); - -/** - * Update the current state of the open game controllers. - * - * This is called automatically by the event loop if any game controller - * events are enabled. - */ -extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void); - - -/** - * The list of axes available from a controller - */ -typedef enum -{ - SDL_CONTROLLER_AXIS_INVALID = -1, - SDL_CONTROLLER_AXIS_LEFTX, - SDL_CONTROLLER_AXIS_LEFTY, - SDL_CONTROLLER_AXIS_RIGHTX, - SDL_CONTROLLER_AXIS_RIGHTY, - SDL_CONTROLLER_AXIS_TRIGGERLEFT, - SDL_CONTROLLER_AXIS_TRIGGERRIGHT, - SDL_CONTROLLER_AXIS_MAX -} SDL_GameControllerAxis; - -/** - * turn this string into a axis mapping - */ -extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString); - -/** - * turn this axis enum into a string mapping - */ -extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis); - -/** - * Get the SDL joystick layer binding for this controller button mapping - */ -extern DECLSPEC SDL_GameControllerButtonBind SDLCALL -SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); - -/** - * Get the current state of an axis control on a game controller. - * - * The state is a value ranging from -32768 to 32767. - * - * The axis indices start at index 0. - */ -extern DECLSPEC Sint16 SDLCALL -SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); - -/** - * The list of buttons available from a controller - */ -typedef enum -{ - SDL_CONTROLLER_BUTTON_INVALID = -1, - SDL_CONTROLLER_BUTTON_A, - SDL_CONTROLLER_BUTTON_B, - SDL_CONTROLLER_BUTTON_X, - SDL_CONTROLLER_BUTTON_Y, - SDL_CONTROLLER_BUTTON_BACK, - SDL_CONTROLLER_BUTTON_GUIDE, - SDL_CONTROLLER_BUTTON_START, - SDL_CONTROLLER_BUTTON_LEFTSTICK, - SDL_CONTROLLER_BUTTON_RIGHTSTICK, - SDL_CONTROLLER_BUTTON_LEFTSHOULDER, - SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, - SDL_CONTROLLER_BUTTON_DPAD_UP, - SDL_CONTROLLER_BUTTON_DPAD_DOWN, - SDL_CONTROLLER_BUTTON_DPAD_LEFT, - SDL_CONTROLLER_BUTTON_DPAD_RIGHT, - SDL_CONTROLLER_BUTTON_MAX -} SDL_GameControllerButton; - -/** - * turn this string into a button mapping - */ -extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString); - -/** - * turn this button enum into a string mapping - */ -extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button); - -/** - * Get the SDL joystick layer binding for this controller button mapping - */ -extern DECLSPEC SDL_GameControllerButtonBind SDLCALL -SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, - SDL_GameControllerButton button); - - -/** - * Get the current state of a button on a game controller. - * - * The button indices start at index 0. - */ -extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, - SDL_GameControllerButton button); - -/** - * Close a controller previously opened with SDL_GameControllerOpen(). - */ -extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_gamecontroller_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_gesture.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_gesture.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_gesture.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_gesture.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_gesture.h - * - * Include file for SDL gesture event handling. - */ - -#ifndef _SDL_gesture_h -#define _SDL_gesture_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "SDL_touch.h" - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef Sint64 SDL_GestureID; - -/* Function prototypes */ - -/** - * \brief Begin Recording a gesture on the specified touch, or all touches (-1) - * - * - */ -extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId); - - -/** - * \brief Save all currently loaded Dollar Gesture templates - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst); - -/** - * \brief Save a currently loaded Dollar Gesture template - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst); - - -/** - * \brief Load Dollar Gesture templates from a file - * - * - */ -extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_gesture_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL.h - * - * Main include header for the SDL library - */ - -/** - * \mainpage Simple DirectMedia Layer (SDL) - * - * http://www.libsdl.org/ - * - * \section intro_sec Introduction - * - * Simple DirectMedia Layer is a cross-platform development library designed - * to provide low level access to audio, keyboard, mouse, joystick, and - * graphics hardware via OpenGL and Direct3D. It is used by video playback - * software, emulators, and popular games including Valve's award winning - * catalog and many Humble Bundle games. - * - * SDL officially supports Windows, Mac OS X, Linux, iOS, and Android. - * Support for other platforms may be found in the source code. - * - * SDL is written in C, works natively with C++, and there are bindings - * available for several other languages, including C# and Python. - * - * This library is distributed under the zlib license, which can be found - * in the file "COPYING.txt". - * - * The best way to learn how to use SDL is to check out the header files in - * the "include" subdirectory and the programs in the "test" subdirectory. - * The header files and test programs are well commented and always up to date. - * More documentation and FAQs are available online at: - * http://wiki.libsdl.org/ - * - * If you need help with the library, or just want to discuss SDL related - * issues, you can join the developers mailing list: - * http://www.libsdl.org/mailing-list.php - * - * Enjoy! - * Sam Lantinga (slouken@libsdl.org) - */ - -#ifndef _SDL_H -#define _SDL_H - -#include "SDL_main.h" -#include "SDL_stdinc.h" -#include "SDL_assert.h" -#include "SDL_atomic.h" -#include "SDL_audio.h" -#include "SDL_clipboard.h" -#include "SDL_cpuinfo.h" -#include "SDL_endian.h" -#include "SDL_error.h" -#include "SDL_events.h" -#include "SDL_filesystem.h" -#include "SDL_joystick.h" -#include "SDL_gamecontroller.h" -#include "SDL_haptic.h" -#include "SDL_hints.h" -#include "SDL_loadso.h" -#include "SDL_log.h" -#include "SDL_messagebox.h" -#include "SDL_mutex.h" -#include "SDL_power.h" -#include "SDL_render.h" -#include "SDL_rwops.h" -#include "SDL_system.h" -#include "SDL_thread.h" -#include "SDL_timer.h" -#include "SDL_version.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* As of version 0.5, SDL is loaded dynamically into the application */ - -/** - * \name SDL_INIT_* - * - * These are the flags which may be passed to SDL_Init(). You should - * specify the subsystems which you will be using in your application. - */ -/* @{ */ -#define SDL_INIT_TIMER 0x00000001 -#define SDL_INIT_AUDIO 0x00000010 -#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */ -#define SDL_INIT_JOYSTICK 0x00000200 /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */ -#define SDL_INIT_HAPTIC 0x00001000 -#define SDL_INIT_GAMECONTROLLER 0x00002000 /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */ -#define SDL_INIT_EVENTS 0x00004000 -#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */ -#define SDL_INIT_EVERYTHING ( \ - SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \ - SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \ - ) -/* @} */ - -/** - * This function initializes the subsystems specified by \c flags - * Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup - * signal handlers for some commonly ignored fatal signals (like SIGSEGV). - */ -extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); - -/** - * This function initializes specific SDL subsystems - */ -extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); - -/** - * This function cleans up specific SDL subsystems - */ -extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); - -/** - * This function returns a mask of the specified subsystems which have - * previously been initialized. - * - * If \c flags is 0, it returns a mask of all initialized subsystems. - */ -extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); - -/** - * This function cleans up all initialized subsystems. You should - * call it upon all exit conditions. - */ -extern DECLSPEC void SDLCALL SDL_Quit(void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_H */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_haptic.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_haptic.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_haptic.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_haptic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,1225 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_haptic.h - * - * \brief The SDL Haptic subsystem allows you to control haptic (force feedback) - * devices. - * - * The basic usage is as follows: - * - Initialize the Subsystem (::SDL_INIT_HAPTIC). - * - Open a Haptic Device. - * - SDL_HapticOpen() to open from index. - * - SDL_HapticOpenFromJoystick() to open from an existing joystick. - * - Create an effect (::SDL_HapticEffect). - * - Upload the effect with SDL_HapticNewEffect(). - * - Run the effect with SDL_HapticRunEffect(). - * - (optional) Free the effect with SDL_HapticDestroyEffect(). - * - Close the haptic device with SDL_HapticClose(). - * - * \par Simple rumble example: - * \code - * SDL_Haptic *haptic; - * - * // Open the device - * haptic = SDL_HapticOpen( 0 ); - * if (haptic == NULL) - * return -1; - * - * // Initialize simple rumble - * if (SDL_HapticRumbleInit( haptic ) != 0) - * return -1; - * - * // Play effect at 50% strength for 2 seconds - * if (SDL_HapticRumblePlay( haptic, 0.5, 2000 ) != 0) - * return -1; - * SDL_Delay( 2000 ); - * - * // Clean up - * SDL_HapticClose( haptic ); - * \endcode - * - * \par Complete example: - * \code - * int test_haptic( SDL_Joystick * joystick ) { - * SDL_Haptic *haptic; - * SDL_HapticEffect effect; - * int effect_id; - * - * // Open the device - * haptic = SDL_HapticOpenFromJoystick( joystick ); - * if (haptic == NULL) return -1; // Most likely joystick isn't haptic - * - * // See if it can do sine waves - * if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) { - * SDL_HapticClose(haptic); // No sine effect - * return -1; - * } - * - * // Create the effect - * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default - * effect.type = SDL_HAPTIC_SINE; - * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates - * effect.periodic.direction.dir[0] = 18000; // Force comes from south - * effect.periodic.period = 1000; // 1000 ms - * effect.periodic.magnitude = 20000; // 20000/32767 strength - * effect.periodic.length = 5000; // 5 seconds long - * effect.periodic.attack_length = 1000; // Takes 1 second to get max strength - * effect.periodic.fade_length = 1000; // Takes 1 second to fade away - * - * // Upload the effect - * effect_id = SDL_HapticNewEffect( haptic, &effect ); - * - * // Test the effect - * SDL_HapticRunEffect( haptic, effect_id, 1 ); - * SDL_Delay( 5000); // Wait for the effect to finish - * - * // We destroy the effect, although closing the device also does this - * SDL_HapticDestroyEffect( haptic, effect_id ); - * - * // Close the device - * SDL_HapticClose(haptic); - * - * return 0; // Success - * } - * \endcode - * - * You can also find out more information on my blog: - * http://bobbens.dyndns.org/journal/2010/sdl_haptic/ - * - * \author Edgar Simo Serra - */ - -#ifndef _SDL_haptic_h -#define _SDL_haptic_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_joystick.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** - * \typedef SDL_Haptic - * - * \brief The haptic structure used to identify an SDL haptic. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - */ -struct _SDL_Haptic; -typedef struct _SDL_Haptic SDL_Haptic; - - -/** - * \name Haptic features - * - * Different haptic features a device can have. - */ -/* @{ */ - -/** - * \name Haptic effects - */ -/* @{ */ - -/** - * \brief Constant effect supported. - * - * Constant haptic effect. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_CONSTANT (1<<0) - -/** - * \brief Sine wave effect supported. - * - * Periodic haptic effect that simulates sine waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SINE (1<<1) - -/** - * \brief Left/Right effect supported. - * - * Haptic effect for direct control over high/low frequency motors. - * - * \sa SDL_HapticLeftRight - * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry, - * we ran out of bits, and this is important for XInput devices. - */ -#define SDL_HAPTIC_LEFTRIGHT (1<<2) - -/* !!! FIXME: put this back when we have more bits in 2.1 */ -/* #define SDL_HAPTIC_SQUARE (1<<2) */ - -/** - * \brief Triangle wave effect supported. - * - * Periodic haptic effect that simulates triangular waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_TRIANGLE (1<<3) - -/** - * \brief Sawtoothup wave effect supported. - * - * Periodic haptic effect that simulates saw tooth up waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SAWTOOTHUP (1<<4) - -/** - * \brief Sawtoothdown wave effect supported. - * - * Periodic haptic effect that simulates saw tooth down waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5) - -/** - * \brief Ramp effect supported. - * - * Ramp haptic effect. - * - * \sa SDL_HapticRamp - */ -#define SDL_HAPTIC_RAMP (1<<6) - -/** - * \brief Spring effect supported - uses axes position. - * - * Condition haptic effect that simulates a spring. Effect is based on the - * axes position. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_SPRING (1<<7) - -/** - * \brief Damper effect supported - uses axes velocity. - * - * Condition haptic effect that simulates dampening. Effect is based on the - * axes velocity. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_DAMPER (1<<8) - -/** - * \brief Inertia effect supported - uses axes acceleration. - * - * Condition haptic effect that simulates inertia. Effect is based on the axes - * acceleration. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_INERTIA (1<<9) - -/** - * \brief Friction effect supported - uses axes movement. - * - * Condition haptic effect that simulates friction. Effect is based on the - * axes movement. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_FRICTION (1<<10) - -/** - * \brief Custom effect is supported. - * - * User defined custom haptic effect. - */ -#define SDL_HAPTIC_CUSTOM (1<<11) - -/* @} *//* Haptic effects */ - -/* These last few are features the device has, not effects */ - -/** - * \brief Device can set global gain. - * - * Device supports setting the global gain. - * - * \sa SDL_HapticSetGain - */ -#define SDL_HAPTIC_GAIN (1<<12) - -/** - * \brief Device can set autocenter. - * - * Device supports setting autocenter. - * - * \sa SDL_HapticSetAutocenter - */ -#define SDL_HAPTIC_AUTOCENTER (1<<13) - -/** - * \brief Device can be queried for effect status. - * - * Device can be queried for effect status. - * - * \sa SDL_HapticGetEffectStatus - */ -#define SDL_HAPTIC_STATUS (1<<14) - -/** - * \brief Device can be paused. - * - * \sa SDL_HapticPause - * \sa SDL_HapticUnpause - */ -#define SDL_HAPTIC_PAUSE (1<<15) - - -/** - * \name Direction encodings - */ -/* @{ */ - -/** - * \brief Uses polar coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_POLAR 0 - -/** - * \brief Uses cartesian coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_CARTESIAN 1 - -/** - * \brief Uses spherical coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_SPHERICAL 2 - -/* @} *//* Direction encodings */ - -/* @} *//* Haptic features */ - -/* - * Misc defines. - */ - -/** - * \brief Used to play a device an infinite number of times. - * - * \sa SDL_HapticRunEffect - */ -#define SDL_HAPTIC_INFINITY 4294967295U - - -/** - * \brief Structure that represents a haptic direction. - * - * Directions can be specified by: - * - ::SDL_HAPTIC_POLAR : Specified by polar coordinates. - * - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates. - * - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates. - * - * Cardinal directions of the haptic device are relative to the positioning - * of the device. North is considered to be away from the user. - * - * The following diagram represents the cardinal directions: - * \verbatim - .--. - |__| .-------. - |=.| |.-----.| - |--| || || - | | |'-----'| - |__|~')_____(' - [ COMPUTER ] - - - North (0,-1) - ^ - | - | - (1,0) West <----[ HAPTIC ]----> East (-1,0) - | - | - v - South (0,1) - - - [ USER ] - \|||/ - (o o) - ---ooO-(_)-Ooo--- - \endverbatim - * - * If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a - * degree starting north and turning clockwise. ::SDL_HAPTIC_POLAR only uses - * the first \c dir parameter. The cardinal directions would be: - * - North: 0 (0 degrees) - * - East: 9000 (90 degrees) - * - South: 18000 (180 degrees) - * - West: 27000 (270 degrees) - * - * If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions - * (X axis, Y axis and Z axis (with 3 axes)). ::SDL_HAPTIC_CARTESIAN uses - * the first three \c dir parameters. The cardinal directions would be: - * - North: 0,-1, 0 - * - East: -1, 0, 0 - * - South: 0, 1, 0 - * - West: 1, 0, 0 - * - * The Z axis represents the height of the effect if supported, otherwise - * it's unused. In cartesian encoding (1, 2) would be the same as (2, 4), you - * can use any multiple you want, only the direction matters. - * - * If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations. - * The first two \c dir parameters are used. The \c dir parameters are as - * follows (all values are in hundredths of degrees): - * - Degrees from (1, 0) rotated towards (0, 1). - * - Degrees towards (0, 0, 1) (device needs at least 3 axes). - * - * - * Example of force coming from the south with all encodings (force coming - * from the south means the user will have to pull the stick to counteract): - * \code - * SDL_HapticDirection direction; - * - * // Cartesian directions - * direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding. - * direction.dir[0] = 0; // X position - * direction.dir[1] = 1; // Y position - * // Assuming the device has 2 axes, we don't need to specify third parameter. - * - * // Polar directions - * direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding. - * direction.dir[0] = 18000; // Polar only uses first parameter - * - * // Spherical coordinates - * direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding - * direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters. - * \endcode - * - * \sa SDL_HAPTIC_POLAR - * \sa SDL_HAPTIC_CARTESIAN - * \sa SDL_HAPTIC_SPHERICAL - * \sa SDL_HapticEffect - * \sa SDL_HapticNumAxes - */ -typedef struct SDL_HapticDirection -{ - Uint8 type; /**< The type of encoding. */ - Sint32 dir[3]; /**< The encoded direction. */ -} SDL_HapticDirection; - - -/** - * \brief A structure containing a template for a Constant effect. - * - * The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect. - * - * A constant effect applies a constant force in the specified direction - * to the joystick. - * - * \sa SDL_HAPTIC_CONSTANT - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticConstant -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_CONSTANT */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Constant */ - Sint16 level; /**< Strength of the constant effect. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticConstant; - -/** - * \brief A structure containing a template for a Periodic effect. - * - * The struct handles the following effects: - * - ::SDL_HAPTIC_SINE - * - ::SDL_HAPTIC_LEFTRIGHT - * - ::SDL_HAPTIC_TRIANGLE - * - ::SDL_HAPTIC_SAWTOOTHUP - * - ::SDL_HAPTIC_SAWTOOTHDOWN - * - * A periodic effect consists in a wave-shaped effect that repeats itself - * over time. The type determines the shape of the wave and the parameters - * determine the dimensions of the wave. - * - * Phase is given by hundredth of a cycle meaning that giving the phase a value - * of 9000 will displace it 25% of its period. Here are sample values: - * - 0: No phase displacement. - * - 9000: Displaced 25% of its period. - * - 18000: Displaced 50% of its period. - * - 27000: Displaced 75% of its period. - * - 36000: Displaced 100% of its period, same as 0, but 0 is preferred. - * - * Examples: - * \verbatim - SDL_HAPTIC_SINE - __ __ __ __ - / \ / \ / \ / - / \__/ \__/ \__/ - - SDL_HAPTIC_SQUARE - __ __ __ __ __ - | | | | | | | | | | - | |__| |__| |__| |__| | - - SDL_HAPTIC_TRIANGLE - /\ /\ /\ /\ /\ - / \ / \ / \ / \ / - / \/ \/ \/ \/ - - SDL_HAPTIC_SAWTOOTHUP - /| /| /| /| /| /| /| - / | / | / | / | / | / | / | - / |/ |/ |/ |/ |/ |/ | - - SDL_HAPTIC_SAWTOOTHDOWN - \ |\ |\ |\ |\ |\ |\ | - \ | \ | \ | \ | \ | \ | \ | - \| \| \| \| \| \| \| - \endverbatim - * - * \sa SDL_HAPTIC_SINE - * \sa SDL_HAPTIC_LEFTRIGHT - * \sa SDL_HAPTIC_TRIANGLE - * \sa SDL_HAPTIC_SAWTOOTHUP - * \sa SDL_HAPTIC_SAWTOOTHDOWN - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticPeriodic -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT, - ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or - ::SDL_HAPTIC_SAWTOOTHDOWN */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Periodic */ - Uint16 period; /**< Period of the wave. */ - Sint16 magnitude; /**< Peak value. */ - Sint16 offset; /**< Mean value of the wave. */ - Uint16 phase; /**< Horizontal shift given by hundredth of a cycle. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticPeriodic; - -/** - * \brief A structure containing a template for a Condition effect. - * - * The struct handles the following effects: - * - ::SDL_HAPTIC_SPRING: Effect based on axes position. - * - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity. - * - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration. - * - ::SDL_HAPTIC_FRICTION: Effect based on axes movement. - * - * Direction is handled by condition internals instead of a direction member. - * The condition effect specific members have three parameters. The first - * refers to the X axis, the second refers to the Y axis and the third - * refers to the Z axis. The right terms refer to the positive side of the - * axis and the left terms refer to the negative side of the axis. Please - * refer to the ::SDL_HapticDirection diagram for which side is positive and - * which is negative. - * - * \sa SDL_HapticDirection - * \sa SDL_HAPTIC_SPRING - * \sa SDL_HAPTIC_DAMPER - * \sa SDL_HAPTIC_INERTIA - * \sa SDL_HAPTIC_FRICTION - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticCondition -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER, - ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */ - SDL_HapticDirection direction; /**< Direction of the effect - Not used ATM. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Condition */ - Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */ - Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */ - Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */ - Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */ - Uint16 deadband[3]; /**< Size of the dead zone. */ - Sint16 center[3]; /**< Position of the dead zone. */ -} SDL_HapticCondition; - -/** - * \brief A structure containing a template for a Ramp effect. - * - * This struct is exclusively for the ::SDL_HAPTIC_RAMP effect. - * - * The ramp effect starts at start strength and ends at end strength. - * It augments in linear fashion. If you use attack and fade with a ramp - * the effects get added to the ramp effect making the effect become - * quadratic instead of linear. - * - * \sa SDL_HAPTIC_RAMP - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticRamp -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_RAMP */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Ramp */ - Sint16 start; /**< Beginning strength level. */ - Sint16 end; /**< Ending strength level. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticRamp; - -/** - * \brief A structure containing a template for a Left/Right effect. - * - * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect. - * - * The Left/Right effect is used to explicitly control the large and small - * motors, commonly found in modern game controllers. One motor is high - * frequency, the other is low frequency. - * - * \sa SDL_HAPTIC_LEFTRIGHT - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticLeftRight -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_LEFTRIGHT */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - - /* Rumble */ - Uint16 large_magnitude; /**< Control of the large controller motor. */ - Uint16 small_magnitude; /**< Control of the small controller motor. */ -} SDL_HapticLeftRight; - -/** - * \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect. - * - * A custom force feedback effect is much like a periodic effect, where the - * application can define its exact shape. You will have to allocate the - * data yourself. Data should consist of channels * samples Uint16 samples. - * - * If channels is one, the effect is rotated using the defined direction. - * Otherwise it uses the samples in data for the different axes. - * - * \sa SDL_HAPTIC_CUSTOM - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticCustom -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_CUSTOM */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Custom */ - Uint8 channels; /**< Axes to use, minimum of one. */ - Uint16 period; /**< Sample periods. */ - Uint16 samples; /**< Amount of samples. */ - Uint16 *data; /**< Should contain channels*samples items. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticCustom; - -/** - * \brief The generic template for any haptic effect. - * - * All values max at 32767 (0x7FFF). Signed values also can be negative. - * Time values unless specified otherwise are in milliseconds. - * - * You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767 - * value. Neither delay, interval, attack_length nor fade_length support - * ::SDL_HAPTIC_INFINITY. Fade will also not be used since effect never ends. - * - * Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of - * ::SDL_HAPTIC_INFINITY. - * - * Button triggers may not be supported on all devices, it is advised to not - * use them if possible. Buttons start at index 1 instead of index 0 like - * the joystick. - * - * If both attack_length and fade_level are 0, the envelope is not used, - * otherwise both values are used. - * - * Common parts: - * \code - * // Replay - All effects have this - * Uint32 length; // Duration of effect (ms). - * Uint16 delay; // Delay before starting effect. - * - * // Trigger - All effects have this - * Uint16 button; // Button that triggers effect. - * Uint16 interval; // How soon before effect can be triggered again. - * - * // Envelope - All effects except condition effects have this - * Uint16 attack_length; // Duration of the attack (ms). - * Uint16 attack_level; // Level at the start of the attack. - * Uint16 fade_length; // Duration of the fade out (ms). - * Uint16 fade_level; // Level at the end of the fade. - * \endcode - * - * - * Here we have an example of a constant effect evolution in time: - * \verbatim - Strength - ^ - | - | effect level --> _________________ - | / \ - | / \ - | / \ - | / \ - | attack_level --> | \ - | | | <--- fade_level - | - +--------------------------------------------------> Time - [--] [---] - attack_length fade_length - - [------------------][-----------------------] - delay length - \endverbatim - * - * Note either the attack_level or the fade_level may be above the actual - * effect level. - * - * \sa SDL_HapticConstant - * \sa SDL_HapticPeriodic - * \sa SDL_HapticCondition - * \sa SDL_HapticRamp - * \sa SDL_HapticLeftRight - * \sa SDL_HapticCustom - */ -typedef union SDL_HapticEffect -{ - /* Common for all force feedback effects */ - Uint16 type; /**< Effect type. */ - SDL_HapticConstant constant; /**< Constant effect. */ - SDL_HapticPeriodic periodic; /**< Periodic effect. */ - SDL_HapticCondition condition; /**< Condition effect. */ - SDL_HapticRamp ramp; /**< Ramp effect. */ - SDL_HapticLeftRight leftright; /**< Left/Right effect. */ - SDL_HapticCustom custom; /**< Custom effect. */ -} SDL_HapticEffect; - - -/* Function prototypes */ -/** - * \brief Count the number of haptic devices attached to the system. - * - * \return Number of haptic devices detected on the system. - */ -extern DECLSPEC int SDLCALL SDL_NumHaptics(void); - -/** - * \brief Get the implementation dependent name of a Haptic device. - * - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. - * - * \param device_index Index of the device to get its name. - * \return Name of the device or NULL on error. - * - * \sa SDL_NumHaptics - */ -extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index); - -/** - * \brief Opens a Haptic device for usage. - * - * The index passed as an argument refers to the N'th Haptic device on this - * system. - * - * When opening a haptic device, its gain will be set to maximum and - * autocenter will be disabled. To modify these values use - * SDL_HapticSetGain() and SDL_HapticSetAutocenter(). - * - * \param device_index Index of the device to open. - * \return Device identifier or NULL on error. - * - * \sa SDL_HapticIndex - * \sa SDL_HapticOpenFromMouse - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - * \sa SDL_HapticSetGain - * \sa SDL_HapticSetAutocenter - * \sa SDL_HapticPause - * \sa SDL_HapticStopAll - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index); - -/** - * \brief Checks if the haptic device at index has been opened. - * - * \param device_index Index to check to see if it has been opened. - * \return 1 if it has been opened or 0 if it hasn't. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticIndex - */ -extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index); - -/** - * \brief Gets the index of a haptic device. - * - * \param haptic Haptic device to get the index of. - * \return The index of the haptic device or -1 on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpened - */ -extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic); - -/** - * \brief Gets whether or not the current mouse has haptic capabilities. - * - * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't. - * - * \sa SDL_HapticOpenFromMouse - */ -extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void); - -/** - * \brief Tries to open a haptic device from the current mouse. - * - * \return The haptic device identifier or NULL on error. - * - * \sa SDL_MouseIsHaptic - * \sa SDL_HapticOpen - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void); - -/** - * \brief Checks to see if a joystick has haptic features. - * - * \param joystick Joystick to test for haptic capabilities. - * \return 1 if the joystick is haptic, 0 if it isn't - * or -1 if an error ocurred. - * - * \sa SDL_HapticOpenFromJoystick - */ -extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick); - -/** - * \brief Opens a Haptic device for usage from a Joystick device. - * - * You must still close the haptic device seperately. It will not be closed - * with the joystick. - * - * When opening from a joystick you should first close the haptic device before - * closing the joystick device. If not, on some implementations the haptic - * device will also get unallocated and you'll be unable to use force feedback - * on that device. - * - * \param joystick Joystick to create a haptic device from. - * \return A valid haptic device identifier on success or NULL on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticClose - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick * - joystick); - -/** - * \brief Closes a Haptic device previously opened with SDL_HapticOpen(). - * - * \param haptic Haptic device to close. - */ -extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic); - -/** - * \brief Returns the number of effects a haptic device can store. - * - * On some platforms this isn't fully supported, and therefore is an - * approximation. Always check to see if your created effect was actually - * created and do not rely solely on SDL_HapticNumEffects(). - * - * \param haptic The haptic device to query effect max. - * \return The number of effects the haptic device can store or - * -1 on error. - * - * \sa SDL_HapticNumEffectsPlaying - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic); - -/** - * \brief Returns the number of effects a haptic device can play at the same - * time. - * - * This is not supported on all platforms, but will always return a value. - * Added here for the sake of completeness. - * - * \param haptic The haptic device to query maximum playing effects. - * \return The number of effects the haptic device can play at the same time - * or -1 on error. - * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic); - -/** - * \brief Gets the haptic devices supported features in bitwise matter. - * - * Example: - * \code - * if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) { - * printf("We have constant haptic effect!"); - * } - * \endcode - * - * \param haptic The haptic device to query. - * \return Haptic features in bitwise manner (OR'd). - * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticEffectSupported - */ -extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic); - - -/** - * \brief Gets the number of haptic axes the device has. - * - * \sa SDL_HapticDirection - */ -extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic); - -/** - * \brief Checks to see if effect is supported by haptic. - * - * \param haptic Haptic device to check on. - * \param effect Effect to check to see if it is supported. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. - * - * \sa SDL_HapticQuery - * \sa SDL_HapticNewEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic, - SDL_HapticEffect * - effect); - -/** - * \brief Creates a new haptic effect on the device. - * - * \param haptic Haptic device to create the effect on. - * \param effect Properties of the effect to create. - * \return The id of the effect on success or -1 on error. - * - * \sa SDL_HapticUpdateEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic, - SDL_HapticEffect * effect); - -/** - * \brief Updates the properties of an effect. - * - * Can be used dynamically, although behaviour when dynamically changing - * direction may be strange. Specifically the effect may reupload itself - * and start playing from the start. You cannot change the type either when - * running SDL_HapticUpdateEffect(). - * - * \param haptic Haptic device that has the effect. - * \param effect Effect to update. - * \param data New effect properties to use. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticNewEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic, - int effect, - SDL_HapticEffect * data); - -/** - * \brief Runs the haptic effect on its associated haptic device. - * - * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over - * repeating the envelope (attack and fade) every time. If you only want the - * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length - * parameter. - * - * \param haptic Haptic device to run the effect on. - * \param effect Identifier of the haptic effect to run. - * \param iterations Number of iterations to run the effect. Use - * ::SDL_HAPTIC_INFINITY for infinity. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticStopEffect - * \sa SDL_HapticDestroyEffect - * \sa SDL_HapticGetEffectStatus - */ -extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic, - int effect, - Uint32 iterations); - -/** - * \brief Stops the haptic effect on its associated haptic device. - * - * \param haptic Haptic device to stop the effect on. - * \param effect Identifier of the effect to stop. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic, - int effect); - -/** - * \brief Destroys a haptic effect on the device. - * - * This will stop the effect if it's running. Effects are automatically - * destroyed when the device is closed. - * - * \param haptic Device to destroy the effect on. - * \param effect Identifier of the effect to destroy. - * - * \sa SDL_HapticNewEffect - */ -extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic, - int effect); - -/** - * \brief Gets the status of the current effect on the haptic device. - * - * Device must support the ::SDL_HAPTIC_STATUS feature. - * - * \param haptic Haptic device to query the effect status on. - * \param effect Identifier of the effect to query its status. - * \return 0 if it isn't playing, 1 if it is playing or -1 on error. - * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticStopEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic, - int effect); - -/** - * \brief Sets the global gain of the device. - * - * Device must support the ::SDL_HAPTIC_GAIN feature. - * - * The user may specify the maximum gain by setting the environment variable - * SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to - * SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the - * maximum. - * - * \param haptic Haptic device to set the gain on. - * \param gain Value to set the gain to, should be between 0 and 100. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain); - -/** - * \brief Sets the global autocenter of the device. - * - * Autocenter should be between 0 and 100. Setting it to 0 will disable - * autocentering. - * - * Device must support the ::SDL_HAPTIC_AUTOCENTER feature. - * - * \param haptic Haptic device to set autocentering on. - * \param autocenter Value to set autocenter to, 0 disables autocentering. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic, - int autocenter); - -/** - * \brief Pauses a haptic device. - * - * Device must support the ::SDL_HAPTIC_PAUSE feature. Call - * SDL_HapticUnpause() to resume playback. - * - * Do not modify the effects nor add new ones while the device is paused. - * That can cause all sorts of weird errors. - * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticUnpause - */ -extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic); - -/** - * \brief Unpauses a haptic device. - * - * Call to unpause after SDL_HapticPause(). - * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticPause - */ -extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic); - -/** - * \brief Stops all the currently playing effects on a haptic device. - * - * \param haptic Haptic device to stop. - * \return 0 on success or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic); - -/** - * \brief Checks to see if rumble is supported on a haptic device. - * - * \param haptic Haptic device to check to see if it supports rumble. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. - * - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic); - -/** - * \brief Initializes the haptic device for simple rumble playback. - * - * \param haptic Haptic device to initialize for simple rumble playback. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic); - -/** - * \brief Runs simple rumble on a haptic device - * - * \param haptic Haptic device to play rumble effect on. - * \param strength Strength of the rumble to play as a 0-1 float value. - * \param length Length of the rumble to play in milliseconds. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length ); - -/** - * \brief Stops the simple rumble on a haptic device. - * - * \param haptic Haptic to stop the rumble on. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_haptic_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_hints.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_hints.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_hints.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_hints.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,517 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_hints.h - * - * Official documentation for SDL configuration variables - * - * This file contains functions to set and get configuration hints, - * as well as listing each of them alphabetically. - * - * The convention for naming hints is SDL_HINT_X, where "SDL_X" is - * the environment variable that can be used to override the default. - * - * In general these hints are just that - they may or may not be - * supported or applicable on any given platform, but they provide - * a way for an application or user to give the library a hint as - * to how they would like the library to work. - */ - -#ifndef _SDL_hints_h -#define _SDL_hints_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. - * - * SDL can try to accelerate the SDL screen surface by using streaming - * textures with a 3D rendering engine. This variable controls whether and - * how this is done. - * - * This variable can be set to the following values: - * "0" - Disable 3D acceleration - * "1" - Enable 3D acceleration, using the default renderer. - * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) - * - * By default SDL tries to make a best guess for each platform whether - * to use acceleration or not. - */ -#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" - -/** - * \brief A variable specifying which render driver to use. - * - * If the application doesn't pick a specific renderer to use, this variable - * specifies the name of the preferred renderer. If the preferred renderer - * can't be initialized, the normal default renderer is used. - * - * This variable is case insensitive and can be set to the following values: - * "direct3d" - * "opengl" - * "opengles2" - * "opengles" - * "software" - * - * The default varies by platform, but it's the first one in the list that - * is available on the current platform. - */ -#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" - -/** - * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. - * - * This variable can be set to the following values: - * "0" - Disable shaders - * "1" - Enable shaders - * - * By default shaders are used if OpenGL supports them. - */ -#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" - -/** - * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. - * - * This variable can be set to the following values: - * "0" - Thread-safety is not enabled (faster) - * "1" - Thread-safety is enabled - * - * By default the Direct3D device is created with thread-safety disabled. - */ -#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" - -/** - * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. - * - * This variable does not have any effect on the Direct3D 9 based renderer. - * - * This variable can be set to the following values: - * "0" - Disable Debug Layer use - * "1" - Enable Debug Layer use - * - * By default, SDL does not use Direct3D Debug Layer. - */ -#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_HINT_RENDER_DIRECT3D11_DEBUG" - -/** - * \brief A variable controlling the scaling quality - * - * This variable can be set to the following values: - * "0" or "nearest" - Nearest pixel sampling - * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) - * "2" or "best" - Currently this is the same as "linear" - * - * By default nearest pixel sampling is used - */ -#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" - -/** - * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. - * - * This variable can be set to the following values: - * "0" - Disable vsync - * "1" - Enable vsync - * - * By default SDL does not sync screen surface updates with vertical refresh. - */ -#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" - -/** - * \brief A variable controlling whether the screensaver is enabled. - * - * This variable can be set to the following values: - * "0" - Disable screensaver - * "1" - Enable screensaver - * - * By default SDL will disable the screensaver. - */ -#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" - -/** - * \brief A variable controlling whether the X11 VidMode extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XVidMode - * "1" - Enable XVidMode - * - * By default SDL will use XVidMode if it is available. - */ -#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" - -/** - * \brief A variable controlling whether the X11 Xinerama extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable Xinerama - * "1" - Enable Xinerama - * - * By default SDL will use Xinerama if it is available. - */ -#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" - -/** - * \brief A variable controlling whether the X11 XRandR extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XRandR - * "1" - Enable XRandR - * - * By default SDL will not use XRandR because of window manager issues. - */ -#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" - -/** - * \brief A variable controlling whether grabbing input grabs the keyboard - * - * This variable can be set to the following values: - * "0" - Grab will affect only the mouse - * "1" - Grab will affect mouse and keyboard - * - * By default SDL will not grab the keyboard so system shortcuts still work. - */ -#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" - -/** -* \brief A variable controlling whether relative mouse mode is implemented using mouse warping -* -* This variable can be set to the following values: -* "0" - Relative mouse mode uses raw input -* "1" - Relative mouse mode uses mouse warping -* -* By default SDL will use raw input for relative mouse mode -*/ -#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" - -/** - * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. - * - */ -#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" - -/** - * \brief A variable controlling whether the idle timer is disabled on iOS. - * - * When an iOS app does not receive touches for some time, the screen is - * dimmed automatically. For games where the accelerometer is the only input - * this is problematic. This functionality can be disabled by setting this - * hint. - * - * This variable can be set to the following values: - * "0" - Enable idle timer - * "1" - Disable idle timer - */ -#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" - -/** - * \brief A variable controlling which orientations are allowed on iOS. - * - * In some circumstances it is necessary to be able to explicitly control - * which UI orientations are allowed. - * - * This variable is a space delimited list of the following values: - * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" - */ -#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" - -/** - * \brief A variable controlling whether an Android built-in accelerometer should be - * listed as a joystick device, rather than listing actual joysticks only. - * - * This variable can be set to the following values: - * "0" - List only real joysticks and accept input from them - * "1" - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default). - */ -#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" - - -/** - * \brief A variable that lets you disable the detection and use of Xinput gamepad devices - * - * The variable can be set to the following values: - * "0" - Disable XInput detection (only uses direct input) - * "1" - Enable XInput detection (the default) - */ -#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" - - -/** - * \brief A variable that lets you manually hint extra gamecontroller db entries - * - * The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h - * - * This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER) - * You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping() - */ -#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG" - - -/** - * \brief A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background. - * - * The variable can be set to the following values: - * "0" - Disable joystick & gamecontroller input events when the - * application is in the background. - * "1" - Enable joystick & gamecontroller input events when the - * application is in the background. - * - * The default value is "0". This hint may be set at any time. - */ -#define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS" - - -/** - * \brief If set to 0 then never set the top most bit on a SDL Window, even if the video mode expects it. - * This is a debugging aid for developers and not expected to be used by end users. The default is "1" - * - * This variable can be set to the following values: - * "0" - don't allow topmost - * "1" - allow topmost - */ -#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" - - -/** - * \brief A variable that controls the timer resolution, in milliseconds. - * - * The higher resolution the timer, the more frequently the CPU services - * timer interrupts, and the more precise delays are, but this takes up - * power and CPU time. This hint is only used on Windows 7 and earlier. - * - * See this blog post for more information: - * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ - * - * If this variable is set to "0", the system timer resolution is not set. - * - * The default value is "1". This hint may be set at any time. - */ -#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" - - -/** - * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac) - */ -#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED" - -/** - * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac - * - * If present, holding ctrl while left clicking will generate a right click - * event when on Mac. - */ -#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" - -/** -* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries -* -* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It -* can use two different sets of binaries, those compiled by the user from source -* or those provided by the Chrome browser. In the later case, these binaries require -* that SDL loads a DLL providing the shader compiler. -* -* This variable can be set to the following values: -* "d3dcompiler_46.dll" - default, best for Vista or later. -* "d3dcompiler_43.dll" - for XP support. -* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. -* -*/ -#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" - -/** -* \brief A variable that is the address of another SDL_Window* (as a hex string formatted with "%p"). -* -* If this hint is set before SDL_CreateWindowFrom() and the SDL_Window* it is set to has -* SDL_WINDOW_OPENGL set (and running on WGL only, currently), then two things will occur on the newly -* created SDL_Window: -* -* 1. Its pixel format will be set to the same pixel format as this SDL_Window. This is -* needed for example when sharing an OpenGL context across multiple windows. -* -* 2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for -* OpenGL rendering. -* -* This variable can be set to the following values: -* The address (as a string "%p") of the SDL_Window* that new windows created with SDL_CreateWindowFrom() should -* share a pixel format with. -*/ -#define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT" - -/* - * \brief A URL to a WinRT app's privacy policy - * - * All network-enabled WinRT apps must make a privacy policy available to its - * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be - * be available in the Windows Settings charm, as accessed from within the app. - * SDL provides code to add a URL-based link there, which can point to the app's - * privacy policy. - * - * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init functions. The contents of the hint should - * be a valid URL. For example, "http://www.example.com". - * - * The default value is "", which will prevent SDL from adding a privacy policy - * link to the Settings charm. This hint should only be set during app init. - * - * The label text of an app's "Privacy Policy" link may be customized via another - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that on Windows Phone, Microsoft does not provide standard UI - * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL - * will not get used on that platform. Network-enabled phone apps should display - * their privacy policy through some other, in-app means. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_HINT_WINRT_PRIVACY_POLICY_URL" - -/** \brief Label text for a WinRT app's privacy policy link - * - * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, - * Microsoft mandates that this policy be available via the Windows Settings charm. - * SDL provides code to add a link there, with it's label text being set via the - * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that a privacy policy's contents are not set via this hint. A separate - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the - * policy. - * - * The contents of this hint should be encoded as a UTF8 string. - * - * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init. - * - * For additional information on linking to a privacy policy, see the documentation for - * SDL_HINT_WINRT_PRIVACY_POLICY_URL. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_HINT_WINRT_PRIVACY_POLICY_LABEL" - -/** \brief If set to 1, back button press events on Windows Phone 8+ will be marked as handled. - * - * TODO, WinRT: document SDL_HINT_WINRT_HANDLE_BACK_BUTTON need and use - * For now, more details on why this is needed can be found at the - * beginning of the following web page: - * http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj247550(v=vs.105).aspx - */ -#define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_HINT_WINRT_HANDLE_BACK_BUTTON" - -/** - * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. - * - * This hint only applies to Mac OS X. - * - * The variable can be set to the following values: - * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and - * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" - * button on their titlebars). - * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and - * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" - * button on their titlebars. - * - * The default value is "1". Spaces are disabled regardless of this hint if - * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before - * any windows are created. - */ -#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" - - -/** - * \brief An enumeration of hint priorities - */ -typedef enum -{ - SDL_HINT_DEFAULT, - SDL_HINT_NORMAL, - SDL_HINT_OVERRIDE -} SDL_HintPriority; - - -/** - * \brief Set a hint with a specific priority - * - * The priority controls the behavior when setting a hint that already - * has a value. Hints will replace existing hints of their priority and - * lower. Environment variables are considered to have override priority. - * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name, - const char *value, - SDL_HintPriority priority); - -/** - * \brief Set a hint with normal priority - * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, - const char *value); - -/** - * \brief Get a hint - * - * \return The string value of a hint variable. - */ -extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); - -/** - * \brief Add a function to watch a particular hint - * - * \param name The hint to watch - * \param callback The function to call when the hint value changes - * \param userdata A pointer to pass to the callback function - */ -typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); -extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, - SDL_HintCallback callback, - void *userdata); - -/** - * \brief Remove a function watching a particular hint - * - * \param name The hint being watched - * \param callback The function being called when the hint value changes - * \param userdata A pointer being passed to the callback function - */ -extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name, - SDL_HintCallback callback, - void *userdata); - -/** - * \brief Clear all hints - * - * This function is called during SDL_Quit() to free stored hints. - */ -extern DECLSPEC void SDLCALL SDL_ClearHints(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_hints_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_joystick.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_joystick.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_joystick.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_joystick.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,253 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_joystick.h - * - * Include file for SDL joystick event handling - * - * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick - * behind a device_index changing as joysticks are plugged and unplugged. - * - * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted - * then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in. - * - * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of - * the device (a X360 wired controller for example). This identifier is platform dependent. - * - * - */ - -#ifndef _SDL_joystick_h -#define _SDL_joystick_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_joystick.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system - * for joysticks, and load appropriate drivers. - * - * If you would like to receive joystick updates while the application - * is in the background, you should set the following hint before calling - * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS - */ - -/* The joystick structure used to identify an SDL joystick */ -struct _SDL_Joystick; -typedef struct _SDL_Joystick SDL_Joystick; - -/* A structure that encodes the stable unique id for a joystick device */ -typedef struct { - Uint8 data[16]; -} SDL_JoystickGUID; - -typedef Sint32 SDL_JoystickID; - - -/* Function prototypes */ -/** - * Count the number of joysticks attached to the system right now - */ -extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); - -/** - * Get the implementation dependent name of a joystick. - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); - -/** - * Open a joystick for use. - * The index passed as an argument refers tothe N'th joystick on the system. - * This index is the value which will identify this joystick in future joystick - * events. - * - * \return A joystick identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index); - -/** - * Return the name for this currently opened joystick. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); - -/** - * Return the GUID for the joystick at this index - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index); - -/** - * Return the GUID for this opened joystick - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick); - -/** - * Return a string representation for this guid. pszGUID must point to at least 33 bytes - * (32 for the string plus a NULL terminator). - */ -extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID); - -/** - * convert a string into a joystick formatted guid - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID); - -/** - * Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick); - -/** - * Get the instance ID of an opened joystick or -1 if the joystick is invalid. - */ -extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick); - -/** - * Get the number of general axis controls on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick); - -/** - * Get the number of trackballs on a joystick. - * - * Joystick trackballs have only relative motion events associated - * with them and their state cannot be polled. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick); - -/** - * Get the number of POV hats on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick); - -/** - * Get the number of buttons on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick); - -/** - * Update the current state of the open joysticks. - * - * This is called automatically by the event loop if any joystick - * events are enabled. - */ -extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void); - -/** - * Enable/disable joystick event polling. - * - * If joystick events are disabled, you must call SDL_JoystickUpdate() - * yourself and check the state of the joystick when you want joystick - * information. - * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. - */ -extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); - -/** - * Get the current state of an axis control on a joystick. - * - * The state is a value ranging from -32768 to 32767. - * - * The axis indices start at index 0. - */ -extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, - int axis); - -/** - * \name Hat positions - */ -/* @{ */ -#define SDL_HAT_CENTERED 0x00 -#define SDL_HAT_UP 0x01 -#define SDL_HAT_RIGHT 0x02 -#define SDL_HAT_DOWN 0x04 -#define SDL_HAT_LEFT 0x08 -#define SDL_HAT_RIGHTUP (SDL_HAT_RIGHT|SDL_HAT_UP) -#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT|SDL_HAT_DOWN) -#define SDL_HAT_LEFTUP (SDL_HAT_LEFT|SDL_HAT_UP) -#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT|SDL_HAT_DOWN) -/* @} */ - -/** - * Get the current state of a POV hat on a joystick. - * - * The hat indices start at index 0. - * - * \return The return value is one of the following positions: - * - ::SDL_HAT_CENTERED - * - ::SDL_HAT_UP - * - ::SDL_HAT_RIGHT - * - ::SDL_HAT_DOWN - * - ::SDL_HAT_LEFT - * - ::SDL_HAT_RIGHTUP - * - ::SDL_HAT_RIGHTDOWN - * - ::SDL_HAT_LEFTUP - * - ::SDL_HAT_LEFTDOWN - */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick, - int hat); - -/** - * Get the ball axis change since the last poll. - * - * \return 0, or -1 if you passed it invalid parameters. - * - * The ball indices start at index 0. - */ -extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, - int ball, int *dx, int *dy); - -/** - * Get the current state of a button on a joystick. - * - * The button indices start at index 0. - */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, - int button); - -/** - * Close a joystick previously opened with SDL_JoystickOpen(). - */ -extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_joystick_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_keyboard.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_keyboard.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_keyboard.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_keyboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_keyboard.h - * - * Include file for SDL keyboard event handling - */ - -#ifndef _SDL_keyboard_h -#define _SDL_keyboard_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_keycode.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The SDL keysym structure, used in key events. - * - * \note If you are looking for translated character input, see the ::SDL_TEXTINPUT event. - */ -typedef struct SDL_Keysym -{ - SDL_Scancode scancode; /**< SDL physical key code - see ::SDL_Scancode for details */ - SDL_Keycode sym; /**< SDL virtual key code - see ::SDL_Keycode for details */ - Uint16 mod; /**< current key modifiers */ - Uint32 unused; -} SDL_Keysym; - -/* Function prototypes */ - -/** - * \brief Get the window which currently has keyboard focus. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void); - -/** - * \brief Get a snapshot of the current state of the keyboard. - * - * \param numkeys if non-NULL, receives the length of the returned array. - * - * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values. - * - * \b Example: - * \code - * const Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode - */ -extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys); - -/** - * \brief Get the current key modifier state for the keyboard. - */ -extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void); - -/** - * \brief Set the current key modifier state for the keyboard. - * - * \note This does not change the keyboard state, only the key modifier flags. - */ -extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate); - -/** - * \brief Get the key code corresponding to the given scancode according - * to the current keyboard layout. - * - * See ::SDL_Keycode for details. - * - * \sa SDL_GetKeyName() - */ -extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode); - -/** - * \brief Get the scancode corresponding to the given key code according to the - * current keyboard layout. - * - * See ::SDL_Scancode for details. - * - * \sa SDL_GetScancodeName() - */ -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key); - -/** - * \brief Get a human-readable name for a scancode. - * - * \return A pointer to the name for the scancode. - * If the scancode doesn't have a name, this function returns - * an empty string (""). - * - * \sa SDL_Scancode - */ -extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode); - -/** - * \brief Get a scancode from a human-readable name - * - * \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized - * - * \sa SDL_Scancode - */ -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); - -/** - * \brief Get a human-readable name for a key. - * - * \return A pointer to a UTF-8 string that stays valid at least until the next - * call to this function. If you need it around any longer, you must - * copy it. If the key doesn't have a name, this function returns an - * empty string (""). - * - * \sa SDL_Key - */ -extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); - -/** - * \brief Get a key code from a human-readable name - * - * \return key code, or SDLK_UNKNOWN if the name wasn't recognized - * - * \sa SDL_Keycode - */ -extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); - -/** - * \brief Start accepting Unicode text input events. - * This function will show the on-screen keyboard if supported. - * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC void SDLCALL SDL_StartTextInput(void); - -/** - * \brief Return whether or not Unicode text input events are enabled. - * - * \sa SDL_StartTextInput() - * \sa SDL_StopTextInput() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void); - -/** - * \brief Stop receiving any text input events. - * This function will hide the on-screen keyboard if supported. - * - * \sa SDL_StartTextInput() - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC void SDLCALL SDL_StopTextInput(void); - -/** - * \brief Set the rectangle used to type Unicode text inputs. - * This is used as a hint for IME and on-screen keyboard placement. - * - * \sa SDL_StartTextInput() - */ -extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); - -/** - * \brief Returns whether the platform has some screen keyboard support. - * - * \return SDL_TRUE if some keyboard support is available else SDL_FALSE. - * - * \note Not all screen keyboard functions are supported on all platforms. - * - * \sa SDL_IsScreenKeyboardShown() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void); - -/** - * \brief Returns whether the screen keyboard is shown for given window. - * - * \param window The window for which screen keyboard should be queried. - * - * \return SDL_TRUE if screen keyboard is shown else SDL_FALSE. - * - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_keyboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_keycode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_keycode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_keycode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_keycode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,341 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_keycode.h - * - * Defines constants which identify keyboard keys and modifiers. - */ - -#ifndef _SDL_keycode_h -#define _SDL_keycode_h - -#include "SDL_stdinc.h" -#include "SDL_scancode.h" - -/** - * \brief The SDL virtual key representation. - * - * Values of this type are used to represent keyboard keys using the current - * layout of the keyboard. These values include Unicode values representing - * the unmodified character that would be generated by pressing the key, or - * an SDLK_* constant for those keys that do not generate characters. - */ -typedef Sint32 SDL_Keycode; - -#define SDLK_SCANCODE_MASK (1<<30) -#define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) - -enum -{ - SDLK_UNKNOWN = 0, - - SDLK_RETURN = '\r', - SDLK_ESCAPE = '\033', - SDLK_BACKSPACE = '\b', - SDLK_TAB = '\t', - SDLK_SPACE = ' ', - SDLK_EXCLAIM = '!', - SDLK_QUOTEDBL = '"', - SDLK_HASH = '#', - SDLK_PERCENT = '%', - SDLK_DOLLAR = '$', - SDLK_AMPERSAND = '&', - SDLK_QUOTE = '\'', - SDLK_LEFTPAREN = '(', - SDLK_RIGHTPAREN = ')', - SDLK_ASTERISK = '*', - SDLK_PLUS = '+', - SDLK_COMMA = ',', - SDLK_MINUS = '-', - SDLK_PERIOD = '.', - SDLK_SLASH = '/', - SDLK_0 = '0', - SDLK_1 = '1', - SDLK_2 = '2', - SDLK_3 = '3', - SDLK_4 = '4', - SDLK_5 = '5', - SDLK_6 = '6', - SDLK_7 = '7', - SDLK_8 = '8', - SDLK_9 = '9', - SDLK_COLON = ':', - SDLK_SEMICOLON = ';', - SDLK_LESS = '<', - SDLK_EQUALS = '=', - SDLK_GREATER = '>', - SDLK_QUESTION = '?', - SDLK_AT = '@', - /* - Skip uppercase letters - */ - SDLK_LEFTBRACKET = '[', - SDLK_BACKSLASH = '\\', - SDLK_RIGHTBRACKET = ']', - SDLK_CARET = '^', - SDLK_UNDERSCORE = '_', - SDLK_BACKQUOTE = '`', - SDLK_a = 'a', - SDLK_b = 'b', - SDLK_c = 'c', - SDLK_d = 'd', - SDLK_e = 'e', - SDLK_f = 'f', - SDLK_g = 'g', - SDLK_h = 'h', - SDLK_i = 'i', - SDLK_j = 'j', - SDLK_k = 'k', - SDLK_l = 'l', - SDLK_m = 'm', - SDLK_n = 'n', - SDLK_o = 'o', - SDLK_p = 'p', - SDLK_q = 'q', - SDLK_r = 'r', - SDLK_s = 's', - SDLK_t = 't', - SDLK_u = 'u', - SDLK_v = 'v', - SDLK_w = 'w', - SDLK_x = 'x', - SDLK_y = 'y', - SDLK_z = 'z', - - SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK), - - SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1), - SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2), - SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3), - SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4), - SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5), - SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6), - SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7), - SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8), - SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9), - SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10), - SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11), - SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12), - - SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN), - SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK), - SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE), - SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), - SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), - SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - SDLK_DELETE = '\177', - SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), - SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), - SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), - SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT), - SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN), - SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP), - - SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR), - SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE), - SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY), - SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS), - SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS), - SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER), - SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1), - SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2), - SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3), - SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4), - SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5), - SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6), - SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7), - SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8), - SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9), - SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0), - SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD), - - SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION), - SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER), - SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS), - SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13), - SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14), - SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15), - SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16), - SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17), - SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18), - SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19), - SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20), - SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21), - SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22), - SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23), - SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24), - SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE), - SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP), - SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU), - SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT), - SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP), - SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN), - SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO), - SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT), - SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY), - SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE), - SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND), - SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE), - SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP), - SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN), - SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA), - SDLK_KP_EQUALSAS400 = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400), - - SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE), - SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ), - SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL), - SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR), - SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR), - SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2), - SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR), - SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT), - SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER), - SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN), - SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL), - SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL), - - SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00), - SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000), - SDLK_THOUSANDSSEPARATOR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR), - SDLK_DECIMALSEPARATOR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR), - SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT), - SDLK_CURRENCYSUBUNIT = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT), - SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN), - SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN), - SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE), - SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE), - SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB), - SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE), - SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A), - SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B), - SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C), - SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D), - SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E), - SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F), - SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR), - SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER), - SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT), - SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS), - SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER), - SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND), - SDLK_KP_DBLAMPERSAND = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND), - SDLK_KP_VERTICALBAR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR), - SDLK_KP_DBLVERTICALBAR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR), - SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON), - SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH), - SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE), - SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT), - SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM), - SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE), - SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL), - SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR), - SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD), - SDLK_KP_MEMSUBTRACT = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT), - SDLK_KP_MEMMULTIPLY = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY), - SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE), - SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS), - SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR), - SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY), - SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY), - SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL), - SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL), - SDLK_KP_HEXADECIMAL = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL), - - SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL), - SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT), - SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT), - SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI), - SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL), - SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT), - SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT), - SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI), - - SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE), - - SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT), - SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV), - SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP), - SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY), - SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE), - SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT), - SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW), - SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL), - SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR), - SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER), - SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH), - SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME), - SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK), - SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD), - SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP), - SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH), - SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS), - - SDLK_BRIGHTNESSDOWN = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN), - SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP), - SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH), - SDLK_KBDILLUMTOGGLE = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE), - SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN), - SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP), - SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT), - SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP) -}; - -/** - * \brief Enumeration of valid key mods (possibly OR'd together). - */ -typedef enum -{ - KMOD_NONE = 0x0000, - KMOD_LSHIFT = 0x0001, - KMOD_RSHIFT = 0x0002, - KMOD_LCTRL = 0x0040, - KMOD_RCTRL = 0x0080, - KMOD_LALT = 0x0100, - KMOD_RALT = 0x0200, - KMOD_LGUI = 0x0400, - KMOD_RGUI = 0x0800, - KMOD_NUM = 0x1000, - KMOD_CAPS = 0x2000, - KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDL_Keymod; - -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) - -#endif /* _SDL_keycode_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_loadso.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_loadso.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_loadso.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_loadso.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_loadso.h - * - * System dependent library loading routines - * - * Some things to keep in mind: - * \li These functions only work on C function names. Other languages may - * have name mangling and intrinsic language support that varies from - * compiler to compiler. - * \li Make sure you declare your function pointers with the same calling - * convention as the actual library function. Your code will crash - * mysteriously if you do not do this. - * \li Avoid namespace collisions. If you load a symbol from the library, - * it is not defined whether or not it goes into the global symbol - * namespace for the application. If it does and it conflicts with - * symbols in your code or other shared libraries, you will not get - * the results you expect. :) - */ - -#ifndef _SDL_loadso_h -#define _SDL_loadso_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * This function dynamically loads a shared object and returns a pointer - * to the object handle (or NULL if there was an error). - * The 'sofile' parameter is a system dependent name of the object file. - */ -extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); - -/** - * Given an object handle, this function looks up the address of the - * named function in the shared object and returns it. This address - * is no longer valid after calling SDL_UnloadObject(). - */ -extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle, - const char *name); - -/** - * Unload a shared object from memory. - */ -extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_loadso_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_log.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_log.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_log.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_log.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_log.h - * - * Simple log messages with categories and priorities. - * - * By default logs are quiet, but if you're debugging SDL you might want: - * - * SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN); - * - * Here's where the messages go on different platforms: - * Windows: debug output stream - * Android: log output - * Others: standard error output (stderr) - */ - -#ifndef _SDL_log_h -#define _SDL_log_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * \brief The maximum size of a log message - * - * Messages longer than the maximum size will be truncated - */ -#define SDL_MAX_LOG_MESSAGE 4096 - -/** - * \brief The predefined log categories - * - * By default the application category is enabled at the INFO level, - * the assert category is enabled at the WARN level, test is enabled - * at the VERBOSE level and all other categories are enabled at the - * CRITICAL level. - */ -enum -{ - SDL_LOG_CATEGORY_APPLICATION, - SDL_LOG_CATEGORY_ERROR, - SDL_LOG_CATEGORY_ASSERT, - SDL_LOG_CATEGORY_SYSTEM, - SDL_LOG_CATEGORY_AUDIO, - SDL_LOG_CATEGORY_VIDEO, - SDL_LOG_CATEGORY_RENDER, - SDL_LOG_CATEGORY_INPUT, - SDL_LOG_CATEGORY_TEST, - - /* Reserved for future SDL library use */ - SDL_LOG_CATEGORY_RESERVED1, - SDL_LOG_CATEGORY_RESERVED2, - SDL_LOG_CATEGORY_RESERVED3, - SDL_LOG_CATEGORY_RESERVED4, - SDL_LOG_CATEGORY_RESERVED5, - SDL_LOG_CATEGORY_RESERVED6, - SDL_LOG_CATEGORY_RESERVED7, - SDL_LOG_CATEGORY_RESERVED8, - SDL_LOG_CATEGORY_RESERVED9, - SDL_LOG_CATEGORY_RESERVED10, - - /* Beyond this point is reserved for application use, e.g. - enum { - MYAPP_CATEGORY_AWESOME1 = SDL_LOG_CATEGORY_CUSTOM, - MYAPP_CATEGORY_AWESOME2, - MYAPP_CATEGORY_AWESOME3, - ... - }; - */ - SDL_LOG_CATEGORY_CUSTOM -}; - -/** - * \brief The predefined log priorities - */ -typedef enum -{ - SDL_LOG_PRIORITY_VERBOSE = 1, - SDL_LOG_PRIORITY_DEBUG, - SDL_LOG_PRIORITY_INFO, - SDL_LOG_PRIORITY_WARN, - SDL_LOG_PRIORITY_ERROR, - SDL_LOG_PRIORITY_CRITICAL, - SDL_NUM_LOG_PRIORITIES -} SDL_LogPriority; - - -/** - * \brief Set the priority of all log categories - */ -extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority); - -/** - * \brief Set the priority of a particular log category - */ -extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category, - SDL_LogPriority priority); - -/** - * \brief Get the priority of a particular log category - */ -extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category); - -/** - * \brief Reset all priorities to default. - * - * \note This is called in SDL_Quit(). - */ -extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void); - -/** - * \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO - */ -extern DECLSPEC void SDLCALL SDL_Log(const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_VERBOSE - */ -extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_DEBUG - */ -extern DECLSPEC void SDLCALL SDL_LogDebug(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_INFO - */ -extern DECLSPEC void SDLCALL SDL_LogInfo(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_WARN - */ -extern DECLSPEC void SDLCALL SDL_LogWarn(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_ERROR - */ -extern DECLSPEC void SDLCALL SDL_LogError(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_CRITICAL - */ -extern DECLSPEC void SDLCALL SDL_LogCritical(int category, const char *fmt, ...); - -/** - * \brief Log a message with the specified category and priority. - */ -extern DECLSPEC void SDLCALL SDL_LogMessage(int category, - SDL_LogPriority priority, - const char *fmt, ...); - -/** - * \brief Log a message with the specified category and priority. - */ -extern DECLSPEC void SDLCALL SDL_LogMessageV(int category, - SDL_LogPriority priority, - const char *fmt, va_list ap); - -/** - * \brief The prototype for the log output function - */ -typedef void (*SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message); - -/** - * \brief Get the current log output function. - */ -extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata); - -/** - * \brief This function allows you to replace the default log output - * function with one of your own. - */ -extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_log_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_main.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_main.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_main.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_main.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_main_h -#define _SDL_main_h - -#include "SDL_stdinc.h" - -/** - * \file SDL_main.h - * - * Redefine main() on some platforms so that it is called by SDL. - */ - -#ifndef SDL_MAIN_HANDLED -#if defined(__WIN32__) -/* On Windows SDL provides WinMain(), which parses the command line and passes - the arguments to your main function. - - If you provide your own WinMain(), you may define SDL_MAIN_HANDLED - */ -#define SDL_MAIN_AVAILABLE - -#elif defined(__WINRT__) -/* On WinRT, SDL provides a main function that initializes CoreApplication, - creating an instance of IFrameworkView in the process. - - Please note that #include'ing SDL_main.h is not enough to get a main() - function working. In non-XAML apps, the file, - src/main/winrt/SDL_WinRT_main_NonXAML.cpp, or a copy of it, must be compiled - into the app itself. In XAML apps, the function, SDL_WinRTRunApp must be - called, with a pointer to the Direct3D-hosted XAML control passed in. -*/ -#define SDL_MAIN_NEEDED - -#elif defined(__IPHONEOS__) -/* On iOS SDL provides a main function that creates an application delegate - and starts the iOS application run loop. - - See src/video/uikit/SDL_uikitappdelegate.m for more details. - */ -#define SDL_MAIN_NEEDED - -#elif defined(__ANDROID__) -/* On Android SDL provides a Java class in SDLActivity.java that is the - main activity entry point. - - See README-android.txt for more details on extending that class. - */ -#define SDL_MAIN_NEEDED - -#endif -#endif /* SDL_MAIN_HANDLED */ - -#ifdef __cplusplus -#define C_LINKAGE "C" -#else -#define C_LINKAGE -#endif /* __cplusplus */ - -/** - * \file SDL_main.h - * - * The application's main() function must be called with C linkage, - * and should be declared like this: - * \code - * #ifdef __cplusplus - * extern "C" - * #endif - * int main(int argc, char *argv[]) - * { - * } - * \endcode - */ - -#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE) -#define main SDL_main -#endif - -/** - * The prototype for the application's main() function - */ -extern C_LINKAGE int SDL_main(int argc, char *argv[]); - - -#include "begin_code.h" -#ifdef __cplusplus -extern "C" { -#endif - -/** - * This is called by the real SDL main function to let the rest of the - * library know that initialization was done properly. - * - * Calling this yourself without knowing what you're doing can cause - * crashes and hard to diagnose problems with your application. - */ -extern DECLSPEC void SDLCALL SDL_SetMainReady(void); - -#ifdef __WIN32__ - -/** - * This can be called to set the application class at startup - */ -extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, - void *hInst); -extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); - -#endif /* __WIN32__ */ - - -#ifdef __WINRT__ - -/** - * \brief Initializes and launches an SDL/WinRT application. - * - * \param mainFunction The SDL app's C-style main(). - * \param xamlBackgroundPanel An optional, XAML-based, background panel. - * For Non-XAML apps, this value must be set to NULL. For XAML apps, - * pass in a pointer to a SwapChainBackgroundPanel, casted to an - * IInspectable (via reinterpret_cast). - * \ret 0 on success, -1 on failure. On failure, use SDL_GetError to retrieve more - * information on the failure. - */ -extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * xamlBackgroundPanel); - -#endif /* __WINRT__ */ - - -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_main_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_messagebox.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_messagebox.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_messagebox.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_messagebox.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_messagebox_h -#define _SDL_messagebox_h - -#include "SDL_stdinc.h" -#include "SDL_video.h" /* For SDL_Window */ - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief SDL_MessageBox flags. If supported will display warning icon, etc. - */ -typedef enum -{ - SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ - SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ - SDL_MESSAGEBOX_INFORMATION = 0x00000040 /**< informational dialog */ -} SDL_MessageBoxFlags; - -/** - * \brief Flags for SDL_MessageBoxButtonData. - */ -typedef enum -{ - SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001, /**< Marks the default button when return is hit */ - SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002 /**< Marks the default button when escape is hit */ -} SDL_MessageBoxButtonFlags; - -/** - * \brief Individual button data. - */ -typedef struct -{ - Uint32 flags; /**< ::SDL_MessageBoxButtonFlags */ - int buttonid; /**< User defined button id (value returned via SDL_ShowMessageBox) */ - const char * text; /**< The UTF-8 button text */ -} SDL_MessageBoxButtonData; - -/** - * \brief RGB value used in a message box color scheme - */ -typedef struct -{ - Uint8 r, g, b; -} SDL_MessageBoxColor; - -typedef enum -{ - SDL_MESSAGEBOX_COLOR_BACKGROUND, - SDL_MESSAGEBOX_COLOR_TEXT, - SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, - SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, - SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, - SDL_MESSAGEBOX_COLOR_MAX -} SDL_MessageBoxColorType; - -/** - * \brief A set of colors to use for message box dialogs - */ -typedef struct -{ - SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX]; -} SDL_MessageBoxColorScheme; - -/** - * \brief MessageBox structure containing title, text, window, etc. - */ -typedef struct -{ - Uint32 flags; /**< ::SDL_MessageBoxFlags */ - SDL_Window *window; /**< Parent window, can be NULL */ - const char *title; /**< UTF-8 title */ - const char *message; /**< UTF-8 message text */ - - int numbuttons; - const SDL_MessageBoxButtonData *buttons; - - const SDL_MessageBoxColorScheme *colorScheme; /**< ::SDL_MessageBoxColorScheme, can be NULL to use system settings */ -} SDL_MessageBoxData; - -/** - * \brief Create a modal message box. - * - * \param messageboxdata The SDL_MessageBoxData structure with title, text, etc. - * \param buttonid The pointer to which user id of hit button should be copied. - * - * \return -1 on error, otherwise 0 and buttonid contains user id of button - * hit or -1 if dialog was closed. - * - * \note This function should be called on the thread that created the parent - * window, or on the main thread if the messagebox has no parent. It will - * block execution of that thread until the user clicks a button or - * closes the messagebox. - */ -extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid); - -/** - * \brief Create a simple modal message box - * - * \param flags ::SDL_MessageBoxFlags - * \param title UTF-8 title text - * \param message UTF-8 message text - * \param window The parent window, or NULL for no parent - * - * \return 0 on success, -1 on error - * - * \sa SDL_ShowMessageBox - */ -extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_messagebox_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_mouse.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_mouse.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_mouse.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_mouse.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_mouse.h - * - * Include file for SDL mouse event handling. - */ - -#ifndef _SDL_mouse_h -#define _SDL_mouse_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct SDL_Cursor SDL_Cursor; /* Implementation dependent */ - -/** - * \brief Cursor types for SDL_CreateSystemCursor. - */ -typedef enum -{ - SDL_SYSTEM_CURSOR_ARROW, /**< Arrow */ - SDL_SYSTEM_CURSOR_IBEAM, /**< I-beam */ - SDL_SYSTEM_CURSOR_WAIT, /**< Wait */ - SDL_SYSTEM_CURSOR_CROSSHAIR, /**< Crosshair */ - SDL_SYSTEM_CURSOR_WAITARROW, /**< Small wait cursor (or Wait if not available) */ - SDL_SYSTEM_CURSOR_SIZENWSE, /**< Double arrow pointing northwest and southeast */ - SDL_SYSTEM_CURSOR_SIZENESW, /**< Double arrow pointing northeast and southwest */ - SDL_SYSTEM_CURSOR_SIZEWE, /**< Double arrow pointing west and east */ - SDL_SYSTEM_CURSOR_SIZENS, /**< Double arrow pointing north and south */ - SDL_SYSTEM_CURSOR_SIZEALL, /**< Four pointed arrow pointing north, south, east, and west */ - SDL_SYSTEM_CURSOR_NO, /**< Slashed circle or crossbones */ - SDL_SYSTEM_CURSOR_HAND, /**< Hand */ - SDL_NUM_SYSTEM_CURSORS -} SDL_SystemCursor; - -/* Function prototypes */ - -/** - * \brief Get the window which currently has mouse focus. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void); - -/** - * \brief Retrieve the current state of the mouse. - * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse cursor position relative to the focus window for the currently - * selected mouse. You can pass NULL for either x or y. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y); - -/** - * \brief Retrieve the relative state of the mouse. - * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse deltas since the last call to SDL_GetRelativeMouseState(). - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y); - -/** - * \brief Moves the mouse to the given position within the window. - * - * \param window The window to move the mouse into, or NULL for the current mouse focus - * \param x The x coordinate within the window - * \param y The y coordinate within the window - * - * \note This function generates a mouse motion event - */ -extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window, - int x, int y); - -/** - * \brief Set relative mouse mode. - * - * \param enabled Whether or not to enable relative mode - * - * \return 0 on success, or -1 if relative mode is not supported. - * - * While the mouse is in relative mode, the cursor is hidden, and the - * driver will try to report continuous motion in the current window. - * Only relative motion events will be delivered, the mouse position - * will not change. - * - * \note This function will flush any pending mouse motion. - * - * \sa SDL_GetRelativeMouseMode() - */ -extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled); - -/** - * \brief Query whether relative mouse mode is enabled. - * - * \sa SDL_SetRelativeMouseMode() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void); - -/** - * \brief Create a cursor, using the specified bitmap data and - * mask (in MSB format). - * - * The cursor width must be a multiple of 8 bits. - * - * The cursor is created in black and white according to the following: - * - * - * - * - * - * - *
data mask resulting pixel on screen
0 1 White
1 1 Black
0 0 Transparent
1 0 Inverted color if possible, black - * if not.
- * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, - const Uint8 * mask, - int w, int h, int hot_x, - int hot_y); - -/** - * \brief Create a color cursor. - * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface, - int hot_x, - int hot_y); - -/** - * \brief Create a system cursor. - * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id); - -/** - * \brief Set the active cursor. - */ -extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor); - -/** - * \brief Return the active cursor. - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); - -/** - * \brief Return the default cursor. - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); - -/** - * \brief Frees a cursor created with SDL_CreateCursor(). - * - * \sa SDL_CreateCursor() - */ -extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); - -/** - * \brief Toggle whether or not the cursor is shown. - * - * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current - * state. - * - * \return 1 if the cursor is shown, or 0 if the cursor is hidden. - */ -extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); - -/** - * Used as a mask when testing buttons in buttonstate. - * - Button 1: Left mouse button - * - Button 2: Middle mouse button - * - Button 3: Right mouse button - */ -#define SDL_BUTTON(X) (1 << ((X)-1)) -#define SDL_BUTTON_LEFT 1 -#define SDL_BUTTON_MIDDLE 2 -#define SDL_BUTTON_RIGHT 3 -#define SDL_BUTTON_X1 4 -#define SDL_BUTTON_X2 5 -#define SDL_BUTTON_LMASK SDL_BUTTON(SDL_BUTTON_LEFT) -#define SDL_BUTTON_MMASK SDL_BUTTON(SDL_BUTTON_MIDDLE) -#define SDL_BUTTON_RMASK SDL_BUTTON(SDL_BUTTON_RIGHT) -#define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) -#define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_mutex.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_mutex.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_mutex.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_mutex.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_mutex_h -#define _SDL_mutex_h - -/** - * \file SDL_mutex.h - * - * Functions to provide thread synchronization primitives. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Synchronization functions which can time out return this value - * if they time out. - */ -#define SDL_MUTEX_TIMEDOUT 1 - -/** - * This is the timeout value which corresponds to never time out. - */ -#define SDL_MUTEX_MAXWAIT (~(Uint32)0) - - -/** - * \name Mutex functions - */ -/* @{ */ - -/* The SDL mutex structure, defined in SDL_sysmutex.c */ -struct SDL_mutex; -typedef struct SDL_mutex SDL_mutex; - -/** - * Create a mutex, initialized unlocked. - */ -extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void); - -/** - * Lock the mutex. - * - * \return 0, or -1 on error. - */ -#define SDL_mutexP(m) SDL_LockMutex(m) -extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex); - -/** - * Try to lock the mutex - * - * \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex); - -/** - * Unlock the mutex. - * - * \return 0, or -1 on error. - * - * \warning It is an error to unlock a mutex that has not been locked by - * the current thread, and doing so results in undefined behavior. - */ -#define SDL_mutexV(m) SDL_UnlockMutex(m) -extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex); - -/** - * Destroy a mutex. - */ -extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex); - -/* @} *//* Mutex functions */ - - -/** - * \name Semaphore functions - */ -/* @{ */ - -/* The SDL semaphore structure, defined in SDL_syssem.c */ -struct SDL_semaphore; -typedef struct SDL_semaphore SDL_sem; - -/** - * Create a semaphore, initialized with value, returns NULL on failure. - */ -extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value); - -/** - * Destroy a semaphore. - */ -extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem); - -/** - * This function suspends the calling thread until the semaphore pointed - * to by \c sem has a positive count. It then atomically decreases the - * semaphore count. - */ -extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem); - -/** - * Non-blocking variant of SDL_SemWait(). - * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would - * block, and -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem); - -/** - * Variant of SDL_SemWait() with a timeout in milliseconds. - * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not - * succeed in the allotted time, and -1 on error. - * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. - */ -extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms); - -/** - * Atomically increases the semaphore's count (not blocking). - * - * \return 0, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem); - -/** - * Returns the current count of the semaphore. - */ -extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem); - -/* @} *//* Semaphore functions */ - - -/** - * \name Condition variable functions - */ -/* @{ */ - -/* The SDL condition variable structure, defined in SDL_syscond.c */ -struct SDL_cond; -typedef struct SDL_cond SDL_cond; - -/** - * Create a condition variable. - * - * Typical use of condition variables: - * - * Thread A: - * SDL_LockMutex(lock); - * while ( ! condition ) { - * SDL_CondWait(cond, lock); - * } - * SDL_UnlockMutex(lock); - * - * Thread B: - * SDL_LockMutex(lock); - * ... - * condition = true; - * ... - * SDL_CondSignal(cond); - * SDL_UnlockMutex(lock); - * - * There is some discussion whether to signal the condition variable - * with the mutex locked or not. There is some potential performance - * benefit to unlocking first on some platforms, but there are some - * potential race conditions depending on how your code is structured. - * - * In general it's safer to signal the condition variable while the - * mutex is locked. - */ -extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void); - -/** - * Destroy a condition variable. - */ -extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond); - -/** - * Restart one of the threads that are waiting on the condition variable. - * - * \return 0 or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond); - -/** - * Restart all threads that are waiting on the condition variable. - * - * \return 0 or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond); - -/** - * Wait on the condition variable, unlocking the provided mutex. - * - * \warning The mutex must be locked before entering this function! - * - * The mutex is re-locked once the condition variable is signaled. - * - * \return 0 when it is signaled, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex); - -/** - * Waits for at most \c ms milliseconds, and returns 0 if the condition - * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not - * signaled in the allotted time, and -1 on error. - * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. - */ -extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, - SDL_mutex * mutex, Uint32 ms); - -/* @} *//* Condition variable functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_mutex_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_name.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_name.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_name.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_name.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDLname_h_ -#define _SDLname_h_ - -#if defined(__STDC__) || defined(__cplusplus) -#define NeedFunctionPrototypes 1 -#endif - -#define SDL_NAME(X) SDL_##X - -#endif /* _SDLname_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles2.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles2.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles2.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles2.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2790 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 2.0 API headers. - */ -#ifndef _MSC_VER -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#else /* _MSC_VER */ - -/* OpenGL ES2 headers for Visual Studio */ - -#ifndef __khrplatform_h_ -#define __khrplatform_h_ - -/* -** Copyright (c) 2008-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Khronos platform-specific types and definitions. -* -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ -* -* Adopters may modify this file to suit their platform. Adopters are -* encouraged to submit platform specific modifications to the Khronos -* group so that they can be included in future versions of this file. -* Please submit changes by sending them to the public Khronos Bugzilla -* (http://khronos.org/bugzilla) by filing a bug against product -* "Khronos (general)" component "Registry". -* -* A predefined template which fills in some of the bug fields can be -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you -* must create a Bugzilla login first. -* -* -* See the Implementer's Guidelines for information about where this file -* should be located on your system and for more details of its use: -* http://www.khronos.org/registry/implementers_guide.pdf -* -* This file should be included as -* #include -* by Khronos client API header files that use its types and defines. -* -* The types in khrplatform.h should only be used to define API-specific types. -* -* Types defined in khrplatform.h: -* khronos_int8_t signed 8 bit -* khronos_uint8_t unsigned 8 bit -* khronos_int16_t signed 16 bit -* khronos_uint16_t unsigned 16 bit -* khronos_int32_t signed 32 bit -* khronos_uint32_t unsigned 32 bit -* khronos_int64_t signed 64 bit -* khronos_uint64_t unsigned 64 bit -* khronos_intptr_t signed same number of bits as a pointer -* khronos_uintptr_t unsigned same number of bits as a pointer -* khronos_ssize_t signed size -* khronos_usize_t unsigned size -* khronos_float_t signed 32 bit floating point -* khronos_time_ns_t unsigned 64 bit time in nanoseconds -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in -* nanoseconds -* khronos_stime_nanoseconds_t signed time interval in nanoseconds -* khronos_boolean_enum_t enumerated boolean type. This should -* only be used as a base type when a client API's boolean type is -* an enum. Client APIs which use an integer or other type for -* booleans cannot use this as the base type for their boolean. -* -* Tokens defined in khrplatform.h: -* -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. -* -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. -* -* Calling convention macros defined in this file: -* KHRONOS_APICALL -* KHRONOS_APIENTRY -* KHRONOS_APIATTRIBUTES -* -* These may be used in function prototypes as: -* -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname( -* int arg1, -* int arg2) KHRONOS_APIATTRIBUTES; -*/ - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APICALL -*------------------------------------------------------------------------- -* This precedes the return type of the function in the function prototype. -*/ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) -# define KHRONOS_APICALL __declspec(dllimport) -#elif defined (__SYMBIAN32__) -# define KHRONOS_APICALL IMPORT_C -#else -# define KHRONOS_APICALL -#endif - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APIENTRY -*------------------------------------------------------------------------- -* This follows the return type of the function and precedes the function -* name in the function prototype. -*/ -#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -/* Win32 but not WinCE */ -# define KHRONOS_APIENTRY __stdcall -#else -# define KHRONOS_APIENTRY -#endif - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APIATTRIBUTES -*------------------------------------------------------------------------- -* This follows the closing parenthesis of the function prototype arguments. -*/ -#if defined (__ARMCC_2__) -#define KHRONOS_APIATTRIBUTES __softfp -#else -#define KHRONOS_APIATTRIBUTES -#endif - -/*------------------------------------------------------------------------- -* basic type definitions -*-----------------------------------------------------------------------*/ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) - - -/* -* Using -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__VMS ) || defined(__sgi) - -/* -* Using -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(_WIN32) && !defined(__SCITECH_SNAP__) - -/* -* Win32 -*/ -typedef __int32 khronos_int32_t; -typedef unsigned __int32 khronos_uint32_t; -typedef __int64 khronos_int64_t; -typedef unsigned __int64 khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__sun__) || defined(__digital__) - -/* -* Sun or Digital -*/ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#if defined(__arch64__) || defined(_LP64) -typedef long int khronos_int64_t; -typedef unsigned long int khronos_uint64_t; -#else -typedef long long int khronos_int64_t; -typedef unsigned long long int khronos_uint64_t; -#endif /* __arch64__ */ -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif 0 - -/* -* Hypothetical platform with no float or int64 support -*/ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#define KHRONOS_SUPPORT_INT64 0 -#define KHRONOS_SUPPORT_FLOAT 0 - -#else - -/* -* Generic fallback -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#endif - - -/* -* Types that are (so far) the same on all platforms -*/ -typedef signed char khronos_int8_t; -typedef unsigned char khronos_uint8_t; -typedef signed short int khronos_int16_t; -typedef unsigned short int khronos_uint16_t; - -/* -* Types that differ between LLP64 and LP64 architectures - in LLP64, -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears -* to be the only LLP64 architecture in current use. -*/ -#ifdef _WIN64 -typedef signed long long int khronos_intptr_t; -typedef unsigned long long int khronos_uintptr_t; -typedef signed long long int khronos_ssize_t; -typedef unsigned long long int khronos_usize_t; -#else -typedef signed long int khronos_intptr_t; -typedef unsigned long int khronos_uintptr_t; -typedef signed long int khronos_ssize_t; -typedef unsigned long int khronos_usize_t; -#endif - -#if KHRONOS_SUPPORT_FLOAT -/* -* Float type -*/ -typedef float khronos_float_t; -#endif - -#if KHRONOS_SUPPORT_INT64 -/* Time types -* -* These types can be used to represent a time interval in nanoseconds or -* an absolute Unadjusted System Time. Unadjusted System Time is the number -* of nanoseconds since some arbitrary system event (e.g. since the last -* time the system booted). The Unadjusted System Time is an unsigned -* 64 bit value that wraps back to 0 every 584 years. Time intervals -* may be either signed or unsigned. -*/ -typedef khronos_uint64_t khronos_utime_nanoseconds_t; -typedef khronos_int64_t khronos_stime_nanoseconds_t; -#endif - -/* -* Dummy value used to pad enum types to 32 bits. -*/ -#ifndef KHRONOS_MAX_ENUM -#define KHRONOS_MAX_ENUM 0x7FFFFFFF -#endif - -/* -* Enumerated boolean type -* -* Values other than zero should be considered to be true. Therefore -* comparisons should not be made against KHRONOS_TRUE. -*/ -typedef enum { - KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, - KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM -} khronos_boolean_enum_t; - -#endif /* __khrplatform_h_ */ - - -#ifndef __gl2platform_h_ -#define __gl2platform_h_ - -/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h - * - * Adopters may modify khrplatform.h and this file to suit their platform. - * You are encouraged to submit all modifications to the Khronos group so that - * they can be included in future versions of this file. Please submit changes - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) - * by filing a bug against product "OpenGL-ES" component "Registry". - */ - -/*#include */ - -#ifndef GL_APICALL -#define GL_APICALL KHRONOS_APICALL -#endif - -#ifndef GL_APIENTRY -#define GL_APIENTRY KHRONOS_APIENTRY -#endif - -#endif /* __gl2platform_h_ */ - -#ifndef __gl2_h_ -#define __gl2_h_ - -/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */ - -/*#include */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/*------------------------------------------------------------------------- - * Data type definitions - *-----------------------------------------------------------------------*/ - -typedef void GLvoid; -typedef char GLchar; -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef khronos_int8_t GLbyte; -typedef short GLshort; -typedef int GLint; -typedef int GLsizei; -typedef khronos_uint8_t GLubyte; -typedef unsigned short GLushort; -typedef unsigned int GLuint; -typedef khronos_float_t GLfloat; -typedef khronos_float_t GLclampf; -typedef khronos_int32_t GLfixed; - -/* GL types for handling large vertex buffer objects */ -typedef khronos_intptr_t GLintptr; -typedef khronos_ssize_t GLsizeiptr; - -/* OpenGL ES core versions */ -#define GL_ES_VERSION_2_0 1 - -/* ClearBufferMask */ -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_COLOR_BUFFER_BIT 0x00004000 - -/* Boolean */ -#define GL_FALSE 0 -#define GL_TRUE 1 - -/* BeginMode */ -#define GL_POINTS 0x0000 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_LINE_STRIP 0x0003 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 - -/* AlphaFunction (not supported in ES20) */ -/* GL_NEVER */ -/* GL_LESS */ -/* GL_EQUAL */ -/* GL_LEQUAL */ -/* GL_GREATER */ -/* GL_NOTEQUAL */ -/* GL_GEQUAL */ -/* GL_ALWAYS */ - -/* BlendingFactorDest */ -#define GL_ZERO 0 -#define GL_ONE 1 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 - -/* BlendingFactorSrc */ -/* GL_ZERO */ -/* GL_ONE */ -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -/* GL_SRC_ALPHA */ -/* GL_ONE_MINUS_SRC_ALPHA */ -/* GL_DST_ALPHA */ -/* GL_ONE_MINUS_DST_ALPHA */ - -/* BlendEquationSeparate */ -#define GL_FUNC_ADD 0x8006 -#define GL_BLEND_EQUATION 0x8009 -#define GL_BLEND_EQUATION_RGB 0x8009 /* same as BLEND_EQUATION */ -#define GL_BLEND_EQUATION_ALPHA 0x883D - -/* BlendSubtract */ -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B - -/* Separate Blend Functions */ -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 - -/* Buffer Objects */ -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 - -#define GL_STREAM_DRAW 0x88E0 -#define GL_STATIC_DRAW 0x88E4 -#define GL_DYNAMIC_DRAW 0x88E8 - -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 - -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 - -/* CullFaceMode */ -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_FRONT_AND_BACK 0x0408 - -/* DepthFunction */ -/* GL_NEVER */ -/* GL_LESS */ -/* GL_EQUAL */ -/* GL_LEQUAL */ -/* GL_GREATER */ -/* GL_NOTEQUAL */ -/* GL_GEQUAL */ -/* GL_ALWAYS */ - -/* EnableCap */ -#define GL_TEXTURE_2D 0x0DE1 -#define GL_CULL_FACE 0x0B44 -#define GL_BLEND 0x0BE2 -#define GL_DITHER 0x0BD0 -#define GL_STENCIL_TEST 0x0B90 -#define GL_DEPTH_TEST 0x0B71 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_COVERAGE 0x80A0 - -/* ErrorCode */ -#define GL_NO_ERROR 0 -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_OUT_OF_MEMORY 0x0505 - -/* FrontFaceDirection */ -#define GL_CW 0x0900 -#define GL_CCW 0x0901 - -/* GetPName */ -#define GL_LINE_WIDTH 0x0B21 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#define GL_VIEWPORT 0x0BA2 -#define GL_SCISSOR_BOX 0x0C10 -/* GL_SCISSOR_TEST */ -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -/* GL_POLYGON_OFFSET_FILL */ -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB - -/* GetTextureParameter */ -/* GL_TEXTURE_MAG_FILTER */ -/* GL_TEXTURE_MIN_FILTER */ -/* GL_TEXTURE_WRAP_S */ -/* GL_TEXTURE_WRAP_T */ - -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 - -/* HintMode */ -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 - -/* HintTarget */ -#define GL_GENERATE_MIPMAP_HINT 0x8192 - -/* DataType */ -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_FIXED 0x140C - -/* PixelFormat */ -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A - -/* PixelType */ -/* GL_UNSIGNED_BYTE */ -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 - -/* Shaders */ -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#define GL_SHADER_TYPE 0x8B4F -#define GL_DELETE_STATUS 0x8B80 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D - -/* StencilFunction */ -#define GL_NEVER 0x0200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 - -/* StencilOp */ -/* GL_ZERO */ -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_INVERT 0x150A -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 - -/* StringName */ -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 - -/* TextureMagFilter */ -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 - -/* TextureMinFilter */ -/* GL_NEAREST */ -/* GL_LINEAR */ -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 - -/* TextureParameterName */ -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 - -/* TextureTarget */ -/* GL_TEXTURE_2D */ -#define GL_TEXTURE 0x1702 - -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C - -/* TextureUnit */ -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 - -/* TextureWrapMode */ -#define GL_REPEAT 0x2901 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_MIRRORED_REPEAT 0x8370 - -/* Uniform Types */ -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_CUBE 0x8B60 - -/* Vertex Arrays */ -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F - -/* Read Format */ -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B - -/* Shader Source */ -#define GL_COMPILE_STATUS 0x8B81 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_SHADER_COMPILER 0x8DFA - -/* Shader Binary */ -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 - -/* Shader Precision-Specified Types */ -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 - -/* Framebuffer Object. */ -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 - -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGB565 0x8D62 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_STENCIL_INDEX8 0x8D48 - -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 - -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 - -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 - -#define GL_NONE 0 - -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD - -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 - -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 - -/*------------------------------------------------------------------------- - * GL core functions. - *-----------------------------------------------------------------------*/ - -GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); -GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name); -GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture); -GL_APICALL void GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GL_APICALL void GL_APIENTRY glBlendEquation ( GLenum mode ); -GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage); -GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data); -GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target); -GL_APICALL void GL_APIENTRY glClear (GLbitfield mask); -GL_APICALL void GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GL_APICALL void GL_APIENTRY glClearDepthf (GLclampf depth); -GL_APICALL void GL_APIENTRY glClearStencil (GLint s); -GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader); -GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL GLuint GL_APIENTRY glCreateProgram (void); -GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type); -GL_APICALL void GL_APIENTRY glCullFace (GLenum mode); -GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers); -GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers); -GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program); -GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers); -GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader); -GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures); -GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func); -GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag); -GL_APICALL void GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar); -GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glDisable (GLenum cap); -GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); -GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices); -GL_APICALL void GL_APIENTRY glEnable (GLenum cap); -GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glFinish (void); -GL_APICALL void GL_APIENTRY glFlush (void); -GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode); -GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers); -GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target); -GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers); -GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers); -GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); -GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); -GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params); -GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL GLenum GL_APIENTRY glGetError (void); -GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog); -GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog); -GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); -GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source); -GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name); -GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params); -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); -GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer); -GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode); -GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer); -GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap); -GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer); -GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program); -GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader); -GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture); -GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width); -GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program); -GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units); -GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); -GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void); -GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); -GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); -GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params); -GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params); -GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat x); -GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint x); -GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y); -GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z); -GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w); -GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUseProgram (GLuint program); -GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program); -GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x); -GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr); -GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - -#ifdef __cplusplus -} -#endif - -#endif /* __gl2_h_ */ - - -#ifndef __gl2ext_h_ -#define __gl2ext_h_ - -/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -#ifndef GL_APIENTRYP -# define GL_APIENTRYP GL_APIENTRY* -#endif - -/*------------------------------------------------------------------------* - * OES extension tokens - *------------------------------------------------------------------------*/ - -/* GL_OES_compressed_ETC1_RGB8_texture */ -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_ETC1_RGB8_OES 0x8D64 -#endif - -/* GL_OES_compressed_paletted_texture */ -#ifndef GL_OES_compressed_paletted_texture -#define GL_PALETTE4_RGB8_OES 0x8B90 -#define GL_PALETTE4_RGBA8_OES 0x8B91 -#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 -#define GL_PALETTE4_RGBA4_OES 0x8B93 -#define GL_PALETTE4_RGB5_A1_OES 0x8B94 -#define GL_PALETTE8_RGB8_OES 0x8B95 -#define GL_PALETTE8_RGBA8_OES 0x8B96 -#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 -#define GL_PALETTE8_RGBA4_OES 0x8B98 -#define GL_PALETTE8_RGB5_A1_OES 0x8B99 -#endif - -/* GL_OES_depth24 */ -#ifndef GL_OES_depth24 -#define GL_DEPTH_COMPONENT24_OES 0x81A6 -#endif - -/* GL_OES_depth32 */ -#ifndef GL_OES_depth32 -#define GL_DEPTH_COMPONENT32_OES 0x81A7 -#endif - -/* GL_OES_depth_texture */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_EGL_image */ -#ifndef GL_OES_EGL_image -typedef void* GLeglImageOES; -#endif - -/* GL_OES_EGL_image_external */ -#ifndef GL_OES_EGL_image_external -/* GLeglImageOES defined in GL_OES_EGL_image already. */ -#define GL_TEXTURE_EXTERNAL_OES 0x8D65 -#define GL_SAMPLER_EXTERNAL_OES 0x8D66 -#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 -#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 -#endif - -/* GL_OES_element_index_uint */ -#ifndef GL_OES_element_index_uint -#define GL_UNSIGNED_INT 0x1405 -#endif - -/* GL_OES_get_program_binary */ -#ifndef GL_OES_get_program_binary -#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS_OES 0x87FE -#define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF -#endif - -/* GL_OES_mapbuffer */ -#ifndef GL_OES_mapbuffer -#define GL_WRITE_ONLY_OES 0x88B9 -#define GL_BUFFER_ACCESS_OES 0x88BB -#define GL_BUFFER_MAPPED_OES 0x88BC -#define GL_BUFFER_MAP_POINTER_OES 0x88BD -#endif - -/* GL_OES_packed_depth_stencil */ -#ifndef GL_OES_packed_depth_stencil -#define GL_DEPTH_STENCIL_OES 0x84F9 -#define GL_UNSIGNED_INT_24_8_OES 0x84FA -#define GL_DEPTH24_STENCIL8_OES 0x88F0 -#endif - -/* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat -#define GL_ALPHA8_OES 0x803C -#define GL_DEPTH_COMPONENT16_OES 0x81A5 -/* reuse GL_DEPTH_COMPONENT24_OES */ -/* reuse GL_DEPTH24_STENCIL8_OES */ -/* reuse GL_DEPTH_COMPONENT32_OES */ -#define GL_LUMINANCE4_ALPHA4_OES 0x8043 -#define GL_LUMINANCE8_ALPHA8_OES 0x8045 -#define GL_LUMINANCE8_OES 0x8040 -#define GL_RGBA4_OES 0x8056 -#define GL_RGB5_A1_OES 0x8057 -#define GL_RGB565_OES 0x8D62 -/* reuse GL_RGB8_OES */ -/* reuse GL_RGBA8_OES */ -/* reuse GL_RGB10_EXT */ -/* reuse GL_RGB10_A2_EXT */ -#endif - -/* GL_OES_rgb8_rgba8 */ -#ifndef GL_OES_rgb8_rgba8 -#define GL_RGB8_OES 0x8051 -#define GL_RGBA8_OES 0x8058 -#endif - -/* GL_OES_standard_derivatives */ -#ifndef GL_OES_standard_derivatives -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES 0x8B8B -#endif - -/* GL_OES_stencil1 */ -#ifndef GL_OES_stencil1 -#define GL_STENCIL_INDEX1_OES 0x8D46 -#endif - -/* GL_OES_stencil4 */ -#ifndef GL_OES_stencil4 -#define GL_STENCIL_INDEX4_OES 0x8D47 -#endif - -#ifndef GL_OES_surfaceless_context -#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 -#endif - -/* GL_OES_texture_3D */ -#ifndef GL_OES_texture_3D -#define GL_TEXTURE_WRAP_R_OES 0x8072 -#define GL_TEXTURE_3D_OES 0x806F -#define GL_TEXTURE_BINDING_3D_OES 0x806A -#define GL_MAX_3D_TEXTURE_SIZE_OES 0x8073 -#define GL_SAMPLER_3D_OES 0x8B5F -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES 0x8CD4 -#endif - -/* GL_OES_texture_float */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_float_linear */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_half_float */ -#ifndef GL_OES_texture_half_float -#define GL_HALF_FLOAT_OES 0x8D61 -#endif - -/* GL_OES_texture_half_float_linear */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_npot */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_vertex_array_object */ -#ifndef GL_OES_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 -#endif - -/* GL_OES_vertex_half_float */ -/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */ - -/* GL_OES_vertex_type_10_10_10_2 */ -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_UNSIGNED_INT_10_10_10_2_OES 0x8DF6 -#define GL_INT_10_10_10_2_OES 0x8DF7 -#endif - -/*------------------------------------------------------------------------* - * KHR extension tokens - *------------------------------------------------------------------------*/ - -#ifndef GL_KHR_debug -typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_QUERY 0x82E3 -/* PROGRAM_PIPELINE only in GL */ -#define GL_SAMPLER 0x82E6 -/* DISPLAY_LIST only in GL */ -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#endif - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD -#endif - -/*------------------------------------------------------------------------* - * AMD extension tokens - *------------------------------------------------------------------------*/ - -/* GL_AMD_compressed_3DC_texture */ -#ifndef GL_AMD_compressed_3DC_texture -#define GL_3DC_X_AMD 0x87F9 -#define GL_3DC_XY_AMD 0x87FA -#endif - -/* GL_AMD_compressed_ATC_texture */ -#ifndef GL_AMD_compressed_ATC_texture -#define GL_ATC_RGB_AMD 0x8C92 -#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93 -#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE -#endif - -/* GL_AMD_performance_monitor */ -#ifndef GL_AMD_performance_monitor -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -#endif - -/* GL_AMD_program_binary_Z400 */ -#ifndef GL_AMD_program_binary_Z400 -#define GL_Z400_BINARY_AMD 0x8740 -#endif - -/*------------------------------------------------------------------------* - * ANGLE extension tokens - *------------------------------------------------------------------------*/ - -/* GL_ANGLE_framebuffer_blit */ -#ifndef GL_ANGLE_framebuffer_blit -#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA -#endif - -/* GL_ANGLE_framebuffer_multisample */ -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 -#define GL_MAX_SAMPLES_ANGLE 0x8D57 -#endif - -/* GL_ANGLE_instanced_arrays */ -#ifndef GL_ANGLE_instanced_arrays -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE -#endif - -/* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 -#endif - -/* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#endif - -/* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 -#endif - -/* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage -#define GL_TEXTURE_USAGE_ANGLE 0x93A2 -#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 -#endif - -/* GL_ANGLE_translated_shader_source */ -#ifndef GL_ANGLE_translated_shader_source -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 -#endif - -/*------------------------------------------------------------------------* - * APPLE extension tokens - *------------------------------------------------------------------------*/ - -/* GL_APPLE_copy_texture_levels */ -/* No new tokens introduced by this extension. */ - -/* GL_APPLE_framebuffer_multisample */ -#ifndef GL_APPLE_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 -#define GL_MAX_SAMPLES_APPLE 0x8D57 -#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA -#endif - -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -/* GL_APPLE_sync */ -#ifndef GL_APPLE_sync - -#ifndef __gl3_h_ -/* These types are defined with reference to - * in the Apple extension spec, but here we use the Khronos - * portable types in khrplatform.h, and assume those types - * are always defined. - * If any other extensions using these types are defined, - * the typedefs must move out of this block and be shared. - */ -typedef khronos_int64_t GLint64; -typedef khronos_uint64_t GLuint64; -typedef struct __GLsync *GLsync; -#endif - -#define GL_SYNC_OBJECT_APPLE 0x8A53 -#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 -#define GL_OBJECT_TYPE_APPLE 0x9112 -#define GL_SYNC_CONDITION_APPLE 0x9113 -#define GL_SYNC_STATUS_APPLE 0x9114 -#define GL_SYNC_FLAGS_APPLE 0x9115 -#define GL_SYNC_FENCE_APPLE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 -#define GL_UNSIGNALED_APPLE 0x9118 -#define GL_SIGNALED_APPLE 0x9119 -#define GL_ALREADY_SIGNALED_APPLE 0x911A -#define GL_TIMEOUT_EXPIRED_APPLE 0x911B -#define GL_CONDITION_SATISFIED_APPLE 0x911C -#define GL_WAIT_FAILED_APPLE 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 -#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull -#endif - -/* GL_APPLE_texture_format_BGRA8888 */ -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_BGRA_EXT 0x80E1 -#endif - -/* GL_APPLE_texture_max_level */ -#ifndef GL_APPLE_texture_max_level -#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D -#endif - -/*------------------------------------------------------------------------* - * ARM extension tokens - *------------------------------------------------------------------------*/ - -/* GL_ARM_mali_program_binary */ -#ifndef GL_ARM_mali_program_binary -#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 -#endif - -/* GL_ARM_mali_shader_binary */ -#ifndef GL_ARM_mali_shader_binary -#define GL_MALI_SHADER_BINARY_ARM 0x8F60 -#endif - -/* GL_ARM_rgba8 */ -/* No new tokens introduced by this extension. */ - -/*------------------------------------------------------------------------* - * EXT extension tokens - *------------------------------------------------------------------------*/ - -/* GL_EXT_blend_minmax */ -#ifndef GL_EXT_blend_minmax -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#endif - -/* GL_EXT_color_buffer_half_float */ -#ifndef GL_EXT_color_buffer_half_float -#define GL_RGBA16F_EXT 0x881A -#define GL_RGB16F_EXT 0x881B -#define GL_RG16F_EXT 0x822F -#define GL_R16F_EXT 0x822D -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 -#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 -#endif - -/* GL_EXT_debug_label */ -#ifndef GL_EXT_debug_label -#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F -#define GL_PROGRAM_OBJECT_EXT 0x8B40 -#define GL_SHADER_OBJECT_EXT 0x8B48 -#define GL_BUFFER_OBJECT_EXT 0x9151 -#define GL_QUERY_OBJECT_EXT 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 -#endif - -/* GL_EXT_debug_marker */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_discard_framebuffer */ -#ifndef GL_EXT_discard_framebuffer -#define GL_COLOR_EXT 0x1800 -#define GL_DEPTH_EXT 0x1801 -#define GL_STENCIL_EXT 0x1802 -#endif - -/* GL_EXT_map_buffer_range */ -#ifndef GL_EXT_map_buffer_range -#define GL_MAP_READ_BIT_EXT 0x0001 -#define GL_MAP_WRITE_BIT_EXT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 -#endif - -/* GL_EXT_multisampled_render_to_texture */ -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -/* GL_EXT_multiview_draw_buffers */ -#ifndef GL_EXT_multiview_draw_buffers -#define GL_COLOR_ATTACHMENT_EXT 0x90F0 -#define GL_MULTIVIEW_EXT 0x90F1 -#define GL_DRAW_BUFFER_EXT 0x0C01 -#define GL_READ_BUFFER_EXT 0x0C02 -#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 -#endif - -/* GL_EXT_multi_draw_arrays */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_occlusion_query_boolean */ -#ifndef GL_EXT_occlusion_query_boolean -#define GL_ANY_SAMPLES_PASSED_EXT 0x8C2F -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A -#define GL_CURRENT_QUERY_EXT 0x8865 -#define GL_QUERY_RESULT_EXT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 -#endif - -/* GL_EXT_read_format_bgra */ -#ifndef GL_EXT_read_format_bgra -#define GL_BGRA_EXT 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366 -#endif - -/* GL_EXT_robustness */ -#ifndef GL_EXT_robustness -/* reuse GL_NO_ERROR */ -#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 -#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 -#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 -#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 -#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 -#endif - -/* GL_EXT_separate_shader_objects */ -#ifndef GL_EXT_separate_shader_objects -#define GL_VERTEX_SHADER_BIT_EXT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 -#define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE_EXT 0x8258 -#define GL_ACTIVE_PROGRAM_EXT 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A -#endif - -/* GL_EXT_shader_framebuffer_fetch */ -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 -#endif - -/* GL_EXT_shader_texture_lod */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_shadow_samplers */ -#ifndef GL_EXT_shadow_samplers -#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C -#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D -#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E -#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 -#endif - -/* GL_EXT_sRGB */ -#ifndef GL_EXT_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 -#endif - -/* GL_EXT_texture_compression_dxt1 */ -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#endif - -/* GL_EXT_texture_filter_anisotropic */ -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -/* GL_EXT_texture_format_BGRA8888 */ -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_BGRA_EXT 0x80E1 -#endif - -/* GL_EXT_texture_rg */ -#ifndef GL_EXT_texture_rg -#define GL_RED_EXT 0x1903 -#define GL_RG_EXT 0x8227 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#endif - -/* GL_EXT_texture_storage */ -#ifndef GL_EXT_texture_storage -#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F -#define GL_ALPHA8_EXT 0x803C -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_RGBA32F_EXT 0x8814 -#define GL_RGB32F_EXT 0x8815 -#define GL_ALPHA32F_EXT 0x8816 -#define GL_LUMINANCE32F_EXT 0x8818 -#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 -/* reuse GL_RGBA16F_EXT */ -/* reuse GL_RGB16F_EXT */ -#define GL_ALPHA16F_EXT 0x881C -#define GL_LUMINANCE16F_EXT 0x881E -#define GL_LUMINANCE_ALPHA16F_EXT 0x881F -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGB10_EXT 0x8052 -#define GL_BGRA8_EXT 0x93A1 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#define GL_R32F_EXT 0x822E -#define GL_RG32F_EXT 0x8230 -#define GL_R16F_EXT 0x822D -#define GL_RG16F_EXT 0x822F -#endif - -/* GL_EXT_texture_type_2_10_10_10_REV */ -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 -#endif - -/* GL_EXT_unpack_subimage */ -#ifndef GL_EXT_unpack_subimage -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 -#endif - -/*------------------------------------------------------------------------* - * DMP extension tokens - *------------------------------------------------------------------------*/ - -/* GL_DMP_shader_binary */ -#ifndef GL_DMP_shader_binary -#define GL_SHADER_BINARY_DMP 0x9250 -#endif - -/*------------------------------------------------------------------------* - * FJ extension tokens - *------------------------------------------------------------------------*/ - -/* GL_FJ_shader_binary_GCCSO */ -#ifndef GL_FJ_shader_binary_GCCSO -#define GCCSO_SHADER_BINARY_FJ 0x9260 -#endif - -/*------------------------------------------------------------------------* - * IMG extension tokens - *------------------------------------------------------------------------*/ - -/* GL_IMG_program_binary */ -#ifndef GL_IMG_program_binary -#define GL_SGX_PROGRAM_BINARY_IMG 0x9130 -#endif - -/* GL_IMG_read_format */ -#ifndef GL_IMG_read_format -#define GL_BGRA_IMG 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 -#endif - -/* GL_IMG_shader_binary */ -#ifndef GL_IMG_shader_binary -#define GL_SGX_BINARY_IMG 0x8C0A -#endif - -/* GL_IMG_texture_compression_pvrtc */ -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 -#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -#endif - -/* GL_IMG_multisampled_render_to_texture */ -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 -#define GL_MAX_SAMPLES_IMG 0x9135 -#define GL_TEXTURE_SAMPLES_IMG 0x9136 -#endif - -/*------------------------------------------------------------------------* - * NV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_NV_coverage_sample */ -#ifndef GL_NV_coverage_sample -#define GL_COVERAGE_COMPONENT_NV 0x8ED0 -#define GL_COVERAGE_COMPONENT4_NV 0x8ED1 -#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 -#define GL_COVERAGE_BUFFERS_NV 0x8ED3 -#define GL_COVERAGE_SAMPLES_NV 0x8ED4 -#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 -#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 -#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 -#define GL_COVERAGE_BUFFER_BIT_NV 0x8000 -#endif - -/* GL_NV_depth_nonlinear */ -#ifndef GL_NV_depth_nonlinear -#define GL_DEPTH_COMPONENT16_NONLINEAR_NV 0x8E2C -#endif - -/* GL_NV_draw_buffers */ -#ifndef GL_NV_draw_buffers -#define GL_MAX_DRAW_BUFFERS_NV 0x8824 -#define GL_DRAW_BUFFER0_NV 0x8825 -#define GL_DRAW_BUFFER1_NV 0x8826 -#define GL_DRAW_BUFFER2_NV 0x8827 -#define GL_DRAW_BUFFER3_NV 0x8828 -#define GL_DRAW_BUFFER4_NV 0x8829 -#define GL_DRAW_BUFFER5_NV 0x882A -#define GL_DRAW_BUFFER6_NV 0x882B -#define GL_DRAW_BUFFER7_NV 0x882C -#define GL_DRAW_BUFFER8_NV 0x882D -#define GL_DRAW_BUFFER9_NV 0x882E -#define GL_DRAW_BUFFER10_NV 0x882F -#define GL_DRAW_BUFFER11_NV 0x8830 -#define GL_DRAW_BUFFER12_NV 0x8831 -#define GL_DRAW_BUFFER13_NV 0x8832 -#define GL_DRAW_BUFFER14_NV 0x8833 -#define GL_DRAW_BUFFER15_NV 0x8834 -#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 -#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 -#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 -#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 -#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 -#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 -#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 -#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 -#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 -#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 -#define GL_COLOR_ATTACHMENT10_NV 0x8CEA -#define GL_COLOR_ATTACHMENT11_NV 0x8CEB -#define GL_COLOR_ATTACHMENT12_NV 0x8CEC -#define GL_COLOR_ATTACHMENT13_NV 0x8CED -#define GL_COLOR_ATTACHMENT14_NV 0x8CEE -#define GL_COLOR_ATTACHMENT15_NV 0x8CEF -#endif - -/* GL_NV_fbo_color_attachments */ -#ifndef GL_NV_fbo_color_attachments -#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF -/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */ -#endif - -/* GL_NV_fence */ -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -/* GL_NV_read_buffer */ -#ifndef GL_NV_read_buffer -#define GL_READ_BUFFER_NV 0x0C02 -#endif - -/* GL_NV_read_buffer_front */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_depth */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_depth_stencil */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_stencil */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_texture_compression_s3tc_update */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_texture_npot_2D_mipmap */ -/* No new tokens introduced by this extension. */ - -/*------------------------------------------------------------------------* - * QCOM extension tokens - *------------------------------------------------------------------------*/ - -/* GL_QCOM_alpha_test */ -#ifndef GL_QCOM_alpha_test -#define GL_ALPHA_TEST_QCOM 0x0BC0 -#define GL_ALPHA_TEST_FUNC_QCOM 0x0BC1 -#define GL_ALPHA_TEST_REF_QCOM 0x0BC2 -#endif - -/* GL_QCOM_binning_control */ -#ifndef GL_QCOM_binning_control -#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 -#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 -#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 -#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 -#endif - -/* GL_QCOM_driver_control */ -/* No new tokens introduced by this extension. */ - -/* GL_QCOM_extended_get */ -#ifndef GL_QCOM_extended_get -#define GL_TEXTURE_WIDTH_QCOM 0x8BD2 -#define GL_TEXTURE_HEIGHT_QCOM 0x8BD3 -#define GL_TEXTURE_DEPTH_QCOM 0x8BD4 -#define GL_TEXTURE_INTERNAL_FORMAT_QCOM 0x8BD5 -#define GL_TEXTURE_FORMAT_QCOM 0x8BD6 -#define GL_TEXTURE_TYPE_QCOM 0x8BD7 -#define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 -#define GL_TEXTURE_NUM_LEVELS_QCOM 0x8BD9 -#define GL_TEXTURE_TARGET_QCOM 0x8BDA -#define GL_TEXTURE_OBJECT_VALID_QCOM 0x8BDB -#define GL_STATE_RESTORE 0x8BDC -#endif - -/* GL_QCOM_extended_get2 */ -/* No new tokens introduced by this extension. */ - -/* GL_QCOM_perfmon_global_mode */ -#ifndef GL_QCOM_perfmon_global_mode -#define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0 -#endif - -/* GL_QCOM_writeonly_rendering */ -#ifndef GL_QCOM_writeonly_rendering -#define GL_WRITEONLY_RENDERING_QCOM 0x8823 -#endif - -/* GL_QCOM_tiled_rendering */ -#ifndef GL_QCOM_tiled_rendering -#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 -#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 -#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 -#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 -#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 -#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 -#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 -#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 -#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 -#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 -#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 -#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 -#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 -#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 -#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 -#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 -#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 -#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 -#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 -#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 -#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 -#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 -#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 -#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 -#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 -#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 -#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 -#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 -#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 -#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 -#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 -#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 -#endif - -/*------------------------------------------------------------------------* - * VIV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_VIV_shader_binary */ -#ifndef GL_VIV_shader_binary -#define GL_SHADER_BINARY_VIV 0x8FC4 -#endif - -/*------------------------------------------------------------------------* - * End of extension tokens, start of corresponding extension functions - *------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------* - * OES extension functions - *------------------------------------------------------------------------*/ - -/* GL_OES_compressed_ETC1_RGB8_texture */ -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_OES_compressed_ETC1_RGB8_texture 1 -#endif - -/* GL_OES_compressed_paletted_texture */ -#ifndef GL_OES_compressed_paletted_texture -#define GL_OES_compressed_paletted_texture 1 -#endif - -/* GL_OES_depth24 */ -#ifndef GL_OES_depth24 -#define GL_OES_depth24 1 -#endif - -/* GL_OES_depth32 */ -#ifndef GL_OES_depth32 -#define GL_OES_depth32 1 -#endif - -/* GL_OES_depth_texture */ -#ifndef GL_OES_depth_texture -#define GL_OES_depth_texture 1 -#endif - -/* GL_OES_EGL_image */ -#ifndef GL_OES_EGL_image -#define GL_OES_EGL_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); -GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); -#endif -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); -#endif - -/* GL_OES_EGL_image_external */ -#ifndef GL_OES_EGL_image_external -#define GL_OES_EGL_image_external 1 -/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */ -#endif - -/* GL_OES_element_index_uint */ -#ifndef GL_OES_element_index_uint -#define GL_OES_element_index_uint 1 -#endif - -/* GL_OES_fbo_render_mipmap */ -#ifndef GL_OES_fbo_render_mipmap -#define GL_OES_fbo_render_mipmap 1 -#endif - -/* GL_OES_fragment_precision_high */ -#ifndef GL_OES_fragment_precision_high -#define GL_OES_fragment_precision_high 1 -#endif - -/* GL_OES_get_program_binary */ -#ifndef GL_OES_get_program_binary -#define GL_OES_get_program_binary 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); -#endif -typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); -#endif - -/* GL_OES_mapbuffer */ -#ifndef GL_OES_mapbuffer -#define GL_OES_mapbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access); -GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target); -GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access); -typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params); -#endif - -/* GL_OES_packed_depth_stencil */ -#ifndef GL_OES_packed_depth_stencil -#define GL_OES_packed_depth_stencil 1 -#endif - -/* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat -#define GL_OES_required_internalformat 1 -#endif - -/* GL_OES_rgb8_rgba8 */ -#ifndef GL_OES_rgb8_rgba8 -#define GL_OES_rgb8_rgba8 1 -#endif - -/* GL_OES_standard_derivatives */ -#ifndef GL_OES_standard_derivatives -#define GL_OES_standard_derivatives 1 -#endif - -/* GL_OES_stencil1 */ -#ifndef GL_OES_stencil1 -#define GL_OES_stencil1 1 -#endif - -/* GL_OES_stencil4 */ -#ifndef GL_OES_stencil4 -#define GL_OES_stencil4 1 -#endif - -#ifndef GL_OES_surfaceless_context -#define GL_OES_surfaceless_context 1 -#endif - -/* GL_OES_texture_3D */ -#ifndef GL_OES_texture_3D -#define GL_OES_texture_3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif -typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); -typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif - -/* GL_OES_texture_float */ -#ifndef GL_OES_texture_float -#define GL_OES_texture_float 1 -#endif - -/* GL_OES_texture_float_linear */ -#ifndef GL_OES_texture_float_linear -#define GL_OES_texture_float_linear 1 -#endif - -/* GL_OES_texture_half_float */ -#ifndef GL_OES_texture_half_float -#define GL_OES_texture_half_float 1 -#endif - -/* GL_OES_texture_half_float_linear */ -#ifndef GL_OES_texture_half_float_linear -#define GL_OES_texture_half_float_linear 1 -#endif - -/* GL_OES_texture_npot */ -#ifndef GL_OES_texture_npot -#define GL_OES_texture_npot 1 -#endif - -/* GL_OES_vertex_array_object */ -#ifndef GL_OES_vertex_array_object -#define GL_OES_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array); -GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays); -GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays); -GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array); -#endif -typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array); -typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays); -typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); -#endif - -/* GL_OES_vertex_half_float */ -#ifndef GL_OES_vertex_half_float -#define GL_OES_vertex_half_float 1 -#endif - -/* GL_OES_vertex_type_10_10_10_2 */ -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_OES_vertex_type_10_10_10_2 1 -#endif - -/*------------------------------------------------------------------------* - * KHR extension functions - *------------------------------------------------------------------------*/ - -#ifndef GL_KHR_debug -#define GL_KHR_debug 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); -GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); -GL_APICALL void GL_APIENTRY glPopDebugGroup (void); -GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); -#endif -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); -typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); -typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); -typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params); -#endif - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_KHR_texture_compression_astc_ldr 1 -#endif - - -/*------------------------------------------------------------------------* - * AMD extension functions - *------------------------------------------------------------------------*/ - -/* GL_AMD_compressed_3DC_texture */ -#ifndef GL_AMD_compressed_3DC_texture -#define GL_AMD_compressed_3DC_texture 1 -#endif - -/* GL_AMD_compressed_ATC_texture */ -#ifndef GL_AMD_compressed_ATC_texture -#define GL_AMD_compressed_ATC_texture 1 -#endif - -/* AMD_performance_monitor */ -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); -GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); -typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif - -/* GL_AMD_program_binary_Z400 */ -#ifndef GL_AMD_program_binary_Z400 -#define GL_AMD_program_binary_Z400 1 -#endif - -/*------------------------------------------------------------------------* - * ANGLE extension functions - *------------------------------------------------------------------------*/ - -/* GL_ANGLE_framebuffer_blit */ -#ifndef GL_ANGLE_framebuffer_blit -#define GL_ANGLE_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -/* GL_ANGLE_framebuffer_multisample */ -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_ANGLE_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_ANGLE_instanced_arrays -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor); -#endif -typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); -#endif - -/* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_ANGLE_pack_reverse_row_order 1 -#endif - -/* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_ANGLE_texture_compression_dxt3 1 -#endif - -/* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_ANGLE_texture_compression_dxt5 1 -#endif - -/* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage -#define GL_ANGLE_texture_usage 1 -#endif - -#ifndef GL_ANGLE_translated_shader_source -#define GL_ANGLE_translated_shader_source 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif -typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif - -/*------------------------------------------------------------------------* - * APPLE extension functions - *------------------------------------------------------------------------*/ - -/* GL_APPLE_copy_texture_levels */ -#ifndef GL_APPLE_copy_texture_levels -#define GL_APPLE_copy_texture_levels 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif -typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif - -/* GL_APPLE_framebuffer_multisample */ -#ifndef GL_APPLE_framebuffer_multisample -#define GL_APPLE_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); -#endif - -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#endif - -/* GL_APPLE_sync */ -#ifndef GL_APPLE_sync -#define GL_APPLE_sync 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); -GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); -GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); -GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); -GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif -typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); -typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); -typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); -typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif - -/* GL_APPLE_texture_format_BGRA8888 */ -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_APPLE_texture_format_BGRA8888 1 -#endif - -/* GL_APPLE_texture_max_level */ -#ifndef GL_APPLE_texture_max_level -#define GL_APPLE_texture_max_level 1 -#endif - -/*------------------------------------------------------------------------* - * ARM extension functions - *------------------------------------------------------------------------*/ - -/* GL_ARM_mali_program_binary */ -#ifndef GL_ARM_mali_program_binary -#define GL_ARM_mali_program_binary 1 -#endif - -/* GL_ARM_mali_shader_binary */ -#ifndef GL_ARM_mali_shader_binary -#define GL_ARM_mali_shader_binary 1 -#endif - -/* GL_ARM_rgba8 */ -#ifndef GL_ARM_rgba8 -#define GL_ARM_rgba8 1 -#endif - -/*------------------------------------------------------------------------* - * EXT extension functions - *------------------------------------------------------------------------*/ - -/* GL_EXT_blend_minmax */ -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#endif - -/* GL_EXT_color_buffer_half_float */ -#ifndef GL_EXT_color_buffer_half_float -#define GL_EXT_color_buffer_half_float 1 -#endif - -/* GL_EXT_debug_label */ -#ifndef GL_EXT_debug_label -#define GL_EXT_debug_label 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif -typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif - -/* GL_EXT_debug_marker */ -#ifndef GL_EXT_debug_marker -#define GL_EXT_debug_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void); -#endif -typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); -#endif - -/* GL_EXT_discard_framebuffer */ -#ifndef GL_EXT_discard_framebuffer -#define GL_EXT_discard_framebuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif -typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif - -/* GL_EXT_map_buffer_range */ -#ifndef GL_EXT_map_buffer_range -#define GL_EXT_map_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#endif - -/* GL_EXT_multisampled_render_to_texture */ -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_EXT_multisampled_render_to_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif - -/* GL_EXT_multiview_draw_buffers */ -#ifndef GL_EXT_multiview_draw_buffers -#define GL_EXT_multiview_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); -GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); -GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); -#endif -typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); -typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); -GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -/* GL_EXT_occlusion_query_boolean */ -#ifndef GL_EXT_occlusion_query_boolean -#define GL_EXT_occlusion_query_boolean 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids); -GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids); -GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id); -GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id); -GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); -GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); -#endif -typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); -typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); -typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); -typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -/* GL_EXT_read_format_bgra */ -#ifndef GL_EXT_read_format_bgra -#define GL_EXT_read_format_bgra 1 -#endif - -/* GL_EXT_robustness */ -#ifndef GL_EXT_robustness -#define GL_EXT_robustness 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void); -GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params); -GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif -typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void); -typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif - -/* GL_EXT_separate_shader_objects */ -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program); -GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program); -GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings); -GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines); -GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines); -GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x); -GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y); -GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z); -GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x); -GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif -typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program); -typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings); -typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines); -typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines); -typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif - -/* GL_EXT_shader_framebuffer_fetch */ -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_EXT_shader_framebuffer_fetch 1 -#endif - -/* GL_EXT_shader_texture_lod */ -#ifndef GL_EXT_shader_texture_lod -#define GL_EXT_shader_texture_lod 1 -#endif - -/* GL_EXT_shadow_samplers */ -#ifndef GL_EXT_shadow_samplers -#define GL_EXT_shadow_samplers 1 -#endif - -/* GL_EXT_sRGB */ -#ifndef GL_EXT_sRGB -#define GL_EXT_sRGB 1 -#endif - -/* GL_EXT_texture_compression_dxt1 */ -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_EXT_texture_compression_dxt1 1 -#endif - -/* GL_EXT_texture_filter_anisotropic */ -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -/* GL_EXT_texture_format_BGRA8888 */ -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_EXT_texture_format_BGRA8888 1 -#endif - -/* GL_EXT_texture_rg */ -#ifndef GL_EXT_texture_rg -#define GL_EXT_texture_rg 1 -#endif - -/* GL_EXT_texture_storage */ -#ifndef GL_EXT_texture_storage -#define GL_EXT_texture_storage 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif - -/* GL_EXT_texture_type_2_10_10_10_REV */ -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_EXT_texture_type_2_10_10_10_REV 1 -#endif - -/* GL_EXT_unpack_subimage */ -#ifndef GL_EXT_unpack_subimage -#define GL_EXT_unpack_subimage 1 -#endif - -/*------------------------------------------------------------------------* - * DMP extension functions - *------------------------------------------------------------------------*/ - -/* GL_DMP_shader_binary */ -#ifndef GL_DMP_shader_binary -#define GL_DMP_shader_binary 1 -#endif - -/*------------------------------------------------------------------------* - * FJ extension functions - *------------------------------------------------------------------------*/ - -/* GL_FJ_shader_binary_GCCSO */ -#ifndef GL_FJ_shader_binary_GCCSO -#define GL_FJ_shader_binary_GCCSO 1 -#endif - -/*------------------------------------------------------------------------* - * IMG extension functions - *------------------------------------------------------------------------*/ - -/* GL_IMG_program_binary */ -#ifndef GL_IMG_program_binary -#define GL_IMG_program_binary 1 -#endif - -/* GL_IMG_read_format */ -#ifndef GL_IMG_read_format -#define GL_IMG_read_format 1 -#endif - -/* GL_IMG_shader_binary */ -#ifndef GL_IMG_shader_binary -#define GL_IMG_shader_binary 1 -#endif - -/* GL_IMG_texture_compression_pvrtc */ -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_IMG_texture_compression_pvrtc 1 -#endif - -/* GL_IMG_multisampled_render_to_texture */ -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_IMG_multisampled_render_to_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif - -/*------------------------------------------------------------------------* - * NV extension functions - *------------------------------------------------------------------------*/ - -/* GL_NV_coverage_sample */ -#ifndef GL_NV_coverage_sample -#define GL_NV_coverage_sample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask); -GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation); -#endif -typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask); -typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation); -#endif - -/* GL_NV_depth_nonlinear */ -#ifndef GL_NV_depth_nonlinear -#define GL_NV_depth_nonlinear 1 -#endif - -/* GL_NV_draw_buffers */ -#ifndef GL_NV_draw_buffers -#define GL_NV_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs); -#endif -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs); -#endif - -/* GL_NV_fbo_color_attachments */ -#ifndef GL_NV_fbo_color_attachments -#define GL_NV_fbo_color_attachments 1 -#endif - -/* GL_NV_fence */ -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); -GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *); -GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint); -GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint); -GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); -GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint); -GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum); -#endif -typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -/* GL_NV_read_buffer */ -#ifndef GL_NV_read_buffer -#define GL_NV_read_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode); -#endif -typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode); -#endif - -/* GL_NV_read_buffer_front */ -#ifndef GL_NV_read_buffer_front -#define GL_NV_read_buffer_front 1 -#endif - -/* GL_NV_read_depth */ -#ifndef GL_NV_read_depth -#define GL_NV_read_depth 1 -#endif - -/* GL_NV_read_depth_stencil */ -#ifndef GL_NV_read_depth_stencil -#define GL_NV_read_depth_stencil 1 -#endif - -/* GL_NV_read_stencil */ -#ifndef GL_NV_read_stencil -#define GL_NV_read_stencil 1 -#endif - -/* GL_NV_texture_compression_s3tc_update */ -#ifndef GL_NV_texture_compression_s3tc_update -#define GL_NV_texture_compression_s3tc_update 1 -#endif - -/* GL_NV_texture_npot_2D_mipmap */ -#ifndef GL_NV_texture_npot_2D_mipmap -#define GL_NV_texture_npot_2D_mipmap 1 -#endif - -/*------------------------------------------------------------------------* - * QCOM extension functions - *------------------------------------------------------------------------*/ - -/* GL_QCOM_alpha_test */ -#ifndef GL_QCOM_alpha_test -#define GL_QCOM_alpha_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); -#endif -typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); -#endif - -/* GL_QCOM_binning_control */ -#ifndef GL_QCOM_binning_control -#define GL_QCOM_binning_control 1 -#endif - -/* GL_QCOM_driver_control */ -#ifndef GL_QCOM_driver_control -#define GL_QCOM_driver_control 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls); -GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl); -GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl); -#endif -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls); -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -#endif - -/* GL_QCOM_extended_get */ -#ifndef GL_QCOM_extended_get -#define GL_QCOM_extended_get 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures); -GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); -GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params); -#endif -typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params); -#endif - -/* GL_QCOM_extended_get2 */ -#ifndef GL_QCOM_extended_get2 -#define GL_QCOM_extended_get2 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders); -GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program); -GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif -typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif - -/* GL_QCOM_perfmon_global_mode */ -#ifndef GL_QCOM_perfmon_global_mode -#define GL_QCOM_perfmon_global_mode 1 -#endif - -/* GL_QCOM_writeonly_rendering */ -#ifndef GL_QCOM_writeonly_rendering -#define GL_QCOM_writeonly_rendering 1 -#endif - -/* GL_QCOM_tiled_rendering */ -#ifndef GL_QCOM_tiled_rendering -#define GL_QCOM_tiled_rendering 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); -#endif -typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); -#endif - -/*------------------------------------------------------------------------* - * VIV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_VIV_shader_binary */ -#ifndef GL_VIV_shader_binary -#define GL_VIV_shader_binary 1 -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __gl2ext_h_ */ - -#endif /* _MSC_VER */ - -#ifndef APIENTRY -#define APIENTRY GL_APIENTRY -#endif diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengles.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 1.X API headers. - */ - -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengl.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengl.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengl.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_opengl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,11126 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengl.h - * - * This is a simple file to encapsulate the OpenGL API headers. - */ - -#ifndef _SDL_opengl_h -#define _SDL_opengl_h - -#include "SDL_config.h" - -#ifndef __IPHONEOS__ - -#ifdef __WIN32__ -#define WIN32_LEAN_AND_MEAN -#ifndef NOMINMAX -#define NOMINMAX /* Don't defined min() and max() */ -#endif -#include -#endif - -#ifdef __glext_h_ -/* Someone has already included glext.h */ -#define NO_SDL_GLEXT -#endif -#ifndef NO_SDL_GLEXT -#define __glext_h_ /* Don't let gl.h include glext.h */ -#endif -#if defined(__MACOSX__) -#include /* Header File For The OpenGL Library */ -#define __X_GL_H -#else -#include /* Header File For The OpenGL Library */ -#endif -#ifndef NO_SDL_GLEXT -#undef __glext_h_ -#endif - -/** - * \file SDL_opengl.h - * - * This file is included because glext.h is not available on some systems. - * If you don't want this version included, simply define ::NO_SDL_GLEXT. - * - * The latest version is available from: - * http://www.opengl.org/registry/ - */ - -/** - * \def NO_SDL_GLEXT - * - * Define this if you have your own version of glext.h and want to disable the - * version included in SDL_opengl.h. - */ - -#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY) -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2007-2010 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated $Date: 2010-08-03 01:30:25 -0700 (Tue, 03 Aug 2010) $ */ -/* Current version at http://www.opengl.org/registry/ */ -#define GL_GLEXT_VERSION 64 -/* Function declaration macros - to move into glplatform.h */ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_RESCALE_NORMAL 0x803A -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#endif - -#ifndef GL_ARB_imaging_DEPRECATED -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#endif - -#ifndef GL_VERSION_1_5_DEPRECATED -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_FOG_COORD_SRC 0x8450 -#define GL_FOG_COORD 0x8451 -#define GL_CURRENT_FOG_COORD 0x8453 -#define GL_FOG_COORD_ARRAY_TYPE 0x8454 -#define GL_FOG_COORD_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORD_ARRAY_POINTER 0x8456 -#define GL_FOG_COORD_ARRAY 0x8457 -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D -#define GL_SRC0_RGB 0x8580 -#define GL_SRC1_RGB 0x8581 -#define GL_SRC2_RGB 0x8582 -#define GL_SRC0_ALPHA 0x8588 -#define GL_SRC1_ALPHA 0x8589 -#define GL_SRC2_ALPHA 0x858A -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB 0x8009 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_VERSION_2_0_DEPRECATED -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_TEXTURE_COORDS 0x8871 -#endif - -#ifndef GL_VERSION_2_1 -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#endif - -#ifndef GL_VERSION_2_1_DEPRECATED -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B -#endif - -#ifndef GL_VERSION_3_0 -#define GL_COMPARE_REF_TO_TEXTURE 0x884E -#define GL_CLIP_DISTANCE0 0x3000 -#define GL_CLIP_DISTANCE1 0x3001 -#define GL_CLIP_DISTANCE2 0x3002 -#define GL_CLIP_DISTANCE3 0x3003 -#define GL_CLIP_DISTANCE4 0x3004 -#define GL_CLIP_DISTANCE5 0x3005 -#define GL_CLIP_DISTANCE6 0x3006 -#define GL_CLIP_DISTANCE7 0x3007 -#define GL_MAX_CLIP_DISTANCES 0x0D32 -#define GL_MAJOR_VERSION 0x821B -#define GL_MINOR_VERSION 0x821C -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_DEPTH_BUFFER 0x8223 -#define GL_STENCIL_BUFFER 0x8224 -#define GL_COMPRESSED_RED 0x8225 -#define GL_COMPRESSED_RG 0x8226 -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 -#define GL_RGBA32F 0x8814 -#define GL_RGB32F 0x8815 -#define GL_RGBA16F 0x881A -#define GL_RGB16F 0x881B -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD -#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF -#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 -#define GL_CLAMP_READ_COLOR 0x891C -#define GL_FIXED_ONLY 0x891D -#define GL_MAX_VARYING_COMPONENTS 0x8B4B -#define GL_TEXTURE_1D_ARRAY 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 -#define GL_TEXTURE_2D_ARRAY 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D -#define GL_R11F_G11F_B10F 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B -#define GL_RGB9_E5 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E -#define GL_TEXTURE_SHARED_SIZE 0x8C3F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 -#define GL_PRIMITIVES_GENERATED 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 -#define GL_RASTERIZER_DISCARD 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B -#define GL_INTERLEAVED_ATTRIBS 0x8C8C -#define GL_SEPARATE_ATTRIBS 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F -#define GL_RGBA32UI 0x8D70 -#define GL_RGB32UI 0x8D71 -#define GL_RGBA16UI 0x8D76 -#define GL_RGB16UI 0x8D77 -#define GL_RGBA8UI 0x8D7C -#define GL_RGB8UI 0x8D7D -#define GL_RGBA32I 0x8D82 -#define GL_RGB32I 0x8D83 -#define GL_RGBA16I 0x8D88 -#define GL_RGB16I 0x8D89 -#define GL_RGBA8I 0x8D8E -#define GL_RGB8I 0x8D8F -#define GL_RED_INTEGER 0x8D94 -#define GL_GREEN_INTEGER 0x8D95 -#define GL_BLUE_INTEGER 0x8D96 -#define GL_RGB_INTEGER 0x8D98 -#define GL_RGBA_INTEGER 0x8D99 -#define GL_BGR_INTEGER 0x8D9A -#define GL_BGRA_INTEGER 0x8D9B -#define GL_SAMPLER_1D_ARRAY 0x8DC0 -#define GL_SAMPLER_2D_ARRAY 0x8DC1 -#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 -#define GL_UNSIGNED_INT_VEC2 0x8DC6 -#define GL_UNSIGNED_INT_VEC3 0x8DC7 -#define GL_UNSIGNED_INT_VEC4 0x8DC8 -#define GL_INT_SAMPLER_1D 0x8DC9 -#define GL_INT_SAMPLER_2D 0x8DCA -#define GL_INT_SAMPLER_3D 0x8DCB -#define GL_INT_SAMPLER_CUBE 0x8DCC -#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF -#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 -#define GL_QUERY_WAIT 0x8E13 -#define GL_QUERY_NO_WAIT 0x8E14 -#define GL_QUERY_BY_REGION_WAIT 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 -#define GL_BUFFER_ACCESS_FLAGS 0x911F -#define GL_BUFFER_MAP_LENGTH 0x9120 -#define GL_BUFFER_MAP_OFFSET 0x9121 -/* Reuse tokens from ARB_depth_buffer_float */ -/* reuse GL_DEPTH_COMPONENT32F */ -/* reuse GL_DEPTH32F_STENCIL8 */ -/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */ -/* Reuse tokens from ARB_framebuffer_object */ -/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */ -/* reuse GL_FRAMEBUFFER_DEFAULT */ -/* reuse GL_FRAMEBUFFER_UNDEFINED */ -/* reuse GL_DEPTH_STENCIL_ATTACHMENT */ -/* reuse GL_INDEX */ -/* reuse GL_MAX_RENDERBUFFER_SIZE */ -/* reuse GL_DEPTH_STENCIL */ -/* reuse GL_UNSIGNED_INT_24_8 */ -/* reuse GL_DEPTH24_STENCIL8 */ -/* reuse GL_TEXTURE_STENCIL_SIZE */ -/* reuse GL_TEXTURE_RED_TYPE */ -/* reuse GL_TEXTURE_GREEN_TYPE */ -/* reuse GL_TEXTURE_BLUE_TYPE */ -/* reuse GL_TEXTURE_ALPHA_TYPE */ -/* reuse GL_TEXTURE_DEPTH_TYPE */ -/* reuse GL_UNSIGNED_NORMALIZED */ -/* reuse GL_FRAMEBUFFER_BINDING */ -/* reuse GL_DRAW_FRAMEBUFFER_BINDING */ -/* reuse GL_RENDERBUFFER_BINDING */ -/* reuse GL_READ_FRAMEBUFFER */ -/* reuse GL_DRAW_FRAMEBUFFER */ -/* reuse GL_READ_FRAMEBUFFER_BINDING */ -/* reuse GL_RENDERBUFFER_SAMPLES */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -/* reuse GL_FRAMEBUFFER_COMPLETE */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */ -/* reuse GL_FRAMEBUFFER_UNSUPPORTED */ -/* reuse GL_MAX_COLOR_ATTACHMENTS */ -/* reuse GL_COLOR_ATTACHMENT0 */ -/* reuse GL_COLOR_ATTACHMENT1 */ -/* reuse GL_COLOR_ATTACHMENT2 */ -/* reuse GL_COLOR_ATTACHMENT3 */ -/* reuse GL_COLOR_ATTACHMENT4 */ -/* reuse GL_COLOR_ATTACHMENT5 */ -/* reuse GL_COLOR_ATTACHMENT6 */ -/* reuse GL_COLOR_ATTACHMENT7 */ -/* reuse GL_COLOR_ATTACHMENT8 */ -/* reuse GL_COLOR_ATTACHMENT9 */ -/* reuse GL_COLOR_ATTACHMENT10 */ -/* reuse GL_COLOR_ATTACHMENT11 */ -/* reuse GL_COLOR_ATTACHMENT12 */ -/* reuse GL_COLOR_ATTACHMENT13 */ -/* reuse GL_COLOR_ATTACHMENT14 */ -/* reuse GL_COLOR_ATTACHMENT15 */ -/* reuse GL_DEPTH_ATTACHMENT */ -/* reuse GL_STENCIL_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER */ -/* reuse GL_RENDERBUFFER */ -/* reuse GL_RENDERBUFFER_WIDTH */ -/* reuse GL_RENDERBUFFER_HEIGHT */ -/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */ -/* reuse GL_STENCIL_INDEX1 */ -/* reuse GL_STENCIL_INDEX4 */ -/* reuse GL_STENCIL_INDEX8 */ -/* reuse GL_STENCIL_INDEX16 */ -/* reuse GL_RENDERBUFFER_RED_SIZE */ -/* reuse GL_RENDERBUFFER_GREEN_SIZE */ -/* reuse GL_RENDERBUFFER_BLUE_SIZE */ -/* reuse GL_RENDERBUFFER_ALPHA_SIZE */ -/* reuse GL_RENDERBUFFER_DEPTH_SIZE */ -/* reuse GL_RENDERBUFFER_STENCIL_SIZE */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */ -/* reuse GL_MAX_SAMPLES */ -/* Reuse tokens from ARB_framebuffer_sRGB */ -/* reuse GL_FRAMEBUFFER_SRGB */ -/* Reuse tokens from ARB_half_float_vertex */ -/* reuse GL_HALF_FLOAT */ -/* Reuse tokens from ARB_map_buffer_range */ -/* reuse GL_MAP_READ_BIT */ -/* reuse GL_MAP_WRITE_BIT */ -/* reuse GL_MAP_INVALIDATE_RANGE_BIT */ -/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */ -/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */ -/* reuse GL_MAP_UNSYNCHRONIZED_BIT */ -/* Reuse tokens from ARB_texture_compression_rgtc */ -/* reuse GL_COMPRESSED_RED_RGTC1 */ -/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */ -/* reuse GL_COMPRESSED_RG_RGTC2 */ -/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */ -/* Reuse tokens from ARB_texture_rg */ -/* reuse GL_RG */ -/* reuse GL_RG_INTEGER */ -/* reuse GL_R8 */ -/* reuse GL_R16 */ -/* reuse GL_RG8 */ -/* reuse GL_RG16 */ -/* reuse GL_R16F */ -/* reuse GL_R32F */ -/* reuse GL_RG16F */ -/* reuse GL_RG32F */ -/* reuse GL_R8I */ -/* reuse GL_R8UI */ -/* reuse GL_R16I */ -/* reuse GL_R16UI */ -/* reuse GL_R32I */ -/* reuse GL_R32UI */ -/* reuse GL_RG8I */ -/* reuse GL_RG8UI */ -/* reuse GL_RG16I */ -/* reuse GL_RG16UI */ -/* reuse GL_RG32I */ -/* reuse GL_RG32UI */ -/* Reuse tokens from ARB_vertex_array_object */ -/* reuse GL_VERTEX_ARRAY_BINDING */ -#endif - -#ifndef GL_VERSION_3_0_DEPRECATED -#define GL_CLAMP_VERTEX_COLOR 0x891A -#define GL_CLAMP_FRAGMENT_COLOR 0x891B -#define GL_ALPHA_INTEGER 0x8D97 -/* Reuse tokens from ARB_framebuffer_object */ -/* reuse GL_TEXTURE_LUMINANCE_TYPE */ -/* reuse GL_TEXTURE_INTENSITY_TYPE */ -#endif - -#ifndef GL_VERSION_3_1 -#define GL_SAMPLER_2D_RECT 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 -#define GL_SAMPLER_BUFFER 0x8DC2 -#define GL_INT_SAMPLER_2D_RECT 0x8DCD -#define GL_INT_SAMPLER_BUFFER 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 -#define GL_TEXTURE_BUFFER 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E -#define GL_TEXTURE_RECTANGLE 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_PRIMITIVE_RESTART 0x8F9D -#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E -/* Reuse tokens from ARB_copy_buffer */ -/* reuse GL_COPY_READ_BUFFER */ -/* reuse GL_COPY_WRITE_BUFFER */ -/* Reuse tokens from ARB_draw_instanced (none) */ -/* Reuse tokens from ARB_uniform_buffer_object */ -/* reuse GL_UNIFORM_BUFFER */ -/* reuse GL_UNIFORM_BUFFER_BINDING */ -/* reuse GL_UNIFORM_BUFFER_START */ -/* reuse GL_UNIFORM_BUFFER_SIZE */ -/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */ -/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */ -/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */ -/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */ -/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */ -/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */ -/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */ -/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */ -/* reuse GL_ACTIVE_UNIFORM_BLOCKS */ -/* reuse GL_UNIFORM_TYPE */ -/* reuse GL_UNIFORM_SIZE */ -/* reuse GL_UNIFORM_NAME_LENGTH */ -/* reuse GL_UNIFORM_BLOCK_INDEX */ -/* reuse GL_UNIFORM_OFFSET */ -/* reuse GL_UNIFORM_ARRAY_STRIDE */ -/* reuse GL_UNIFORM_MATRIX_STRIDE */ -/* reuse GL_UNIFORM_IS_ROW_MAJOR */ -/* reuse GL_UNIFORM_BLOCK_BINDING */ -/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */ -/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */ -/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */ -/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */ -/* reuse GL_INVALID_INDEX */ -#endif - -#ifndef GL_VERSION_3_2 -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_LINES_ADJACENCY 0x000A -#define GL_LINE_STRIP_ADJACENCY 0x000B -#define GL_TRIANGLES_ADJACENCY 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D -#define GL_PROGRAM_POINT_SIZE 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 -#define GL_GEOMETRY_SHADER 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT 0x8916 -#define GL_GEOMETRY_INPUT_TYPE 0x8917 -#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 -#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 -#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 -#define GL_CONTEXT_PROFILE_MASK 0x9126 -/* reuse GL_MAX_VARYING_COMPONENTS */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -/* Reuse tokens from ARB_depth_clamp */ -/* reuse GL_DEPTH_CLAMP */ -/* Reuse tokens from ARB_draw_elements_base_vertex (none) */ -/* Reuse tokens from ARB_fragment_coord_conventions (none) */ -/* Reuse tokens from ARB_provoking_vertex */ -/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */ -/* reuse GL_FIRST_VERTEX_CONVENTION */ -/* reuse GL_LAST_VERTEX_CONVENTION */ -/* reuse GL_PROVOKING_VERTEX */ -/* Reuse tokens from ARB_seamless_cube_map */ -/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */ -/* Reuse tokens from ARB_sync */ -/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */ -/* reuse GL_OBJECT_TYPE */ -/* reuse GL_SYNC_CONDITION */ -/* reuse GL_SYNC_STATUS */ -/* reuse GL_SYNC_FLAGS */ -/* reuse GL_SYNC_FENCE */ -/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */ -/* reuse GL_UNSIGNALED */ -/* reuse GL_SIGNALED */ -/* reuse GL_ALREADY_SIGNALED */ -/* reuse GL_TIMEOUT_EXPIRED */ -/* reuse GL_CONDITION_SATISFIED */ -/* reuse GL_WAIT_FAILED */ -/* reuse GL_TIMEOUT_IGNORED */ -/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */ -/* reuse GL_TIMEOUT_IGNORED */ -/* Reuse tokens from ARB_texture_multisample */ -/* reuse GL_SAMPLE_POSITION */ -/* reuse GL_SAMPLE_MASK */ -/* reuse GL_SAMPLE_MASK_VALUE */ -/* reuse GL_MAX_SAMPLE_MASK_WORDS */ -/* reuse GL_TEXTURE_2D_MULTISAMPLE */ -/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */ -/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */ -/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_TEXTURE_SAMPLES */ -/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */ -/* reuse GL_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */ -/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */ -/* reuse GL_MAX_INTEGER_SAMPLES */ -/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */ -#endif - -#ifndef GL_VERSION_3_3 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE -/* Reuse tokens from ARB_blend_func_extended */ -/* reuse GL_SRC1_COLOR */ -/* reuse GL_ONE_MINUS_SRC1_COLOR */ -/* reuse GL_ONE_MINUS_SRC1_ALPHA */ -/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */ -/* Reuse tokens from ARB_explicit_attrib_location (none) */ -/* Reuse tokens from ARB_occlusion_query2 */ -/* reuse GL_ANY_SAMPLES_PASSED */ -/* Reuse tokens from ARB_sampler_objects */ -/* reuse GL_SAMPLER_BINDING */ -/* Reuse tokens from ARB_shader_bit_encoding (none) */ -/* Reuse tokens from ARB_texture_rgb10_a2ui */ -/* reuse GL_RGB10_A2UI */ -/* Reuse tokens from ARB_texture_swizzle */ -/* reuse GL_TEXTURE_SWIZZLE_R */ -/* reuse GL_TEXTURE_SWIZZLE_G */ -/* reuse GL_TEXTURE_SWIZZLE_B */ -/* reuse GL_TEXTURE_SWIZZLE_A */ -/* reuse GL_TEXTURE_SWIZZLE_RGBA */ -/* Reuse tokens from ARB_timer_query */ -/* reuse GL_TIME_ELAPSED */ -/* reuse GL_TIMESTAMP */ -/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */ -/* reuse GL_INT_2_10_10_10_REV */ -#endif - -#ifndef GL_VERSION_4_0 -#define GL_SAMPLE_SHADING 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F -#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F -/* Reuse tokens from ARB_texture_query_lod (none) */ -/* Reuse tokens from ARB_draw_buffers_blend (none) */ -/* Reuse tokens from ARB_draw_indirect */ -/* reuse GL_DRAW_INDIRECT_BUFFER */ -/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */ -/* Reuse tokens from ARB_gpu_shader5 */ -/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */ -/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */ -/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */ -/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */ -/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */ -/* reuse GL_MAX_VERTEX_STREAMS */ -/* Reuse tokens from ARB_gpu_shader_fp64 */ -/* reuse GL_DOUBLE_VEC2 */ -/* reuse GL_DOUBLE_VEC3 */ -/* reuse GL_DOUBLE_VEC4 */ -/* reuse GL_DOUBLE_MAT2 */ -/* reuse GL_DOUBLE_MAT3 */ -/* reuse GL_DOUBLE_MAT4 */ -/* reuse GL_DOUBLE_MAT2x3 */ -/* reuse GL_DOUBLE_MAT2x4 */ -/* reuse GL_DOUBLE_MAT3x2 */ -/* reuse GL_DOUBLE_MAT3x4 */ -/* reuse GL_DOUBLE_MAT4x2 */ -/* reuse GL_DOUBLE_MAT4x3 */ -/* Reuse tokens from ARB_shader_subroutine */ -/* reuse GL_ACTIVE_SUBROUTINES */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */ -/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */ -/* reuse GL_MAX_SUBROUTINES */ -/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */ -/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */ -/* reuse GL_COMPATIBLE_SUBROUTINES */ -/* Reuse tokens from ARB_tessellation_shader */ -/* reuse GL_PATCHES */ -/* reuse GL_PATCH_VERTICES */ -/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */ -/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */ -/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */ -/* reuse GL_TESS_GEN_MODE */ -/* reuse GL_TESS_GEN_SPACING */ -/* reuse GL_TESS_GEN_VERTEX_ORDER */ -/* reuse GL_TESS_GEN_POINT_MODE */ -/* reuse GL_ISOLINES */ -/* reuse GL_FRACTIONAL_ODD */ -/* reuse GL_FRACTIONAL_EVEN */ -/* reuse GL_MAX_PATCH_VERTICES */ -/* reuse GL_MAX_TESS_GEN_LEVEL */ -/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */ -/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */ -/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_PATCH_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */ -/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */ -/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */ -/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */ -/* reuse GL_TESS_EVALUATION_SHADER */ -/* reuse GL_TESS_CONTROL_SHADER */ -/* Reuse tokens from ARB_texture_buffer_object_rgb32 (none) */ -/* Reuse tokens from ARB_transform_feedback2 */ -/* reuse GL_TRANSFORM_FEEDBACK */ -/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */ -/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */ -/* reuse GL_TRANSFORM_FEEDBACK_BINDING */ -/* Reuse tokens from ARB_transform_feedback3 */ -/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */ -/* reuse GL_MAX_VERTEX_STREAMS */ -#endif - -#ifndef GL_VERSION_4_1 -/* Reuse tokens from ARB_ES2_compatibility */ -/* reuse GL_FIXED */ -/* reuse GL_IMPLEMENTATION_COLOR_READ_TYPE */ -/* reuse GL_IMPLEMENTATION_COLOR_READ_FORMAT */ -/* reuse GL_LOW_FLOAT */ -/* reuse GL_MEDIUM_FLOAT */ -/* reuse GL_HIGH_FLOAT */ -/* reuse GL_LOW_INT */ -/* reuse GL_MEDIUM_INT */ -/* reuse GL_HIGH_INT */ -/* reuse GL_SHADER_COMPILER */ -/* reuse GL_NUM_SHADER_BINARY_FORMATS */ -/* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */ -/* reuse GL_MAX_VARYING_VECTORS */ -/* reuse GL_MAX_FRAGMENT_UNIFORM_VECTORS */ -/* Reuse tokens from ARB_get_program_binary */ -/* reuse GL_PROGRAM_BINARY_RETRIEVABLE_HINT */ -/* reuse GL_PROGRAM_BINARY_LENGTH */ -/* reuse GL_NUM_PROGRAM_BINARY_FORMATS */ -/* reuse GL_PROGRAM_BINARY_FORMATS */ -/* Reuse tokens from ARB_separate_shader_objects */ -/* reuse GL_VERTEX_SHADER_BIT */ -/* reuse GL_FRAGMENT_SHADER_BIT */ -/* reuse GL_GEOMETRY_SHADER_BIT */ -/* reuse GL_TESS_CONTROL_SHADER_BIT */ -/* reuse GL_TESS_EVALUATION_SHADER_BIT */ -/* reuse GL_ALL_SHADER_BITS */ -/* reuse GL_PROGRAM_SEPARABLE */ -/* reuse GL_ACTIVE_PROGRAM */ -/* reuse GL_PROGRAM_PIPELINE_BINDING */ -/* Reuse tokens from ARB_shader_precision (none) */ -/* Reuse tokens from ARB_vertex_attrib_64bit - all are in GL 3.0 and 4.0 already */ -/* Reuse tokens from ARB_viewport_array - some are in GL 1.1 and ARB_provoking_vertex already */ -/* reuse GL_MAX_VIEWPORTS */ -/* reuse GL_VIEWPORT_SUBPIXEL_BITS */ -/* reuse GL_VIEWPORT_BOUNDS_RANGE */ -/* reuse GL_LAYER_PROVOKING_VERTEX */ -/* reuse GL_VIEWPORT_INDEX_PROVOKING_VERTEX */ -/* reuse GL_UNDEFINED_VERTEX */ -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_ARB_depth_buffer_float -#define GL_DEPTH_COMPONENT32F 0x8CAC -#define GL_DEPTH32F_STENCIL8 0x8CAD -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD -#endif - -#ifndef GL_ARB_draw_instanced -#endif - -#ifndef GL_ARB_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 -#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 -#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 -#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 -#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 -#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 -#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 -#define GL_FRAMEBUFFER_DEFAULT 0x8218 -#define GL_FRAMEBUFFER_UNDEFINED 0x8219 -#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_DEPTH_STENCIL 0x84F9 -#define GL_UNSIGNED_INT_24_8 0x84FA -#define GL_DEPTH24_STENCIL8 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE 0x88F1 -#define GL_TEXTURE_RED_TYPE 0x8C10 -#define GL_TEXTURE_GREEN_TYPE 0x8C11 -#define GL_TEXTURE_BLUE_TYPE 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE 0x8C13 -#define GL_TEXTURE_DEPTH_TYPE 0x8C16 -#define GL_UNSIGNED_NORMALIZED 0x8C17 -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_READ_FRAMEBUFFER 0x8CA8 -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_COLOR_ATTACHMENT1 0x8CE1 -#define GL_COLOR_ATTACHMENT2 0x8CE2 -#define GL_COLOR_ATTACHMENT3 0x8CE3 -#define GL_COLOR_ATTACHMENT4 0x8CE4 -#define GL_COLOR_ATTACHMENT5 0x8CE5 -#define GL_COLOR_ATTACHMENT6 0x8CE6 -#define GL_COLOR_ATTACHMENT7 0x8CE7 -#define GL_COLOR_ATTACHMENT8 0x8CE8 -#define GL_COLOR_ATTACHMENT9 0x8CE9 -#define GL_COLOR_ATTACHMENT10 0x8CEA -#define GL_COLOR_ATTACHMENT11 0x8CEB -#define GL_COLOR_ATTACHMENT12 0x8CEC -#define GL_COLOR_ATTACHMENT13 0x8CED -#define GL_COLOR_ATTACHMENT14 0x8CEE -#define GL_COLOR_ATTACHMENT15 0x8CEF -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_STENCIL_INDEX1 0x8D46 -#define GL_STENCIL_INDEX4 0x8D47 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_STENCIL_INDEX16 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#define GL_MAX_SAMPLES 0x8D57 -#endif - -#ifndef GL_ARB_framebuffer_object_DEPRECATED -#define GL_INDEX 0x8222 -#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 -#endif - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB 0x8DB9 -#endif - -#ifndef GL_ARB_geometry_shader4 -#define GL_LINES_ADJACENCY_ARB 0x000A -#define GL_LINE_STRIP_ADJACENCY_ARB 0x000B -#define GL_TRIANGLES_ADJACENCY_ARB 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0x000D -#define GL_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 -#define GL_GEOMETRY_SHADER_ARB 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1 -/* reuse GL_MAX_VARYING_COMPONENTS */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -#endif - -#ifndef GL_ARB_half_float_vertex -#define GL_HALF_FLOAT 0x140B -#endif - -#ifndef GL_ARB_instanced_arrays -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE -#endif - -#ifndef GL_ARB_map_buffer_range -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 -#endif - -#ifndef GL_ARB_texture_buffer_object -#define GL_TEXTURE_BUFFER_ARB 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E -#endif - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC -#define GL_COMPRESSED_RG_RGTC2 0x8DBD -#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE -#endif - -#ifndef GL_ARB_texture_rg -#define GL_RG 0x8227 -#define GL_RG_INTEGER 0x8228 -#define GL_R8 0x8229 -#define GL_R16 0x822A -#define GL_RG8 0x822B -#define GL_RG16 0x822C -#define GL_R16F 0x822D -#define GL_R32F 0x822E -#define GL_RG16F 0x822F -#define GL_RG32F 0x8230 -#define GL_R8I 0x8231 -#define GL_R8UI 0x8232 -#define GL_R16I 0x8233 -#define GL_R16UI 0x8234 -#define GL_R32I 0x8235 -#define GL_R32UI 0x8236 -#define GL_RG8I 0x8237 -#define GL_RG8UI 0x8238 -#define GL_RG16I 0x8239 -#define GL_RG16UI 0x823A -#define GL_RG32I 0x823B -#define GL_RG32UI 0x823C -#endif - -#ifndef GL_ARB_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING 0x85B5 -#endif - -#ifndef GL_ARB_uniform_buffer_object -#define GL_UNIFORM_BUFFER 0x8A11 -#define GL_UNIFORM_BUFFER_BINDING 0x8A28 -#define GL_UNIFORM_BUFFER_START 0x8A29 -#define GL_UNIFORM_BUFFER_SIZE 0x8A2A -#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C -#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D -#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E -#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F -#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 -#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 -#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 -#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 -#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 -#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 -#define GL_UNIFORM_TYPE 0x8A37 -#define GL_UNIFORM_SIZE 0x8A38 -#define GL_UNIFORM_NAME_LENGTH 0x8A39 -#define GL_UNIFORM_BLOCK_INDEX 0x8A3A -#define GL_UNIFORM_OFFSET 0x8A3B -#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C -#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D -#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E -#define GL_UNIFORM_BLOCK_BINDING 0x8A3F -#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 -#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFFu -#endif - -#ifndef GL_ARB_compatibility -/* ARB_compatibility just defines tokens from core 3.0 */ -#endif - -#ifndef GL_ARB_copy_buffer -#define GL_COPY_READ_BUFFER 0x8F36 -#define GL_COPY_WRITE_BUFFER 0x8F37 -#endif - -#ifndef GL_ARB_shader_texture_lod -#endif - -#ifndef GL_ARB_depth_clamp -#define GL_DEPTH_CLAMP 0x864F -#endif - -#ifndef GL_ARB_draw_elements_base_vertex -#endif - -#ifndef GL_ARB_fragment_coord_conventions -#endif - -#ifndef GL_ARB_provoking_vertex -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F -#endif - -#ifndef GL_ARB_seamless_cube_map -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F -#endif - -#ifndef GL_ARB_sync -#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 -#define GL_OBJECT_TYPE 0x9112 -#define GL_SYNC_CONDITION 0x9113 -#define GL_SYNC_STATUS 0x9114 -#define GL_SYNC_FLAGS 0x9115 -#define GL_SYNC_FENCE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 -#define GL_UNSIGNALED 0x9118 -#define GL_SIGNALED 0x9119 -#define GL_ALREADY_SIGNALED 0x911A -#define GL_TIMEOUT_EXPIRED 0x911B -#define GL_CONDITION_SATISFIED 0x911C -#define GL_WAIT_FAILED 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull -#endif - -#ifndef GL_ARB_texture_multisample -#define GL_SAMPLE_POSITION 0x8E50 -#define GL_SAMPLE_MASK 0x8E51 -#define GL_SAMPLE_MASK_VALUE 0x8E52 -#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 -#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 -#define GL_TEXTURE_SAMPLES 0x9106 -#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 -#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 -#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D -#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E -#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F -#define GL_MAX_INTEGER_SAMPLES 0x9110 -#endif - -#ifndef GL_ARB_vertex_array_bgra -/* reuse GL_BGRA */ -#endif - -#ifndef GL_ARB_draw_buffers_blend -#endif - -#ifndef GL_ARB_sample_shading -#define GL_SAMPLE_SHADING_ARB 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 -#endif - -#ifndef GL_ARB_texture_cube_map_array -#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F -#endif - -#ifndef GL_ARB_texture_gather -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F -#endif - -#ifndef GL_ARB_texture_query_lod -#endif - -#ifndef GL_ARB_shading_language_include -#define GL_SHADER_INCLUDE_ARB 0x8DAE -#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9 -#define GL_NAMED_STRING_TYPE_ARB 0x8DEA -#endif - -#ifndef GL_ARB_texture_compression_bptc -#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F -#endif - -#ifndef GL_ARB_blend_func_extended -#define GL_SRC1_COLOR 0x88F9 -/* reuse GL_SRC1_ALPHA */ -#define GL_ONE_MINUS_SRC1_COLOR 0x88FA -#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB -#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC -#endif - -#ifndef GL_ARB_explicit_attrib_location -#endif - -#ifndef GL_ARB_occlusion_query2 -#define GL_ANY_SAMPLES_PASSED 0x8C2F -#endif - -#ifndef GL_ARB_sampler_objects -#define GL_SAMPLER_BINDING 0x8919 -#endif - -#ifndef GL_ARB_shader_bit_encoding -#endif - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_RGB10_A2UI 0x906F -#endif - -#ifndef GL_ARB_texture_swizzle -#define GL_TEXTURE_SWIZZLE_R 0x8E42 -#define GL_TEXTURE_SWIZZLE_G 0x8E43 -#define GL_TEXTURE_SWIZZLE_B 0x8E44 -#define GL_TEXTURE_SWIZZLE_A 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 -#endif - -#ifndef GL_ARB_timer_query -#define GL_TIME_ELAPSED 0x88BF -#define GL_TIMESTAMP 0x8E28 -#endif - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */ -#define GL_INT_2_10_10_10_REV 0x8D9F -#endif - -#ifndef GL_ARB_draw_indirect -#define GL_DRAW_INDIRECT_BUFFER 0x8F3F -#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 -#endif - -#ifndef GL_ARB_gpu_shader5 -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D -/* reuse GL_MAX_VERTEX_STREAMS */ -#endif - -#ifndef GL_ARB_gpu_shader_fp64 -/* reuse GL_DOUBLE */ -#define GL_DOUBLE_VEC2 0x8FFC -#define GL_DOUBLE_VEC3 0x8FFD -#define GL_DOUBLE_VEC4 0x8FFE -#define GL_DOUBLE_MAT2 0x8F46 -#define GL_DOUBLE_MAT3 0x8F47 -#define GL_DOUBLE_MAT4 0x8F48 -#define GL_DOUBLE_MAT2x3 0x8F49 -#define GL_DOUBLE_MAT2x4 0x8F4A -#define GL_DOUBLE_MAT3x2 0x8F4B -#define GL_DOUBLE_MAT3x4 0x8F4C -#define GL_DOUBLE_MAT4x2 0x8F4D -#define GL_DOUBLE_MAT4x3 0x8F4E -#endif - -#ifndef GL_ARB_shader_subroutine -#define GL_ACTIVE_SUBROUTINES 0x8DE5 -#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 -#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 -#define GL_MAX_SUBROUTINES 0x8DE7 -#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 -#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A -#define GL_COMPATIBLE_SUBROUTINES 0x8E4B -/* reuse GL_UNIFORM_SIZE */ -/* reuse GL_UNIFORM_NAME_LENGTH */ -#endif - -#ifndef GL_ARB_tessellation_shader -#define GL_PATCHES 0x000E -#define GL_PATCH_VERTICES 0x8E72 -#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 -#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 -#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 -#define GL_TESS_GEN_MODE 0x8E76 -#define GL_TESS_GEN_SPACING 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 -#define GL_TESS_GEN_POINT_MODE 0x8E79 -/* reuse GL_TRIANGLES */ -/* reuse GL_QUADS */ -#define GL_ISOLINES 0x8E7A -/* reuse GL_EQUAL */ -#define GL_FRACTIONAL_ODD 0x8E7B -#define GL_FRACTIONAL_EVEN 0x8E7C -/* reuse GL_CCW */ -/* reuse GL_CW */ -#define GL_MAX_PATCH_VERTICES 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 -#define GL_TESS_EVALUATION_SHADER 0x8E87 -#define GL_TESS_CONTROL_SHADER 0x8E88 -#endif - -#ifndef GL_ARB_texture_buffer_object_rgb32 -/* reuse GL_RGB32F */ -/* reuse GL_RGB32UI */ -/* reuse GL_RGB32I */ -#endif - -#ifndef GL_ARB_transform_feedback2 -#define GL_TRANSFORM_FEEDBACK 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 -#endif - -#ifndef GL_ARB_transform_feedback3 -#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 -#define GL_MAX_VERTEX_STREAMS 0x8E71 -#endif - -#ifndef GL_ARB_ES2_compatibility -#define GL_FIXED 0x140C -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#endif - -#ifndef GL_ARB_get_program_binary -#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF -#endif - -#ifndef GL_ARB_separate_shader_objects -#define GL_VERTEX_SHADER_BIT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT 0x00000002 -#define GL_GEOMETRY_SHADER_BIT 0x00000004 -#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 -#define GL_ALL_SHADER_BITS 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE 0x8258 -#define GL_ACTIVE_PROGRAM 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING 0x825A -#endif - -#ifndef GL_ARB_shader_precision -#endif - -#ifndef GL_ARB_vertex_attrib_64bit -/* reuse GL_RGB32I */ -/* reuse GL_DOUBLE_VEC2 */ -/* reuse GL_DOUBLE_VEC3 */ -/* reuse GL_DOUBLE_VEC4 */ -/* reuse GL_DOUBLE_MAT2 */ -/* reuse GL_DOUBLE_MAT3 */ -/* reuse GL_DOUBLE_MAT4 */ -/* reuse GL_DOUBLE_MAT2x3 */ -/* reuse GL_DOUBLE_MAT2x4 */ -/* reuse GL_DOUBLE_MAT3x2 */ -/* reuse GL_DOUBLE_MAT3x4 */ -/* reuse GL_DOUBLE_MAT4x2 */ -/* reuse GL_DOUBLE_MAT4x3 */ -#endif - -#ifndef GL_ARB_viewport_array -/* reuse GL_SCISSOR_BOX */ -/* reuse GL_VIEWPORT */ -/* reuse GL_DEPTH_RANGE */ -/* reuse GL_SCISSOR_TEST */ -#define GL_MAX_VIEWPORTS 0x825B -#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C -#define GL_VIEWPORT_BOUNDS_RANGE 0x825D -#define GL_LAYER_PROVOKING_VERTEX 0x825E -#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F -#define GL_UNDEFINED_VERTEX 0x8260 -/* reuse GL_FIRST_VERTEX_CONVENTION */ -/* reuse GL_LAST_VERTEX_CONVENTION */ -/* reuse GL_PROVOKING_VERTEX */ -#endif - -#ifndef GL_ARB_cl_event -#define GL_SYNC_CL_EVENT_ARB 0x8240 -#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241 -#endif - -#ifndef GL_ARB_debug_output -#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 -#define GL_DEBUG_SOURCE_API_ARB 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A -#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B -#define GL_DEBUG_TYPE_ERROR_ARB 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E -#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 -#define GL_DEBUG_TYPE_OTHER_ARB 0x8251 -#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 -#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 -#endif - -#ifndef GL_ARB_robustness -/* reuse GL_NO_ERROR */ -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define GL_NO_RESET_NOTIFICATION_ARB 0x8261 -#endif - -#ifndef GL_ARB_shader_stencil_export -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS 0x8118 -#define GL_DUAL_INTENSITY8_SGIS 0x8119 -#define GL_DUAL_INTENSITY12_SGIS 0x811A -#define GL_DUAL_INTENSITY16_SGIS 0x811B -#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C -#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D -#define GL_QUAD_ALPHA4_SGIS 0x811E -#define GL_QUAD_ALPHA8_SGIS 0x811F -#define GL_QUAD_LUMINANCE4_SGIS 0x8120 -#define GL_QUAD_LUMINANCE8_SGIS 0x8121 -#define GL_QUAD_INTENSITY4_SGIS 0x8122 -#define GL_QUAD_INTENSITY8_SGIS 0x8123 -#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 -#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SPRITE_SGIX 0x8148 -#define GL_SPRITE_MODE_SGIX 0x8149 -#define GL_SPRITE_AXIS_SGIX 0x814A -#define GL_SPRITE_TRANSLATION_SGIX 0x814B -#define GL_SPRITE_AXIAL_SGIX 0x814C -#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D -#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E -#endif - -#ifndef GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_POINT_SIZE_MIN_SGIS 0x8126 -#define GL_POINT_SIZE_MAX_SGIS 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 -#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 -#endif - -#ifndef GL_SGIX_instruments -#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 -#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C -#endif - -#ifndef GL_SGIX_framezoom -#define GL_FRAMEZOOM_SGIX 0x818B -#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C -#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#endif - -#ifndef GL_FfdMaskSGIX -#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 -#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 -#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 -#define GL_DEFORMATIONS_MASK_SGIX 0x8196 -#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_REFERENCE_PLANE_SGIX 0x817D -#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E -#endif - -#ifndef GL_SGIX_flush_raster -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_FUNC_POINTS_SGIS 0x812B -#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#endif - -#ifndef GL_HP_image_transform -#define GL_IMAGE_SCALE_X_HP 0x8155 -#define GL_IMAGE_SCALE_Y_HP 0x8156 -#define GL_IMAGE_TRANSLATE_X_HP 0x8157 -#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 -#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 -#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A -#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B -#define GL_IMAGE_MAG_FILTER_HP 0x815C -#define GL_IMAGE_MIN_FILTER_HP 0x815D -#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E -#define GL_CUBIC_HP 0x815F -#define GL_AVERAGE_HP 0x8160 -#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 -#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 -#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_IGNORE_BORDER_HP 0x8150 -#define GL_CONSTANT_BORDER_HP 0x8151 -#define GL_REPLICATE_BORDER_HP 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 -#endif - -#ifndef GL_INGR_palette_buffer -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE -#endif - -#ifndef GL_EXT_color_subtable -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_VERTEX_DATA_HINT_PGI 0x1A22A -#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B -#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C -#define GL_MAX_VERTEX_HINT_PGI 0x1A22D -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 -#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD -#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 -#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C -#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E -#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F -#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 -#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 -#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 -#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 -#define GL_CLIP_NEAR_HINT_PGI 0x1A220 -#define GL_CLIP_FAR_HINT_PGI 0x1A221 -#define GL_WIDE_LINE_HINT_PGI 0x1A222 -#define GL_BACK_NORMALS_HINT_PGI 0x1A223 -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_LIST_PRIORITY_SGIX 0x8182 -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_IR_INSTRUMENT1_SGIX 0x817F -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E -#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F -#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SHADOW_AMBIENT_SGIX 0x80BF -#endif - -#ifndef GL_EXT_index_texture -#endif - -#ifndef GL_EXT_index_material -#define GL_INDEX_MATERIAL_EXT 0x81B8 -#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 -#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA -#endif - -#ifndef GL_EXT_index_func -#define GL_INDEX_TEST_EXT 0x81B5 -#define GL_INDEX_TEST_FUNC_EXT 0x81B6 -#define GL_INDEX_TEST_REF_EXT 0x81B7 -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_IUI_V2F_EXT 0x81AD -#define GL_IUI_V3F_EXT 0x81AE -#define GL_IUI_N3F_V2F_EXT 0x81AF -#define GL_IUI_N3F_V3F_EXT 0x81B0 -#define GL_T2F_IUI_V2F_EXT 0x81B1 -#define GL_T2F_IUI_V3F_EXT 0x81B2 -#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 -#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_YCRCB_422_SGIX 0x81BB -#define GL_YCRCB_444_SGIX 0x81BC -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 -#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 -#define GL_LIGHT_ENV_MODE_SGIX 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B -#define GL_FRAGMENT_LIGHT0_SGIX 0x840C -#define GL_FRAGMENT_LIGHT1_SGIX 0x840D -#define GL_FRAGMENT_LIGHT2_SGIX 0x840E -#define GL_FRAGMENT_LIGHT3_SGIX 0x840F -#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 -#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 -#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 -#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 -#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 -#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 -#endif - -#ifndef GL_WIN_phong_shading -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB -#endif - -#ifndef GL_WIN_specular_fog -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC -#endif - -#ifndef GL_EXT_light_texture -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 -/* reuse GL_FRAGMENT_DEPTH_EXT */ -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 -#endif - -#ifndef GL_SGIX_impact_pixel_texture -#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 -#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 -#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 -#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 -#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 -#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 -#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A -#endif - -#ifndef GL_EXT_bgra -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 -#endif - -#ifndef GL_SGIX_async -#define GL_ASYNC_MARKER_SGIX 0x8329 -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D -#endif - -#ifndef GL_INTEL_texture_scissor -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 -#endif - -#ifndef GL_HP_occlusion_test -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA -#endif - -#ifndef GL_EXT_secondary_color -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF -#endif - -#ifndef GL_EXT_multi_draw_arrays -#endif - -#ifndef GL_EXT_fog_coord -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_TRANSFORM_HINT_APPLE 0x85B1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD -#endif - -#ifndef GL_SUNX_constant_data -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 -#endif - -#ifndef GL_SUN_global_alpha -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA -#endif - -#ifndef GL_SUN_triangle_list -#define GL_RESTART_SUN 0x0001 -#define GL_REPLACE_MIDDLE_SUN 0x0002 -#define GL_REPLACE_OLDEST_SUN 0x0003 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB -#endif - -#ifndef GL_SUN_vertex -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB -#endif - -#ifndef GL_INGR_color_clamp -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INTERLACE_READ_INGR 0x8568 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 -#endif - -#ifndef GL_EXT_texture_cube_map -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_WRAP_BORDER_SUN 0x81D4 -#endif - -#ifndef GL_EXT_texture_env_add -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 -#endif - -#ifndef GL_NV_register_combiners -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 -/* reuse GL_TEXTURE0_ARB */ -/* reuse GL_TEXTURE1_ARB */ -/* reuse GL_ZERO */ -/* reuse GL_NONE */ -/* reuse GL_FOG */ -#endif - -#ifndef GL_NV_fog_distance -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C -/* reuse GL_EYE_PLANE */ -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F -#endif - -#ifndef GL_NV_blend_square -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B -#endif - -#ifndef GL_MESA_resize_buffers -#endif - -#ifndef GL_MESA_window_pos -#endif - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_CULL_VERTEX_IBM 103050 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 -#endif - -#ifndef GL_SGIX_subsample -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 -#endif - -#ifndef GL_SGI_depth_pass_instrument -#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 -#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 -#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 -#endif - -#ifndef GL_3DFX_tbuffer -#endif - -#ifndef GL_EXT_multisample -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_CONVOLUTION_HINT_SGIX 0x8316 -#endif - -#ifndef GL_SGIX_resample -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -#endif - -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_IBM 0x8370 -#endif - -#ifndef GL_NV_evaluators -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 -#endif - -#ifndef GL_NV_texture_compression_vtc -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 -#endif - -#ifndef GL_NV_texture_shader -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 -#endif - -#ifndef GL_NV_vertex_program -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SCALEBIAS_HINT_SGIX 0x8322 -#endif - -#ifndef GL_OML_interlace -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 -#endif - -#ifndef GL_OML_subsample -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 -#endif - -#ifndef GL_OML_resample -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_REG_6_ATI 0x8927 -#define GL_REG_7_ATI 0x8928 -#define GL_REG_8_ATI 0x8929 -#define GL_REG_9_ATI 0x892A -#define GL_REG_10_ATI 0x892B -#define GL_REG_11_ATI 0x892C -#define GL_REG_12_ATI 0x892D -#define GL_REG_13_ATI 0x892E -#define GL_REG_14_ATI 0x892F -#define GL_REG_15_ATI 0x8930 -#define GL_REG_16_ATI 0x8931 -#define GL_REG_17_ATI 0x8932 -#define GL_REG_18_ATI 0x8933 -#define GL_REG_19_ATI 0x8934 -#define GL_REG_20_ATI 0x8935 -#define GL_REG_21_ATI 0x8936 -#define GL_REG_22_ATI 0x8937 -#define GL_REG_23_ATI 0x8938 -#define GL_REG_24_ATI 0x8939 -#define GL_REG_25_ATI 0x893A -#define GL_REG_26_ATI 0x893B -#define GL_REG_27_ATI 0x893C -#define GL_REG_28_ATI 0x893D -#define GL_REG_29_ATI 0x893E -#define GL_REG_30_ATI 0x893F -#define GL_REG_31_ATI 0x8940 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_CON_8_ATI 0x8949 -#define GL_CON_9_ATI 0x894A -#define GL_CON_10_ATI 0x894B -#define GL_CON_11_ATI 0x894C -#define GL_CON_12_ATI 0x894D -#define GL_CON_13_ATI 0x894E -#define GL_CON_14_ATI 0x894F -#define GL_CON_15_ATI 0x8950 -#define GL_CON_16_ATI 0x8951 -#define GL_CON_17_ATI 0x8952 -#define GL_CON_18_ATI 0x8953 -#define GL_CON_19_ATI 0x8954 -#define GL_CON_20_ATI 0x8955 -#define GL_CON_21_ATI 0x8956 -#define GL_CON_22_ATI 0x8957 -#define GL_CON_23_ATI 0x8958 -#define GL_CON_24_ATI 0x8959 -#define GL_CON_25_ATI 0x895A -#define GL_CON_26_ATI 0x895B -#define GL_CON_27_ATI 0x895C -#define GL_CON_28_ATI 0x895D -#define GL_CON_29_ATI 0x895E -#define GL_CON_30_ATI 0x895F -#define GL_CON_31_ATI 0x8960 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B -#define GL_RED_BIT_ATI 0x00000001 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_2X_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_STREAM0_ATI 0x876C -#define GL_VERTEX_STREAM1_ATI 0x876D -#define GL_VERTEX_STREAM2_ATI 0x876E -#define GL_VERTEX_STREAM3_ATI 0x876F -#define GL_VERTEX_STREAM4_ATI 0x8770 -#define GL_VERTEX_STREAM5_ATI 0x8771 -#define GL_VERTEX_STREAM6_ATI 0x8772 -#define GL_VERTEX_STREAM7_ATI 0x8773 -#define GL_VERTEX_SOURCE_ATI 0x8774 -#endif - -#ifndef GL_ATI_element_array -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A -#endif - -#ifndef GL_SUN_mesh_array -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SLICE_ACCUM_SUN 0x85CC -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_DEPTH_CLAMP_NV 0x864F -#endif - -#ifndef GL_NV_occlusion_query -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif - -#ifndef GL_NV_point_sprite -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 -#endif - -#ifndef GL_NV_vertex_program1_1 -#endif - -#ifndef GL_EXT_shadow_funcs -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 -#endif - -#ifndef GL_APPLE_element_array -#define GL_ELEMENT_ARRAY_APPLE 0x8A0C -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E -#endif - -#ifndef GL_APPLE_fence -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CLIENT_APPLE 0x85B4 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_YCBCR_422_APPLE 0x85B9 -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -#ifndef GL_S3_s3tc -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 -#endif - -#ifndef GL_ATI_texture_float -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F -#endif - -#ifndef GL_NV_float_buffer -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E -#endif - -#ifndef GL_NV_fragment_program -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 -#endif - -#ifndef GL_NV_half_float -#define GL_HALF_FLOAT_NV 0x140B -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D -#endif - -#ifndef GL_NV_primitive_restart -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F -#endif - -#ifndef GL_NV_vertex_program2 -#endif - -#ifndef GL_ATI_map_object_buffer -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#endif - -#ifndef GL_OES_read_format -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_BLEND_EQUATION_RGB_EXT 0x8009 -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D -#endif - -#ifndef GL_MESA_pack_invert -#define GL_PACK_INVERT_MESA 0x8758 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF -#endif - -#ifndef GL_NV_fragment_program_option -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 -#endif - -#ifndef GL_NV_vertex_program2_option -/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ -/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ -#endif - -#ifndef GL_NV_vertex_program3 -/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 -#endif - -#ifndef GL_GREMEDY_string_marker -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_STENCIL_TAG_BITS_EXT 0x88F2 -#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING_EXT -#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_TEXTURE_1D_STACK_MESAX 0x8759 -#define GL_TEXTURE_2D_STACK_MESAX 0x875A -#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B -#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C -#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D -#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E -#endif - -#ifndef GL_EXT_timer_query -#define GL_TIME_ELAPSED_EXT 0x88BF -#endif - -#ifndef GL_EXT_gpu_program_parameters -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 -#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 -#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 -#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 -#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 -#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 -#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_LINES_ADJACENCY_EXT 0x000A -#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B -#define GL_TRIANGLES_ADJACENCY_EXT 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D -#define GL_GEOMETRY_PROGRAM_NV 0x8C26 -#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 -#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 -#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */ -/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */ -/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */ -/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */ -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE -#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 -/* reuse GL_LINES_ADJACENCY_EXT */ -/* reuse GL_LINE_STRIP_ADJACENCY_EXT */ -/* reuse GL_TRIANGLES_ADJACENCY_EXT */ -/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -/* reuse GL_PROGRAM_POINT_SIZE_EXT */ -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 -#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 -#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 -#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 -#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 -#define GL_INT_SAMPLER_1D_EXT 0x8DC9 -#define GL_INT_SAMPLER_2D_EXT 0x8DCA -#define GL_INT_SAMPLER_3D_EXT 0x8DCB -#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC -#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD -#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 -#endif - -#ifndef GL_EXT_draw_instanced -#endif - -#ifndef GL_EXT_packed_float -#define GL_R11F_G11F_B10F_EXT 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B -#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C -#endif - -#ifndef GL_EXT_texture_array -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 -#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 -#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 -#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_RGB9_E5_EXT 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E -#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_DEPTH_COMPONENT32F_NV 0x8DAB -#define GL_DEPTH32F_STENCIL8_NV 0x8DAC -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD -#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF -#endif - -#ifndef GL_NV_fragment_program4 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA -#endif - -#ifndef GL_NV_geometry_shader4 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 -#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 -#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 -#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 -#endif - -#ifndef GL_EXT_draw_buffers2 -#endif - -#ifndef GL_NV_transform_feedback -#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 -#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 -#define GL_TEXTURE_COORD_NV 0x8C79 -#define GL_CLIP_DISTANCE_NV 0x8C7A -#define GL_VERTEX_ID_NV 0x8C7B -#define GL_PRIMITIVE_ID_NV 0x8C7C -#define GL_GENERIC_ATTRIB_NV 0x8C7D -#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 -#define GL_ACTIVE_VARYINGS_NV 0x8C81 -#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 -#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 -#define GL_PRIMITIVES_GENERATED_NV 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 -#define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C -#define GL_SEPARATE_ATTRIBS_NV 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F -#define GL_LAYER_NV 0x8DAA -#define GL_NEXT_BUFFER_NV -2 -#define GL_SKIP_COMPONENTS4_NV -3 -#define GL_SKIP_COMPONENTS3_NV -4 -#define GL_SKIP_COMPONENTS2_NV -5 -#define GL_SKIP_COMPONENTS1_NV -6 -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 -#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 -#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 -#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED -#define GL_UNIFORM_BUFFER_EXT 0x8DEE -#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF -#endif - -#ifndef GL_EXT_texture_integer -#define GL_RGBA32UI_EXT 0x8D70 -#define GL_RGB32UI_EXT 0x8D71 -#define GL_ALPHA32UI_EXT 0x8D72 -#define GL_INTENSITY32UI_EXT 0x8D73 -#define GL_LUMINANCE32UI_EXT 0x8D74 -#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -#define GL_RGBA16UI_EXT 0x8D76 -#define GL_RGB16UI_EXT 0x8D77 -#define GL_ALPHA16UI_EXT 0x8D78 -#define GL_INTENSITY16UI_EXT 0x8D79 -#define GL_LUMINANCE16UI_EXT 0x8D7A -#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -#define GL_RGBA8UI_EXT 0x8D7C -#define GL_RGB8UI_EXT 0x8D7D -#define GL_ALPHA8UI_EXT 0x8D7E -#define GL_INTENSITY8UI_EXT 0x8D7F -#define GL_LUMINANCE8UI_EXT 0x8D80 -#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -#define GL_RGBA32I_EXT 0x8D82 -#define GL_RGB32I_EXT 0x8D83 -#define GL_ALPHA32I_EXT 0x8D84 -#define GL_INTENSITY32I_EXT 0x8D85 -#define GL_LUMINANCE32I_EXT 0x8D86 -#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -#define GL_RGBA16I_EXT 0x8D88 -#define GL_RGB16I_EXT 0x8D89 -#define GL_ALPHA16I_EXT 0x8D8A -#define GL_INTENSITY16I_EXT 0x8D8B -#define GL_LUMINANCE16I_EXT 0x8D8C -#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -#define GL_RGBA8I_EXT 0x8D8E -#define GL_RGB8I_EXT 0x8D8F -#define GL_ALPHA8I_EXT 0x8D90 -#define GL_INTENSITY8I_EXT 0x8D91 -#define GL_LUMINANCE8I_EXT 0x8D92 -#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -#define GL_RED_INTEGER_EXT 0x8D94 -#define GL_GREEN_INTEGER_EXT 0x8D95 -#define GL_BLUE_INTEGER_EXT 0x8D96 -#define GL_ALPHA_INTEGER_EXT 0x8D97 -#define GL_RGB_INTEGER_EXT 0x8D98 -#define GL_RGBA_INTEGER_EXT 0x8D99 -#define GL_BGR_INTEGER_EXT 0x8D9A -#define GL_BGRA_INTEGER_EXT 0x8D9B -#define GL_LUMINANCE_INTEGER_EXT 0x8D9C -#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D -#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E -#endif - -#ifndef GL_GREMEDY_frame_terminator -#endif - -#ifndef GL_NV_conditional_render -#define GL_QUERY_WAIT_NV 0x8E13 -#define GL_QUERY_NO_WAIT_NV 0x8E14 -#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 -#endif - -#ifndef GL_NV_present_video -#define GL_FRAME_NV 0x8E26 -#define GL_FIELDS_NV 0x8E27 -#define GL_CURRENT_TIME_NV 0x8E28 -#define GL_NUM_FILL_STREAMS_NV 0x8E29 -#define GL_PRESENT_TIME_NV 0x8E2A -#define GL_PRESENT_DURATION_NV 0x8E2B -#endif - -#ifndef GL_EXT_transform_feedback -#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85 -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F -#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C -#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D -#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88 -#define GL_RASTERIZER_DISCARD_EXT 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76 -#endif - -#ifndef GL_EXT_direct_state_access -#define GL_PROGRAM_MATRIX_EXT 0x8E2D -#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E -#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F -#endif - -#ifndef GL_EXT_vertex_array_bgra -/* reuse GL_BGRA */ -#endif - -#ifndef GL_EXT_texture_swizzle -#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42 -#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43 -#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44 -#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46 -#endif - -#ifndef GL_NV_explicit_multisample -#define GL_SAMPLE_POSITION_NV 0x8E50 -#define GL_SAMPLE_MASK_NV 0x8E51 -#define GL_SAMPLE_MASK_VALUE_NV 0x8E52 -#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53 -#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54 -#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55 -#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 -#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57 -#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58 -#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 -#endif - -#ifndef GL_NV_transform_feedback2 -#define GL_TRANSFORM_FEEDBACK_NV 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 -#endif - -#ifndef GL_ATI_meminfo -#define GL_VBO_FREE_MEMORY_ATI 0x87FB -#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC -#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD -#endif - -#ifndef GL_AMD_performance_monitor -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -#endif - -#ifndef GL_AMD_texture_texture4 -#endif - -#ifndef GL_AMD_vertex_shader_tesselator -#define GL_SAMPLER_BUFFER_AMD 0x9001 -#define GL_INT_SAMPLER_BUFFER_AMD 0x9002 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003 -#define GL_TESSELLATION_MODE_AMD 0x9004 -#define GL_TESSELLATION_FACTOR_AMD 0x9005 -#define GL_DISCRETE_AMD 0x9006 -#define GL_CONTINUOUS_AMD 0x9007 -#endif - -#ifndef GL_EXT_provoking_vertex -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D -#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E -#define GL_PROVOKING_VERTEX_EXT 0x8E4F -#endif - -#ifndef GL_EXT_texture_snorm -#define GL_ALPHA_SNORM 0x9010 -#define GL_LUMINANCE_SNORM 0x9011 -#define GL_LUMINANCE_ALPHA_SNORM 0x9012 -#define GL_INTENSITY_SNORM 0x9013 -#define GL_ALPHA8_SNORM 0x9014 -#define GL_LUMINANCE8_SNORM 0x9015 -#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 -#define GL_INTENSITY8_SNORM 0x9017 -#define GL_ALPHA16_SNORM 0x9018 -#define GL_LUMINANCE16_SNORM 0x9019 -#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A -#define GL_INTENSITY16_SNORM 0x901B -/* reuse GL_RED_SNORM */ -/* reuse GL_RG_SNORM */ -/* reuse GL_RGB_SNORM */ -/* reuse GL_RGBA_SNORM */ -/* reuse GL_R8_SNORM */ -/* reuse GL_RG8_SNORM */ -/* reuse GL_RGB8_SNORM */ -/* reuse GL_RGBA8_SNORM */ -/* reuse GL_R16_SNORM */ -/* reuse GL_RG16_SNORM */ -/* reuse GL_RGB16_SNORM */ -/* reuse GL_RGBA16_SNORM */ -/* reuse GL_SIGNED_NORMALIZED */ -#endif - -#ifndef GL_AMD_draw_buffers_blend -#endif - -#ifndef GL_APPLE_texture_range -#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7 -#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8 -#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC -#define GL_STORAGE_PRIVATE_APPLE 0x85BD -/* reuse GL_STORAGE_CACHED_APPLE */ -/* reuse GL_STORAGE_SHARED_APPLE */ -#endif - -#ifndef GL_APPLE_float_pixels -#define GL_HALF_APPLE 0x140B -#define GL_RGBA_FLOAT32_APPLE 0x8814 -#define GL_RGB_FLOAT32_APPLE 0x8815 -#define GL_ALPHA_FLOAT32_APPLE 0x8816 -#define GL_INTENSITY_FLOAT32_APPLE 0x8817 -#define GL_LUMINANCE_FLOAT32_APPLE 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819 -#define GL_RGBA_FLOAT16_APPLE 0x881A -#define GL_RGB_FLOAT16_APPLE 0x881B -#define GL_ALPHA_FLOAT16_APPLE 0x881C -#define GL_INTENSITY_FLOAT16_APPLE 0x881D -#define GL_LUMINANCE_FLOAT16_APPLE 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F -#define GL_COLOR_FLOAT_APPLE 0x8A0F -#endif - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00 -#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01 -#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02 -#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03 -#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04 -#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05 -#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06 -#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07 -#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08 -#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09 -#endif - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14 -#endif - -#ifndef GL_APPLE_object_purgeable -#define GL_BUFFER_OBJECT_APPLE 0x85B3 -#define GL_RELEASED_APPLE 0x8A19 -#define GL_VOLATILE_APPLE 0x8A1A -#define GL_RETAINED_APPLE 0x8A1B -#define GL_UNDEFINED_APPLE 0x8A1C -#define GL_PURGEABLE_APPLE 0x8A1D -#endif - -#ifndef GL_APPLE_row_bytes -#define GL_PACK_ROW_BYTES_APPLE 0x8A15 -#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 -#endif - -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */ -/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */ -#endif - -#ifndef GL_NV_video_capture -#define GL_VIDEO_BUFFER_NV 0x9020 -#define GL_VIDEO_BUFFER_BINDING_NV 0x9021 -#define GL_FIELD_UPPER_NV 0x9022 -#define GL_FIELD_LOWER_NV 0x9023 -#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 -#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 -#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026 -#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027 -#define GL_VIDEO_BUFFER_PITCH_NV 0x9028 -#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029 -#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A -#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B -#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C -#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D -#define GL_PARTIAL_SUCCESS_NV 0x902E -#define GL_SUCCESS_NV 0x902F -#define GL_FAILURE_NV 0x9030 -#define GL_YCBYCR8_422_NV 0x9031 -#define GL_YCBAYCR8A_4224_NV 0x9032 -#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033 -#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034 -#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035 -#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036 -#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037 -#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038 -#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039 -#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A -#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B -#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C -#endif - -#ifndef GL_NV_copy_image -#endif - -#ifndef GL_EXT_separate_shader_objects -#define GL_ACTIVE_PROGRAM_EXT 0x8B8D -#endif - -#ifndef GL_NV_parameter_buffer_object2 -#endif - -#ifndef GL_NV_shader_buffer_load -#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D -#define GL_GPU_ADDRESS_NV 0x8F34 -#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35 -#endif - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E -#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F -#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20 -#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 -#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22 -#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 -#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24 -#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25 -#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26 -#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 -#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28 -#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29 -#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A -#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B -#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C -#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D -#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E -#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F -#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30 -#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31 -#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32 -#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33 -#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40 -#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 -#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42 -#endif - -#ifndef GL_NV_texture_barrier -#endif - -#ifndef GL_AMD_shader_stencil_export -#endif - -#ifndef GL_AMD_seamless_cubemap_per_texture -/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */ -#endif - -#ifndef GL_AMD_conservative_depth -#endif - -#ifndef GL_EXT_shader_image_load_store -#define GL_MAX_IMAGE_UNITS_EXT 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 -#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A -#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B -#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C -#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D -#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E -#define GL_IMAGE_1D_EXT 0x904C -#define GL_IMAGE_2D_EXT 0x904D -#define GL_IMAGE_3D_EXT 0x904E -#define GL_IMAGE_2D_RECT_EXT 0x904F -#define GL_IMAGE_CUBE_EXT 0x9050 -#define GL_IMAGE_BUFFER_EXT 0x9051 -#define GL_IMAGE_1D_ARRAY_EXT 0x9052 -#define GL_IMAGE_2D_ARRAY_EXT 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056 -#define GL_INT_IMAGE_1D_EXT 0x9057 -#define GL_INT_IMAGE_2D_EXT 0x9058 -#define GL_INT_IMAGE_3D_EXT 0x9059 -#define GL_INT_IMAGE_2D_RECT_EXT 0x905A -#define GL_INT_IMAGE_CUBE_EXT 0x905B -#define GL_INT_IMAGE_BUFFER_EXT 0x905C -#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D -#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C -#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D -#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020 -#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000 -#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF -#endif - -#ifndef GL_EXT_vertex_attrib_64bit -/* reuse GL_DOUBLE */ -#define GL_DOUBLE_VEC2_EXT 0x8FFC -#define GL_DOUBLE_VEC3_EXT 0x8FFD -#define GL_DOUBLE_VEC4_EXT 0x8FFE -#define GL_DOUBLE_MAT2_EXT 0x8F46 -#define GL_DOUBLE_MAT3_EXT 0x8F47 -#define GL_DOUBLE_MAT4_EXT 0x8F48 -#define GL_DOUBLE_MAT2x3_EXT 0x8F49 -#define GL_DOUBLE_MAT2x4_EXT 0x8F4A -#define GL_DOUBLE_MAT3x2_EXT 0x8F4B -#define GL_DOUBLE_MAT3x4_EXT 0x8F4C -#define GL_DOUBLE_MAT4x2_EXT 0x8F4D -#define GL_DOUBLE_MAT4x3_EXT 0x8F4E -#endif - -#ifndef GL_NV_gpu_program5 -#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C -#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D -#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44 -#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV 0x8F45 -#endif - -#ifndef GL_NV_gpu_shader5 -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F -#define GL_INT8_NV 0x8FE0 -#define GL_INT8_VEC2_NV 0x8FE1 -#define GL_INT8_VEC3_NV 0x8FE2 -#define GL_INT8_VEC4_NV 0x8FE3 -#define GL_INT16_NV 0x8FE4 -#define GL_INT16_VEC2_NV 0x8FE5 -#define GL_INT16_VEC3_NV 0x8FE6 -#define GL_INT16_VEC4_NV 0x8FE7 -#define GL_INT64_VEC2_NV 0x8FE9 -#define GL_INT64_VEC3_NV 0x8FEA -#define GL_INT64_VEC4_NV 0x8FEB -#define GL_UNSIGNED_INT8_NV 0x8FEC -#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED -#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE -#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF -#define GL_UNSIGNED_INT16_NV 0x8FF0 -#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1 -#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 -#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 -#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 -#define GL_FLOAT16_NV 0x8FF8 -#define GL_FLOAT16_VEC2_NV 0x8FF9 -#define GL_FLOAT16_VEC3_NV 0x8FFA -#define GL_FLOAT16_VEC4_NV 0x8FFB -/* reuse GL_PATCHES */ -#endif - -#ifndef GL_NV_shader_buffer_store -#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010 -/* reuse GL_READ_WRITE */ -/* reuse GL_WRITE_ONLY */ -#endif - -#ifndef GL_NV_tessellation_program5 -#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 -#define GL_TESS_CONTROL_PROGRAM_NV 0x891E -#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F -#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74 -#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75 -#endif - -#ifndef GL_NV_vertex_attrib_integer_64bit -/* reuse GL_INT64_NV */ -/* reuse GL_UNSIGNED_INT64_NV */ -#endif - -#ifndef GL_NV_multisample_coverage -#define GL_COVERAGE_SAMPLES_NV 0x80A9 -#define GL_COLOR_SAMPLES_NV 0x8E20 -#endif - -#ifndef GL_AMD_name_gen_delete -#define GL_DATA_BUFFER_AMD 0x9151 -#define GL_PERFORMANCE_MONITOR_AMD 0x9152 -#define GL_QUERY_OBJECT_AMD 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154 -#define GL_SAMPLER_OBJECT_AMD 0x9155 -#endif - -#ifndef GL_AMD_debug_output -#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 -#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 -#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 -#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A -#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B -#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C -#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D -#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E -#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F -#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150 -#endif - -#ifndef GL_NV_vdpau_interop -#define GL_SURFACE_STATE_NV 0x86EB -#define GL_SURFACE_REGISTERED_NV 0x86FD -#define GL_SURFACE_MAPPED_NV 0x8700 -#define GL_WRITE_DISCARD_NV 0x88BE -#endif - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#endif - - -/*************************************************************/ - -#include -#ifndef GL_VERSION_2_0 -/* GL type for program/shader text */ -typedef char GLchar; -#endif - -#ifndef GL_VERSION_1_5 -/* GL types for handling large vertex buffer objects */ -#if defined(__APPLE__) -typedef long GLintptr; -typedef long GLsizeiptr; -#else -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -#if defined(__APPLE__) -typedef long GLintptrARB; -typedef long GLsizeiptrARB; -#else -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for program/shader text and shader object handles */ -typedef char GLcharARB; -#if defined(__APPLE__) -typedef void *GLhandleARB; -#else -typedef unsigned int GLhandleARB; -#endif -#endif - -/* GL type for "half" precision (s10e5) float data in host memory */ -#ifndef GL_ARB_half_float_pixel -typedef unsigned short GLhalfARB; -#endif - -#ifndef GL_NV_half_float -typedef unsigned short GLhalfNV; -#endif - -#ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include -#elif defined(__sun__) || defined(__digital__) -#include -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include -#elif defined(__SCO__) || defined(__USLC__) -#include -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include -#endif -#endif - -#ifndef GL_EXT_timer_query -typedef int64_t GLint64EXT; -typedef uint64_t GLuint64EXT; -#endif - -#ifndef GL_ARB_sync -typedef int64_t GLint64; -typedef uint64_t GLuint64; -typedef struct __GLsync *GLsync; -#endif - -#ifndef GL_ARB_cl_event -/* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */ -struct _cl_context; -struct _cl_event; -#endif - -#ifndef GL_ARB_debug_output -typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#endif - -#ifndef GL_AMD_debug_output -typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#endif - -#ifndef GL_NV_vdpau_interop -typedef GLintptr GLvdpauSurfaceNV; -#endif - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GLAPI void APIENTRY glBlendEquation (GLenum mode); -GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_VERSION_1_2_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table); -GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params); -GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params); -GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image); -GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glResetHistogram (GLenum target); -GLAPI void APIENTRY glResetMinmax (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); -#endif - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTexture (GLenum texture); -GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_VERSION_1_3_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClientActiveTexture (GLenum texture); -GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s); -GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s); -GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s); -GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s); -GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t); -GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t); -GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t); -GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t); -GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r); -GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m); -GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m); -GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m); -GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); -#endif - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param); -GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_VERSION_1_4_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordf (GLfloat coord); -GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord); -GLAPI void APIENTRY glFogCoordd (GLdouble coord); -GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord); -GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v); -GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v); -GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v); -GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue); -GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v); -GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue); -GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v); -GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v); -GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue); -GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v); -GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue); -GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v); -GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2iv (const GLint *v); -GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2sv (const GLshort *v); -GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3iv (const GLint *v); -GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3sv (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); -#endif - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsQuery (GLuint id); -GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id); -GLAPI void APIENTRY glEndQuery (GLenum target); -GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params); -GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers); -GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers); -GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer); -GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access); -GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target); -GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs); -GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader); -GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name); -GLAPI void APIENTRY glCompileShader (GLuint shader); -GLAPI GLuint APIENTRY glCreateProgram (void); -GLAPI GLuint APIENTRY glCreateShader (GLenum type); -GLAPI void APIENTRY glDeleteProgram (GLuint program); -GLAPI void APIENTRY glDeleteShader (GLuint shader); -GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader); -GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index); -GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index); -GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params); -GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params); -GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgram (GLuint program); -GLAPI GLboolean APIENTRY glIsShader (GLuint shader); -GLAPI void APIENTRY glLinkProgram (GLuint program); -GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -GLAPI void APIENTRY glUseProgram (GLuint program); -GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0); -GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glUniform1i (GLint location, GLint v0); -GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glValidateProgram (GLuint program); -GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); -typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif - -#ifndef GL_VERSION_3_0 -#define GL_VERSION_3_0 1 -/* OpenGL 3.0 also reuses entry points from these extensions: */ -/* ARB_framebuffer_object */ -/* ARB_map_buffer_range */ -/* ARB_vertex_array_object */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data); -GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data); -GLAPI void APIENTRY glEnablei (GLenum target, GLuint index); -GLAPI void APIENTRY glDisablei (GLenum target, GLuint index); -GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index); -GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedback (void); -GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp); -GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode); -GLAPI void APIENTRY glEndConditionalRender (void); -GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params); -GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x); -GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y); -GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x); -GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y); -GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params); -GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0); -GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value); -GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value); -GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value); -GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data); -typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index); -typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp); -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode); -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); -#endif - -#ifndef GL_VERSION_3_1 -#define GL_VERSION_3_1 1 -/* OpenGL 3.1 also reuses entry points from these extensions: */ -/* ARB_copy_buffer */ -/* ARB_uniform_buffer_object */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index); -#endif - -#ifndef GL_VERSION_3_2 -#define GL_VERSION_3_2 1 -/* OpenGL 3.2 also reuses entry points from these extensions: */ -/* ARB_draw_elements_base_vertex */ -/* ARB_provoking_vertex */ -/* ARB_sync */ -/* ARB_texture_multisample */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data); -GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params); -GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif - -#ifndef GL_VERSION_3_3 -#define GL_VERSION_3_3 1 -/* OpenGL 3.3 also reuses entry points from these extensions: */ -/* ARB_blend_func_extended */ -/* ARB_sampler_objects */ -/* ARB_explicit_attrib_location, but it has none */ -/* ARB_occlusion_query2 (no entry points) */ -/* ARB_shader_bit_encoding (no entry points) */ -/* ARB_texture_rgb10_a2ui (no entry points) */ -/* ARB_texture_swizzle (no entry points) */ -/* ARB_timer_query */ -/* ARB_vertex_type_2_10_10_10_rev */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor); -#endif - -#ifndef GL_VERSION_4_0 -#define GL_VERSION_4_0 1 -/* OpenGL 4.0 also reuses entry points from these extensions: */ -/* ARB_texture_query_lod (no entry points) */ -/* ARB_draw_indirect */ -/* ARB_gpu_shader5 (no entry points) */ -/* ARB_gpu_shader_fp64 */ -/* ARB_shader_subroutine */ -/* ARB_tessellation_shader */ -/* ARB_texture_buffer_object_rgb32 (no entry points) */ -/* ARB_texture_cube_map_array (no entry points) */ -/* ARB_texture_gather (no entry points) */ -/* ARB_transform_feedback2 */ -/* ARB_transform_feedback3 */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMinSampleShading (GLclampf value); -GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value); -typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif - -#ifndef GL_VERSION_4_1 -#define GL_VERSION_4_1 1 -/* OpenGL 4.1 also reuses entry points from these extensions: */ -/* ARB_ES2_compatibility */ -/* ARB_get_program_binary */ -/* ARB_separate_shader_objects */ -/* ARB_shader_precision (no entry points) */ -/* ARB_vertex_attrib_64bit */ -/* ARB_viewport_array */ -#endif - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTextureARB (GLenum texture); -GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture); -GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s); -GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s); -GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s); -GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s); -GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t); -GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t); -GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t); -GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t); -GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r); -GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m); -GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m); -GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m); -GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -#endif - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); -#endif - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 -#endif - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 -#endif - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights); -GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights); -GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights); -GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights); -GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights); -GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights); -GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights); -GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights); -GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glVertexBlendARB (GLint count); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights); -typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights); -typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights); -typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights); -typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights); -typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights); -typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count); -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index); -GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices); -GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices); -GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices); -GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 -#endif - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 -#endif - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v); -GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v); -GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v); -GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v); -#endif - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index); -GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index); -GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program); -GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs); -GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string); -GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program); -#endif - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 -/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer); -GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers); -GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers); -GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer); -GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access); -GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target); -GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id); -GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id); -GLAPI void APIENTRY glEndQueryARB (GLenum target); -GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj); -GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname); -GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj); -GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType); -GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj); -GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void); -GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj); -GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj); -GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj); -GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj); -GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0); -GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0); -GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name); -GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params); -GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params); -GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name); -GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 -#endif - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 -#endif - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 -#endif - -#ifndef GL_ARB_depth_buffer_float -#define GL_ARB_depth_buffer_float 1 -#endif - -#ifndef GL_ARB_draw_instanced -#define GL_ARB_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_ARB_framebuffer_object -#define GL_ARB_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers); -GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers); -GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer); -GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers); -GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers); -GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target); -GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateMipmap (GLenum target); -GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target); -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_ARB_framebuffer_sRGB 1 -#endif - -#ifndef GL_ARB_geometry_shader4 -#define GL_ARB_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value); -GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_ARB_half_float_vertex -#define GL_ARB_half_float_vertex 1 -#endif - -#ifndef GL_ARB_instanced_arrays -#define GL_ARB_instanced_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); -#endif - -#ifndef GL_ARB_map_buffer_range -#define GL_ARB_map_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#endif - -#ifndef GL_ARB_texture_buffer_object -#define GL_ARB_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_ARB_texture_compression_rgtc 1 -#endif - -#ifndef GL_ARB_texture_rg -#define GL_ARB_texture_rg 1 -#endif - -#ifndef GL_ARB_vertex_array_object -#define GL_ARB_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArray (GLuint array); -GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays); -GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays); -GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array); -#endif - -#ifndef GL_ARB_uniform_buffer_object -#define GL_ARB_uniform_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices); -GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName); -GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -#endif - -#ifndef GL_ARB_compatibility -#define GL_ARB_compatibility 1 -#endif - -#ifndef GL_ARB_copy_buffer -#define GL_ARB_copy_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif - -#ifndef GL_ARB_shader_texture_lod -#define GL_ARB_shader_texture_lod 1 -#endif - -#ifndef GL_ARB_depth_clamp -#define GL_ARB_depth_clamp 1 -#endif - -#ifndef GL_ARB_draw_elements_base_vertex -#define GL_ARB_draw_elements_base_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex); -#endif - -#ifndef GL_ARB_fragment_coord_conventions -#define GL_ARB_fragment_coord_conventions 1 -#endif - -#ifndef GL_ARB_provoking_vertex -#define GL_ARB_provoking_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProvokingVertex (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode); -#endif - -#ifndef GL_ARB_seamless_cube_map -#define GL_ARB_seamless_cube_map 1 -#endif - -#ifndef GL_ARB_sync -#define GL_ARB_sync 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags); -GLAPI GLboolean APIENTRY glIsSync (GLsync sync); -GLAPI void APIENTRY glDeleteSync (GLsync sync); -GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params); -GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync); -typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync); -typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif - -#ifndef GL_ARB_texture_multisample -#define GL_ARB_texture_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val); -GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val); -typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask); -#endif - -#ifndef GL_ARB_vertex_array_bgra -#define GL_ARB_vertex_array_bgra 1 -#endif - -#ifndef GL_ARB_draw_buffers_blend -#define GL_ARB_draw_buffers_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif - -#ifndef GL_ARB_sample_shading -#define GL_ARB_sample_shading 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMinSampleShadingARB (GLclampf value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value); -#endif - -#ifndef GL_ARB_texture_cube_map_array -#define GL_ARB_texture_cube_map_array 1 -#endif - -#ifndef GL_ARB_texture_gather -#define GL_ARB_texture_gather 1 -#endif - -#ifndef GL_ARB_texture_query_lod -#define GL_ARB_texture_query_lod 1 -#endif - -#ifndef GL_ARB_shading_language_include -#define GL_ARB_shading_language_include 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string); -GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name); -GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length); -GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name); -GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string); -GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string); -typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length); -typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name); -typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string); -typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params); -#endif - -#ifndef GL_ARB_texture_compression_bptc -#define GL_ARB_texture_compression_bptc 1 -#endif - -#ifndef GL_ARB_blend_func_extended -#define GL_ARB_blend_func_extended 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name); -#endif - -#ifndef GL_ARB_explicit_attrib_location -#define GL_ARB_explicit_attrib_location 1 -#endif - -#ifndef GL_ARB_occlusion_query2 -#define GL_ARB_occlusion_query2 1 -#endif - -#ifndef GL_ARB_sampler_objects -#define GL_ARB_sampler_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers); -GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers); -GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler); -GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler); -GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param); -GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param); -GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param); -GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param); -GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param); -GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param); -GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers); -typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers); -typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler); -typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_ARB_texture_rgb10_a2ui 1 -#endif - -#ifndef GL_ARB_texture_swizzle -#define GL_ARB_texture_swizzle 1 -#endif - -#ifndef GL_ARB_timer_query -#define GL_ARB_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target); -GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params); -GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params); -#endif - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -#define GL_ARB_vertex_type_2_10_10_10_rev 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color); -GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color); -GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color); -GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -#endif - -#ifndef GL_ARB_draw_indirect -#define GL_ARB_draw_indirect 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect); -GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect); -#endif - -#ifndef GL_ARB_gpu_shader5 -#define GL_ARB_gpu_shader5 1 -#endif - -#ifndef GL_ARB_gpu_shader_fp64 -#define GL_ARB_gpu_shader_fp64 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x); -GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y); -GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x); -typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params); -#endif - -#ifndef GL_ARB_shader_subroutine -#define GL_ARB_shader_subroutine 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name); -GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name); -GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices); -GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params); -GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name); -typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices); -typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values); -#endif - -#ifndef GL_ARB_tessellation_shader -#define GL_ARB_tessellation_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value); -GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value); -typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values); -#endif - -#ifndef GL_ARB_texture_buffer_object_rgb32 -#define GL_ARB_texture_buffer_object_rgb32 1 -#endif - -#ifndef GL_ARB_transform_feedback2 -#define GL_ARB_transform_feedback2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids); -GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids); -GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id); -GLAPI void APIENTRY glPauseTransformFeedback (void); -GLAPI void APIENTRY glResumeTransformFeedback (void); -GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids); -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id); -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id); -#endif - -#ifndef GL_ARB_transform_feedback3 -#define GL_ARB_transform_feedback3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream); -GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id); -GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index); -GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream); -typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_ARB_ES2_compatibility -#define GL_ARB_ES2_compatibility 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReleaseShaderCompiler (void); -GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); -GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f); -GLAPI void APIENTRY glClearDepthf (GLclampf d); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void); -typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); -typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f); -typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLclampf d); -#endif - -#ifndef GL_ARB_get_program_binary -#define GL_ARB_get_program_binary 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); -GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_ARB_separate_shader_objects -#define GL_ARB_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program); -GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program); -GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* *strings); -GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines); -GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines); -GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params); -GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0); -GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0); -GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0); -GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0); -GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1); -GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* *strings); -typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines); -typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif - -#ifndef GL_ARB_vertex_attrib_64bit -#define GL_ARB_vertex_attrib_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params); -#endif - -#ifndef GL_ARB_viewport_array -#define GL_ARB_viewport_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v); -GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v); -GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLclampd *v); -GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLclampd n, GLclampd f); -GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data); -GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v); -typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd *v); -typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f); -typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data); -typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data); -#endif - -#ifndef GL_ARB_cl_event -#define GL_ARB_cl_event 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); -#endif - -#ifndef GL_ARB_debug_output -#define GL_ARB_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -#endif - -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void); -GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values); -GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values); -GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values); -GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern); -GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); -GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); -GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); -GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params); -GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void); -typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values); -typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern); -typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); -typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); -typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); -typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); -#endif - -#ifndef GL_ARB_shader_stencil_export -#define GL_ARB_shader_stencil_export 1 -#endif - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 -#endif - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); -#endif - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 -#endif - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights); -GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights); -typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glResetHistogramEXT (GLenum target); -GLAPI void APIENTRY glResetMinmaxEXT (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target); -#endif - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params); -GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params); -GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image); -GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif - -#ifndef GL_SGI_color_matrix -#define GL_SGI_color_matrix 1 -#endif - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table); -GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params); -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param); -GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params); -GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params); -GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 -#endif - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 -#endif - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences); -GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture); -GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures); -GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures); -GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture); -GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures); -typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures); -typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 -#endif - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 -#endif - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glArrayElementEXT (GLint i); -GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer); -GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params); -GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer); -typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 -#endif - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 -#endif - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 -#endif - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_SGIX_pixel_tiles 1 -#endif - -#ifndef GL_SGIX_texture_select -#define GL_SGIX_texture_select 1 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param); -GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param); -GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 -#endif - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_SGIS_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIX_instruments -#define GL_SGIX_instruments 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetInstrumentsSGIX (void); -GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer); -GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p); -GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker); -GLAPI void APIENTRY glStartInstrumentsSGIX (void); -GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer); -typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p); -typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker); -typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker); -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 -#endif - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameZoomSGIX (GLint factor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor); -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTagSampleBufferSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_SGIX_polynomial_ffd 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -GLAPI void APIENTRY glDeformSGIX (GLbitfield mask); -GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask); -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation); -#endif - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushRasterSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points); -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 -#endif - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 -#endif - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode); -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data); -GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params); -GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param); -GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param); -GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_SGIX_calligraphic_fragment 1 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 -#endif - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 -#endif - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref); -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count); -GLAPI void APIENTRY glUnlockArraysEXT (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void); -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params); -GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_SGIX_fragment_lighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode); -GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params); -GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params); -GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params); -GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params); -GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 -#endif - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 -#endif - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glApplyTextureEXT (GLenum mode); -GLAPI void APIENTRY glTextureLightEXT (GLenum pname); -GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 -#endif - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 -#endif - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker); -GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp); -GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp); -GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range); -GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range); -GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp); -typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp); -typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -#endif - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 -#endif - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue); -GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v); -GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue); -GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v); -GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v); -GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue); -GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v); -GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue); -GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v); -GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureNormalEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord); -GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord); -GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord); -GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord); -GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz); -GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz); -GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz); -GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz); -GLAPI void APIENTRY glTangent3ivEXT (const GLint *v); -GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz); -GLAPI void APIENTRY glTangent3svEXT (const GLshort *v); -GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz); -GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz); -GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz); -GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz); -GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v); -GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz); -GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v); -GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz); -typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz); -typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz); -typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz); -typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz); -typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz); -typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz); -typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz); -typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz); -typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz); -typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_SGIX_fog_scale 1 -#endif - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFinishTextureSUNX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void); -#endif - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor); -GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor); -GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor); -GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor); -GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor); -GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor); -GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor); -GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -#endif - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code); -GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code); -GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code); -GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code); -GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code); -GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code); -GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_blend_func_separate -#define GL_INGR_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 -#endif - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight); -GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight); -GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushVertexArrayRangeNV (void); -GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer); -#endif - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param); -GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params); -GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param); -GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params); -#endif - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 -#endif - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 -#endif - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glResizeBuffersMESA (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); -#endif - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v); -GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v); -GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v); -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride); -GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif - -#ifndef GL_SGIX_subsample -#define GL_SGIX_subsample 1 -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_SGIX_ycrcba 1 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#define GL_SGIX_ycrcb_subsample 1 -#endif - -#ifndef GL_SGIX_depth_pass_instrument -#define GL_SGIX_depth_pass_instrument 1 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 -#endif - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); -#endif - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 -#endif - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_SGIS_texture_color_mask 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif - -#ifndef GL_SGIX_igloo_interface -#define GL_SGIX_igloo_interface 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params); -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 -#endif - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences); -GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences); -GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence); -GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence); -GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params); -GLAPI void APIENTRY glFinishFenceNV (GLuint fence); -GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 -#endif - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 -#endif - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences); -GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params); -GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs); -GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program); -GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id); -GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v); -GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v); -GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v); -GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v); -GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform); -GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v); -typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SGIX_scalebias_hint 1 -#endif - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 -#endif - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 -#endif - -#ifndef GL_OML_resample -#define GL_OML_resample 1 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param); -GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param); -GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param); -GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range); -GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id); -GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id); -GLAPI void APIENTRY glBeginFragmentShaderATI (void); -GLAPI void APIENTRY glEndFragmentShaderATI (void); -GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle); -GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle); -GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value); -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param); -GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage); -GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params); -GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); -typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params); -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVertexShaderEXT (void); -GLAPI void APIENTRY glEndVertexShaderEXT (void); -GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id); -GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range); -GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id); -GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1); -GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num); -GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num); -GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr); -GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr); -GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr); -GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr); -GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr); -GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr); -GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr); -GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr); -GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr); -GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr); -GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id); -GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id); -GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value); -GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value); -GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value); -GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value); -GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value); -GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap); -GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data); -GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr); -typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr); -typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr); -typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr); -typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr); -typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr); -typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr); -typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr); -typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data); -typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x); -GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x); -GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x); -GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x); -GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y); -GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords); -GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz); -GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream); -GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param); -GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer); -GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count); -GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 -#endif - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id); -GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id); -GLAPI void APIENTRY glEndOcclusionQueryNV (void); -GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param); -GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 -#endif - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 -#endif - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 -#endif - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer); -GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences); -GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences); -GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence); -GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name); -GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences); -typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); -typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array); -GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays); -GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays); -GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 -#endif - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_ATI_pixel_format_float 1 -/* This is really a WGL extension, but defines some associated GL enums. - * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. - */ -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 -#endif - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 -#endif - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 -#endif - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 -/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y); -GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z); -GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s); -GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t); -GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r); -GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s); -GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t); -GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog); -GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog); -GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight); -GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight); -GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x); -GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y); -GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s); -typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); -typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -#endif - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPrimitiveRestartNV (void); -GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 -#endif - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 -#endif - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 -#endif - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 -#endif - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 -#endif - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer); -GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers); -GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers); -GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer); -GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer); -GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers); -GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers); -GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target); -GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -#endif - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string); -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_EXT_packed_depth_stencil 1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_EXT_stencil_clear_tag 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag); -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_EXT_texture_sRGB 1 -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_MESAX_texture_stack 1 -#endif - -#ifndef GL_EXT_timer_query -#define GL_EXT_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_gpu_program_parameters -#define GL_EXT_gpu_program_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_APPLE_flush_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size); -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_NV_gpu_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params); -GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_NV_geometry_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit); -GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_EXT_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_NV_vertex_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x); -GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y); -GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x); -GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y); -GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params); -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_EXT_gpu_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params); -GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name); -GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0); -GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -#endif - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_packed_float -#define GL_EXT_packed_float 1 -#endif - -#ifndef GL_EXT_texture_array -#define GL_EXT_texture_array 1 -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_EXT_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_EXT_texture_compression_latc 1 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_EXT_texture_shared_exponent 1 -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_NV_depth_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glClearDepthdNV (GLdouble depth); -GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth); -typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax); -#endif - -#ifndef GL_NV_fragment_program4 -#define GL_NV_fragment_program4 1 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_NV_framebuffer_multisample_coverage 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_EXT_framebuffer_sRGB 1 -#endif - -#ifndef GL_NV_geometry_shader4 -#define GL_NV_geometry_shader4 1 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_NV_parameter_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif - -#ifndef GL_EXT_draw_buffers2 -#define GL_EXT_draw_buffers2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data); -GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data); -GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index); -GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index); -GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data); -typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); -#endif - -#ifndef GL_NV_transform_feedback -#define GL_NV_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedbackNV (void); -GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode); -GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name); -GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location); -GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode); -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_EXT_bindable_uniform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer); -GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location); -GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer); -typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location); -typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location); -#endif - -#ifndef GL_EXT_texture_integer -#define GL_EXT_texture_integer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha); -GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha); -typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif - -#ifndef GL_GREMEDY_frame_terminator -#define GL_GREMEDY_frame_terminator 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameTerminatorGREMEDY (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void); -#endif - -#ifndef GL_NV_conditional_render -#define GL_NV_conditional_render 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode); -GLAPI void APIENTRY glEndConditionalRenderNV (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode); -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void); -#endif - -#ifndef GL_NV_present_video -#define GL_NV_present_video 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); -GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params); -GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); -typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_transform_feedback -#define GL_EXT_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedbackEXT (void); -GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -#endif - -#ifndef GL_EXT_direct_state_access -#define GL_EXT_direct_state_access 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask); -GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask); -GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode); -GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glMatrixPopEXT (GLenum mode); -GLAPI void APIENTRY glMatrixPushEXT (GLenum mode); -GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture); -GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index); -GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index); -GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); -GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); -GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data); -GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data); -GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data); -GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img); -GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img); -GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string); -GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string); -GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params); -GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0); -GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0); -GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0); -GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data); -GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access); -GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer); -GLAPI GLvoid* APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length); -GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params); -GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data); -GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params); -GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target); -GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target); -GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target); -GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode); -GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs); -GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode); -GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x); -GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y); -GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); -typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data); -typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data); -typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer); -typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params); -typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target); -typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -#endif - -#ifndef GL_EXT_vertex_array_bgra -#define GL_EXT_vertex_array_bgra 1 -#endif - -#ifndef GL_EXT_texture_swizzle -#define GL_EXT_texture_swizzle 1 -#endif - -#ifndef GL_NV_explicit_multisample -#define GL_NV_explicit_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val); -GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask); -GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val); -typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask); -typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer); -#endif - -#ifndef GL_NV_transform_feedback2 -#define GL_NV_transform_feedback2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids); -GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids); -GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id); -GLAPI void APIENTRY glPauseTransformFeedbackNV (void); -GLAPI void APIENTRY glResumeTransformFeedbackNV (void); -GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids); -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id); -#endif - -#ifndef GL_ATI_meminfo -#define GL_ATI_meminfo 1 -#endif - -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif - -#ifndef GL_AMD_texture_texture4 -#define GL_AMD_texture_texture4 1 -#endif - -#ifndef GL_AMD_vertex_shader_tesselator -#define GL_AMD_vertex_shader_tesselator 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor); -GLAPI void APIENTRY glTessellationModeAMD (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_provoking_vertex -#define GL_EXT_provoking_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_texture_snorm -#define GL_EXT_texture_snorm 1 -#endif - -#ifndef GL_AMD_draw_buffers_blend -#define GL_AMD_draw_buffers_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_APPLE_texture_range -#define GL_APPLE_texture_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer); -GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_APPLE_float_pixels -#define GL_APPLE_float_pixels 1 -#endif - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_APPLE_vertex_program_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname); -GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname); -GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname); -GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -#endif - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_APPLE_aux_depth_stencil 1 -#endif - -#ifndef GL_APPLE_object_purgeable -#define GL_APPLE_object_purgeable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option); -GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option); -GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params); -#endif - -#ifndef GL_APPLE_row_bytes -#define GL_APPLE_row_bytes 1 -#endif - -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#endif - -#ifndef GL_NV_video_capture -#define GL_NV_video_capture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot); -GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot); -GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params); -GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time); -GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params); -GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params); -typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params); -#endif - -#ifndef GL_NV_copy_image -#define GL_NV_copy_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif - -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program); -GLAPI void APIENTRY glActiveProgramEXT (GLuint program); -GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program); -typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string); -#endif - -#ifndef GL_NV_parameter_buffer_object2 -#define GL_NV_parameter_buffer_object2 1 -#endif - -#ifndef GL_NV_shader_buffer_load -#define GL_NV_shader_buffer_load 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access); -GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target); -GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target); -GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access); -GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer); -GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer); -GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result); -GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value); -GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params); -GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value); -GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access); -typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target); -typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target); -typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access); -typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer); -typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result); -typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); -typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_NV_vertex_buffer_unified_memory 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride); -GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result); -#endif - -#ifndef GL_NV_texture_barrier -#define GL_NV_texture_barrier 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureBarrierNV (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void); -#endif - -#ifndef GL_AMD_shader_stencil_export -#define GL_AMD_shader_stencil_export 1 -#endif - -#ifndef GL_AMD_seamless_cubemap_per_texture -#define GL_AMD_seamless_cubemap_per_texture 1 -#endif - -#ifndef GL_AMD_conservative_depth -#define GL_AMD_conservative_depth 1 -#endif - -#ifndef GL_EXT_shader_image_load_store -#define GL_EXT_shader_image_load_store 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers); -#endif - -#ifndef GL_EXT_vertex_attrib_64bit -#define GL_EXT_vertex_attrib_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -#endif - -#ifndef GL_NV_gpu_program5 -#define GL_NV_gpu_program5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param); -#endif - -#ifndef GL_NV_gpu_shader5 -#define GL_NV_gpu_shader5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x); -GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x); -GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params); -GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x); -GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x); -GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); -typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x); -typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif - -#ifndef GL_NV_shader_buffer_store -#define GL_NV_shader_buffer_store 1 -#endif - -#ifndef GL_NV_tessellation_program5 -#define GL_NV_tessellation_program5 1 -#endif - -#ifndef GL_NV_vertex_attrib_integer_64bit -#define GL_NV_vertex_attrib_integer_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x); -GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x); -GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -#endif - -#ifndef GL_NV_multisample_coverage -#define GL_NV_multisample_coverage 1 -#endif - -#ifndef GL_AMD_name_gen_delete -#define GL_AMD_name_gen_delete 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names); -GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names); -GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names); -typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names); -typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name); -#endif - -#ifndef GL_AMD_debug_output -#define GL_AMD_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, GLvoid *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, GLvoid *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif - -#ifndef GL_NV_vdpau_interop -#define GL_NV_vdpau_interop 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVDPAUInitNV (const GLvoid *vdpDevice, const GLvoid *getProcAddress); -GLAPI void APIENTRY glVDPAUFiniNV (void); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface); -GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface); -GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access); -GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); -GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const GLvoid *vdpDevice, const GLvoid *getProcAddress); -typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access); -typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); -typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); -#endif - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#define GL_AMD_transform_feedback3_lines_triangles 1 -#endif - - -#ifdef __cplusplus -} -#endif - -#endif -#endif /* NO_SDL_GLEXT */ - -#endif /* !__IPHONEOS__ */ - -#endif /* _SDL_opengl_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_pixels.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_pixels.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_pixels.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_pixels.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,429 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_pixels.h - * - * Header for the enumerated pixel format definitions. - */ - -#ifndef _SDL_pixels_h -#define _SDL_pixels_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name Transparency definitions - * - * These define alpha as the opacity of a surface. - */ -/* @{ */ -#define SDL_ALPHA_OPAQUE 255 -#define SDL_ALPHA_TRANSPARENT 0 -/* @} */ - -/** Pixel type. */ -enum -{ - SDL_PIXELTYPE_UNKNOWN, - SDL_PIXELTYPE_INDEX1, - SDL_PIXELTYPE_INDEX4, - SDL_PIXELTYPE_INDEX8, - SDL_PIXELTYPE_PACKED8, - SDL_PIXELTYPE_PACKED16, - SDL_PIXELTYPE_PACKED32, - SDL_PIXELTYPE_ARRAYU8, - SDL_PIXELTYPE_ARRAYU16, - SDL_PIXELTYPE_ARRAYU32, - SDL_PIXELTYPE_ARRAYF16, - SDL_PIXELTYPE_ARRAYF32 -}; - -/** Bitmap pixel order, high bit -> low bit. */ -enum -{ - SDL_BITMAPORDER_NONE, - SDL_BITMAPORDER_4321, - SDL_BITMAPORDER_1234 -}; - -/** Packed component order, high bit -> low bit. */ -enum -{ - SDL_PACKEDORDER_NONE, - SDL_PACKEDORDER_XRGB, - SDL_PACKEDORDER_RGBX, - SDL_PACKEDORDER_ARGB, - SDL_PACKEDORDER_RGBA, - SDL_PACKEDORDER_XBGR, - SDL_PACKEDORDER_BGRX, - SDL_PACKEDORDER_ABGR, - SDL_PACKEDORDER_BGRA -}; - -/** Array component order, low byte -> high byte. */ -enum -{ - SDL_ARRAYORDER_NONE, - SDL_ARRAYORDER_RGB, - SDL_ARRAYORDER_RGBA, - SDL_ARRAYORDER_ARGB, - SDL_ARRAYORDER_BGR, - SDL_ARRAYORDER_BGRA, - SDL_ARRAYORDER_ABGR -}; - -/** Packed component layout. */ -enum -{ - SDL_PACKEDLAYOUT_NONE, - SDL_PACKEDLAYOUT_332, - SDL_PACKEDLAYOUT_4444, - SDL_PACKEDLAYOUT_1555, - SDL_PACKEDLAYOUT_5551, - SDL_PACKEDLAYOUT_565, - SDL_PACKEDLAYOUT_8888, - SDL_PACKEDLAYOUT_2101010, - SDL_PACKEDLAYOUT_1010102 -}; - -#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) - -#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \ - ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \ - ((bits) << 8) | ((bytes) << 0)) - -#define SDL_PIXELFLAG(X) (((X) >> 28) & 0x0F) -#define SDL_PIXELTYPE(X) (((X) >> 24) & 0x0F) -#define SDL_PIXELORDER(X) (((X) >> 20) & 0x0F) -#define SDL_PIXELLAYOUT(X) (((X) >> 16) & 0x0F) -#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF) -#define SDL_BYTESPERPIXEL(X) \ - (SDL_ISPIXELFORMAT_FOURCC(X) ? \ - ((((X) == SDL_PIXELFORMAT_YUY2) || \ - ((X) == SDL_PIXELFORMAT_UYVY) || \ - ((X) == SDL_PIXELFORMAT_YVYU)) ? 2 : 1) : (((X) >> 0) & 0xFF)) - -#define SDL_ISPIXELFORMAT_INDEXED(format) \ - (!SDL_ISPIXELFORMAT_FOURCC(format) && \ - ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \ - (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \ - (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8))) - -#define SDL_ISPIXELFORMAT_ALPHA(format) \ - (!SDL_ISPIXELFORMAT_FOURCC(format) && \ - ((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA))) - -/* The flag is set to 1 because 0x1? is not in the printable ASCII range */ -#define SDL_ISPIXELFORMAT_FOURCC(format) \ - ((format) && (SDL_PIXELFLAG(format) != 1)) - -/* Note: If you modify this list, update SDL_GetPixelFormatName() */ -enum -{ - SDL_PIXELFORMAT_UNKNOWN, - SDL_PIXELFORMAT_INDEX1LSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0, - 1, 0), - SDL_PIXELFORMAT_INDEX1MSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0, - 1, 0), - SDL_PIXELFORMAT_INDEX4LSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0, - 4, 0), - SDL_PIXELFORMAT_INDEX4MSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0, - 4, 0), - SDL_PIXELFORMAT_INDEX8 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1), - SDL_PIXELFORMAT_RGB332 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_332, 8, 1), - SDL_PIXELFORMAT_RGB444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_4444, 12, 2), - SDL_PIXELFORMAT_RGB555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_BGR555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_ARGB4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_RGBA4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_ABGR4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_BGRA4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_ARGB1555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_1555, 16, 2), - SDL_PIXELFORMAT_RGBA5551 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_5551, 16, 2), - SDL_PIXELFORMAT_ABGR1555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_1555, 16, 2), - SDL_PIXELFORMAT_BGRA5551 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_5551, 16, 2), - SDL_PIXELFORMAT_RGB565 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_565, 16, 2), - SDL_PIXELFORMAT_BGR565 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_565, 16, 2), - SDL_PIXELFORMAT_RGB24 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0, - 24, 3), - SDL_PIXELFORMAT_BGR24 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0, - 24, 3), - SDL_PIXELFORMAT_RGB888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_RGBX8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGR888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGRX8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_ARGB8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_RGBA8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_ABGR8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_BGRA8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_ARGB2101010 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_2101010, 32, 4), - - SDL_PIXELFORMAT_YV12 = /**< Planar mode: Y + V + U (3 planes) */ - SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'), - SDL_PIXELFORMAT_IYUV = /**< Planar mode: Y + U + V (3 planes) */ - SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'), - SDL_PIXELFORMAT_YUY2 = /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'), - SDL_PIXELFORMAT_UYVY = /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'), - SDL_PIXELFORMAT_YVYU = /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U') -}; - -typedef struct SDL_Color -{ - Uint8 r; - Uint8 g; - Uint8 b; - Uint8 a; -} SDL_Color; -#define SDL_Colour SDL_Color - -typedef struct SDL_Palette -{ - int ncolors; - SDL_Color *colors; - Uint32 version; - int refcount; -} SDL_Palette; - -/** - * \note Everything in the pixel format structure is read-only. - */ -typedef struct SDL_PixelFormat -{ - Uint32 format; - SDL_Palette *palette; - Uint8 BitsPerPixel; - Uint8 BytesPerPixel; - Uint8 padding[2]; - Uint32 Rmask; - Uint32 Gmask; - Uint32 Bmask; - Uint32 Amask; - Uint8 Rloss; - Uint8 Gloss; - Uint8 Bloss; - Uint8 Aloss; - Uint8 Rshift; - Uint8 Gshift; - Uint8 Bshift; - Uint8 Ashift; - int refcount; - struct SDL_PixelFormat *next; -} SDL_PixelFormat; - -/** - * \brief Get the human readable name of a pixel format - */ -extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format); - -/** - * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks. - * - * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible. - * - * \sa SDL_MasksToPixelFormatEnum() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, - int *bpp, - Uint32 * Rmask, - Uint32 * Gmask, - Uint32 * Bmask, - Uint32 * Amask); - -/** - * \brief Convert a bpp and RGBA masks to an enumerated pixel format. - * - * \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion - * wasn't possible. - * - * \sa SDL_PixelFormatEnumToMasks() - */ -extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, - Uint32 Rmask, - Uint32 Gmask, - Uint32 Bmask, - Uint32 Amask); - -/** - * \brief Create an SDL_PixelFormat structure from a pixel format enum. - */ -extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format); - -/** - * \brief Free an SDL_PixelFormat structure. - */ -extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format); - -/** - * \brief Create a palette structure with the specified number of color - * entries. - * - * \return A new palette, or NULL if there wasn't enough memory. - * - * \note The palette entries are initialized to white. - * - * \sa SDL_FreePalette() - */ -extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors); - -/** - * \brief Set the palette for a pixel format structure. - */ -extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format, - SDL_Palette *palette); - -/** - * \brief Set a range of colors in a palette. - * - * \param palette The palette to modify. - * \param colors An array of colors to copy into the palette. - * \param firstcolor The index of the first palette entry to modify. - * \param ncolors The number of entries to modify. - * - * \return 0 on success, or -1 if not all of the colors could be set. - */ -extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette, - const SDL_Color * colors, - int firstcolor, int ncolors); - -/** - * \brief Free a palette created with SDL_AllocPalette(). - * - * \sa SDL_AllocPalette() - */ -extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette); - -/** - * \brief Maps an RGB triple to an opaque pixel value for a given pixel format. - * - * \sa SDL_MapRGBA - */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format, - Uint8 r, Uint8 g, Uint8 b); - -/** - * \brief Maps an RGBA quadruple to a pixel value for a given pixel format. - * - * \sa SDL_MapRGB - */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the RGB components from a pixel of the specified format. - * - * \sa SDL_GetRGBA - */ -extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, - const SDL_PixelFormat * format, - Uint8 * r, Uint8 * g, Uint8 * b); - -/** - * \brief Get the RGBA components from a pixel of the specified format. - * - * \sa SDL_GetRGB - */ -extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, - const SDL_PixelFormat * format, - Uint8 * r, Uint8 * g, Uint8 * b, - Uint8 * a); - -/** - * \brief Calculate a 256 entry gamma ramp for a gamma value. - */ -extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_pixels_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_platform.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_platform.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_platform.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_platform.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_platform.h - * - * Try to get a standard set of platform defines. - */ - -#ifndef _SDL_platform_h -#define _SDL_platform_h - -#if defined(_AIX) -#undef __AIX__ -#define __AIX__ 1 -#endif -#if defined(__HAIKU__) -#undef __HAIKU__ -#define __HAIKU__ 1 -#endif -#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__) -#undef __BSDI__ -#define __BSDI__ 1 -#endif -#if defined(_arch_dreamcast) -#undef __DREAMCAST__ -#define __DREAMCAST__ 1 -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#undef __FREEBSD__ -#define __FREEBSD__ 1 -#endif -#if defined(hpux) || defined(__hpux) || defined(__hpux__) -#undef __HPUX__ -#define __HPUX__ 1 -#endif -#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE) -#undef __IRIX__ -#define __IRIX__ 1 -#endif -#if defined(linux) || defined(__linux) || defined(__linux__) -#undef __LINUX__ -#define __LINUX__ 1 -#endif -#if defined(ANDROID) || defined(__ANDROID__) -#undef __ANDROID__ -#undef __LINUX__ /* do we need to do this? */ -#define __ANDROID__ 1 -#endif - -#if defined(__APPLE__) -/* lets us know what version of Mac OS X we're compiling on */ -#include "AvailabilityMacros.h" -#include "TargetConditionals.h" -#if TARGET_OS_IPHONE -/* if compiling for iPhone */ -#undef __IPHONEOS__ -#define __IPHONEOS__ 1 -#undef __MACOSX__ -#else -/* if not compiling for iPhone */ -#undef __MACOSX__ -#define __MACOSX__ 1 -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -# error SDL for Mac OS X only supports deploying on 10.5 and above. -#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */ -#endif /* TARGET_OS_IPHONE */ -#endif /* defined(__APPLE__) */ - -#if defined(__NetBSD__) -#undef __NETBSD__ -#define __NETBSD__ 1 -#endif -#if defined(__OpenBSD__) -#undef __OPENBSD__ -#define __OPENBSD__ 1 -#endif -#if defined(__OS2__) -#undef __OS2__ -#define __OS2__ 1 -#endif -#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE) -#undef __OSF__ -#define __OSF__ 1 -#endif -#if defined(__QNXNTO__) -#undef __QNXNTO__ -#define __QNXNTO__ 1 -#endif -#if defined(riscos) || defined(__riscos) || defined(__riscos__) -#undef __RISCOS__ -#define __RISCOS__ 1 -#endif -#if defined(__SVR4) -#undef __SOLARIS__ -#define __SOLARIS__ 1 -#endif - -#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -/* Try to find out if we're compiling for WinRT or non-WinRT */ -/* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */ -#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_) /* _MSC_VER==1700 for MSVC 2012 */ -#include -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#undef __WINDOWS__ -#define __WINDOWS__ 1 -/* See if we're compiling for WinRT: */ -#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -#undef __WINRT__ -#define __WINRT__ 1 -#endif -#else -#undef __WINDOWS__ -#define __WINDOWS__ 1 -#endif /* _MSC_VER < 1700 */ -#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */ - -#if defined(__WINDOWS__) -#undef __WIN32__ -#define __WIN32__ 1 -#endif -#if defined(__PSP__) -#undef __PSP__ -#define __PSP__ 1 -#endif - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Gets the name of the platform. - */ -extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_platform_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_power.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_power.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_power.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_power.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_power_h -#define _SDL_power_h - -/** - * \file SDL_power.h - * - * Header for the SDL power management routines. - */ - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The basic state for the system's power supply. - */ -typedef enum -{ - SDL_POWERSTATE_UNKNOWN, /**< cannot determine power status */ - SDL_POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */ - SDL_POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */ - SDL_POWERSTATE_CHARGING, /**< Plugged in, charging battery */ - SDL_POWERSTATE_CHARGED /**< Plugged in, battery charged */ -} SDL_PowerState; - - -/** - * \brief Get the current power supply details. - * - * \param secs Seconds of battery life left. You can pass a NULL here if - * you don't care. Will return -1 if we can't determine a - * value, or we're not running on a battery. - * - * \param pct Percentage of battery life left, between 0 and 100. You can - * pass a NULL here if you don't care. Will return -1 if we - * can't determine a value, or we're not running on a battery. - * - * \return The state of the battery (if any). - */ -extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_power_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_quit.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_quit.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_quit.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_quit.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_quit.h - * - * Include file for SDL quit event handling. - */ - -#ifndef _SDL_quit_h -#define _SDL_quit_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -/** - * \file SDL_quit.h - * - * An ::SDL_QUIT event is generated when the user tries to close the application - * window. If it is ignored or filtered out, the window will remain open. - * If it is not ignored or filtered, it is queued normally and the window - * is allowed to close. When the window is closed, screen updates will - * complete, but have no effect. - * - * SDL_Init() installs signal handlers for SIGINT (keyboard interrupt) - * and SIGTERM (system termination request), if handlers do not already - * exist, that generate ::SDL_QUIT events as well. There is no way - * to determine the cause of an ::SDL_QUIT event, but setting a signal - * handler in your application will override the default generation of - * quit events for that signal. - * - * \sa SDL_Quit() - */ - -/* There are no functions directly affecting the quit event */ - -#define SDL_QuitRequested() \ - (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) - -#endif /* _SDL_quit_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_rect.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_rect.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_rect.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_rect.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_rect.h - * - * Header file for SDL_rect definition and management functions. - */ - -#ifndef _SDL_rect_h -#define _SDL_rect_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_pixels.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The structure that defines a point - * - * \sa SDL_EnclosePoints - */ -typedef struct SDL_Point -{ - int x; - int y; -} SDL_Point; - -/** - * \brief A rectangle, with the origin at the upper left. - * - * \sa SDL_RectEmpty - * \sa SDL_RectEquals - * \sa SDL_HasIntersection - * \sa SDL_IntersectRect - * \sa SDL_UnionRect - * \sa SDL_EnclosePoints - */ -typedef struct SDL_Rect -{ - int x, y; - int w, h; -} SDL_Rect; - -/** - * \brief Returns true if the rectangle has no area. - */ -SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) -{ - return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE; -} - -/** - * \brief Returns true if the two rectangles are equal. - */ -SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) -{ - return (a && b && (a->x == b->x) && (a->y == b->y) && - (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE; -} - -/** - * \brief Determine whether two rectangles intersect. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A, - const SDL_Rect * B); - -/** - * \brief Calculate the intersection of two rectangles. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A, - const SDL_Rect * B, - SDL_Rect * result); - -/** - * \brief Calculate the union of two rectangles. - */ -extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A, - const SDL_Rect * B, - SDL_Rect * result); - -/** - * \brief Calculate a minimal rectangle enclosing a set of points - * - * \return SDL_TRUE if any points were within the clipping rect - */ -extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, - int count, - const SDL_Rect * clip, - SDL_Rect * result); - -/** - * \brief Calculate the intersection of a rectangle and line segment. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * - rect, int *X1, - int *Y1, int *X2, - int *Y2); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_rect_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_render.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_render.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_render.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_render.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,870 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_render.h - * - * Header file for SDL 2D rendering functions. - * - * This API supports the following features: - * * single pixel points - * * single pixel lines - * * filled rectangles - * * texture images - * - * The primitives may be drawn in opaque, blended, or additive modes. - * - * The texture images may be drawn in opaque, blended, or additive modes. - * They can have an additional color tint or alpha modulation applied to - * them, and may also be stretched with linear interpolation. - * - * This API is designed to accelerate simple 2D operations. You may - * want more functionality such as polygons and particle effects and - * in that case you should use SDL's OpenGL/Direct3D support or one - * of the many good 3D engines. - * - * These functions must be called from the main thread. - * See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995 - */ - -#ifndef _SDL_render_h -#define _SDL_render_h - -#include "SDL_stdinc.h" -#include "SDL_rect.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Flags used when creating a rendering context - */ -typedef enum -{ - SDL_RENDERER_SOFTWARE = 0x00000001, /**< The renderer is a software fallback */ - SDL_RENDERER_ACCELERATED = 0x00000002, /**< The renderer uses hardware - acceleration */ - SDL_RENDERER_PRESENTVSYNC = 0x00000004, /**< Present is synchronized - with the refresh rate */ - SDL_RENDERER_TARGETTEXTURE = 0x00000008 /**< The renderer supports - rendering to texture */ -} SDL_RendererFlags; - -/** - * \brief Information on the capabilities of a render driver or context. - */ -typedef struct SDL_RendererInfo -{ - const char *name; /**< The name of the renderer */ - Uint32 flags; /**< Supported ::SDL_RendererFlags */ - Uint32 num_texture_formats; /**< The number of available texture formats */ - Uint32 texture_formats[16]; /**< The available texture formats */ - int max_texture_width; /**< The maximimum texture width */ - int max_texture_height; /**< The maximimum texture height */ -} SDL_RendererInfo; - -/** - * \brief The access pattern allowed for a texture. - */ -typedef enum -{ - SDL_TEXTUREACCESS_STATIC, /**< Changes rarely, not lockable */ - SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */ - SDL_TEXTUREACCESS_TARGET /**< Texture can be used as a render target */ -} SDL_TextureAccess; - -/** - * \brief The texture channel modulation used in SDL_RenderCopy(). - */ -typedef enum -{ - SDL_TEXTUREMODULATE_NONE = 0x00000000, /**< No modulation */ - SDL_TEXTUREMODULATE_COLOR = 0x00000001, /**< srcC = srcC * color */ - SDL_TEXTUREMODULATE_ALPHA = 0x00000002 /**< srcA = srcA * alpha */ -} SDL_TextureModulate; - -/** - * \brief Flip constants for SDL_RenderCopyEx - */ -typedef enum -{ - SDL_FLIP_NONE = 0x00000000, /**< Do not flip */ - SDL_FLIP_HORIZONTAL = 0x00000001, /**< flip horizontally */ - SDL_FLIP_VERTICAL = 0x00000002 /**< flip vertically */ -} SDL_RendererFlip; - -/** - * \brief A structure representing rendering state - */ -struct SDL_Renderer; -typedef struct SDL_Renderer SDL_Renderer; - -/** - * \brief An efficient driver-specific representation of pixel data - */ -struct SDL_Texture; -typedef struct SDL_Texture SDL_Texture; - - -/* Function prototypes */ - -/** - * \brief Get the number of 2D rendering drivers available for the current - * display. - * - * A render driver is a set of code that handles rendering and texture - * management on a particular display. Normally there is only one, but - * some drivers may have several available with different capabilities. - * - * \sa SDL_GetRenderDriverInfo() - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void); - -/** - * \brief Get information about a specific 2D rendering driver for the current - * display. - * - * \param index The index of the driver to query information about. - * \param info A pointer to an SDL_RendererInfo struct to be filled with - * information on the rendering driver. - * - * \return 0 on success, -1 if the index was out of range. - * - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index, - SDL_RendererInfo * info); - -/** - * \brief Create a window and default renderer - * - * \param width The width of the window - * \param height The height of the window - * \param window_flags The flags used to create the window - * \param window A pointer filled with the window, or NULL on error - * \param renderer A pointer filled with the renderer, or NULL on error - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( - int width, int height, Uint32 window_flags, - SDL_Window **window, SDL_Renderer **renderer); - - -/** - * \brief Create a 2D rendering context for a window. - * - * \param window The window where rendering is displayed. - * \param index The index of the rendering driver to initialize, or -1 to - * initialize the first one supporting the requested flags. - * \param flags ::SDL_RendererFlags. - * - * \return A valid rendering context or NULL if there was an error. - * - * \sa SDL_CreateSoftwareRenderer() - * \sa SDL_GetRendererInfo() - * \sa SDL_DestroyRenderer() - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window, - int index, Uint32 flags); - -/** - * \brief Create a 2D software rendering context for a surface. - * - * \param surface The surface where rendering is done. - * - * \return A valid rendering context or NULL if there was an error. - * - * \sa SDL_CreateRenderer() - * \sa SDL_DestroyRenderer() - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface); - -/** - * \brief Get the renderer associated with a window. - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window); - -/** - * \brief Get information about a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, - SDL_RendererInfo * info); - -/** - * \brief Get the output size of a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, - int *w, int *h); - -/** - * \brief Create a texture for a rendering context. - * - * \param renderer The renderer. - * \param format The format of the texture. - * \param access One of the enumerated values in ::SDL_TextureAccess. - * \param w The width of the texture in pixels. - * \param h The height of the texture in pixels. - * - * \return The created texture is returned, or 0 if no rendering context was - * active, the format was unsupported, or the width or height were out - * of range. - * - * \sa SDL_QueryTexture() - * \sa SDL_UpdateTexture() - * \sa SDL_DestroyTexture() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, - Uint32 format, - int access, int w, - int h); - -/** - * \brief Create a texture from an existing surface. - * - * \param renderer The renderer. - * \param surface The surface containing pixel data used to fill the texture. - * - * \return The created texture is returned, or 0 on error. - * - * \note The surface is not modified or freed by this function. - * - * \sa SDL_QueryTexture() - * \sa SDL_DestroyTexture() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface); - -/** - * \brief Query the attributes of a texture - * - * \param texture A texture to be queried. - * \param format A pointer filled in with the raw format of the texture. The - * actual format may differ, but pixel transfers will use this - * format. - * \param access A pointer filled in with the actual access to the texture. - * \param w A pointer filled in with the width of the texture in pixels. - * \param h A pointer filled in with the height of the texture in pixels. - * - * \return 0 on success, or -1 if the texture is not valid. - */ -extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture, - Uint32 * format, int *access, - int *w, int *h); - -/** - * \brief Set an additional color value used in render copy operations. - * - * \param texture The texture to update. - * \param r The red color value multiplied into copy operations. - * \param g The green color value multiplied into copy operations. - * \param b The blue color value multiplied into copy operations. - * - * \return 0 on success, or -1 if the texture is not valid or color modulation - * is not supported. - * - * \sa SDL_GetTextureColorMod() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture, - Uint8 r, Uint8 g, Uint8 b); - - -/** - * \brief Get the additional color value used in render copy operations. - * - * \param texture The texture to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureColorMod() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture, - Uint8 * r, Uint8 * g, - Uint8 * b); - -/** - * \brief Set an additional alpha value used in render copy operations. - * - * \param texture The texture to update. - * \param alpha The alpha value multiplied into copy operations. - * - * \return 0 on success, or -1 if the texture is not valid or alpha modulation - * is not supported. - * - * \sa SDL_GetTextureAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture, - Uint8 alpha); - -/** - * \brief Get the additional alpha value used in render copy operations. - * - * \param texture The texture to query. - * \param alpha A pointer filled in with the current alpha value. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture, - Uint8 * alpha); - -/** - * \brief Set the blend mode used for texture copy operations. - * - * \param texture The texture to update. - * \param blendMode ::SDL_BlendMode to use for texture blending. - * - * \return 0 on success, or -1 if the texture is not valid or the blend mode is - * not supported. - * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. - * - * \sa SDL_GetTextureBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for texture copy operations. - * - * \param texture The texture to query. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture, - SDL_BlendMode *blendMode); - -/** - * \brief Update the given texture rectangle with new pixel data. - * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param pixels The raw pixel data. - * \param pitch The number of bytes between rows of pixel data. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \note This is a fairly slow function. - */ -extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture, - const SDL_Rect * rect, - const void *pixels, int pitch); - -/** - * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data. - * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param Yplane The raw pixel data for the Y plane. - * \param Ypitch The number of bytes between rows of pixel data for the Y plane. - * \param Uplane The raw pixel data for the U plane. - * \param Upitch The number of bytes between rows of pixel data for the U plane. - * \param Vplane The raw pixel data for the V plane. - * \param Vpitch The number of bytes between rows of pixel data for the V plane. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \note You can use SDL_UpdateTexture() as long as your pixel data is - * a contiguous block of Y and U/V planes in the proper order, but - * this function is available if your pixel data is not contiguous. - */ -extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, - const SDL_Rect * rect, - const Uint8 *Yplane, int Ypitch, - const Uint8 *Uplane, int Upitch, - const Uint8 *Vplane, int Vpitch); - -/** - * \brief Lock a portion of the texture for write-only pixel access. - * - * \param texture The texture to lock for access, which was created with - * ::SDL_TEXTUREACCESS_STREAMING. - * \param rect A pointer to the rectangle to lock for access. If the rect - * is NULL, the entire texture will be locked. - * \param pixels This is filled in with a pointer to the locked pixels, - * appropriately offset by the locked area. - * \param pitch This is filled in with the pitch of the locked pixels. - * - * \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING. - * - * \sa SDL_UnlockTexture() - */ -extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture, - const SDL_Rect * rect, - void **pixels, int *pitch); - -/** - * \brief Unlock a texture, uploading the changes to video memory, if needed. - * - * \sa SDL_LockTexture() - */ -extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture); - -/** - * \brief Determines whether a window supports the use of render targets - * - * \param renderer The renderer that will be checked - * - * \return SDL_TRUE if supported, SDL_FALSE if not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer); - -/** - * \brief Set a texture as the current rendering target. - * - * \param renderer The renderer. - * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target - * - * \return 0 on success, or -1 on error - * - * \sa SDL_GetRenderTarget() - */ -extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, - SDL_Texture *texture); - -/** - * \brief Get the current render target or NULL for the default render target. - * - * \return The current render target - * - * \sa SDL_SetRenderTarget() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer); - -/** - * \brief Set device independent resolution for rendering - * - * \param renderer The renderer for which resolution should be set. - * \param w The width of the logical resolution - * \param h The height of the logical resolution - * - * This function uses the viewport and scaling functionality to allow a fixed logical - * resolution for rendering, regardless of the actual output resolution. If the actual - * output resolution doesn't have the same aspect ratio the output rendering will be - * centered within the output display. - * - * If the output display is a window, mouse events in the window will be filtered - * and scaled so they seem to arrive within the logical resolution. - * - * \note If this function results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. - * - * \sa SDL_RenderGetLogicalSize() - * \sa SDL_RenderSetScale() - * \sa SDL_RenderSetViewport() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h); - -/** - * \brief Get device independent resolution for rendering - * - * \param renderer The renderer from which resolution should be queried. - * \param w A pointer filled with the width of the logical resolution - * \param h A pointer filled with the height of the logical resolution - * - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); - -/** - * \brief Set the drawing area for rendering on the current target. - * - * \param renderer The renderer for which the drawing area should be set. - * \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target. - * - * The x,y of the viewport rect represents the origin for rendering. - * - * \return 0 on success, or -1 on error - * - * \note If the window associated with the renderer is resized, the viewport is automatically reset. - * - * \sa SDL_RenderGetViewport() - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the drawing area for the current target. - * - * \sa SDL_RenderSetViewport() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the clip rectangle for the current target. - * - * \param renderer The renderer for which clip rectangle should be set. - * \param rect A pointer to the rectangle to set as the clip rectangle, or - * NULL to disable clipping. - * - * \return 0 on success, or -1 on error - * - * \sa SDL_RenderGetClipRect() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the clip rectangle for the current target. - * - * \param renderer The renderer from which clip rectangle should be queried. - * \param rect A pointer filled in with the current clip rectangle, or - * an empty rectangle if clipping is disabled. - * - * \sa SDL_RenderSetClipRect() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the drawing scale for rendering on the current target. - * - * \param renderer The renderer for which the drawing scale should be set. - * \param scaleX The horizontal scaling factor - * \param scaleY The vertical scaling factor - * - * The drawing coordinates are scaled by the x/y scaling factors - * before they are used by the renderer. This allows resolution - * independent drawing with a single coordinate system. - * - * \note If this results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. For best results use integer scaling factors. - * - * \sa SDL_RenderGetScale() - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer, - float scaleX, float scaleY); - -/** - * \brief Get the drawing scale for the current target. - * - * \param renderer The renderer from which drawing scale should be queried. - * \param scaleX A pointer filled in with the horizontal scaling factor - * \param scaleY A pointer filled in with the vertical scaling factor - * - * \sa SDL_RenderSetScale() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer, - float *scaleX, float *scaleY); - -/** - * \brief Set the color used for drawing operations (Rect, Line and Clear). - * - * \param renderer The renderer for which drawing color should be set. - * \param r The red value used to draw on the rendering target. - * \param g The green value used to draw on the rendering target. - * \param b The blue value used to draw on the rendering target. - * \param a The alpha value used to draw on the rendering target, usually - * ::SDL_ALPHA_OPAQUE (255). - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the color used for drawing operations (Rect, Line and Clear). - * - * \param renderer The renderer from which drawing color should be queried. - * \param r A pointer to the red value used to draw on the rendering target. - * \param g A pointer to the green value used to draw on the rendering target. - * \param b A pointer to the blue value used to draw on the rendering target. - * \param a A pointer to the alpha value used to draw on the rendering target, - * usually ::SDL_ALPHA_OPAQUE (255). - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer, - Uint8 * r, Uint8 * g, Uint8 * b, - Uint8 * a); - -/** - * \brief Set the blend mode used for drawing operations (Fill and Line). - * - * \param renderer The renderer for which blend mode should be set. - * \param blendMode ::SDL_BlendMode to use for blending. - * - * \return 0 on success, or -1 on error - * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. - * - * \sa SDL_GetRenderDrawBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for drawing operations. - * - * \param renderer The renderer from which blend mode should be queried. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 on error - * - * \sa SDL_SetRenderDrawBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, - SDL_BlendMode *blendMode); - -/** - * \brief Clear the current rendering target with the drawing color - * - * This function clears the entire rendering target, ignoring the viewport. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); - -/** - * \brief Draw a point on the current rendering target. - * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer, - int x, int y); - -/** - * \brief Draw multiple points on the current rendering target. - * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer, - const SDL_Point * points, - int count); - -/** - * \brief Draw a line on the current rendering target. - * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer, - int x1, int y1, int x2, int y2); - -/** - * \brief Draw a series of connected lines on the current rendering target. - * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer, - const SDL_Point * points, - int count); - -/** - * \brief Draw a rectangle on the current rendering target. - * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Draw some number of rectangles on the current rendering target. - * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer, - const SDL_Rect * rects, - int count); - -/** - * \brief Fill a rectangle on the current rendering target with the drawing color. - * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. - * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer, - const SDL_Rect * rects, - int count); - -/** - * \brief Copy a portion of the texture to the current rendering target. - * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, - SDL_Texture * texture, - const SDL_Rect * srcrect, - const SDL_Rect * dstrect); - -/** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center - * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done aroud dstrect.w/2, dstrect.h/2) - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, - SDL_Texture * texture, - const SDL_Rect * srcrect, - const SDL_Rect * dstrect, - const double angle, - const SDL_Point *center, - const SDL_RendererFlip flip); - -/** - * \brief Read pixels from the current rendering target. - * - * \param renderer The renderer from which pixels should be read. - * \param rect A pointer to the rectangle to read, or NULL for the entire - * render target. - * \param format The desired format of the pixel data, or 0 to use the format - * of the rendering target - * \param pixels A pointer to be filled in with the pixel data - * \param pitch The pitch of the pixels parameter. - * - * \return 0 on success, or -1 if pixel reading is not supported. - * - * \warning This is a very slow operation, and should not be used frequently. - */ -extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, - const SDL_Rect * rect, - Uint32 format, - void *pixels, int pitch); - -/** - * \brief Update the screen with rendering performed. - */ -extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer); - -/** - * \brief Destroy the specified texture. - * - * \sa SDL_CreateTexture() - * \sa SDL_CreateTextureFromSurface() - */ -extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture); - -/** - * \brief Destroy the rendering context for a window and free associated - * textures. - * - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer); - - -/** - * \brief Bind the texture to the current OpenGL/ES/ES2 context for use with - * OpenGL instructions. - * - * \param texture The SDL texture to bind - * \param texw A pointer to a float that will be filled with the texture width - * \param texh A pointer to a float that will be filled with the texture height - * - * \return 0 on success, or -1 if the operation is not supported - */ -extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh); - -/** - * \brief Unbind a texture from the current OpenGL/ES/ES2 context. - * - * \param texture The SDL texture to unbind - * - * \return 0 on success, or -1 if the operation is not supported - */ -extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_render_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_revision.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_revision.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_revision.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_revision.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#define SDL_REVISION "hg-8628:b558f99d48f0" -#define SDL_REVISION_NUMBER 8628 diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_rwops.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_rwops.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_rwops.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_rwops.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_rwops.h - * - * This file provides a general interface for SDL to read and write - * data streams. It can easily be extended to files, memory, etc. - */ - -#ifndef _SDL_rwops_h -#define _SDL_rwops_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* RWops Types */ -#define SDL_RWOPS_UNKNOWN 0 /* Unknown stream type */ -#define SDL_RWOPS_WINFILE 1 /* Win32 file */ -#define SDL_RWOPS_STDFILE 2 /* Stdio file */ -#define SDL_RWOPS_JNIFILE 3 /* Android asset */ -#define SDL_RWOPS_MEMORY 4 /* Memory stream */ -#define SDL_RWOPS_MEMORY_RO 5 /* Read-Only memory stream */ - -/** - * This is the read/write operation structure -- very basic. - */ -typedef struct SDL_RWops -{ - /** - * Return the size of the file in this rwops, or -1 if unknown - */ - Sint64 (SDLCALL * size) (struct SDL_RWops * context); - - /** - * Seek to \c offset relative to \c whence, one of stdio's whence values: - * RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END - * - * \return the final offset in the data stream, or -1 on error. - */ - Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset, - int whence); - - /** - * Read up to \c maxnum objects each of size \c size from the data - * stream to the area pointed at by \c ptr. - * - * \return the number of objects read, or 0 at error or end of file. - */ - size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr, - size_t size, size_t maxnum); - - /** - * Write exactly \c num objects each of size \c size from the area - * pointed at by \c ptr to data stream. - * - * \return the number of objects written, or 0 at error or end of file. - */ - size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr, - size_t size, size_t num); - - /** - * Close and free an allocated SDL_RWops structure. - * - * \return 0 if successful or -1 on write error when flushing data. - */ - int (SDLCALL * close) (struct SDL_RWops * context); - - Uint32 type; - union - { -#if defined(ANDROID) - struct - { - void *fileNameRef; - void *inputStreamRef; - void *readableByteChannelRef; - void *readMethod; - void *assetFileDescriptorRef; - long position; - long size; - long offset; - int fd; - } androidio; -#elif defined(__WIN32__) - struct - { - SDL_bool append; - void *h; - struct - { - void *data; - size_t size; - size_t left; - } buffer; - } windowsio; -#endif - -#ifdef HAVE_STDIO_H - struct - { - SDL_bool autoclose; - FILE *fp; - } stdio; -#endif - struct - { - Uint8 *base; - Uint8 *here; - Uint8 *stop; - } mem; - struct - { - void *data1; - void *data2; - } unknown; - } hidden; - -} SDL_RWops; - - -/** - * \name RWFrom functions - * - * Functions to create SDL_RWops structures from various data streams. - */ -/* @{ */ - -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file, - const char *mode); - -#ifdef HAVE_STDIO_H -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, - SDL_bool autoclose); -#else -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp, - SDL_bool autoclose); -#endif - -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size); -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem, - int size); - -/* @} *//* RWFrom functions */ - - -extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void); -extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); - -#define RW_SEEK_SET 0 /**< Seek from the beginning of data */ -#define RW_SEEK_CUR 1 /**< Seek relative to current read point */ -#define RW_SEEK_END 2 /**< Seek relative to the end of data */ - -/** - * \name Read/write macros - * - * Macros to easily read and write from an SDL_RWops structure. - */ -/* @{ */ -#define SDL_RWsize(ctx) (ctx)->size(ctx) -#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence) -#define SDL_RWtell(ctx) (ctx)->seek(ctx, 0, RW_SEEK_CUR) -#define SDL_RWread(ctx, ptr, size, n) (ctx)->read(ctx, ptr, size, n) -#define SDL_RWwrite(ctx, ptr, size, n) (ctx)->write(ctx, ptr, size, n) -#define SDL_RWclose(ctx) (ctx)->close(ctx) -/* @} *//* Read/write macros */ - - -/** - * \name Read endian functions - * - * Read an item of the specified endianness and return in native format. - */ -/* @{ */ -extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src); -extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src); -extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src); -extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src); -extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src); -extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src); -extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); -/* @} *//* Read endian functions */ - -/** - * \name Write endian functions - * - * Write an item of native format to the specified endianness. - */ -/* @{ */ -extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); -/* @} *//* Write endian functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_rwops_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_scancode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_scancode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_scancode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_scancode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,401 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_scancode.h - * - * Defines keyboard scancodes. - */ - -#ifndef _SDL_scancode_h -#define _SDL_scancode_h - -#include "SDL_stdinc.h" - -/** - * \brief The SDL keyboard scancode representation. - * - * Values of this type are used to represent keyboard keys, among other places - * in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the - * SDL_Event structure. - * - * The values in this enumeration are based on the USB usage page standard: - * http://www.usb.org/developers/devclass_docs/Hut1_12v2.pdf - */ -typedef enum -{ - SDL_SCANCODE_UNKNOWN = 0, - - /** - * \name Usage page 0x07 - * - * These values are from usage page 0x07 (USB keyboard page). - */ - /* @{ */ - - SDL_SCANCODE_A = 4, - SDL_SCANCODE_B = 5, - SDL_SCANCODE_C = 6, - SDL_SCANCODE_D = 7, - SDL_SCANCODE_E = 8, - SDL_SCANCODE_F = 9, - SDL_SCANCODE_G = 10, - SDL_SCANCODE_H = 11, - SDL_SCANCODE_I = 12, - SDL_SCANCODE_J = 13, - SDL_SCANCODE_K = 14, - SDL_SCANCODE_L = 15, - SDL_SCANCODE_M = 16, - SDL_SCANCODE_N = 17, - SDL_SCANCODE_O = 18, - SDL_SCANCODE_P = 19, - SDL_SCANCODE_Q = 20, - SDL_SCANCODE_R = 21, - SDL_SCANCODE_S = 22, - SDL_SCANCODE_T = 23, - SDL_SCANCODE_U = 24, - SDL_SCANCODE_V = 25, - SDL_SCANCODE_W = 26, - SDL_SCANCODE_X = 27, - SDL_SCANCODE_Y = 28, - SDL_SCANCODE_Z = 29, - - SDL_SCANCODE_1 = 30, - SDL_SCANCODE_2 = 31, - SDL_SCANCODE_3 = 32, - SDL_SCANCODE_4 = 33, - SDL_SCANCODE_5 = 34, - SDL_SCANCODE_6 = 35, - SDL_SCANCODE_7 = 36, - SDL_SCANCODE_8 = 37, - SDL_SCANCODE_9 = 38, - SDL_SCANCODE_0 = 39, - - SDL_SCANCODE_RETURN = 40, - SDL_SCANCODE_ESCAPE = 41, - SDL_SCANCODE_BACKSPACE = 42, - SDL_SCANCODE_TAB = 43, - SDL_SCANCODE_SPACE = 44, - - SDL_SCANCODE_MINUS = 45, - SDL_SCANCODE_EQUALS = 46, - SDL_SCANCODE_LEFTBRACKET = 47, - SDL_SCANCODE_RIGHTBRACKET = 48, - SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return - * key on ISO keyboards and at the right end - * of the QWERTY row on ANSI keyboards. - * Produces REVERSE SOLIDUS (backslash) and - * VERTICAL LINE in a US layout, REVERSE - * SOLIDUS and VERTICAL LINE in a UK Mac - * layout, NUMBER SIGN and TILDE in a UK - * Windows layout, DOLLAR SIGN and POUND SIGN - * in a Swiss German layout, NUMBER SIGN and - * APOSTROPHE in a German layout, GRAVE - * ACCENT and POUND SIGN in a French Mac - * layout, and ASTERISK and MICRO SIGN in a - * French Windows layout. - */ - SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code - * instead of 49 for the same key, but all - * OSes I've seen treat the two codes - * identically. So, as an implementor, unless - * your keyboard generates both of those - * codes and your OS treats them differently, - * you should generate SDL_SCANCODE_BACKSLASH - * instead of this code. As a user, you - * should not rely on this code because SDL - * will never generate it with most (all?) - * keyboards. - */ - SDL_SCANCODE_SEMICOLON = 51, - SDL_SCANCODE_APOSTROPHE = 52, - SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI - * and ISO keyboards). Produces GRAVE ACCENT and - * TILDE in a US Windows layout and in US and UK - * Mac layouts on ANSI keyboards, GRAVE ACCENT - * and NOT SIGN in a UK Windows layout, SECTION - * SIGN and PLUS-MINUS SIGN in US and UK Mac - * layouts on ISO keyboards, SECTION SIGN and - * DEGREE SIGN in a Swiss German layout (Mac: - * only on ISO keyboards), CIRCUMFLEX ACCENT and - * DEGREE SIGN in a German layout (Mac: only on - * ISO keyboards), SUPERSCRIPT TWO and TILDE in a - * French Windows layout, COMMERCIAL AT and - * NUMBER SIGN in a French Mac layout on ISO - * keyboards, and LESS-THAN SIGN and GREATER-THAN - * SIGN in a Swiss German, German, or French Mac - * layout on ANSI keyboards. - */ - SDL_SCANCODE_COMMA = 54, - SDL_SCANCODE_PERIOD = 55, - SDL_SCANCODE_SLASH = 56, - - SDL_SCANCODE_CAPSLOCK = 57, - - SDL_SCANCODE_F1 = 58, - SDL_SCANCODE_F2 = 59, - SDL_SCANCODE_F3 = 60, - SDL_SCANCODE_F4 = 61, - SDL_SCANCODE_F5 = 62, - SDL_SCANCODE_F6 = 63, - SDL_SCANCODE_F7 = 64, - SDL_SCANCODE_F8 = 65, - SDL_SCANCODE_F9 = 66, - SDL_SCANCODE_F10 = 67, - SDL_SCANCODE_F11 = 68, - SDL_SCANCODE_F12 = 69, - - SDL_SCANCODE_PRINTSCREEN = 70, - SDL_SCANCODE_SCROLLLOCK = 71, - SDL_SCANCODE_PAUSE = 72, - SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but - does send code 73, not 117) */ - SDL_SCANCODE_HOME = 74, - SDL_SCANCODE_PAGEUP = 75, - SDL_SCANCODE_DELETE = 76, - SDL_SCANCODE_END = 77, - SDL_SCANCODE_PAGEDOWN = 78, - SDL_SCANCODE_RIGHT = 79, - SDL_SCANCODE_LEFT = 80, - SDL_SCANCODE_DOWN = 81, - SDL_SCANCODE_UP = 82, - - SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards - */ - SDL_SCANCODE_KP_DIVIDE = 84, - SDL_SCANCODE_KP_MULTIPLY = 85, - SDL_SCANCODE_KP_MINUS = 86, - SDL_SCANCODE_KP_PLUS = 87, - SDL_SCANCODE_KP_ENTER = 88, - SDL_SCANCODE_KP_1 = 89, - SDL_SCANCODE_KP_2 = 90, - SDL_SCANCODE_KP_3 = 91, - SDL_SCANCODE_KP_4 = 92, - SDL_SCANCODE_KP_5 = 93, - SDL_SCANCODE_KP_6 = 94, - SDL_SCANCODE_KP_7 = 95, - SDL_SCANCODE_KP_8 = 96, - SDL_SCANCODE_KP_9 = 97, - SDL_SCANCODE_KP_0 = 98, - SDL_SCANCODE_KP_PERIOD = 99, - - SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO - * keyboards have over ANSI ones, - * located between left shift and Y. - * Produces GRAVE ACCENT and TILDE in a - * US or UK Mac layout, REVERSE SOLIDUS - * (backslash) and VERTICAL LINE in a - * US or UK Windows layout, and - * LESS-THAN SIGN and GREATER-THAN SIGN - * in a Swiss German, German, or French - * layout. */ - SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */ - SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag, - * not a physical key - but some Mac keyboards - * do have a power key. */ - SDL_SCANCODE_KP_EQUALS = 103, - SDL_SCANCODE_F13 = 104, - SDL_SCANCODE_F14 = 105, - SDL_SCANCODE_F15 = 106, - SDL_SCANCODE_F16 = 107, - SDL_SCANCODE_F17 = 108, - SDL_SCANCODE_F18 = 109, - SDL_SCANCODE_F19 = 110, - SDL_SCANCODE_F20 = 111, - SDL_SCANCODE_F21 = 112, - SDL_SCANCODE_F22 = 113, - SDL_SCANCODE_F23 = 114, - SDL_SCANCODE_F24 = 115, - SDL_SCANCODE_EXECUTE = 116, - SDL_SCANCODE_HELP = 117, - SDL_SCANCODE_MENU = 118, - SDL_SCANCODE_SELECT = 119, - SDL_SCANCODE_STOP = 120, - SDL_SCANCODE_AGAIN = 121, /**< redo */ - SDL_SCANCODE_UNDO = 122, - SDL_SCANCODE_CUT = 123, - SDL_SCANCODE_COPY = 124, - SDL_SCANCODE_PASTE = 125, - SDL_SCANCODE_FIND = 126, - SDL_SCANCODE_MUTE = 127, - SDL_SCANCODE_VOLUMEUP = 128, - SDL_SCANCODE_VOLUMEDOWN = 129, -/* not sure whether there's a reason to enable these */ -/* SDL_SCANCODE_LOCKINGCAPSLOCK = 130, */ -/* SDL_SCANCODE_LOCKINGNUMLOCK = 131, */ -/* SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */ - SDL_SCANCODE_KP_COMMA = 133, - SDL_SCANCODE_KP_EQUALSAS400 = 134, - - SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see - footnotes in USB doc */ - SDL_SCANCODE_INTERNATIONAL2 = 136, - SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */ - SDL_SCANCODE_INTERNATIONAL4 = 138, - SDL_SCANCODE_INTERNATIONAL5 = 139, - SDL_SCANCODE_INTERNATIONAL6 = 140, - SDL_SCANCODE_INTERNATIONAL7 = 141, - SDL_SCANCODE_INTERNATIONAL8 = 142, - SDL_SCANCODE_INTERNATIONAL9 = 143, - SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */ - SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */ - SDL_SCANCODE_LANG3 = 146, /**< Katakana */ - SDL_SCANCODE_LANG4 = 147, /**< Hiragana */ - SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */ - SDL_SCANCODE_LANG6 = 149, /**< reserved */ - SDL_SCANCODE_LANG7 = 150, /**< reserved */ - SDL_SCANCODE_LANG8 = 151, /**< reserved */ - SDL_SCANCODE_LANG9 = 152, /**< reserved */ - - SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */ - SDL_SCANCODE_SYSREQ = 154, - SDL_SCANCODE_CANCEL = 155, - SDL_SCANCODE_CLEAR = 156, - SDL_SCANCODE_PRIOR = 157, - SDL_SCANCODE_RETURN2 = 158, - SDL_SCANCODE_SEPARATOR = 159, - SDL_SCANCODE_OUT = 160, - SDL_SCANCODE_OPER = 161, - SDL_SCANCODE_CLEARAGAIN = 162, - SDL_SCANCODE_CRSEL = 163, - SDL_SCANCODE_EXSEL = 164, - - SDL_SCANCODE_KP_00 = 176, - SDL_SCANCODE_KP_000 = 177, - SDL_SCANCODE_THOUSANDSSEPARATOR = 178, - SDL_SCANCODE_DECIMALSEPARATOR = 179, - SDL_SCANCODE_CURRENCYUNIT = 180, - SDL_SCANCODE_CURRENCYSUBUNIT = 181, - SDL_SCANCODE_KP_LEFTPAREN = 182, - SDL_SCANCODE_KP_RIGHTPAREN = 183, - SDL_SCANCODE_KP_LEFTBRACE = 184, - SDL_SCANCODE_KP_RIGHTBRACE = 185, - SDL_SCANCODE_KP_TAB = 186, - SDL_SCANCODE_KP_BACKSPACE = 187, - SDL_SCANCODE_KP_A = 188, - SDL_SCANCODE_KP_B = 189, - SDL_SCANCODE_KP_C = 190, - SDL_SCANCODE_KP_D = 191, - SDL_SCANCODE_KP_E = 192, - SDL_SCANCODE_KP_F = 193, - SDL_SCANCODE_KP_XOR = 194, - SDL_SCANCODE_KP_POWER = 195, - SDL_SCANCODE_KP_PERCENT = 196, - SDL_SCANCODE_KP_LESS = 197, - SDL_SCANCODE_KP_GREATER = 198, - SDL_SCANCODE_KP_AMPERSAND = 199, - SDL_SCANCODE_KP_DBLAMPERSAND = 200, - SDL_SCANCODE_KP_VERTICALBAR = 201, - SDL_SCANCODE_KP_DBLVERTICALBAR = 202, - SDL_SCANCODE_KP_COLON = 203, - SDL_SCANCODE_KP_HASH = 204, - SDL_SCANCODE_KP_SPACE = 205, - SDL_SCANCODE_KP_AT = 206, - SDL_SCANCODE_KP_EXCLAM = 207, - SDL_SCANCODE_KP_MEMSTORE = 208, - SDL_SCANCODE_KP_MEMRECALL = 209, - SDL_SCANCODE_KP_MEMCLEAR = 210, - SDL_SCANCODE_KP_MEMADD = 211, - SDL_SCANCODE_KP_MEMSUBTRACT = 212, - SDL_SCANCODE_KP_MEMMULTIPLY = 213, - SDL_SCANCODE_KP_MEMDIVIDE = 214, - SDL_SCANCODE_KP_PLUSMINUS = 215, - SDL_SCANCODE_KP_CLEAR = 216, - SDL_SCANCODE_KP_CLEARENTRY = 217, - SDL_SCANCODE_KP_BINARY = 218, - SDL_SCANCODE_KP_OCTAL = 219, - SDL_SCANCODE_KP_DECIMAL = 220, - SDL_SCANCODE_KP_HEXADECIMAL = 221, - - SDL_SCANCODE_LCTRL = 224, - SDL_SCANCODE_LSHIFT = 225, - SDL_SCANCODE_LALT = 226, /**< alt, option */ - SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */ - SDL_SCANCODE_RCTRL = 228, - SDL_SCANCODE_RSHIFT = 229, - SDL_SCANCODE_RALT = 230, /**< alt gr, option */ - SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */ - - SDL_SCANCODE_MODE = 257, /**< I'm not sure if this is really not covered - * by any of the above, but since there's a - * special KMOD_MODE for it I'm adding it here - */ - - /* @} *//* Usage page 0x07 */ - - /** - * \name Usage page 0x0C - * - * These values are mapped from usage page 0x0C (USB consumer page). - */ - /* @{ */ - - SDL_SCANCODE_AUDIONEXT = 258, - SDL_SCANCODE_AUDIOPREV = 259, - SDL_SCANCODE_AUDIOSTOP = 260, - SDL_SCANCODE_AUDIOPLAY = 261, - SDL_SCANCODE_AUDIOMUTE = 262, - SDL_SCANCODE_MEDIASELECT = 263, - SDL_SCANCODE_WWW = 264, - SDL_SCANCODE_MAIL = 265, - SDL_SCANCODE_CALCULATOR = 266, - SDL_SCANCODE_COMPUTER = 267, - SDL_SCANCODE_AC_SEARCH = 268, - SDL_SCANCODE_AC_HOME = 269, - SDL_SCANCODE_AC_BACK = 270, - SDL_SCANCODE_AC_FORWARD = 271, - SDL_SCANCODE_AC_STOP = 272, - SDL_SCANCODE_AC_REFRESH = 273, - SDL_SCANCODE_AC_BOOKMARKS = 274, - - /* @} *//* Usage page 0x0C */ - - /** - * \name Walther keys - * - * These are values that Christian Walther added (for mac keyboard?). - */ - /* @{ */ - - SDL_SCANCODE_BRIGHTNESSDOWN = 275, - SDL_SCANCODE_BRIGHTNESSUP = 276, - SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display - switch, video mode switch */ - SDL_SCANCODE_KBDILLUMTOGGLE = 278, - SDL_SCANCODE_KBDILLUMDOWN = 279, - SDL_SCANCODE_KBDILLUMUP = 280, - SDL_SCANCODE_EJECT = 281, - SDL_SCANCODE_SLEEP = 282, - - SDL_SCANCODE_APP1 = 283, - SDL_SCANCODE_APP2 = 284, - - /* @} *//* Walther keys */ - - /* Add any other keys here. */ - - SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes - for array bounds */ -} SDL_Scancode; - -#endif /* _SDL_scancode_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_shape.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_shape.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_shape.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_shape.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_shape_h -#define _SDL_shape_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_surface.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** \file SDL_shape.h - * - * Header file for the shaped window API. - */ - -#define SDL_NONSHAPEABLE_WINDOW -1 -#define SDL_INVALID_SHAPE_ARGUMENT -2 -#define SDL_WINDOW_LACKS_SHAPE -3 - -/** - * \brief Create a window that can be shaped with the specified position, dimensions, and flags. - * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following: - * ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE, - * ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED, - * ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset. - * - * \return The window created, or NULL if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); - -/** - * \brief Return whether the given window is a shaped window. - * - * \param window The window to query for being shaped. - * - * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL. - * \sa SDL_CreateShapedWindow - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window); - -/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */ -typedef enum { - /** \brief The default mode, a binarized alpha cutoff of 1. */ - ShapeModeDefault, - /** \brief A binarized alpha cutoff with a given integer value. */ - ShapeModeBinarizeAlpha, - /** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */ - ShapeModeReverseBinarizeAlpha, - /** \brief A color key is applied. */ - ShapeModeColorKey -} WindowShapeMode; - -#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha) - -/** \brief A union containing parameters for shaped windows. */ -typedef union { - /** \brief a cutoff alpha value for binarization of the window shape's alpha channel. */ - Uint8 binarizationCutoff; - SDL_Color colorKey; -} SDL_WindowShapeParams; - -/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */ -typedef struct SDL_WindowShapeMode { - /** \brief The mode of these window-shape parameters. */ - WindowShapeMode mode; - /** \brief Window-shape parameters. */ - SDL_WindowShapeParams parameters; -} SDL_WindowShapeMode; - -/** - * \brief Set the shape and parameters of a shaped window. - * - * \param window The shaped window whose parameters should be set. - * \param shape A surface encoding the desired shape for the window. - * \param shape_mode The parameters to set for the shaped window. - * - * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on invalid an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW - * if the SDL_Window* given does not reference a valid shaped window. - * - * \sa SDL_WindowShapeMode - * \sa SDL_GetShapedWindowMode. - */ -extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); - -/** - * \brief Get the shape parameters of a shaped window. - * - * \param window The shaped window whose parameters should be retrieved. - * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape. - * - * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode - * data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if - * the SDL_Window* given is a shapeable window currently lacking a shape. - * - * \sa SDL_WindowShapeMode - * \sa SDL_SetWindowShape - */ -extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_shape_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_stdinc.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_stdinc.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_stdinc.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_stdinc.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,405 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_stdinc.h - * - * This is a general header that includes C language support. - */ - -#ifndef _SDL_stdinc_h -#define _SDL_stdinc_h - -#include "SDL_config.h" - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_STDIO_H -#include -#endif -#if defined(STDC_HEADERS) -# include -# include -# include -#else -# if defined(HAVE_STDLIB_H) -# include -# elif defined(HAVE_MALLOC_H) -# include -# endif -# if defined(HAVE_STDDEF_H) -# include -# endif -# if defined(HAVE_STDARG_H) -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#if defined(HAVE_INTTYPES_H) -# include -#elif defined(HAVE_STDINT_H) -# include -#endif -#ifdef HAVE_CTYPE_H -# include -#endif -#ifdef HAVE_MATH_H -# if defined(__WINRT__) -/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on - WinRT. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx - for more information. -*/ -# define _USE_MATH_DEFINES -# endif -# include -#endif -#ifdef HAVE_FLOAT_H -# include -#endif -#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) -# include -#endif - -/** - * The number of elements in an array. - */ -#define SDL_arraysize(array) (sizeof(array)/sizeof(array[0])) -#define SDL_TABLESIZE(table) SDL_arraysize(table) - -/** - * \name Cast operators - * - * Use proper C++ casts when compiled as C++ to be compatible with the option - * -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above). - */ -/* @{ */ -#ifdef __cplusplus -#define SDL_reinterpret_cast(type, expression) reinterpret_cast(expression) -#define SDL_static_cast(type, expression) static_cast(expression) -#define SDL_const_cast(type, expression) const_cast(expression) -#else -#define SDL_reinterpret_cast(type, expression) ((type)(expression)) -#define SDL_static_cast(type, expression) ((type)(expression)) -#define SDL_const_cast(type, expression) ((type)(expression)) -#endif -/* @} *//* Cast operators */ - -/* Define a four character code as a Uint32 */ -#define SDL_FOURCC(A, B, C, D) \ - ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24)) - -/** - * \name Basic data types - */ -/* @{ */ - -typedef enum -{ - SDL_FALSE = 0, - SDL_TRUE = 1 -} SDL_bool; - -/** - * \brief A signed 8-bit integer type. - */ -typedef int8_t Sint8; -/** - * \brief An unsigned 8-bit integer type. - */ -typedef uint8_t Uint8; -/** - * \brief A signed 16-bit integer type. - */ -typedef int16_t Sint16; -/** - * \brief An unsigned 16-bit integer type. - */ -typedef uint16_t Uint16; -/** - * \brief A signed 32-bit integer type. - */ -typedef int32_t Sint32; -/** - * \brief An unsigned 32-bit integer type. - */ -typedef uint32_t Uint32; - -/** - * \brief A signed 64-bit integer type. - */ -typedef int64_t Sint64; -/** - * \brief An unsigned 64-bit integer type. - */ -typedef uint64_t Uint64; - -/* @} *//* Basic data types */ - - -#define SDL_COMPILE_TIME_ASSERT(name, x) \ - typedef int SDL_dummy_ ## name[(x) * 2 - 1] -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1); -SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); -SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); -SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); -SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); -SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); -SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); -SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ -/** \endcond */ - -/* Check to make sure enums are the size of ints, for structure packing. - For both Watcom C/C++ and Borland C/C++ the compiler option that makes - enums having the size of an int must be enabled. - This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11). -*/ - -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__ANDROID__) - /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ -typedef enum -{ - DUMMY_ENUM_VALUE -} SDL_DUMMY_ENUM; - -SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int)); -#endif -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ -/** \endcond */ - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(HAVE_ALLOCA) && !defined(alloca) -# if defined(HAVE_ALLOCA_H) -# include -# elif defined(__GNUC__) -# define alloca __builtin_alloca -# elif defined(_MSC_VER) -# include -# define alloca _alloca -# elif defined(__WATCOMC__) -# include -# elif defined(__BORLANDC__) -# include -# elif defined(__DMC__) -# include -# elif defined(__AIX__) -#pragma alloca -# elif defined(__MRC__) -void *alloca(unsigned); -# else -char *alloca(); -# endif -#endif -#ifdef HAVE_ALLOCA -#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count)) -#define SDL_stack_free(data) -#else -#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count)) -#define SDL_stack_free(data) SDL_free(data) -#endif - -extern DECLSPEC void *SDLCALL SDL_malloc(size_t size); -extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size); -extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size); -extern DECLSPEC void SDLCALL SDL_free(void *mem); - -extern DECLSPEC char *SDLCALL SDL_getenv(const char *name); -extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite); - -extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *)); - -extern DECLSPEC int SDLCALL SDL_abs(int x); - -/* !!! FIXME: these have side effects. You probably shouldn't use them. */ -/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */ -#define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) -#define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) - -extern DECLSPEC int SDLCALL SDL_isdigit(int x); -extern DECLSPEC int SDLCALL SDL_isspace(int x); -extern DECLSPEC int SDLCALL SDL_toupper(int x); -extern DECLSPEC int SDLCALL SDL_tolower(int x); - -extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len); - -#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) -#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) - -/* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */ -SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) -{ -#if defined(__GNUC__) && defined(i386) - int u0, u1, u2; - __asm__ __volatile__ ( - "cld \n\t" - "rep ; stosl \n\t" - : "=&D" (u0), "=&a" (u1), "=&c" (u2) - : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords)) - : "memory" - ); -#else - size_t _n = (dwords + 3) / 4; - Uint32 *_p = SDL_static_cast(Uint32 *, dst); - Uint32 _val = (val); - if (dwords == 0) - return; - switch (dwords % 4) - { - case 0: do { *_p++ = _val; - case 3: *_p++ = _val; - case 2: *_p++ = _val; - case 1: *_p++ = _val; - } while ( --_n ); - } -#endif -} - - -extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len); - -SDL_FORCE_INLINE void *SDL_memcpy4(void *dst, const void *src, size_t dwords) -{ - return SDL_memcpy(dst, src, dwords * 4); -} - -extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, size_t len); -extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); - -extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); -extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen); -extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen); - -extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); -extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen); -extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes); -extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen); -extern DECLSPEC char *SDLCALL SDL_strdup(const char *str); -extern DECLSPEC char *SDLCALL SDL_strrev(char *str); -extern DECLSPEC char *SDLCALL SDL_strupr(char *str); -extern DECLSPEC char *SDLCALL SDL_strlwr(char *str); -extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c); -extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c); -extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle); - -extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix); - -extern DECLSPEC int SDLCALL SDL_atoi(const char *str); -extern DECLSPEC double SDLCALL SDL_atof(const char *str); -extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base); -extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base); -extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base); -extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base); -extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp); - -extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2); -extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen); -extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2); -extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len); - -extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...); -extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap); -extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...); -extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap); - -#ifndef HAVE_M_PI -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327950288 /* pi */ -#endif -#endif - -extern DECLSPEC double SDLCALL SDL_acos(double x); -extern DECLSPEC double SDLCALL SDL_asin(double x); -extern DECLSPEC double SDLCALL SDL_atan(double x); -extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); -extern DECLSPEC double SDLCALL SDL_ceil(double x); -extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); -extern DECLSPEC double SDLCALL SDL_cos(double x); -extern DECLSPEC float SDLCALL SDL_cosf(float x); -extern DECLSPEC double SDLCALL SDL_fabs(double x); -extern DECLSPEC double SDLCALL SDL_floor(double x); -extern DECLSPEC double SDLCALL SDL_log(double x); -extern DECLSPEC double SDLCALL SDL_pow(double x, double y); -extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); -extern DECLSPEC double SDLCALL SDL_sin(double x); -extern DECLSPEC float SDLCALL SDL_sinf(float x); -extern DECLSPEC double SDLCALL SDL_sqrt(double x); - -/* The SDL implementation of iconv() returns these error codes */ -#define SDL_ICONV_ERROR (size_t)-1 -#define SDL_ICONV_E2BIG (size_t)-2 -#define SDL_ICONV_EILSEQ (size_t)-3 -#define SDL_ICONV_EINVAL (size_t)-4 - -/* SDL_iconv_* are now always real symbols/types, not macros or inlined. */ -typedef struct _SDL_iconv_t *SDL_iconv_t; -extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, - const char *fromcode); -extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, - size_t * inbytesleft, char **outbuf, - size_t * outbytesleft); -/** - * This function converts a string between encodings in one pass, returning a - * string that must be freed with SDL_free() or NULL on error. - */ -extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, - const char *fromcode, - const char *inbuf, - size_t inbytesleft); -#define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_stdinc_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_surface.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_surface.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_surface.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_surface.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,503 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_surface.h - * - * Header file for ::SDL_Surface definition and management functions. - */ - -#ifndef _SDL_surface_h -#define _SDL_surface_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_blendmode.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name Surface flags - * - * These are the currently supported flags for the ::SDL_Surface. - * - * \internal - * Used internally (read-only). - */ -/* @{ */ -#define SDL_SWSURFACE 0 /**< Just here for compatibility */ -#define SDL_PREALLOC 0x00000001 /**< Surface uses preallocated memory */ -#define SDL_RLEACCEL 0x00000002 /**< Surface is RLE encoded */ -#define SDL_DONTFREE 0x00000004 /**< Surface is referenced internally */ -/* @} *//* Surface flags */ - -/** - * Evaluates to true if the surface needs to be locked before access. - */ -#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0) - -/** - * \brief A collection of pixels used in software blitting. - * - * \note This structure should be treated as read-only, except for \c pixels, - * which, if not NULL, contains the raw pixel data for the surface. - */ -typedef struct SDL_Surface -{ - Uint32 flags; /**< Read-only */ - SDL_PixelFormat *format; /**< Read-only */ - int w, h; /**< Read-only */ - int pitch; /**< Read-only */ - void *pixels; /**< Read-write */ - - /** Application data associated with the surface */ - void *userdata; /**< Read-write */ - - /** information needed for surfaces requiring locks */ - int locked; /**< Read-only */ - void *lock_data; /**< Read-only */ - - /** clipping information */ - SDL_Rect clip_rect; /**< Read-only */ - - /** info for fast blit mapping to other surfaces */ - struct SDL_BlitMap *map; /**< Private */ - - /** Reference count -- used when freeing surface */ - int refcount; /**< Read-mostly */ -} SDL_Surface; - -/** - * \brief The type of function used for surface blitting functions. - */ -typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect, - struct SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * Allocate and free an RGB surface. - * - * If the depth is 4 or 8 bits, an empty palette is allocated for the surface. - * If the depth is greater than 8 bits, the pixel format is set using the - * flags '[RGB]mask'. - * - * If the function runs out of memory, it will return NULL. - * - * \param flags The \c flags are obsolete and should be set to 0. - * \param width The width in pixels of the surface to create. - * \param height The height in pixels of the surface to create. - * \param depth The depth in bits of the surface to create. - * \param Rmask The red mask of the surface to create. - * \param Gmask The green mask of the surface to create. - * \param Bmask The blue mask of the surface to create. - * \param Amask The alpha mask of the surface to create. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface - (Uint32 flags, int width, int height, int depth, - Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); -extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, - int width, - int height, - int depth, - int pitch, - Uint32 Rmask, - Uint32 Gmask, - Uint32 Bmask, - Uint32 Amask); -extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); - -/** - * \brief Set the palette used by a surface. - * - * \return 0, or -1 if the surface format doesn't use a palette. - * - * \note A single palette can be shared with many surfaces. - */ -extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface, - SDL_Palette * palette); - -/** - * \brief Sets up a surface for directly accessing the pixels. - * - * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write - * to and read from \c surface->pixels, using the pixel format stored in - * \c surface->format. Once you are done accessing the surface, you should - * use SDL_UnlockSurface() to release it. - * - * Not all surfaces require locking. If SDL_MUSTLOCK(surface) evaluates - * to 0, then you can read and write to the surface at any time, and the - * pixel format of the surface will not change. - * - * No operating system or library calls should be made between lock/unlock - * pairs, as critical system locks may be held during this time. - * - * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked. - * - * \sa SDL_UnlockSurface() - */ -extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface); -/** \sa SDL_LockSurface() */ -extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface); - -/** - * Load a surface from a seekable SDL data stream (memory or file). - * - * If \c freesrc is non-zero, the stream will be closed after being read. - * - * The new surface should be freed with SDL_FreeSurface(). - * - * \return the new surface, or NULL if there was an error. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, - int freesrc); - -/** - * Load a surface from a file. - * - * Convenience macro. - */ -#define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1) - -/** - * Save a surface to a seekable SDL data stream (memory or file). - * - * If \c freedst is non-zero, the stream will be closed after being written. - * - * \return 0 if successful or -1 if there was an error. - */ -extern DECLSPEC int SDLCALL SDL_SaveBMP_RW - (SDL_Surface * surface, SDL_RWops * dst, int freedst); - -/** - * Save a surface to a file. - * - * Convenience macro. - */ -#define SDL_SaveBMP(surface, file) \ - SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1) - -/** - * \brief Sets the RLE acceleration hint for a surface. - * - * \return 0 on success, or -1 if the surface is not valid - * - * \note If RLE is enabled, colorkey and alpha blending blits are much faster, - * but the surface must be locked before directly accessing the pixels. - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, - int flag); - -/** - * \brief Sets the color key (transparent pixel) in a blittable surface. - * - * \param surface The surface to update - * \param flag Non-zero to enable colorkey and 0 to disable colorkey - * \param key The transparent pixel in the native surface format - * - * \return 0 on success, or -1 if the surface is not valid - * - * You can pass SDL_RLEACCEL to enable RLE accelerated blits. - */ -extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, - int flag, Uint32 key); - -/** - * \brief Gets the color key (transparent pixel) in a blittable surface. - * - * \param surface The surface to update - * \param key A pointer filled in with the transparent pixel in the native - * surface format - * - * \return 0 on success, or -1 if the surface is not valid or colorkey is not - * enabled. - */ -extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface, - Uint32 * key); - -/** - * \brief Set an additional color value used in blit operations. - * - * \param surface The surface to update. - * \param r The red color value multiplied into blit operations. - * \param g The green color value multiplied into blit operations. - * \param b The blue color value multiplied into blit operations. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_GetSurfaceColorMod() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface, - Uint8 r, Uint8 g, Uint8 b); - - -/** - * \brief Get the additional color value used in blit operations. - * - * \param surface The surface to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceColorMod() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface, - Uint8 * r, Uint8 * g, - Uint8 * b); - -/** - * \brief Set an additional alpha value used in blit operations. - * - * \param surface The surface to update. - * \param alpha The alpha value multiplied into blit operations. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_GetSurfaceAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface, - Uint8 alpha); - -/** - * \brief Get the additional alpha value used in blit operations. - * - * \param surface The surface to query. - * \param alpha A pointer filled in with the current alpha value. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface, - Uint8 * alpha); - -/** - * \brief Set the blend mode used for blit operations. - * - * \param surface The surface to update. - * \param blendMode ::SDL_BlendMode to use for blit blending. - * - * \return 0 on success, or -1 if the parameters are not valid. - * - * \sa SDL_GetSurfaceBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for blit operations. - * - * \param surface The surface to query. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface, - SDL_BlendMode *blendMode); - -/** - * Sets the clipping rectangle for the destination surface in a blit. - * - * If the clip rectangle is NULL, clipping will be disabled. - * - * If the clip rectangle doesn't intersect the surface, the function will - * return SDL_FALSE and blits will be completely clipped. Otherwise the - * function returns SDL_TRUE and blits to the surface will be clipped to - * the intersection of the surface area and the clipping rectangle. - * - * Note that blits are automatically clipped to the edges of the source - * and destination surfaces. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface, - const SDL_Rect * rect); - -/** - * Gets the clipping rectangle for the destination surface in a blit. - * - * \c rect must be a pointer to a valid rectangle which will be filled - * with the correct values. - */ -extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface, - SDL_Rect * rect); - -/** - * Creates a new surface of the specified format, and then copies and maps - * the given surface to it so the blit of the converted surface will be as - * fast as possible. If this function fails, it returns NULL. - * - * The \c flags parameter is passed to SDL_CreateRGBSurface() and has those - * semantics. You can also pass ::SDL_RLEACCEL in the flags parameter and - * SDL will try to RLE accelerate colorkey and alpha blits in the resulting - * surface. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface - (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags); -extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat - (SDL_Surface * src, Uint32 pixel_format, Uint32 flags); - -/** - * \brief Copy a block of pixels of one format to another format - * - * \return 0 on success, or -1 if there was an error - */ -extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, - Uint32 src_format, - const void * src, int src_pitch, - Uint32 dst_format, - void * dst, int dst_pitch); - -/** - * Performs a fast fill of the given rectangle with \c color. - * - * If \c rect is NULL, the whole surface will be filled with \c color. - * - * The color should be a pixel of the format used by the surface, and - * can be generated by the SDL_MapRGB() function. - * - * \return 0 on success, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_FillRect - (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color); -extern DECLSPEC int SDLCALL SDL_FillRects - (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color); - -/** - * Performs a fast blit from the source surface to the destination surface. - * - * This assumes that the source and destination rectangles are - * the same size. If either \c srcrect or \c dstrect are NULL, the entire - * surface (\c src or \c dst) is copied. The final blit rectangles are saved - * in \c srcrect and \c dstrect after all clipping is performed. - * - * \return If the blit is successful, it returns 0, otherwise it returns -1. - * - * The blit function should not be called on a locked surface. - * - * The blit semantics for surfaces with and without blending and colorkey - * are defined as follows: - * \verbatim - RGBA->RGB: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source alpha-channel and per-surface alpha) - SDL_SRCCOLORKEY ignored. - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source color key, ignoring alpha in the - comparison. - - RGB->RGBA: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source per-surface alpha) - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB, set destination alpha to source per-surface alpha value. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source color key. - - RGBA->RGBA: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source alpha-channel and per-surface alpha) - SDL_SRCCOLORKEY ignored. - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy all of RGBA to the destination. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source color key, ignoring alpha in the - comparison. - - RGB->RGB: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source per-surface alpha) - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source color key. - \endverbatim - * - * You should call SDL_BlitSurface() unless you know exactly how SDL - * blitting works internally and how to use the other blit functions. - */ -#define SDL_BlitSurface SDL_UpperBlit - -/** - * This is the public blit function, SDL_BlitSurface(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlit() - */ -extern DECLSPEC int SDLCALL SDL_UpperBlit - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * This is a semi-private blit function and it performs low-level surface - * blitting only. - */ -extern DECLSPEC int SDLCALL SDL_LowerBlit - (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * same pixel format. - * - * \note This function uses a static buffer, and is not thread-safe. - */ -extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src, - const SDL_Rect * srcrect, - SDL_Surface * dst, - const SDL_Rect * dstrect); - -#define SDL_BlitScaled SDL_UpperBlitScaled - -/** - * This is the public scaled blit function, SDL_BlitScaled(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlitScaled() - */ -extern DECLSPEC int SDLCALL SDL_UpperBlitScaled - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * This is a semi-private blit function and it performs low-level surface - * scaled blitting only. - */ -extern DECLSPEC int SDLCALL SDL_LowerBlitScaled - (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_surface_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_system.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_system.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_system.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_system.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,191 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_system.h - * - * Include file for platform specific SDL API functions - */ - -#ifndef _SDL_system_h -#define _SDL_system_h - -#include "SDL_stdinc.h" -#include "SDL_keyboard.h" -#include "SDL_render.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - - -/* Platform specific functions for Windows */ -#ifdef __WIN32__ - -/* Returns the D3D9 adapter index that matches the specified display index. - This adapter index can be passed to IDirect3D9::CreateDevice and controls - on which monitor a full screen application will appear. -*/ -extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex ); - -/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer. - Once you are done using the device, you should release it to avoid a resource leak. - */ -typedef struct IDirect3DDevice9 IDirect3DDevice9; -extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer); - -/* Returns the DXGI Adapter and Output indices for the specified display index. - These can be passed to EnumAdapters and EnumOutputs respectively to get the objects - required to create a DX10 or DX11 device and swap chain. - */ -extern DECLSPEC void SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex ); - -#endif /* __WIN32__ */ - - -/* Platform specific functions for iOS */ -#if defined(__IPHONEOS__) && __IPHONEOS__ - -extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); -extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled); - -#endif /* __IPHONEOS__ */ - - -/* Platform specific functions for Android */ -#if defined(__ANDROID__) && __ANDROID__ - -/* Get the JNI environment for the current thread - This returns JNIEnv*, but the prototype is void* so we don't need jni.h - */ -extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(); - -/* Get the SDL Activity object for the application - This returns jobject, but the prototype is void* so we don't need jni.h - The jobject returned by SDL_AndroidGetActivity is a local reference. - It is the caller's responsibility to properly release it - (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef) - */ -extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(); - -/* See the official Android developer guide for more information: - http://developer.android.com/guide/topics/data/data-storage.html -*/ -#define SDL_ANDROID_EXTERNAL_STORAGE_READ 0x01 -#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02 - -/* Get the path used for internal storage for this application. - This path is unique to your application and cannot be written to - by other applications. - */ -extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(); - -/* Get the current state of external storage, a bitmask of these values: - SDL_ANDROID_EXTERNAL_STORAGE_READ - SDL_ANDROID_EXTERNAL_STORAGE_WRITE - If external storage is currently unavailable, this will return 0. -*/ -extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(); - -/* Get the path used for external storage for this application. - This path is unique to your application, but is public and can be - written to by other applications. - */ -extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(); - -#endif /* __ANDROID__ */ - -/* Platform specific functions for WinRT */ -#if defined(__WINRT__) && __WINRT__ - -/** - * \brief WinRT / Windows Phone path types - */ -typedef enum -{ - /** \brief The installed app's root directory. - Files here are likely to be read-only. */ - SDL_WINRT_PATH_INSTALLED_LOCATION, - - /** \brief The app's local data store. Files may be written here */ - SDL_WINRT_PATH_LOCAL_FOLDER, - - /** \brief The app's roaming data store. Unsupported on Windows Phone. - Files written here may be copied to other machines via a network - connection. - */ - SDL_WINRT_PATH_ROAMING_FOLDER, - - /** \brief The app's temporary data store. Unsupported on Windows Phone. - Files written here may be deleted at any time. */ - SDL_WINRT_PATH_TEMP_FOLDER -} SDL_WinRT_Path; - - -/** - * \brief Retrieves a WinRT defined path on the local file system - * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx - * - * \param pathType The type of path to retrieve. - * \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. - */ -extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType); - -/** - * \brief Retrieves a WinRT defined path on the local file system - * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx - * - * \param pathType The type of path to retrieve. - * \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. - */ -extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); - -#endif /* __WINRT__ */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_system_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_syswm.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_syswm.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_syswm.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_syswm.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,272 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_syswm.h - * - * Include file for SDL custom system window manager hooks. - */ - -#ifndef _SDL_syswm_h -#define _SDL_syswm_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_version.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_syswm.h - * - * Your application has access to a special type of event ::SDL_SYSWMEVENT, - * which contains window-manager specific information and arrives whenever - * an unhandled window event occurs. This event is ignored by default, but - * you can enable it with SDL_EventState(). - */ -#ifdef SDL_PROTOTYPES_ONLY -struct SDL_SysWMinfo; -#else - -#if defined(SDL_VIDEO_DRIVER_WINDOWS) -#define WIN32_LEAN_AND_MEAN -#include -#endif - -#if defined(SDL_VIDEO_DRIVER_WINRT) -#include -#endif - -/* This is the structure for custom window manager events */ -#if defined(SDL_VIDEO_DRIVER_X11) -#if defined(__APPLE__) && defined(__MACH__) -/* conflicts with Quickdraw.h */ -#define Cursor X11Cursor -#endif - -#include -#include - -#if defined(__APPLE__) && defined(__MACH__) -/* matches the re-define above */ -#undef Cursor -#endif - -#endif /* defined(SDL_VIDEO_DRIVER_X11) */ - -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) -#include -#endif - -#if defined(SDL_VIDEO_DRIVER_COCOA) -#ifdef __OBJC__ -#include -#else -typedef struct _NSWindow NSWindow; -#endif -#endif - -#if defined(SDL_VIDEO_DRIVER_UIKIT) -#ifdef __OBJC__ -#include -#else -typedef struct _UIWindow UIWindow; -typedef struct _UIViewController UIViewController; -#endif -#endif - -#if defined(SDL_VIDEO_DRIVER_MIR) -#include -#endif - - -/** - * These are the various supported windowing subsystems - */ -typedef enum -{ - SDL_SYSWM_UNKNOWN, - SDL_SYSWM_WINDOWS, - SDL_SYSWM_X11, - SDL_SYSWM_DIRECTFB, - SDL_SYSWM_COCOA, - SDL_SYSWM_UIKIT, - SDL_SYSWM_WAYLAND, - SDL_SYSWM_MIR, - SDL_SYSWM_WINRT, -} SDL_SYSWM_TYPE; - -/** - * The custom event structure. - */ -struct SDL_SysWMmsg -{ - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union - { -#if defined(SDL_VIDEO_DRIVER_WINDOWS) - struct { - HWND hwnd; /**< The window for the message */ - UINT msg; /**< The type of message */ - WPARAM wParam; /**< WORD message parameter */ - LPARAM lParam; /**< LONG message parameter */ - } win; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) - struct { - XEvent event; - } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) - struct { - DFBEvent event; - } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) - struct - { - /* No Cocoa window events yet */ - } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) - struct - { - /* No UIKit window events yet */ - } uikit; -#endif - /* Can't have an empty union */ - int dummy; - } msg; -}; - -/** - * The custom window manager information structure. - * - * When this structure is returned, it holds information about which - * low level system it is using, and will be one of SDL_SYSWM_TYPE. - */ -struct SDL_SysWMinfo -{ - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union - { -#if defined(SDL_VIDEO_DRIVER_WINDOWS) - struct - { - HWND window; /**< The window handle */ - } win; -#endif -#if defined(SDL_VIDEO_DRIVER_WINRT) - struct - { - IInspectable * window; /**< The WinRT CoreWindow */ - } winrt; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) - struct - { - Display *display; /**< The X11 display */ - Window window; /**< The X11 window */ - } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) - struct - { - IDirectFB *dfb; /**< The directfb main interface */ - IDirectFBWindow *window; /**< The directfb window handle */ - IDirectFBSurface *surface; /**< The directfb client surface */ - } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) - struct - { - NSWindow *window; /* The Cocoa window */ - } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) - struct - { - UIWindow *window; /* The UIKit window */ - } uikit; -#endif -#if defined(SDL_VIDEO_DRIVER_WAYLAND) - struct - { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ - } wl; -#endif -#if defined(SDL_VIDEO_DRIVER_MIR) - struct - { - MirConnection *connection; /**< Mir display server connection */ - MirSurface *surface; /**< Mir surface */ - } mir; -#endif - - /* Can't have an empty union */ - int dummy; - } info; -}; - -#endif /* SDL_PROTOTYPES_ONLY */ - -typedef struct SDL_SysWMinfo SDL_SysWMinfo; - -/* Function prototypes */ -/** - * \brief This function allows access to driver-dependent window information. - * - * \param window The window about which information is being requested - * \param info This structure must be initialized with the SDL version, and is - * then filled in with information about the given window. - * - * \return SDL_TRUE if the function is implemented and the version member of - * the \c info struct is valid, SDL_FALSE otherwise. - * - * You typically use this function like this: - * \code - * SDL_SysWMinfo info; - * SDL_VERSION(&info.version); - * if ( SDL_GetWindowWMInfo(window, &info) ) { ... } - * \endcode - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, - SDL_SysWMinfo * info); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_syswm_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_thread.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_thread.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_thread.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_thread.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_thread_h -#define _SDL_thread_h - -/** - * \file SDL_thread.h - * - * Header for the SDL thread management routines. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -/* Thread synchronization primitives */ -#include "SDL_atomic.h" -#include "SDL_mutex.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* The SDL thread structure, defined in SDL_thread.c */ -struct SDL_Thread; -typedef struct SDL_Thread SDL_Thread; - -/* The SDL thread ID */ -typedef unsigned long SDL_threadID; - -/* Thread local storage ID, 0 is the invalid ID */ -typedef unsigned int SDL_TLSID; - -/** - * The SDL thread priority. - * - * \note On many systems you require special privileges to set high priority. - */ -typedef enum { - SDL_THREAD_PRIORITY_LOW, - SDL_THREAD_PRIORITY_NORMAL, - SDL_THREAD_PRIORITY_HIGH -} SDL_ThreadPriority; - -/** - * The function passed to SDL_CreateThread(). - * It is passed a void* user context parameter and returns an int. - */ -typedef int (SDLCALL * SDL_ThreadFunction) (void *data); - -#if defined(__WIN32__) && !defined(HAVE_LIBC) -/** - * \file SDL_thread.h - * - * We compile SDL into a DLL. This means, that it's the DLL which - * creates a new thread for the calling process with the SDL_CreateThread() - * API. There is a problem with this, that only the RTL of the SDL.DLL will - * be initialized for those threads, and not the RTL of the calling - * application! - * - * To solve this, we make a little hack here. - * - * We'll always use the caller's _beginthread() and _endthread() APIs to - * start a new thread. This way, if it's the SDL.DLL which uses this API, - * then the RTL of SDL.DLL will be used to create the new thread, and if it's - * the application, then the RTL of the application will be used. - * - * So, in short: - * Always use the _beginthread() and _endthread() of the calling runtime - * library! - */ -#define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#include /* This has _beginthread() and _endthread() defined! */ - -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, - unsigned (__stdcall * - func) (void - *), - void *arg, unsigned, - unsigned *threadID); -typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); - -/** - * Create a thread. - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, - pfnSDL_CurrentBeginThread pfnBeginThread, - pfnSDL_CurrentEndThread pfnEndThread); - -/** - * Create a thread. - */ -#if defined(SDL_CreateThread) && SDL_DYNAMIC_API -#undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#endif - -#else - -/** - * Create a thread. - * - * Thread naming is a little complicated: Most systems have very small - * limits for the string length (Haiku has 32 bytes, Linux currently has 16, - * Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll - * have to see what happens with your system's debugger. The name should be - * UTF-8 (but using the naming limits of C identifiers is a better bet). - * There are no requirements for thread naming conventions, so long as the - * string is null-terminated UTF-8, but these guidelines are helpful in - * choosing a name: - * - * http://stackoverflow.com/questions/149932/naming-conventions-for-threads - * - * If a system imposes requirements, SDL will try to munge the string for - * it (truncate, etc), but the original string contents will be available - * from SDL_GetThreadName(). - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); - -#endif - -/** - * Get the thread name, as it was specified in SDL_CreateThread(). - * This function returns a pointer to a UTF-8 string that names the - * specified thread, or NULL if it doesn't have a name. This is internal - * memory, not to be free()'d by the caller, and remains valid until the - * specified thread is cleaned up by SDL_WaitThread(). - */ -extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread); - -/** - * Get the thread identifier for the current thread. - */ -extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void); - -/** - * Get the thread identifier for the specified thread. - * - * Equivalent to SDL_ThreadID() if the specified thread is NULL. - */ -extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread); - -/** - * Set the priority for the current thread - */ -extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority); - -/** - * Wait for a thread to finish. Threads that haven't been detached will - * remain (as a "zombie") until this function cleans them up. Not doing so - * is a resource leak. - * - * Once a thread has been cleaned up through this function, the SDL_Thread - * that references it becomes invalid and should not be referenced again. - * As such, only one thread may call SDL_WaitThread() on another. - * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. - * - * You may not wait on a thread that has been used in a call to - * SDL_DetachThread(). Use either that function or this one, but not - * both, or behavior is undefined. - * - * It is safe to pass NULL to this function; it is a no-op. - */ -extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); - -/** - * A thread may be "detached" to signify that it should not remain until - * another thread has called SDL_WaitThread() on it. Detaching a thread - * is useful for long-running threads that nothing needs to synchronize - * with or further manage. When a detached thread is done, it simply - * goes away. - * - * There is no way to recover the return code of a detached thread. If you - * need this, don't detach the thread and instead use SDL_WaitThread(). - * - * Once a thread is detached, you should usually assume the SDL_Thread isn't - * safe to reference again, as it will become invalid immediately upon - * the detached thread's exit, instead of remaining until someone has called - * SDL_WaitThread() to finally clean it up. As such, don't detach the same - * thread more than once. - * - * If a thread has already exited when passed to SDL_DetachThread(), it will - * stop waiting for a call to SDL_WaitThread() and clean up immediately. - * It is not safe to detach a thread that might be used with SDL_WaitThread(). - * - * You may not call SDL_WaitThread() on a thread that has been detached. - * Use either that function or this one, but not both, or behavior is - * undefined. - * - * It is safe to pass NULL to this function; it is a no-op. - */ -extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread); - -/** - * \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific. - * - * \return The newly created thread local storage identifier, or 0 on error - * - * \code - * static SDL_SpinLock tls_lock; - * static SDL_TLSID thread_local_storage; - * - * void SetMyThreadData(void *value) - * { - * if (!thread_local_storage) { - * SDL_AtomicLock(&tls_lock); - * if (!thread_local_storage) { - * thread_local_storage = SDL_TLSCreate(); - * } - * SDL_AtomicUnLock(&tls_lock); - * } - * SDL_TLSSet(thread_local_storage, value); - * } - * - * void *GetMyThreadData(void) - * { - * return SDL_TLSGet(thread_local_storage); - * } - * \endcode - * - * \sa SDL_TLSGet() - * \sa SDL_TLSSet() - */ -extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void); - -/** - * \brief Get the value associated with a thread local storage ID for the current thread. - * - * \param id The thread local storage ID - * - * \return The value associated with the ID for the current thread, or NULL if no value has been set. - * - * \sa SDL_TLSCreate() - * \sa SDL_TLSSet() - */ -extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id); - -/** - * \brief Set the value associated with a thread local storage ID for the current thread. - * - * \param id The thread local storage ID - * \param value The value to associate with the ID for the current thread - * \param destructor A function called when the thread exits, to free the value. - * - * \return 0 on success, -1 on error - * - * \sa SDL_TLSCreate() - * \sa SDL_TLSGet() - */ -extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void*)); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_thread_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_timer.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_timer.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_timer.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_timer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_timer_h -#define _SDL_timer_h - -/** - * \file SDL_timer.h - * - * Header for the SDL time management routines. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Get the number of milliseconds since the SDL library initialization. - * - * \note This value wraps if the program runs for more than ~49 days. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void); - -/** - * \brief Compare SDL ticks values, and return true if A has passed B - * - * e.g. if you want to wait 100 ms, you could do this: - * Uint32 timeout = SDL_GetTicks() + 100; - * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { - * ... do work until timeout has elapsed - * } - */ -#define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0) - -/** - * \brief Get the current value of the high resolution counter - */ -extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void); - -/** - * \brief Get the count per second of the high resolution counter - */ -extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void); - -/** - * \brief Wait a specified number of milliseconds before returning. - */ -extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms); - -/** - * Function prototype for the timer callback function. - * - * The callback function is passed the current timer interval and returns - * the next timer interval. If the returned value is the same as the one - * passed in, the periodic alarm continues, otherwise a new alarm is - * scheduled. If the callback returns 0, the periodic alarm is cancelled. - */ -typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); - -/** - * Definition of the timer ID type. - */ -typedef int SDL_TimerID; - -/** - * \brief Add a new timer to the pool of timers already running. - * - * \return A timer ID, or NULL when an error occurs. - */ -extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, - SDL_TimerCallback callback, - void *param); - -/** - * \brief Remove a timer knowing its ID. - * - * \return A boolean value indicating success or failure. - * - * \warning It is not safe to remove a timer multiple times. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_timer_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_touch.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_touch.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_touch.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_touch.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_touch.h - * - * Include file for SDL touch event handling. - */ - -#ifndef _SDL_touch_h -#define _SDL_touch_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef Sint64 SDL_TouchID; -typedef Sint64 SDL_FingerID; - -typedef struct SDL_Finger -{ - SDL_FingerID id; - float x; - float y; - float pressure; -} SDL_Finger; - -/* Used as the device ID for mouse events simulated with touch input */ -#define SDL_TOUCH_MOUSEID ((Uint32)-1) - - -/* Function prototypes */ - -/** - * \brief Get the number of registered touch devices. - */ -extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void); - -/** - * \brief Get the touch ID with the given index, or 0 if the index is invalid. - */ -extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index); - -/** - * \brief Get the number of active fingers for a given touch device. - */ -extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID); - -/** - * \brief Get the finger object of the given touch, with the given index. - */ -extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_touch_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_types.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_types.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_types.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_types.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_types.h - * - * \deprecated - */ - -/* DEPRECATED */ -#include "SDL_stdinc.h" diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_version.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_version.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_version.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_version.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_version.h - * - * This header defines the current SDL version. - */ - -#ifndef _SDL_version_h -#define _SDL_version_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Information the version of SDL in use. - * - * Represents the library's version as three levels: major revision - * (increments with massive changes, additions, and enhancements), - * minor revision (increments with backwards-compatible changes to the - * major revision), and patchlevel (increments with fixes to the minor - * revision). - * - * \sa SDL_VERSION - * \sa SDL_GetVersion - */ -typedef struct SDL_version -{ - Uint8 major; /**< major version */ - Uint8 minor; /**< minor version */ - Uint8 patch; /**< update version */ -} SDL_version; - -/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL -*/ -#define SDL_MAJOR_VERSION 2 -#define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 3 - -/** - * \brief Macro to determine SDL version program was compiled against. - * - * This macro fills in a SDL_version structure with the version of the - * library you compiled against. This is determined by what header the - * compiler uses. Note that if you dynamically linked the library, you might - * have a slightly newer or older version at runtime. That version can be - * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), - * is not a macro. - * - * \param x A pointer to a SDL_version struct to initialize. - * - * \sa SDL_version - * \sa SDL_GetVersion - */ -#define SDL_VERSION(x) \ -{ \ - (x)->major = SDL_MAJOR_VERSION; \ - (x)->minor = SDL_MINOR_VERSION; \ - (x)->patch = SDL_PATCHLEVEL; \ -} - -/** - * This macro turns the version numbers into a numeric value: - * \verbatim - (1,2,3) -> (1203) - \endverbatim - * - * This assumes that there will never be more than 100 patchlevels. - */ -#define SDL_VERSIONNUM(X, Y, Z) \ - ((X)*1000 + (Y)*100 + (Z)) - -/** - * This is the version number macro for the current SDL version. - */ -#define SDL_COMPILEDVERSION \ - SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL) - -/** - * This macro will evaluate to true if compiled with SDL at least X.Y.Z. - */ -#define SDL_VERSION_ATLEAST(X, Y, Z) \ - (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) - -/** - * \brief Get the version of SDL that is linked against your program. - * - * If you are linking to SDL dynamically, then it is possible that the - * current version will be different than the version you compiled against. - * This function returns the current version, while SDL_VERSION() is a - * macro that tells you what version you compiled with. - * - * \code - * SDL_version compiled; - * SDL_version linked; - * - * SDL_VERSION(&compiled); - * SDL_GetVersion(&linked); - * printf("We compiled against SDL version %d.%d.%d ...\n", - * compiled.major, compiled.minor, compiled.patch); - * printf("But we linked against SDL version %d.%d.%d.\n", - * linked.major, linked.minor, linked.patch); - * \endcode - * - * This function may be called safely at any time, even before SDL_Init(). - * - * \sa SDL_VERSION - */ -extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver); - -/** - * \brief Get the code revision of SDL that is linked against your program. - * - * Returns an arbitrary string (a hash value) uniquely identifying the - * exact revision of the SDL library in use, and is only useful in comparing - * against other revisions. It is NOT an incrementing number. - */ -extern DECLSPEC const char *SDLCALL SDL_GetRevision(void); - -/** - * \brief Get the revision number of SDL that is linked against your program. - * - * Returns a number uniquely identifying the exact revision of the SDL - * library in use. It is an incrementing number based on commits to - * hg.libsdl.org. - */ -extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_version_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_video.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_video.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Headers/SDL_video.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Headers/SDL_video.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,979 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_video.h - * - * Header file for SDL video functions. - */ - -#ifndef _SDL_video_h -#define _SDL_video_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_surface.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The structure that defines a display mode - * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() - * \sa SDL_GetDesktopDisplayMode() - * \sa SDL_GetCurrentDisplayMode() - * \sa SDL_GetClosestDisplayMode() - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() - */ -typedef struct -{ - Uint32 format; /**< pixel format */ - int w; /**< width */ - int h; /**< height */ - int refresh_rate; /**< refresh rate (or zero for unspecified) */ - void *driverdata; /**< driver-specific data, initialize to 0 */ -} SDL_DisplayMode; - -/** - * \brief The type used to identify a window - * - * \sa SDL_CreateWindow() - * \sa SDL_CreateWindowFrom() - * \sa SDL_DestroyWindow() - * \sa SDL_GetWindowData() - * \sa SDL_GetWindowFlags() - * \sa SDL_GetWindowGrab() - * \sa SDL_GetWindowPosition() - * \sa SDL_GetWindowSize() - * \sa SDL_GetWindowTitle() - * \sa SDL_HideWindow() - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() - * \sa SDL_RaiseWindow() - * \sa SDL_RestoreWindow() - * \sa SDL_SetWindowData() - * \sa SDL_SetWindowFullscreen() - * \sa SDL_SetWindowGrab() - * \sa SDL_SetWindowIcon() - * \sa SDL_SetWindowPosition() - * \sa SDL_SetWindowSize() - * \sa SDL_SetWindowBordered() - * \sa SDL_SetWindowTitle() - * \sa SDL_ShowWindow() - */ -typedef struct SDL_Window SDL_Window; - -/** - * \brief The flags on a window - * - * \sa SDL_GetWindowFlags() - */ -typedef enum -{ - SDL_WINDOW_FULLSCREEN = 0x00000001, /**< fullscreen window */ - SDL_WINDOW_OPENGL = 0x00000002, /**< window usable with OpenGL context */ - SDL_WINDOW_SHOWN = 0x00000004, /**< window is visible */ - SDL_WINDOW_HIDDEN = 0x00000008, /**< window is not visible */ - SDL_WINDOW_BORDERLESS = 0x00000010, /**< no window decoration */ - SDL_WINDOW_RESIZABLE = 0x00000020, /**< window can be resized */ - SDL_WINDOW_MINIMIZED = 0x00000040, /**< window is minimized */ - SDL_WINDOW_MAXIMIZED = 0x00000080, /**< window is maximized */ - SDL_WINDOW_INPUT_GRABBED = 0x00000100, /**< window has grabbed input focus */ - SDL_WINDOW_INPUT_FOCUS = 0x00000200, /**< window has input focus */ - SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */ - SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ), - SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */ - SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000 /**< window should be created in high-DPI mode if supported */ -} SDL_WindowFlags; - -/** - * \brief Used to indicate that you don't care what the window position is. - */ -#define SDL_WINDOWPOS_UNDEFINED_MASK 0x1FFF0000 -#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X) (SDL_WINDOWPOS_UNDEFINED_MASK|(X)) -#define SDL_WINDOWPOS_UNDEFINED SDL_WINDOWPOS_UNDEFINED_DISPLAY(0) -#define SDL_WINDOWPOS_ISUNDEFINED(X) \ - (((X)&0xFFFF0000) == SDL_WINDOWPOS_UNDEFINED_MASK) - -/** - * \brief Used to indicate that the window position should be centered. - */ -#define SDL_WINDOWPOS_CENTERED_MASK 0x2FFF0000 -#define SDL_WINDOWPOS_CENTERED_DISPLAY(X) (SDL_WINDOWPOS_CENTERED_MASK|(X)) -#define SDL_WINDOWPOS_CENTERED SDL_WINDOWPOS_CENTERED_DISPLAY(0) -#define SDL_WINDOWPOS_ISCENTERED(X) \ - (((X)&0xFFFF0000) == SDL_WINDOWPOS_CENTERED_MASK) - -/** - * \brief Event subtype for window events - */ -typedef enum -{ - SDL_WINDOWEVENT_NONE, /**< Never used */ - SDL_WINDOWEVENT_SHOWN, /**< Window has been shown */ - SDL_WINDOWEVENT_HIDDEN, /**< Window has been hidden */ - SDL_WINDOWEVENT_EXPOSED, /**< Window has been exposed and should be - redrawn */ - SDL_WINDOWEVENT_MOVED, /**< Window has been moved to data1, data2 - */ - SDL_WINDOWEVENT_RESIZED, /**< Window has been resized to data1xdata2 */ - SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */ - SDL_WINDOWEVENT_MINIMIZED, /**< Window has been minimized */ - SDL_WINDOWEVENT_MAXIMIZED, /**< Window has been maximized */ - SDL_WINDOWEVENT_RESTORED, /**< Window has been restored to normal size - and position */ - SDL_WINDOWEVENT_ENTER, /**< Window has gained mouse focus */ - SDL_WINDOWEVENT_LEAVE, /**< Window has lost mouse focus */ - SDL_WINDOWEVENT_FOCUS_GAINED, /**< Window has gained keyboard focus */ - SDL_WINDOWEVENT_FOCUS_LOST, /**< Window has lost keyboard focus */ - SDL_WINDOWEVENT_CLOSE /**< The window manager requests that the - window be closed */ -} SDL_WindowEventID; - -/** - * \brief An opaque handle to an OpenGL context. - */ -typedef void *SDL_GLContext; - -/** - * \brief OpenGL configuration attributes - */ -typedef enum -{ - SDL_GL_RED_SIZE, - SDL_GL_GREEN_SIZE, - SDL_GL_BLUE_SIZE, - SDL_GL_ALPHA_SIZE, - SDL_GL_BUFFER_SIZE, - SDL_GL_DOUBLEBUFFER, - SDL_GL_DEPTH_SIZE, - SDL_GL_STENCIL_SIZE, - SDL_GL_ACCUM_RED_SIZE, - SDL_GL_ACCUM_GREEN_SIZE, - SDL_GL_ACCUM_BLUE_SIZE, - SDL_GL_ACCUM_ALPHA_SIZE, - SDL_GL_STEREO, - SDL_GL_MULTISAMPLEBUFFERS, - SDL_GL_MULTISAMPLESAMPLES, - SDL_GL_ACCELERATED_VISUAL, - SDL_GL_RETAINED_BACKING, - SDL_GL_CONTEXT_MAJOR_VERSION, - SDL_GL_CONTEXT_MINOR_VERSION, - SDL_GL_CONTEXT_EGL, - SDL_GL_CONTEXT_FLAGS, - SDL_GL_CONTEXT_PROFILE_MASK, - SDL_GL_SHARE_WITH_CURRENT_CONTEXT, - SDL_GL_FRAMEBUFFER_SRGB_CAPABLE -} SDL_GLattr; - -typedef enum -{ - SDL_GL_CONTEXT_PROFILE_CORE = 0x0001, - SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002, - SDL_GL_CONTEXT_PROFILE_ES = 0x0004 /* GLX_CONTEXT_ES2_PROFILE_BIT_EXT */ -} SDL_GLprofile; - -typedef enum -{ - SDL_GL_CONTEXT_DEBUG_FLAG = 0x0001, - SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002, - SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = 0x0004, - SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = 0x0008 -} SDL_GLcontextFlag; - - -/* Function prototypes */ - -/** - * \brief Get the number of video drivers compiled into SDL - * - * \sa SDL_GetVideoDriver() - */ -extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void); - -/** - * \brief Get the name of a built in video driver. - * - * \note The video drivers are presented in the order in which they are - * normally checked during initialization. - * - * \sa SDL_GetNumVideoDrivers() - */ -extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index); - -/** - * \brief Initialize the video subsystem, optionally specifying a video driver. - * - * \param driver_name Initialize a specific driver by name, or NULL for the - * default video driver. - * - * \return 0 on success, -1 on error - * - * This function initializes the video subsystem; setting up a connection - * to the window manager, etc, and determines the available display modes - * and pixel formats, but does not initialize a window or graphics mode. - * - * \sa SDL_VideoQuit() - */ -extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name); - -/** - * \brief Shuts down the video subsystem. - * - * This function closes all windows, and restores the original video mode. - * - * \sa SDL_VideoInit() - */ -extern DECLSPEC void SDLCALL SDL_VideoQuit(void); - -/** - * \brief Returns the name of the currently initialized video driver. - * - * \return The name of the current video driver or NULL if no driver - * has been initialized - * - * \sa SDL_GetNumVideoDrivers() - * \sa SDL_GetVideoDriver() - */ -extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void); - -/** - * \brief Returns the number of available video displays. - * - * \sa SDL_GetDisplayBounds() - */ -extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void); - -/** - * \brief Get the name of a display in UTF-8 encoding - * - * \return The name of a display, or NULL for an invalid display index. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); - -/** - * \brief Get the desktop area represented by a display, with the primary - * display located at 0,0 - * - * \return 0 on success, or -1 if the index is out of range. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); - -/** - * \brief Returns the number of available display modes. - * - * \sa SDL_GetDisplayMode() - */ -extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex); - -/** - * \brief Fill in information about a specific display mode. - * - * \note The display modes are sorted in this priority: - * \li bits per pixel -> more colors to fewer colors - * \li width -> largest to smallest - * \li height -> largest to smallest - * \li refresh rate -> highest to lowest - * - * \sa SDL_GetNumDisplayModes() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex, - SDL_DisplayMode * mode); - -/** - * \brief Fill in information about the desktop display mode. - */ -extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode); - -/** - * \brief Fill in information about the current display mode. - */ -extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode); - - -/** - * \brief Get the closest match to the requested display mode. - * - * \param displayIndex The index of display from which mode should be queried. - * \param mode The desired display mode - * \param closest A pointer to a display mode to be filled in with the closest - * match of the available display modes. - * - * \return The passed in value \c closest, or NULL if no matching video mode - * was available. - * - * The available display modes are scanned, and \c closest is filled in with the - * closest mode matching the requested mode and returned. The mode format and - * refresh_rate default to the desktop mode if they are 0. The modes are - * scanned with size being first priority, format being second priority, and - * finally checking the refresh_rate. If all the available modes are too - * small, then NULL is returned. - * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() - */ -extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest); - -/** - * \brief Get the display index associated with a window. - * - * \return the display index of the display containing the center of the - * window, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window); - -/** - * \brief Set the display mode used when a fullscreen window is visible. - * - * By default the window's dimensions and the desktop format and refresh rate - * are used. - * - * \param window The window for which the display mode should be set. - * \param mode The mode to use, or NULL for the default mode. - * - * \return 0 on success, or -1 if setting the display mode failed. - * - * \sa SDL_GetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window, - const SDL_DisplayMode - * mode); - -/** - * \brief Fill in information about the display mode used when a fullscreen - * window is visible. - * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() - */ -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window, - SDL_DisplayMode * mode); - -/** - * \brief Get the pixel format associated with the window. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); - -/** - * \brief Create a window with the specified position, dimensions, and flags. - * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of any of the following: - * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_ALLOW_HIGHDPI. - * - * \return The id of the window created, or zero if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, - int x, int y, int w, - int h, Uint32 flags); - -/** - * \brief Create an SDL window from an existing native window. - * - * \param data A pointer to driver-dependent window creation data - * - * \return The id of the window created, or zero if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data); - -/** - * \brief Get the numeric ID of a window, for logging purposes. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window); - -/** - * \brief Get a window from a stored ID, or NULL if it doesn't exist. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id); - -/** - * \brief Get the window flags. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window); - -/** - * \brief Set the title of a window, in UTF-8 format. - * - * \sa SDL_GetWindowTitle() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window, - const char *title); - -/** - * \brief Get the title of a window, in UTF-8 format. - * - * \sa SDL_SetWindowTitle() - */ -extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window); - -/** - * \brief Set the icon for a window. - * - * \param window The window for which the icon should be set. - * \param icon The icon for the window. - */ -extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window, - SDL_Surface * icon); - -/** - * \brief Associate an arbitrary named pointer with a window. - * - * \param window The window to associate with the pointer. - * \param name The name of the pointer. - * \param userdata The associated pointer. - * - * \return The previous value associated with 'name' - * - * \note The name is case-sensitive. - * - * \sa SDL_GetWindowData() - */ -extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window, - const char *name, - void *userdata); - -/** - * \brief Retrieve the data pointer associated with a window. - * - * \param window The window to query. - * \param name The name of the pointer. - * - * \return The value associated with 'name' - * - * \sa SDL_SetWindowData() - */ -extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, - const char *name); - -/** - * \brief Set the position of a window. - * - * \param window The window to reposition. - * \param x The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * - * \note The window coordinate origin is the upper left of the display. - * - * \sa SDL_GetWindowPosition() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, - int x, int y); - -/** - * \brief Get the position of a window. - * - * \param window The window to query. - * \param x Pointer to variable for storing the x position, may be NULL - * \param y Pointer to variable for storing the y position, may be NULL - * - * \sa SDL_SetWindowPosition() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, - int *x, int *y); - -/** - * \brief Set the size of a window's client area. - * - * \param window The window to resize. - * \param w The width of the window, must be >0 - * \param h The height of the window, must be >0 - * - * \note You can't change the size of a fullscreen window, it automatically - * matches the size of the display mode. - * - * \sa SDL_GetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, - int h); - -/** - * \brief Get the size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL - * - * \sa SDL_SetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, - int *h); - -/** - * \brief Set the minimum size of a window's client area. - * - * \param window The window to set a new minimum size. - * \param min_w The minimum width of the window, must be >0 - * \param min_h The minimum height of the window, must be >0 - * - * \note You can't change the minimum size of a fullscreen window, it - * automatically matches the size of the display mode. - * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window, - int min_w, int min_h); - -/** - * \brief Get the minimum size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the minimum width, may be NULL - * \param h Pointer to variable for storing the minimum height, may be NULL - * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window, - int *w, int *h); - -/** - * \brief Set the maximum size of a window's client area. - * - * \param window The window to set a new maximum size. - * \param max_w The maximum width of the window, must be >0 - * \param max_h The maximum height of the window, must be >0 - * - * \note You can't change the maximum size of a fullscreen window, it - * automatically matches the size of the display mode. - * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window, - int max_w, int max_h); - -/** - * \brief Get the maximum size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the maximum width, may be NULL - * \param h Pointer to variable for storing the maximum height, may be NULL - * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window, - int *w, int *h); - -/** - * \brief Set the border state of a window. - * - * This will add or remove the window's SDL_WINDOW_BORDERLESS flag and - * add or remove the border from the actual window. This is a no-op if the - * window's border already matches the requested state. - * - * \param window The window of which to change the border state. - * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border. - * - * \note You can't change the border state of a fullscreen window. - * - * \sa SDL_GetWindowFlags() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window, - SDL_bool bordered); - -/** - * \brief Show a window. - * - * \sa SDL_HideWindow() - */ -extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window); - -/** - * \brief Hide a window. - * - * \sa SDL_ShowWindow() - */ -extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window); - -/** - * \brief Raise a window above other windows and set the input focus. - */ -extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window); - -/** - * \brief Make a window as large as possible. - * - * \sa SDL_RestoreWindow() - */ -extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window); - -/** - * \brief Minimize a window to an iconic representation. - * - * \sa SDL_RestoreWindow() - */ -extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window); - -/** - * \brief Restore the size and position of a minimized or maximized window. - * - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() - */ -extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window); - -/** - * \brief Set a window's fullscreen state. - * - * \return 0 on success, or -1 if setting the display mode failed. - * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window, - Uint32 flags); - -/** - * \brief Get the SDL surface associated with the window. - * - * \return The window's framebuffer surface, or NULL on error. - * - * A new surface will be created with the optimal format for the window, - * if necessary. This surface will be freed when the window is destroyed. - * - * \note You may not combine this with 3D or the rendering API on this window. - * - * \sa SDL_UpdateWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() - */ -extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window); - -/** - * \brief Copy the window surface to the screen. - * - * \return 0 on success, or -1 on error. - * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() - */ -extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window); - -/** - * \brief Copy a number of rectangles on the window surface to the screen. - * - * \return 0 on success, or -1 on error. - * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRect() - */ -extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window, - const SDL_Rect * rects, - int numrects); - -/** - * \brief Set a window's input grab mode. - * - * \param window The window for which the input grab mode should be set. - * \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input. - * - * \sa SDL_GetWindowGrab() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, - SDL_bool grabbed); - -/** - * \brief Get a window's input grab mode. - * - * \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise. - * - * \sa SDL_SetWindowGrab() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window); - -/** - * \brief Set the brightness (gamma correction) for a window. - * - * \return 0 on success, or -1 if setting the brightness isn't supported. - * - * \sa SDL_GetWindowBrightness() - * \sa SDL_SetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness); - -/** - * \brief Get the brightness (gamma correction) for a window. - * - * \return The last brightness value passed to SDL_SetWindowBrightness() - * - * \sa SDL_SetWindowBrightness() - */ -extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window); - -/** - * \brief Set the gamma ramp for a window. - * - * \param window The window for which the gamma ramp should be set. - * \param red The translation table for the red channel, or NULL. - * \param green The translation table for the green channel, or NULL. - * \param blue The translation table for the blue channel, or NULL. - * - * \return 0 on success, or -1 if gamma ramps are unsupported. - * - * Set the gamma translation table for the red, green, and blue channels - * of the video hardware. Each table is an array of 256 16-bit quantities, - * representing a mapping between the input and output for that channel. - * The input is the index into the array, and the output is the 16-bit - * gamma value at that index, scaled to the output color precision. - * - * \sa SDL_GetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, - const Uint16 * red, - const Uint16 * green, - const Uint16 * blue); - -/** - * \brief Get the gamma ramp for a window. - * - * \param window The window from which the gamma ramp should be queried. - * \param red A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the red channel, or NULL. - * \param green A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the green channel, or NULL. - * \param blue A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the blue channel, or NULL. - * - * \return 0 on success, or -1 if gamma ramps are unsupported. - * - * \sa SDL_SetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, - Uint16 * red, - Uint16 * green, - Uint16 * blue); - -/** - * \brief Destroy a window. - */ -extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window); - - -/** - * \brief Returns whether the screensaver is currently enabled (default on). - * - * \sa SDL_EnableScreenSaver() - * \sa SDL_DisableScreenSaver() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void); - -/** - * \brief Allow the screen to be blanked by a screensaver - * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_DisableScreenSaver() - */ -extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void); - -/** - * \brief Prevent the screen from being blanked by a screensaver - * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_EnableScreenSaver() - */ -extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); - - -/** - * \name OpenGL support functions - */ -/* @{ */ - -/** - * \brief Dynamically load an OpenGL library. - * - * \param path The platform dependent OpenGL library name, or NULL to open the - * default OpenGL library. - * - * \return 0 on success, or -1 if the library couldn't be loaded. - * - * This should be done after initializing the video driver, but before - * creating any OpenGL windows. If no OpenGL library is loaded, the default - * library will be loaded upon creation of the first OpenGL window. - * - * \note If you do this, you need to retrieve all of the GL functions used in - * your program from the dynamic library using SDL_GL_GetProcAddress(). - * - * \sa SDL_GL_GetProcAddress() - * \sa SDL_GL_UnloadLibrary() - */ -extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path); - -/** - * \brief Get the address of an OpenGL function. - */ -extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc); - -/** - * \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). - * - * \sa SDL_GL_LoadLibrary() - */ -extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void); - -/** - * \brief Return true if an OpenGL extension is supported for the current - * context. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char - *extension); - -/** - * \brief Reset all previously set OpenGL context attributes to their default values - */ -extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void); - -/** - * \brief Set an OpenGL window attribute before window creation. - */ -extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value); - -/** - * \brief Get the actual value for an attribute from the current context. - */ -extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value); - -/** - * \brief Create an OpenGL context for use with an OpenGL window, and make it - * current. - * - * \sa SDL_GL_DeleteContext() - */ -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window * - window); - -/** - * \brief Set up an OpenGL context for rendering into an OpenGL window. - * - * \note The context must have been created with a compatible window. - */ -extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window, - SDL_GLContext context); - -/** - * \brief Get the currently active OpenGL window. - */ -extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); - -/** - * \brief Get the currently active OpenGL context. - */ -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); - -/** - * \brief Get the size of a window's underlying drawable (for use with glViewport). - * - * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL - * - * This may differ from SDL_GetWindowSize if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. - * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() - */ -extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w, - int *h); - -/** - * \brief Set the swap interval for the current OpenGL context. - * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical retrace. If the system supports it, you may - * specify -1 to allow late swaps to happen immediately - * instead of waiting for the next retrace. - * - * \return 0 on success, or -1 if setting the swap interval is not supported. - * - * \sa SDL_GL_GetSwapInterval() - */ -extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval); - -/** - * \brief Get the swap interval for the current OpenGL context. - * - * \return 0 if there is no vertical retrace synchronization, 1 if the buffer - * swap is synchronized with the vertical retrace, and -1 if late - * swaps happen immediately instead of waiting for the next retrace. - * If the system can't determine the swap interval, or there isn't a - * valid current context, this will return 0 as a safe default. - * - * \sa SDL_GL_SetSwapInterval() - */ -extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void); - -/** - * \brief Swap the OpenGL buffers for a window, if double-buffering is - * supported. - */ -extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window); - -/** - * \brief Delete an OpenGL context. - * - * \sa SDL_GL_CreateContext() - */ -extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); - -/* @} *//* OpenGL support functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Resources/Info.plist projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Resources/Info.plist --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Resources/Info.plist 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Resources/Info.plist 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ - - - - - BuildMachineOSBuild - 13C64 - CFBundleDevelopmentRegion - English - CFBundleExecutable - SDL2 - CFBundleGetInfoString - http://www.libsdl.org - CFBundleIdentifier - org.libsdl.SDL2 - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Simple DirectMedia Layer - CFBundlePackageType - FMWK - CFBundleShortVersionString - 2.0.3 - CFBundleSignature - SDLX - CFBundleVersion - 2.0.3 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 5A3005 - DTPlatformVersion - GM - DTSDKBuild - 13A595 - DTSDKName - macosx10.9 - DTXcode - 0502 - DTXcodeBuild - 5A3005 - - Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/SDL2 and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-emscripten/SDL2.framework/SDL2 differ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/_CodeSignature/CodeResources projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/_CodeSignature/CodeResources --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/_CodeSignature/CodeResources 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/_CodeSignature/CodeResources 1970-01-01 00:00:00.000000000 +0000 @@ -1,331 +0,0 @@ - - - - - files - - Resources/Info.plist - - d2/oGv37hzJiI02uqOn6tWDcYXg= - - - files2 - - Headers/SDL.h - - V1QWaDSl0nAm0vEYtj9XA3svgrk= - - Headers/SDL_assert.h - - A+ij0rtxdGfk7gc8R6s49k/JSZ4= - - Headers/SDL_atomic.h - - ZlwmoTPRbjyEzJqz6ZnI8O580bM= - - Headers/SDL_audio.h - - Fc9yNvRkakypgT4OZITeQo0sBxQ= - - Headers/SDL_bits.h - - UhPqnEjilCrF8s0HOGP7w5NLnSk= - - Headers/SDL_blendmode.h - - spiBz2bCXIHQJcL3NDs68kAbdA4= - - Headers/SDL_clipboard.h - - NzFBzlIVdDwe6BR6AqXDiR1YTz4= - - Headers/SDL_config.h - - 6UxefSe2Tl+lPT67U1Ux+W+oKIE= - - Headers/SDL_config_macosx.h - - CmgvosArIWjXlCODdGchorpVIQE= - - Headers/SDL_copying.h - - OvmsdAuQcE2bg1R1H0fOMp5/qRQ= - - Headers/SDL_cpuinfo.h - - j391ZF8LcaMfyzF1UXrldg8a7ho= - - Headers/SDL_endian.h - - p99jInDkUdRwbqec59eOp/GQ4rU= - - Headers/SDL_error.h - - ag6f/Hm+13QrR9p07cju5XbKvSE= - - Headers/SDL_events.h - - 0k79XbDGCX7yxKi/mty+869GbIc= - - Headers/SDL_filesystem.h - - 3wT4lJaVKpbsNWiM44VbPz8WHt4= - - Headers/SDL_gamecontroller.h - - F+/ctfs6RZGvLHmQIS9smmc0Xik= - - Headers/SDL_gesture.h - - 8wiTqdK35saUqErjOvlXivTiXVk= - - Headers/SDL_haptic.h - - oa68FWhNliE7F2tz3N5hJQzUxZU= - - Headers/SDL_hints.h - - uq66WfAIC63c4YdZj47y0l+gxgI= - - Headers/SDL_joystick.h - - 2vEN7qvUBuqvc/0fhBnGupEuY/I= - - Headers/SDL_keyboard.h - - XvF3ZIyOD54CoemusEc0wg8sLIQ= - - Headers/SDL_keycode.h - - qxtvZLZ+BOAWk9XvBB8ywRLrbJI= - - Headers/SDL_loadso.h - - tzkBoa1ccEUEs6EQoqFD+y59G9s= - - Headers/SDL_log.h - - 5+u+5Ws0ERngj9djx3aZEPNvOiw= - - Headers/SDL_main.h - - 5wmi6gkUFkpi5p65kKHH9Hb5Jrc= - - Headers/SDL_messagebox.h - - gAGlr7m3thQnx4wyzAaLZAMmJ4k= - - Headers/SDL_mouse.h - - Ga3nAm990weBvd0CkIvRVUkiFC0= - - Headers/SDL_mutex.h - - iPyVkuP4RrNbMUVEKvE35l9OrqQ= - - Headers/SDL_name.h - - 78vt0/b4lhJtAs7LthA9zGgvAeM= - - Headers/SDL_opengl.h - - UXQS2AWZNWQoyMC/DBJWHQNE3lY= - - Headers/SDL_opengles.h - - 9HDT4VHcWQHLcr8mRN/zQAxIwaY= - - Headers/SDL_opengles2.h - - 4GQ4IpKTxOxwxDXdTOwDGKiyfcI= - - Headers/SDL_pixels.h - - 38AJ5fWTwkPLu6JAG6tnzA1phQw= - - Headers/SDL_platform.h - - 7xpqeGpv91l0wCzOtEZZJx/XISY= - - Headers/SDL_power.h - - WDdEpBEDv/GnPdkf7epZKqzcf0Q= - - Headers/SDL_quit.h - - 4mMscyp/+n+3UUqr7x584Efy4LM= - - Headers/SDL_rect.h - - zUUib0allCqvVaRE3U+zoTjKWtM= - - Headers/SDL_render.h - - aeK6wmYO+oEwbiT+nweUdM5xXCY= - - Headers/SDL_revision.h - - BAH0o/ZreMGrmdBWnxc1nqmA1kU= - - Headers/SDL_rwops.h - - 355p5zkvsqZOPmYPLeWG+5SyupU= - - Headers/SDL_scancode.h - - INF4sgKOGtCULJnJCOokJHtR5XI= - - Headers/SDL_shape.h - - Xfr+F9W53TRs1xmQmetWSqr5J80= - - Headers/SDL_stdinc.h - - cYfn4UFpzaPnYpdyouDJu9cOVMA= - - Headers/SDL_surface.h - - IvWIDZA3/njVjOeUGPOCI1TgtYk= - - Headers/SDL_system.h - - AiH00EpXgPKdhet2G4xcmcH/ksM= - - Headers/SDL_syswm.h - - EWVOWAWmIEwtelxbObXBFBjeAhs= - - Headers/SDL_thread.h - - 6c/SdVyJYzPCpc9VReC4M2mkHsU= - - Headers/SDL_timer.h - - qRaDucrtFMo0wi2Ht1asTXT1KzQ= - - Headers/SDL_touch.h - - GuFayLe8ckqQ9fDTywrbkDqalF8= - - Headers/SDL_types.h - - cI11mHss4ZMZRb+tcavcqvyGyMU= - - Headers/SDL_version.h - - E+9SX+Ras/OOKs+Hx3Qqg9OmSJo= - - Headers/SDL_video.h - - 5JajflSoR/g19DlcFCyjlnc/11U= - - Headers/begin_code.h - - G/sTX6v+h2gKPdH8ly0VNFG9bH0= - - Headers/close_code.h - - +wrOrAXurJ3oZCk/811bnw6AHrc= - - Resources/Info.plist - - d2/oGv37hzJiI02uqOn6tWDcYXg= - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/begin_code.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/begin_code.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/begin_code.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/begin_code.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file begin_code.h - * - * This file sets things up for C dynamic library function definitions, - * static inlined functions, and structures aligned at 4-byte alignment. - * If you don't like ugly C preprocessor code, don't look at this file. :) - */ - -/* This shouldn't be nested -- included it around code only. */ -#ifdef _begin_code_h -#error Nested inclusion of begin_code.h -#endif -#define _begin_code_h - -#ifndef SDL_DEPRECATED -# if (__GNUC__ >= 4) /* technically, this arrived in gcc 3.1, but oh well. */ -# define SDL_DEPRECATED __attribute__((deprecated)) -# else -# define SDL_DEPRECATED -# endif -#endif - -/* Some compilers use a special export keyword */ -#ifndef DECLSPEC -# if defined(__WIN32__) || defined(__WINRT__) -# ifdef __BORLANDC__ -# ifdef BUILD_SDL -# define DECLSPEC -# else -# define DECLSPEC __declspec(dllimport) -# endif -# else -# define DECLSPEC __declspec(dllexport) -# endif -# else -# if defined(__GNUC__) && __GNUC__ >= 4 -# define DECLSPEC __attribute__ ((visibility("default"))) -# elif defined(__GNUC__) && __GNUC__ >= 2 -# define DECLSPEC __declspec(dllexport) -# else -# define DECLSPEC -# endif -# endif -#endif - -/* By default SDL uses the C calling convention */ -#ifndef SDLCALL -#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__) -#define SDLCALL __cdecl -#else -#define SDLCALL -#endif -#endif /* SDLCALL */ - -/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */ -#ifdef __SYMBIAN32__ -#undef DECLSPEC -#define DECLSPEC -#endif /* __SYMBIAN32__ */ - -/* Force structure packing at 4 byte alignment. - This is necessary if the header is included in code which has structure - packing set to an alternate value, say for loading structures from disk. - The packing is reset to the previous value in close_code.h - */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) -#ifdef _MSC_VER -#pragma warning(disable: 4103) -#endif -#ifdef __BORLANDC__ -#pragma nopackwarning -#endif -#ifdef _M_X64 -/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */ -#pragma pack(push,8) -#else -#pragma pack(push,4) -#endif -#endif /* Compiler needs structure packing set */ - -#ifndef SDL_INLINE -#if defined(__GNUC__) -#define SDL_INLINE __inline__ -#elif defined(_MSC_VER) || defined(__BORLANDC__) || \ - defined(__DMC__) || defined(__SC__) || \ - defined(__WATCOMC__) || defined(__LCC__) || \ - defined(__DECC) -#define SDL_INLINE __inline -#ifndef __inline__ -#define __inline__ __inline -#endif -#else -#define SDL_INLINE inline -#ifndef __inline__ -#define __inline__ inline -#endif -#endif -#endif /* SDL_INLINE not defined */ - -#ifndef SDL_FORCE_INLINE -#if defined(_MSC_VER) -#define SDL_FORCE_INLINE __forceinline -#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) ) -#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__ -#else -#define SDL_FORCE_INLINE static SDL_INLINE -#endif -#endif /* SDL_FORCE_INLINE not defined */ - -/* Apparently this is needed by several Windows compilers */ -#if !defined(__MACH__) -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif /* NULL */ -#endif /* ! Mac OS X - breaks precompiled headers */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/close_code.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/close_code.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/close_code.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/close_code.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file close_code.h - * - * This file reverses the effects of begin_code.h and should be included - * after you finish any function and structure declarations in your headers - */ - -#undef _begin_code_h - -/* Reset structure packing at previous byte alignment */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__) || defined(__BORLANDC__) -#ifdef __BORLANDC__ -#pragma nopackwarning -#endif -#pragma pack(pop) -#endif /* Compiler needs structure packing set */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_assert.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_assert.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_assert.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_assert.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_assert_h -#define _SDL_assert_h - -#include "SDL_config.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef SDL_ASSERT_LEVEL -#ifdef SDL_DEFAULT_ASSERT_LEVEL -#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL -#elif defined(_DEBUG) || defined(DEBUG) || \ - (defined(__GNUC__) && !defined(__OPTIMIZE__)) -#define SDL_ASSERT_LEVEL 2 -#else -#define SDL_ASSERT_LEVEL 1 -#endif -#endif /* SDL_ASSERT_LEVEL */ - -/* -These are macros and not first class functions so that the debugger breaks -on the assertion line and not in some random guts of SDL, and so each -assert can have unique static variables associated with it. -*/ - -#if defined(_MSC_VER) -/* Don't include intrin.h here because it contains C++ code */ - extern void __cdecl __debugbreak(void); - #define SDL_TriggerBreakpoint() __debugbreak() -#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) - #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) -#elif defined(HAVE_SIGNAL_H) - #include - #define SDL_TriggerBreakpoint() raise(SIGTRAP) -#else - /* How do we trigger breakpoints on this platform? */ - #define SDL_TriggerBreakpoint() -#endif - -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */ -# define SDL_FUNCTION __func__ -#elif ((__GNUC__ >= 2) || defined(_MSC_VER)) -# define SDL_FUNCTION __FUNCTION__ -#else -# define SDL_FUNCTION "???" -#endif -#define SDL_FILE __FILE__ -#define SDL_LINE __LINE__ - -/* -sizeof (x) makes the compiler still parse the expression even without -assertions enabled, so the code is always checked at compile time, but -doesn't actually generate code for it, so there are no side effects or -expensive checks at run time, just the constant size of what x WOULD be, -which presumably gets optimized out as unused. -This also solves the problem of... - - int somevalue = blah(); - SDL_assert(somevalue == 1); - -...which would cause compiles to complain that somevalue is unused if we -disable assertions. -*/ - -#ifdef _MSC_VER /* stupid /W4 warnings. */ -#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__) -#else -#define SDL_NULL_WHILE_LOOP_CONDITION (0) -#endif - -#define SDL_disabled_assert(condition) \ - do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION) - -typedef enum -{ - SDL_ASSERTION_RETRY, /**< Retry the assert immediately. */ - SDL_ASSERTION_BREAK, /**< Make the debugger trigger a breakpoint. */ - SDL_ASSERTION_ABORT, /**< Terminate the program. */ - SDL_ASSERTION_IGNORE, /**< Ignore the assert. */ - SDL_ASSERTION_ALWAYS_IGNORE /**< Ignore the assert from now on. */ -} SDL_assert_state; - -typedef struct SDL_assert_data -{ - int always_ignore; - unsigned int trigger_count; - const char *condition; - const char *filename; - int linenum; - const char *function; - const struct SDL_assert_data *next; -} SDL_assert_data; - -#if (SDL_ASSERT_LEVEL > 0) - -/* Never call this directly. Use the SDL_assert* macros. */ -extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *, - const char *, - const char *, int) -#if defined(__clang__) -#if __has_feature(attribute_analyzer_noreturn) -/* this tells Clang's static analysis that we're a custom assert function, - and that the analyzer should assume the condition was always true past this - SDL_assert test. */ - __attribute__((analyzer_noreturn)) -#endif -#endif -; - -/* the do {} while(0) avoids dangling else problems: - if (x) SDL_assert(y); else blah(); - ... without the do/while, the "else" could attach to this macro's "if". - We try to handle just the minimum we need here in a macro...the loop, - the static vars, and break points. The heavy lifting is handled in - SDL_ReportAssertion(), in SDL_assert.c. -*/ -#define SDL_enabled_assert(condition) \ - do { \ - while ( !(condition) ) { \ - static struct SDL_assert_data assert_data = { \ - 0, 0, #condition, 0, 0, 0, 0 \ - }; \ - const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \ - SDL_FUNCTION, \ - SDL_FILE, \ - SDL_LINE); \ - if (state == SDL_ASSERTION_RETRY) { \ - continue; /* go again. */ \ - } else if (state == SDL_ASSERTION_BREAK) { \ - SDL_TriggerBreakpoint(); \ - } \ - break; /* not retrying. */ \ - } \ - } while (SDL_NULL_WHILE_LOOP_CONDITION) - -#endif /* enabled assertions support code */ - -/* Enable various levels of assertions. */ -#if SDL_ASSERT_LEVEL == 0 /* assertions disabled */ -# define SDL_assert(condition) SDL_disabled_assert(condition) -# define SDL_assert_release(condition) SDL_disabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 1 /* release settings. */ -# define SDL_assert(condition) SDL_disabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 2 /* normal settings. */ -# define SDL_assert(condition) SDL_enabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 3 /* paranoid settings. */ -# define SDL_assert(condition) SDL_enabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_enabled_assert(condition) -#else -# error Unknown assertion level. -#endif - -/* this assertion is never disabled at any level. */ -#define SDL_assert_always(condition) SDL_enabled_assert(condition) - - -typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)( - const SDL_assert_data* data, void* userdata); - -/** - * \brief Set an application-defined assertion handler. - * - * This allows an app to show its own assertion UI and/or force the - * response to an assertion failure. If the app doesn't provide this, SDL - * will try to do the right thing, popping up a system-specific GUI dialog, - * and probably minimizing any fullscreen windows. - * - * This callback may fire from any thread, but it runs wrapped in a mutex, so - * it will only fire from one thread at a time. - * - * Setting the callback to NULL restores SDL's original internal handler. - * - * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! - * - * \return SDL_assert_state value of how to handle the assertion failure. - * - * \param handler Callback function, called when an assertion fails. - * \param userdata A pointer passed to the callback as-is. - */ -extern DECLSPEC void SDLCALL SDL_SetAssertionHandler( - SDL_AssertionHandler handler, - void *userdata); - -/** - * \brief Get the default assertion handler. - * - * This returns the function pointer that is called by default when an - * assertion is triggered. This is an internal function provided by SDL, - * that is used for assertions when SDL_SetAssertionHandler() hasn't been - * used to provide a different function. - * - * \return The default SDL_AssertionHandler that is called when an assert triggers. - */ -extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void); - -/** - * \brief Get the current assertion handler. - * - * This returns the function pointer that is called when an assertion is - * triggered. This is either the value last passed to - * SDL_SetAssertionHandler(), or if no application-specified function is - * set, is equivalent to calling SDL_GetDefaultAssertionHandler(). - * - * \param puserdata Pointer to a void*, which will store the "userdata" - * pointer that was passed to SDL_SetAssertionHandler(). - * This value will always be NULL for the default handler. - * If you don't care about this data, it is safe to pass - * a NULL pointer to this function to ignore it. - * \return The SDL_AssertionHandler that is called when an assert triggers. - */ -extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata); - -/** - * \brief Get a list of all assertion failures. - * - * Get all assertions triggered since last call to SDL_ResetAssertionReport(), - * or the start of the program. - * - * The proper way to examine this data looks something like this: - * - * - * const SDL_assert_data *item = SDL_GetAssertionReport(); - * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", - * item->condition, item->function, item->filename, - * item->linenum, item->trigger_count, - * item->always_ignore ? "yes" : "no"); - * item = item->next; - * } - * - * - * \return List of all assertions. - * \sa SDL_ResetAssertionReport - */ -extern DECLSPEC const SDL_assert_data * SDLCALL SDL_GetAssertionReport(void); - -/** - * \brief Reset the list of all assertion failures. - * - * Reset list of all assertions triggered. - * - * \sa SDL_GetAssertionReport - */ -extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_assert_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_atomic.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_atomic.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_atomic.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_atomic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_atomic.h - * - * Atomic operations. - * - * IMPORTANT: - * If you are not an expert in concurrent lockless programming, you should - * only be using the atomic lock and reference counting functions in this - * file. In all other cases you should be protecting your data structures - * with full mutexes. - * - * The list of "safe" functions to use are: - * SDL_AtomicLock() - * SDL_AtomicUnlock() - * SDL_AtomicIncRef() - * SDL_AtomicDecRef() - * - * Seriously, here be dragons! - * ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - * - * You can find out a little more about lockless programming and the - * subtle issues that can arise here: - * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx - * - * There's also lots of good information here: - * http://www.1024cores.net/home/lock-free-algorithms - * http://preshing.com/ - * - * These operations may or may not actually be implemented using - * processor specific atomic operations. When possible they are - * implemented as true processor specific atomic operations. When that - * is not possible the are implemented using locks that *do* use the - * available atomic operations. - * - * All of the atomic operations that modify memory are full memory barriers. - */ - -#ifndef _SDL_atomic_h_ -#define _SDL_atomic_h_ - -#include "SDL_stdinc.h" -#include "SDL_platform.h" - -#include "begin_code.h" - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name SDL AtomicLock - * - * The atomic locks are efficient spinlocks using CPU instructions, - * but are vulnerable to starvation and can spin forever if a thread - * holding a lock has been terminated. For this reason you should - * minimize the code executed inside an atomic lock and never do - * expensive things like API or system calls while holding them. - * - * The atomic locks are not safe to lock recursively. - * - * Porting Note: - * The spin lock functions and type are required and can not be - * emulated because they are used in the atomic emulation code. - */ -/* @{ */ - -typedef int SDL_SpinLock; - -/** - * \brief Try to lock a spin lock by setting it to a non-zero value. - * - * \param lock Points to the lock. - * - * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock); - -/** - * \brief Lock a spin lock by setting it to a non-zero value. - * - * \param lock Points to the lock. - */ -extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock); - -/** - * \brief Unlock a spin lock by setting it to 0. Always returns immediately - * - * \param lock Points to the lock. - */ -extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); - -/* @} *//* SDL AtomicLock */ - - -/** - * The compiler barrier prevents the compiler from reordering - * reads and writes to globally visible variables across the call. - */ -#if defined(_MSC_VER) && (_MSC_VER > 1200) -void _ReadWriteBarrier(void); -#pragma intrinsic(_ReadWriteBarrier) -#define SDL_CompilerBarrier() _ReadWriteBarrier() -#elif defined(__GNUC__) -#define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") -#else -#define SDL_CompilerBarrier() \ -{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); } -#endif - -/** - * Memory barriers are designed to prevent reads and writes from being - * reordered by the compiler and being seen out of order on multi-core CPUs. - * - * A typical pattern would be for thread A to write some data and a flag, - * and for thread B to read the flag and get the data. In this case you - * would insert a release barrier between writing the data and the flag, - * guaranteeing that the data write completes no later than the flag is - * written, and you would insert an acquire barrier between reading the - * flag and reading the data, to ensure that all the reads associated - * with the flag have completed. - * - * In this pattern you should always see a release barrier paired with - * an acquire barrier and you should gate the data reads/writes with a - * single flag variable. - * - * For more information on these semantics, take a look at the blog post: - * http://preshing.com/20120913/acquire-and-release-semantics - */ -#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") -#elif defined(__GNUC__) && defined(__arm__) -#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") -#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) -#ifdef __thumb__ -/* The mcr instruction isn't available in thumb mode, use real functions */ -extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(); -extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(); -#else -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") -#endif /* __thumb__ */ -#else -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("" : : : "memory") -#endif /* __GNUC__ && __arm__ */ -#else -/* This is correct for the x86 and x64 CPUs, and we'll expand this over time. */ -#define SDL_MemoryBarrierRelease() SDL_CompilerBarrier() -#define SDL_MemoryBarrierAcquire() SDL_CompilerBarrier() -#endif - -/** - * \brief A type representing an atomic integer value. It is a struct - * so people don't accidentally use numeric operations on it. - */ -typedef struct { int value; } SDL_atomic_t; - -/** - * \brief Set an atomic variable to a new value if it is currently an old value. - * - * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. - * - * \note If you don't know what this function is for, you shouldn't use it! -*/ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval); - -/** - * \brief Set an atomic variable to a value. - * - * \return The previous value of the atomic variable. - */ -extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v); - -/** - * \brief Get the value of an atomic variable - */ -extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a); - -/** - * \brief Add to an atomic variable. - * - * \return The previous value of the atomic variable. - * - * \note This same style can be used for any number operation - */ -extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); - -/** - * \brief Increment an atomic variable used as a reference count. - */ -#ifndef SDL_AtomicIncRef -#define SDL_AtomicIncRef(a) SDL_AtomicAdd(a, 1) -#endif - -/** - * \brief Decrement an atomic variable used as a reference count. - * - * \return SDL_TRUE if the variable reached zero after decrementing, - * SDL_FALSE otherwise - */ -#ifndef SDL_AtomicDecRef -#define SDL_AtomicDecRef(a) (SDL_AtomicAdd(a, -1) == 1) -#endif - -/** - * \brief Set a pointer to a new value if it is currently an old value. - * - * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise. - * - * \note If you don't know what this function is for, you shouldn't use it! -*/ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval); - -/** - * \brief Set a pointer to a value atomically. - * - * \return The previous value of the pointer. - */ -extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v); - -/** - * \brief Get the value of a pointer atomically. - */ -extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif - -#include "close_code.h" - -#endif /* _SDL_atomic_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_audio.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_audio.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_audio.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_audio.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,506 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_audio.h - * - * Access to the raw audio mixing buffer for the SDL library. - */ - -#ifndef _SDL_audio_h -#define _SDL_audio_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_endian.h" -#include "SDL_mutex.h" -#include "SDL_thread.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Audio format flags. - * - * These are what the 16 bits in SDL_AudioFormat currently mean... - * (Unspecified bits are always zero). - * - * \verbatim - ++-----------------------sample is signed if set - || - || ++-----------sample is bigendian if set - || || - || || ++---sample is float if set - || || || - || || || +---sample bit size---+ - || || || | | - 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 - \endverbatim - * - * There are macros in SDL 2.0 and later to query these bits. - */ -typedef Uint16 SDL_AudioFormat; - -/** - * \name Audio flags - */ -/* @{ */ - -#define SDL_AUDIO_MASK_BITSIZE (0xFF) -#define SDL_AUDIO_MASK_DATATYPE (1<<8) -#define SDL_AUDIO_MASK_ENDIAN (1<<12) -#define SDL_AUDIO_MASK_SIGNED (1<<15) -#define SDL_AUDIO_BITSIZE(x) (x & SDL_AUDIO_MASK_BITSIZE) -#define SDL_AUDIO_ISFLOAT(x) (x & SDL_AUDIO_MASK_DATATYPE) -#define SDL_AUDIO_ISBIGENDIAN(x) (x & SDL_AUDIO_MASK_ENDIAN) -#define SDL_AUDIO_ISSIGNED(x) (x & SDL_AUDIO_MASK_SIGNED) -#define SDL_AUDIO_ISINT(x) (!SDL_AUDIO_ISFLOAT(x)) -#define SDL_AUDIO_ISLITTLEENDIAN(x) (!SDL_AUDIO_ISBIGENDIAN(x)) -#define SDL_AUDIO_ISUNSIGNED(x) (!SDL_AUDIO_ISSIGNED(x)) - -/** - * \name Audio format flags - * - * Defaults to LSB byte order. - */ -/* @{ */ -#define AUDIO_U8 0x0008 /**< Unsigned 8-bit samples */ -#define AUDIO_S8 0x8008 /**< Signed 8-bit samples */ -#define AUDIO_U16LSB 0x0010 /**< Unsigned 16-bit samples */ -#define AUDIO_S16LSB 0x8010 /**< Signed 16-bit samples */ -#define AUDIO_U16MSB 0x1010 /**< As above, but big-endian byte order */ -#define AUDIO_S16MSB 0x9010 /**< As above, but big-endian byte order */ -#define AUDIO_U16 AUDIO_U16LSB -#define AUDIO_S16 AUDIO_S16LSB -/* @} */ - -/** - * \name int32 support - */ -/* @{ */ -#define AUDIO_S32LSB 0x8020 /**< 32-bit integer samples */ -#define AUDIO_S32MSB 0x9020 /**< As above, but big-endian byte order */ -#define AUDIO_S32 AUDIO_S32LSB -/* @} */ - -/** - * \name float32 support - */ -/* @{ */ -#define AUDIO_F32LSB 0x8120 /**< 32-bit floating point samples */ -#define AUDIO_F32MSB 0x9120 /**< As above, but big-endian byte order */ -#define AUDIO_F32 AUDIO_F32LSB -/* @} */ - -/** - * \name Native audio byte ordering - */ -/* @{ */ -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define AUDIO_U16SYS AUDIO_U16LSB -#define AUDIO_S16SYS AUDIO_S16LSB -#define AUDIO_S32SYS AUDIO_S32LSB -#define AUDIO_F32SYS AUDIO_F32LSB -#else -#define AUDIO_U16SYS AUDIO_U16MSB -#define AUDIO_S16SYS AUDIO_S16MSB -#define AUDIO_S32SYS AUDIO_S32MSB -#define AUDIO_F32SYS AUDIO_F32MSB -#endif -/* @} */ - -/** - * \name Allow change flags - * - * Which audio format changes are allowed when opening a device. - */ -/* @{ */ -#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001 -#define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002 -#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004 -#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE) -/* @} */ - -/* @} *//* Audio flags */ - -/** - * This function is called when the audio device needs more data. - * - * \param userdata An application-specific parameter saved in - * the SDL_AudioSpec structure - * \param stream A pointer to the audio data buffer. - * \param len The length of that buffer in bytes. - * - * Once the callback returns, the buffer will no longer be valid. - * Stereo samples are stored in a LRLRLR ordering. - */ -typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream, - int len); - -/** - * The calculated values in this structure are calculated by SDL_OpenAudio(). - */ -typedef struct SDL_AudioSpec -{ - int freq; /**< DSP frequency -- samples per second */ - SDL_AudioFormat format; /**< Audio data format */ - Uint8 channels; /**< Number of channels: 1 mono, 2 stereo */ - Uint8 silence; /**< Audio buffer silence value (calculated) */ - Uint16 samples; /**< Audio buffer size in samples (power of 2) */ - Uint16 padding; /**< Necessary for some compile environments */ - Uint32 size; /**< Audio buffer size in bytes (calculated) */ - SDL_AudioCallback callback; - void *userdata; -} SDL_AudioSpec; - - -struct SDL_AudioCVT; -typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, - SDL_AudioFormat format); - -/** - * A structure to hold a set of audio conversion filters and buffers. - */ -#ifdef __GNUC__ -/* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't - pad it out to 88 bytes to guarantee ABI compatibility between compilers. - vvv - The next time we rev the ABI, make sure to size the ints and add padding. -*/ -#define SDL_AUDIOCVT_PACKED __attribute__((packed)) -#else -#define SDL_AUDIOCVT_PACKED -#endif -/* */ -typedef struct SDL_AudioCVT -{ - int needed; /**< Set to 1 if conversion possible */ - SDL_AudioFormat src_format; /**< Source audio format */ - SDL_AudioFormat dst_format; /**< Target audio format */ - double rate_incr; /**< Rate conversion increment */ - Uint8 *buf; /**< Buffer to hold entire audio data */ - int len; /**< Length of original audio buffer */ - int len_cvt; /**< Length of converted audio buffer */ - int len_mult; /**< buffer must be len*len_mult big */ - double len_ratio; /**< Given len, final size is len*len_ratio */ - SDL_AudioFilter filters[10]; /**< Filter list */ - int filter_index; /**< Current audio conversion function */ -} SDL_AUDIOCVT_PACKED SDL_AudioCVT; - - -/* Function prototypes */ - -/** - * \name Driver discovery functions - * - * These functions return the list of built in audio drivers, in the - * order that they are normally initialized by default. - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void); -extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); -/* @} */ - -/** - * \name Initialization and cleanup - * - * \internal These functions are used internally, and should not be used unless - * you have a specific need to specify the audio driver you want to - * use. You should normally use SDL_Init() or SDL_InitSubSystem(). - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); -extern DECLSPEC void SDLCALL SDL_AudioQuit(void); -/* @} */ - -/** - * This function returns the name of the current audio driver, or NULL - * if no driver has been initialized. - */ -extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); - -/** - * This function opens the audio device with the desired parameters, and - * returns 0 if successful, placing the actual hardware parameters in the - * structure pointed to by \c obtained. If \c obtained is NULL, the audio - * data passed to the callback function will be guaranteed to be in the - * requested format, and will be automatically converted to the hardware - * audio format if necessary. This function returns -1 if it failed - * to open the audio device, or couldn't set up the audio thread. - * - * When filling in the desired audio spec structure, - * - \c desired->freq should be the desired audio frequency in samples-per- - * second. - * - \c desired->format should be the desired audio format. - * - \c desired->samples is the desired size of the audio buffer, in - * samples. This number should be a power of two, and may be adjusted by - * the audio driver to a value more suitable for the hardware. Good values - * seem to range between 512 and 8096 inclusive, depending on the - * application and CPU speed. Smaller values yield faster response time, - * but can lead to underflow if the application is doing heavy processing - * and cannot fill the audio buffer in time. A stereo sample consists of - * both right and left channels in LR ordering. - * Note that the number of samples is directly related to time by the - * following formula: \code ms = (samples*1000)/freq \endcode - * - \c desired->size is the size in bytes of the audio buffer, and is - * calculated by SDL_OpenAudio(). - * - \c desired->silence is the value used to set the buffer to silence, - * and is calculated by SDL_OpenAudio(). - * - \c desired->callback should be set to a function that will be called - * when the audio device is ready for more data. It is passed a pointer - * to the audio buffer, and the length in bytes of the audio buffer. - * This function usually runs in a separate thread, and so you should - * protect data structures that it accesses by calling SDL_LockAudio() - * and SDL_UnlockAudio() in your code. - * - \c desired->userdata is passed as the first parameter to your callback - * function. - * - * The audio device starts out playing silence when it's opened, and should - * be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready - * for your audio callback function to be called. Since the audio driver - * may modify the requested size of the audio buffer, you should allocate - * any local mixing buffers after you open the audio device. - */ -extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, - SDL_AudioSpec * obtained); - -/** - * SDL Audio Device IDs. - * - * A successful call to SDL_OpenAudio() is always device id 1, and legacy - * SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls - * always returns devices >= 2 on success. The legacy calls are good both - * for backwards compatibility and when you don't care about multiple, - * specific, or capture devices. - */ -typedef Uint32 SDL_AudioDeviceID; - -/** - * Get the number of available devices exposed by the current driver. - * Only valid after a successfully initializing the audio subsystem. - * Returns -1 if an explicit list of devices can't be determined; this is - * not an error. For example, if SDL is set up to talk to a remote audio - * server, it can't list every one available on the Internet, but it will - * still allow a specific host to be specified to SDL_OpenAudioDevice(). - * - * In many common cases, when this function returns a value <= 0, it can still - * successfully open the default device (NULL for first argument of - * SDL_OpenAudioDevice()). - */ -extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture); - -/** - * Get the human-readable name of a specific audio device. - * Must be a value between 0 and (number of audio devices-1). - * Only valid after a successfully initializing the audio subsystem. - * The values returned by this function reflect the latest call to - * SDL_GetNumAudioDevices(); recall that function to redetect available - * hardware. - * - * The string returned by this function is UTF-8 encoded, read-only, and - * managed internally. You are not to free it. If you need to keep the - * string for any length of time, you should make your own copy of it, as it - * will be invalid next time any of several other SDL functions is called. - */ -extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index, - int iscapture); - - -/** - * Open a specific audio device. Passing in a device name of NULL requests - * the most reasonable default (and is equivalent to calling SDL_OpenAudio()). - * - * The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but - * some drivers allow arbitrary and driver-specific strings, such as a - * hostname/IP address for a remote audio server, or a filename in the - * diskaudio driver. - * - * \return 0 on error, a valid device ID that is >= 2 on success. - * - * SDL_OpenAudio(), unlike this function, always acts on device ID 1. - */ -extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char - *device, - int iscapture, - const - SDL_AudioSpec * - desired, - SDL_AudioSpec * - obtained, - int - allowed_changes); - - - -/** - * \name Audio state - * - * Get the current audio state. - */ -/* @{ */ -typedef enum -{ - SDL_AUDIO_STOPPED = 0, - SDL_AUDIO_PLAYING, - SDL_AUDIO_PAUSED -} SDL_AudioStatus; -extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void); - -extern DECLSPEC SDL_AudioStatus SDLCALL -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); -/* @} *//* Audio State */ - -/** - * \name Pause audio functions - * - * These functions pause and unpause the audio callback processing. - * They should be called with a parameter of 0 after opening the audio - * device to start playing sound. This is so you can safely initialize - * data for your callback function after opening the audio device. - * Silence will be written to the audio device during the pause. - */ -/* @{ */ -extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); -extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev, - int pause_on); -/* @} *//* Pause audio functions */ - -/** - * This function loads a WAVE from the data source, automatically freeing - * that source if \c freesrc is non-zero. For example, to load a WAVE file, - * you could do: - * \code - * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); - * \endcode - * - * If this function succeeds, it returns the given SDL_AudioSpec, - * filled with the audio data format of the wave data, and sets - * \c *audio_buf to a malloc()'d buffer containing the audio data, - * and sets \c *audio_len to the length of that audio buffer, in bytes. - * You need to free the audio buffer with SDL_FreeWAV() when you are - * done with it. - * - * This function returns NULL and sets the SDL error message if the - * wave file cannot be opened, uses an unknown data format, or is - * corrupt. Currently raw and MS-ADPCM WAVE files are supported. - */ -extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, - int freesrc, - SDL_AudioSpec * spec, - Uint8 ** audio_buf, - Uint32 * audio_len); - -/** - * Loads a WAV from a file. - * Compatibility convenience function. - */ -#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \ - SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) - -/** - * This function frees data previously allocated with SDL_LoadWAV_RW() - */ -extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf); - -/** - * This function takes a source format and rate and a destination format - * and rate, and initializes the \c cvt structure with information needed - * by SDL_ConvertAudio() to convert a buffer of audio data from one format - * to the other. - * - * \return -1 if the format conversion is not supported, 0 if there's - * no conversion needed, or 1 if the audio filter is set up. - */ -extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, - SDL_AudioFormat src_format, - Uint8 src_channels, - int src_rate, - SDL_AudioFormat dst_format, - Uint8 dst_channels, - int dst_rate); - -/** - * Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(), - * created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of - * audio data in the source format, this function will convert it in-place - * to the desired format. - * - * The data conversion may expand the size of the audio data, so the buffer - * \c cvt->buf should be allocated after the \c cvt structure is initialized by - * SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long. - */ -extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt); - -#define SDL_MIX_MAXVOLUME 128 -/** - * This takes two audio buffers of the playing audio format and mixes - * them, performing addition, volume adjustment, and overflow clipping. - * The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME - * for full audio volume. Note this does not change hardware volume. - * This is provided for convenience -- you can mix your own audio data. - */ -extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src, - Uint32 len, int volume); - -/** - * This works like SDL_MixAudio(), but you specify the audio format instead of - * using the format of audio device 1. Thus it can be used when no audio - * device is open at all. - */ -extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, - const Uint8 * src, - SDL_AudioFormat format, - Uint32 len, int volume); - -/** - * \name Audio lock functions - * - * The lock manipulated by these functions protects the callback function. - * During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that - * the callback function is not running. Do not call these from the callback - * function or you will cause deadlock. - */ -/* @{ */ -extern DECLSPEC void SDLCALL SDL_LockAudio(void); -extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev); -extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); -extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev); -/* @} *//* Audio lock functions */ - -/** - * This function shuts down audio processing and closes the audio device. - */ -extern DECLSPEC void SDLCALL SDL_CloseAudio(void); -extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_audio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_bits.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_bits.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_bits.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_bits.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_bits.h - * - * Functions for fiddling with bits and bitmasks. - */ - -#ifndef _SDL_bits_h -#define _SDL_bits_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_bits.h - */ - -/** - * Get the index of the most significant bit. Result is undefined when called - * with 0. This operation can also be stated as "count leading zeroes" and - * "log base 2". - * - * \return Index of the most significant bit, or -1 if the value is 0. - */ -SDL_FORCE_INLINE int -SDL_MostSignificantBitIndex32(Uint32 x) -{ -#if defined(__GNUC__) && __GNUC__ >= 4 - /* Count Leading Zeroes builtin in GCC. - * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html - */ - if (x == 0) { - return -1; - } - return 31 - __builtin_clz(x); -#else - /* Based off of Bit Twiddling Hacks by Sean Eron Anderson - * , released in the public domain. - * http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog - */ - const Uint32 b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000}; - const int S[] = {1, 2, 4, 8, 16}; - - int msbIndex = 0; - int i; - - if (x == 0) { - return -1; - } - - for (i = 4; i >= 0; i--) - { - if (x & b[i]) - { - x >>= S[i]; - msbIndex |= S[i]; - } - } - - return msbIndex; -#endif -} - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_bits_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_blendmode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_blendmode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_blendmode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_blendmode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_blendmode.h - * - * Header file declaring the SDL_BlendMode enumeration - */ - -#ifndef _SDL_blendmode_h -#define _SDL_blendmode_h - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The blend mode used in SDL_RenderCopy() and drawing operations. - */ -typedef enum -{ - SDL_BLENDMODE_NONE = 0x00000000, /**< no blending - dstRGBA = srcRGBA */ - SDL_BLENDMODE_BLEND = 0x00000001, /**< alpha blending - dstRGB = (srcRGB * srcA) + (dstRGB * (1-srcA)) - dstA = srcA + (dstA * (1-srcA)) */ - SDL_BLENDMODE_ADD = 0x00000002, /**< additive blending - dstRGB = (srcRGB * srcA) + dstRGB - dstA = dstA */ - SDL_BLENDMODE_MOD = 0x00000004 /**< color modulate - dstRGB = srcRGB * dstRGB - dstA = dstA */ -} SDL_BlendMode; - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_clipboard.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_clipboard.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_clipboard.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_clipboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_clipboard.h - * - * Include file for SDL clipboard handling - */ - -#ifndef _SDL_clipboard_h -#define _SDL_clipboard_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* Function prototypes */ - -/** - * \brief Put UTF-8 text into the clipboard - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text); - -/** - * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free() - * - * \sa SDL_SetClipboardText() - */ -extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void); - -/** - * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_clipboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -#include "SDL_platform.h" - -/** - * \file SDL_config.h - */ - -/* Add any platform that doesn't build using the configure system. */ -#ifdef USING_PREMAKE_CONFIG_H -#include "SDL_config_premake.h" -#elif defined(__WIN32__) -#include "SDL_config_windows.h" -#elif defined(__WINRT__) -#include "SDL_config_winrt.h" -#elif defined(__MACOSX__) -#include "SDL_config_macosx.h" -#elif defined(__IPHONEOS__) -#include "SDL_config_iphoneos.h" -#elif defined(__ANDROID__) -#include "SDL_config_android.h" -#elif defined(__PSP__) -#include "SDL_config_psp.h" -#else -/* This is a minimal configuration just to get SDL running on new platforms */ -#include "SDL_config_minimal.h" -#endif /* platform config */ - -#ifdef USING_GENERATED_CONFIG_H -#error Wrong SDL_config.h, check your include path? -#endif - -#endif /* _SDL_config_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_config_macosx.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,184 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_config_macosx_h -#define _SDL_config_macosx_h - -#include "SDL_platform.h" - -/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ -#include - -/* This is a set of defines to configure the SDL features */ - -#ifdef __LP64__ - #define SIZEOF_VOIDP 8 -#else - #define SIZEOF_VOIDP 4 -#endif - -/* Useful headers */ -#define HAVE_ALLOCA_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STRING_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MATH_H 1 -#define HAVE_SIGNAL_H 1 - -/* C library functions */ -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 -#define HAVE_ALLOCA 1 -#define HAVE_GETENV 1 -#define HAVE_SETENV 1 -#define HAVE_PUTENV 1 -#define HAVE_UNSETENV 1 -#define HAVE_QSORT 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 -#define HAVE_MEMSET 1 -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCMP 1 -#define HAVE_STRLEN 1 -#define HAVE_STRLCPY 1 -#define HAVE_STRLCAT 1 -#define HAVE_STRDUP 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOULL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 -#define HAVE_VSSCANF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_CEIL 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_LOG 1 -#define HAVE_POW 1 -#define HAVE_SCALBN 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SIGACTION 1 -#define HAVE_SETJMP 1 -#define HAVE_NANOSLEEP 1 -#define HAVE_SYSCONF 1 -#define HAVE_SYSCTLBYNAME 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_COREAUDIO 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#define SDL_JOYSTICK_IOKIT 1 -#define SDL_HAPTIC_IOKIT 1 - -/* Enable various shared object loading systems */ -#define SDL_LOADSO_DLOPEN 1 - -/* Enable various threading systems */ -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 - -/* Enable various timer systems */ -#define SDL_TIMER_UNIX 1 - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_COCOA 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 -#undef SDL_VIDEO_DRIVER_X11 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib" -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 -#define SDL_VIDEO_DRIVER_X11_XRANDR 1 -#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1 -#define SDL_VIDEO_DRIVER_X11_XSHAPE 1 -#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1 -#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1 - -#ifdef MAC_OS_X_VERSION_10_8 -/* - * No matter the versions targeted, this is the 10.8 or later SDK, so you have - * to use the external Xquartz, which is a more modern Xlib. Previous SDKs - * used an older Xlib. - */ -#define SDL_VIDEO_DRIVER_X11_XINPUT2 1 -#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 -#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1 -#endif - -#ifndef SDL_VIDEO_RENDER_OGL -#define SDL_VIDEO_RENDER_OGL 1 -#endif - -/* Enable OpenGL support */ -#ifndef SDL_VIDEO_OPENGL -#define SDL_VIDEO_OPENGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_CGL -#define SDL_VIDEO_OPENGL_CGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_GLX -#define SDL_VIDEO_OPENGL_GLX 1 -#endif - -/* Enable system power support */ -#define SDL_POWER_MACOSX 1 - -/* enable filesystem support */ -#define SDL_FILESYSTEM_COCOA 1 - -/* Enable assembly routines */ -#define SDL_ASSEMBLY_ROUTINES 1 -#ifdef __ppc__ -#define SDL_ALTIVEC_BLITTERS 1 -#endif - -#endif /* _SDL_config_macosx_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_copying.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_copying.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_copying.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_copying.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_cpuinfo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_cpuinfo.h - * - * CPU feature detection for SDL. - */ - -#ifndef _SDL_cpuinfo_h -#define _SDL_cpuinfo_h - -#include "SDL_stdinc.h" - -/* Need to do this here because intrin.h has C++ code in it */ -/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ -#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64)) -#include -#ifndef _WIN64 -#define __MMX__ -#define __3dNOW__ -#endif -#define __SSE__ -#define __SSE2__ -#elif defined(__MINGW64_VERSION_MAJOR) -#include -#else -#ifdef __ALTIVEC__ -#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) -#include -#undef pixel -#endif -#endif -#ifdef __MMX__ -#include -#endif -#ifdef __3dNOW__ -#include -#endif -#ifdef __SSE__ -#include -#endif -#ifdef __SSE2__ -#include -#endif -#endif - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* This is a guess for the cacheline size used for padding. - * Most x86 processors have a 64 byte cache line. - * The 64-bit PowerPC processors have a 128 byte cache line. - * We'll use the larger value to be generally safe. - */ -#define SDL_CACHELINE_SIZE 128 - -/** - * This function returns the number of CPU cores available. - */ -extern DECLSPEC int SDLCALL SDL_GetCPUCount(void); - -/** - * This function returns the L1 cache line size of the CPU - * - * This is useful for determining multi-threaded structure padding - * or SIMD prefetch sizes. - */ -extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void); - -/** - * This function returns true if the CPU has the RDTSC instruction. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void); - -/** - * This function returns true if the CPU has AltiVec features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void); - -/** - * This function returns true if the CPU has MMX features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void); - -/** - * This function returns true if the CPU has 3DNow! features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void); - -/** - * This function returns true if the CPU has SSE features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void); - -/** - * This function returns true if the CPU has SSE2 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void); - -/** - * This function returns true if the CPU has SSE3 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void); - -/** - * This function returns true if the CPU has SSE4.1 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void); - -/** - * This function returns true if the CPU has SSE4.2 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void); - -/** - * This function returns true if the CPU has AVX features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); - -/** - * This function returns the amount of RAM configured in the system, in MB. - */ -extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_cpuinfo_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_endian.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_endian.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_endian.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_endian.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_endian.h - * - * Functions for reading and writing endian-specific values - */ - -#ifndef _SDL_endian_h -#define _SDL_endian_h - -#include "SDL_stdinc.h" - -/** - * \name The two types of endianness - */ -/* @{ */ -#define SDL_LIL_ENDIAN 1234 -#define SDL_BIG_ENDIAN 4321 -/* @} */ - -#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */ -#ifdef __linux__ -#include -#define SDL_BYTEORDER __BYTE_ORDER -#else /* __linux __ */ -#if defined(__hppa__) || \ - defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ - defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ - defined(__sparc__) -#define SDL_BYTEORDER SDL_BIG_ENDIAN -#else -#define SDL_BYTEORDER SDL_LIL_ENDIAN -#endif -#endif /* __linux __ */ -#endif /* !SDL_BYTEORDER */ - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_endian.h - */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - int result; - - __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); - return (Uint16)result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - return SDL_static_cast(Uint16, ((x << 8) | (x >> 8))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswap %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswapl %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - Uint32 result; - - __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x)); - __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x)); - __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); - return result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) | - ((x >> 8) & 0x0000FF00) | (x >> 24))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - union - { - struct - { - Uint32 a, b; - } s; - Uint64 u; - } v; - v.u = x; - __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a), - "1"(v.s. - b)); - return v.u; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - __asm__("bswapq %0": "=r"(x):"0"(x)); - return x; -} -#else -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - Uint32 hi, lo; - - /* Separate into high and low 32-bit values and swap them */ - lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF); - x >>= 32; - hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF); - x = SDL_Swap32(lo); - x <<= 32; - x |= SDL_Swap32(hi); - return (x); -} -#endif - - -SDL_FORCE_INLINE float -SDL_SwapFloat(float x) -{ - union - { - float f; - Uint32 ui32; - } swapper; - swapper.f = x; - swapper.ui32 = SDL_Swap32(swapper.ui32); - return swapper.f; -} - - -/** - * \name Swap to native - * Byteswap item from the specified endianness to the native endianness. - */ -/* @{ */ -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define SDL_SwapLE16(X) (X) -#define SDL_SwapLE32(X) (X) -#define SDL_SwapLE64(X) (X) -#define SDL_SwapFloatLE(X) (X) -#define SDL_SwapBE16(X) SDL_Swap16(X) -#define SDL_SwapBE32(X) SDL_Swap32(X) -#define SDL_SwapBE64(X) SDL_Swap64(X) -#define SDL_SwapFloatBE(X) SDL_SwapFloat(X) -#else -#define SDL_SwapLE16(X) SDL_Swap16(X) -#define SDL_SwapLE32(X) SDL_Swap32(X) -#define SDL_SwapLE64(X) SDL_Swap64(X) -#define SDL_SwapFloatLE(X) SDL_SwapFloat(X) -#define SDL_SwapBE16(X) (X) -#define SDL_SwapBE32(X) (X) -#define SDL_SwapBE64(X) (X) -#define SDL_SwapFloatBE(X) (X) -#endif -/* @} *//* Swap to native */ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_endian_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_error.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_error.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_error.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_error.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_error.h - * - * Simple error message routines for SDL. - */ - -#ifndef _SDL_error_h -#define _SDL_error_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* Public functions */ -/* SDL_SetError() unconditionally returns -1. */ -extern DECLSPEC int SDLCALL SDL_SetError(const char *fmt, ...); -extern DECLSPEC const char *SDLCALL SDL_GetError(void); -extern DECLSPEC void SDLCALL SDL_ClearError(void); - -/** - * \name Internal error functions - * - * \internal - * Private error reporting function - used internally. - */ -/* @{ */ -#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM) -#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED) -#define SDL_InvalidParamError(param) SDL_SetError("Parameter '%s' is invalid", (param)) -typedef enum -{ - SDL_ENOMEM, - SDL_EFREAD, - SDL_EFWRITE, - SDL_EFSEEK, - SDL_UNSUPPORTED, - SDL_LASTERROR -} SDL_errorcode; -/* SDL_Error() unconditionally returns -1. */ -extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code); -/* @} *//* Internal error functions */ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_error_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_events.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_events.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_events.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_events.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,723 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_events.h - * - * Include file for SDL event handling. - */ - -#ifndef _SDL_events_h -#define _SDL_events_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_keyboard.h" -#include "SDL_mouse.h" -#include "SDL_joystick.h" -#include "SDL_gamecontroller.h" -#include "SDL_quit.h" -#include "SDL_gesture.h" -#include "SDL_touch.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* General keyboard/mouse state definitions */ -#define SDL_RELEASED 0 -#define SDL_PRESSED 1 - -/** - * \brief The types of events that can be delivered. - */ -typedef enum -{ - SDL_FIRSTEVENT = 0, /**< Unused (do not remove) */ - - /* Application events */ - SDL_QUIT = 0x100, /**< User-requested quit */ - - /* These application events have special meaning on iOS, see README-ios.txt for details */ - SDL_APP_TERMINATING, /**< The application is being terminated by the OS - Called on iOS in applicationWillTerminate() - Called on Android in onDestroy() - */ - SDL_APP_LOWMEMORY, /**< The application is low on memory, free memory if possible. - Called on iOS in applicationDidReceiveMemoryWarning() - Called on Android in onLowMemory() - */ - SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background - Called on iOS in applicationWillResignActive() - Called on Android in onPause() - */ - SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time - Called on iOS in applicationDidEnterBackground() - Called on Android in onPause() - */ - SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground - Called on iOS in applicationWillEnterForeground() - Called on Android in onResume() - */ - SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive - Called on iOS in applicationDidBecomeActive() - Called on Android in onResume() - */ - - /* Window events */ - SDL_WINDOWEVENT = 0x200, /**< Window state change */ - SDL_SYSWMEVENT, /**< System specific event */ - - /* Keyboard events */ - SDL_KEYDOWN = 0x300, /**< Key pressed */ - SDL_KEYUP, /**< Key released */ - SDL_TEXTEDITING, /**< Keyboard text editing (composition) */ - SDL_TEXTINPUT, /**< Keyboard text input */ - - /* Mouse events */ - SDL_MOUSEMOTION = 0x400, /**< Mouse moved */ - SDL_MOUSEBUTTONDOWN, /**< Mouse button pressed */ - SDL_MOUSEBUTTONUP, /**< Mouse button released */ - SDL_MOUSEWHEEL, /**< Mouse wheel motion */ - - /* Joystick events */ - SDL_JOYAXISMOTION = 0x600, /**< Joystick axis motion */ - SDL_JOYBALLMOTION, /**< Joystick trackball motion */ - SDL_JOYHATMOTION, /**< Joystick hat position change */ - SDL_JOYBUTTONDOWN, /**< Joystick button pressed */ - SDL_JOYBUTTONUP, /**< Joystick button released */ - SDL_JOYDEVICEADDED, /**< A new joystick has been inserted into the system */ - SDL_JOYDEVICEREMOVED, /**< An opened joystick has been removed */ - - /* Game controller events */ - SDL_CONTROLLERAXISMOTION = 0x650, /**< Game controller axis motion */ - SDL_CONTROLLERBUTTONDOWN, /**< Game controller button pressed */ - SDL_CONTROLLERBUTTONUP, /**< Game controller button released */ - SDL_CONTROLLERDEVICEADDED, /**< A new Game controller has been inserted into the system */ - SDL_CONTROLLERDEVICEREMOVED, /**< An opened Game controller has been removed */ - SDL_CONTROLLERDEVICEREMAPPED, /**< The controller mapping was updated */ - - /* Touch events */ - SDL_FINGERDOWN = 0x700, - SDL_FINGERUP, - SDL_FINGERMOTION, - - /* Gesture events */ - SDL_DOLLARGESTURE = 0x800, - SDL_DOLLARRECORD, - SDL_MULTIGESTURE, - - /* Clipboard events */ - SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */ - - /* Drag and drop events */ - SDL_DROPFILE = 0x1000, /**< The system requests a file open */ - - /* Render events */ - SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset */ - - /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use, - * and should be allocated with SDL_RegisterEvents() - */ - SDL_USEREVENT = 0x8000, - - /** - * This last event is only for bounding internal arrays - */ - SDL_LASTEVENT = 0xFFFF -} SDL_EventType; - -/** - * \brief Fields shared by every event - */ -typedef struct SDL_CommonEvent -{ - Uint32 type; - Uint32 timestamp; -} SDL_CommonEvent; - -/** - * \brief Window state change event data (event.window.*) - */ -typedef struct SDL_WindowEvent -{ - Uint32 type; /**< ::SDL_WINDOWEVENT */ - Uint32 timestamp; - Uint32 windowID; /**< The associated window */ - Uint8 event; /**< ::SDL_WindowEventID */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint32 data1; /**< event dependent data */ - Sint32 data2; /**< event dependent data */ -} SDL_WindowEvent; - -/** - * \brief Keyboard button event structure (event.key.*) - */ -typedef struct SDL_KeyboardEvent -{ - Uint32 type; /**< ::SDL_KEYDOWN or ::SDL_KEYUP */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 repeat; /**< Non-zero if this is a key repeat */ - Uint8 padding2; - Uint8 padding3; - SDL_Keysym keysym; /**< The key that was pressed or released */ -} SDL_KeyboardEvent; - -#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32) -/** - * \brief Keyboard text editing event structure (event.edit.*) - */ -typedef struct SDL_TextEditingEvent -{ - Uint32 type; /**< ::SDL_TEXTEDITING */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; /**< The editing text */ - Sint32 start; /**< The start cursor of selected editing text */ - Sint32 length; /**< The length of selected editing text */ -} SDL_TextEditingEvent; - - -#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32) -/** - * \brief Keyboard text input event structure (event.text.*) - */ -typedef struct SDL_TextInputEvent -{ - Uint32 type; /**< ::SDL_TEXTINPUT */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTINPUTEVENT_TEXT_SIZE]; /**< The input text */ -} SDL_TextInputEvent; - -/** - * \brief Mouse motion event structure (event.motion.*) - */ -typedef struct SDL_MouseMotionEvent -{ - Uint32 type; /**< ::SDL_MOUSEMOTION */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Uint32 state; /**< The current button state */ - Sint32 x; /**< X coordinate, relative to window */ - Sint32 y; /**< Y coordinate, relative to window */ - Sint32 xrel; /**< The relative motion in the X direction */ - Sint32 yrel; /**< The relative motion in the Y direction */ -} SDL_MouseMotionEvent; - -/** - * \brief Mouse button event structure (event.button.*) - */ -typedef struct SDL_MouseButtonEvent -{ - Uint32 type; /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Uint8 button; /**< The mouse button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 clicks; /**< 1 for single-click, 2 for double-click, etc. */ - Uint8 padding1; - Sint32 x; /**< X coordinate, relative to window */ - Sint32 y; /**< Y coordinate, relative to window */ -} SDL_MouseButtonEvent; - -/** - * \brief Mouse wheel event structure (event.wheel.*) - */ -typedef struct SDL_MouseWheelEvent -{ - Uint32 type; /**< ::SDL_MOUSEWHEEL */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Sint32 x; /**< The amount scrolled horizontally, positive to the right and negative to the left */ - Sint32 y; /**< The amount scrolled vertically, positive away from the user and negative toward the user */ -} SDL_MouseWheelEvent; - -/** - * \brief Joystick axis motion event structure (event.jaxis.*) - */ -typedef struct SDL_JoyAxisEvent -{ - Uint32 type; /**< ::SDL_JOYAXISMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 axis; /**< The joystick axis index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 value; /**< The axis value (range: -32768 to 32767) */ - Uint16 padding4; -} SDL_JoyAxisEvent; - -/** - * \brief Joystick trackball motion event structure (event.jball.*) - */ -typedef struct SDL_JoyBallEvent -{ - Uint32 type; /**< ::SDL_JOYBALLMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 ball; /**< The joystick trackball index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 xrel; /**< The relative motion in the X direction */ - Sint16 yrel; /**< The relative motion in the Y direction */ -} SDL_JoyBallEvent; - -/** - * \brief Joystick hat position change event structure (event.jhat.*) - */ -typedef struct SDL_JoyHatEvent -{ - Uint32 type; /**< ::SDL_JOYHATMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 hat; /**< The joystick hat index */ - Uint8 value; /**< The hat position value. - * \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP - * \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT - * \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN - * - * Note that zero means the POV is centered. - */ - Uint8 padding1; - Uint8 padding2; -} SDL_JoyHatEvent; - -/** - * \brief Joystick button event structure (event.jbutton.*) - */ -typedef struct SDL_JoyButtonEvent -{ - Uint32 type; /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 button; /**< The joystick button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; -} SDL_JoyButtonEvent; - -/** - * \brief Joystick device event structure (event.jdevice.*) - */ -typedef struct SDL_JoyDeviceEvent -{ - Uint32 type; /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */ - Uint32 timestamp; - Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED event */ -} SDL_JoyDeviceEvent; - - -/** - * \brief Game controller axis motion event structure (event.caxis.*) - */ -typedef struct SDL_ControllerAxisEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERAXISMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 axis; /**< The controller axis (SDL_GameControllerAxis) */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 value; /**< The axis value (range: -32768 to 32767) */ - Uint16 padding4; -} SDL_ControllerAxisEvent; - - -/** - * \brief Game controller button event structure (event.cbutton.*) - */ -typedef struct SDL_ControllerButtonEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 button; /**< The controller button (SDL_GameControllerButton) */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; -} SDL_ControllerButtonEvent; - - -/** - * \brief Controller device event structure (event.cdevice.*) - */ -typedef struct SDL_ControllerDeviceEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */ - Uint32 timestamp; - Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */ -} SDL_ControllerDeviceEvent; - - -/** - * \brief Touch finger event structure (event.tfinger.*) - */ -typedef struct SDL_TouchFingerEvent -{ - Uint32 type; /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device id */ - SDL_FingerID fingerId; - float x; /**< Normalized in the range 0...1 */ - float y; /**< Normalized in the range 0...1 */ - float dx; /**< Normalized in the range 0...1 */ - float dy; /**< Normalized in the range 0...1 */ - float pressure; /**< Normalized in the range 0...1 */ -} SDL_TouchFingerEvent; - - -/** - * \brief Multiple Finger Gesture Event (event.mgesture.*) - */ -typedef struct SDL_MultiGestureEvent -{ - Uint32 type; /**< ::SDL_MULTIGESTURE */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device index */ - float dTheta; - float dDist; - float x; - float y; - Uint16 numFingers; - Uint16 padding; -} SDL_MultiGestureEvent; - - -/** - * \brief Dollar Gesture Event (event.dgesture.*) - */ -typedef struct SDL_DollarGestureEvent -{ - Uint32 type; /**< ::SDL_DOLLARGESTURE */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device id */ - SDL_GestureID gestureId; - Uint32 numFingers; - float error; - float x; /**< Normalized center of gesture */ - float y; /**< Normalized center of gesture */ -} SDL_DollarGestureEvent; - - -/** - * \brief An event used to request a file open by the system (event.drop.*) - * This event is disabled by default, you can enable it with SDL_EventState() - * \note If you enable this event, you must free the filename in the event. - */ -typedef struct SDL_DropEvent -{ - Uint32 type; /**< ::SDL_DROPFILE */ - Uint32 timestamp; - char *file; /**< The file name, which should be freed with SDL_free() */ -} SDL_DropEvent; - - -/** - * \brief The "quit requested" event - */ -typedef struct SDL_QuitEvent -{ - Uint32 type; /**< ::SDL_QUIT */ - Uint32 timestamp; -} SDL_QuitEvent; - -/** - * \brief OS Specific event - */ -typedef struct SDL_OSEvent -{ - Uint32 type; /**< ::SDL_QUIT */ - Uint32 timestamp; -} SDL_OSEvent; - -/** - * \brief A user-defined event type (event.user.*) - */ -typedef struct SDL_UserEvent -{ - Uint32 type; /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */ - Uint32 timestamp; - Uint32 windowID; /**< The associated window if any */ - Sint32 code; /**< User defined event code */ - void *data1; /**< User defined data pointer */ - void *data2; /**< User defined data pointer */ -} SDL_UserEvent; - - -struct SDL_SysWMmsg; -typedef struct SDL_SysWMmsg SDL_SysWMmsg; - -/** - * \brief A video driver dependent system event (event.syswm.*) - * This event is disabled by default, you can enable it with SDL_EventState() - * - * \note If you want to use this event, you should include SDL_syswm.h. - */ -typedef struct SDL_SysWMEvent -{ - Uint32 type; /**< ::SDL_SYSWMEVENT */ - Uint32 timestamp; - SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */ -} SDL_SysWMEvent; - -/** - * \brief General event structure - */ -typedef union SDL_Event -{ - Uint32 type; /**< Event type, shared with all events */ - SDL_CommonEvent common; /**< Common event data */ - SDL_WindowEvent window; /**< Window event data */ - SDL_KeyboardEvent key; /**< Keyboard event data */ - SDL_TextEditingEvent edit; /**< Text editing event data */ - SDL_TextInputEvent text; /**< Text input event data */ - SDL_MouseMotionEvent motion; /**< Mouse motion event data */ - SDL_MouseButtonEvent button; /**< Mouse button event data */ - SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ - SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ - SDL_JoyBallEvent jball; /**< Joystick ball event data */ - SDL_JoyHatEvent jhat; /**< Joystick hat event data */ - SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ - SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ - SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ - SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ - SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ - SDL_QuitEvent quit; /**< Quit request event data */ - SDL_UserEvent user; /**< Custom event data */ - SDL_SysWMEvent syswm; /**< System dependent window event data */ - SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ - SDL_MultiGestureEvent mgesture; /**< Gesture event data */ - SDL_DollarGestureEvent dgesture; /**< Gesture event data */ - SDL_DropEvent drop; /**< Drag and drop event data */ - - /* This is necessary for ABI compatibility between Visual C++ and GCC - Visual C++ will respect the push pack pragma and use 52 bytes for - this structure, and GCC will use the alignment of the largest datatype - within the union, which is 8 bytes. - - So... we'll add padding to force the size to be 56 bytes for both. - */ - Uint8 padding[56]; -} SDL_Event; - - -/* Function prototypes */ - -/** - * Pumps the event loop, gathering events from the input devices. - * - * This function updates the event queue and internal input device state. - * - * This should only be run in the thread that sets the video mode. - */ -extern DECLSPEC void SDLCALL SDL_PumpEvents(void); - -/* @{ */ -typedef enum -{ - SDL_ADDEVENT, - SDL_PEEKEVENT, - SDL_GETEVENT -} SDL_eventaction; - -/** - * Checks the event queue for messages and optionally returns them. - * - * If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to - * the back of the event queue. - * - * If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will not be removed from the queue. - * - * If \c action is ::SDL_GETEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will be removed from the queue. - * - * \return The number of events actually stored, or -1 if there was an error. - * - * This function is thread-safe. - */ -extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, - SDL_eventaction action, - Uint32 minType, Uint32 maxType); -/* @} */ - -/** - * Checks to see if certain event types are in the event queue. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type); -extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType); - -/** - * This function clears events from the event queue - */ -extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type); -extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType); - -/** - * \brief Polls for currently pending events. - * - * \return 1 if there are any pending events, or 0 if there are none available. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - */ -extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event); - -/** - * \brief Waits indefinitely for the next available event. - * - * \return 1, or 0 if there was an error while waiting for events. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - */ -extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event); - -/** - * \brief Waits until the specified timeout (in milliseconds) for the next - * available event. - * - * \return 1, or 0 if there was an error while waiting for events. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - * \param timeout The timeout (in milliseconds) to wait for next event. - */ -extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event, - int timeout); - -/** - * \brief Add an event to the event queue. - * - * \return 1 on success, 0 if the event was filtered, or -1 if the event queue - * was full or there was some other error. - */ -extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event); - -typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event); - -/** - * Sets up a filter to process all events before they change internal state and - * are posted to the internal event queue. - * - * The filter is prototyped as: - * \code - * int SDL_EventFilter(void *userdata, SDL_Event * event); - * \endcode - * - * If the filter returns 1, then the event will be added to the internal queue. - * If it returns 0, then the event will be dropped from the queue, but the - * internal state will still be updated. This allows selective filtering of - * dynamically arriving events. - * - * \warning Be very careful of what you do in the event filter function, as - * it may run in a different thread! - * - * There is one caveat when dealing with the ::SDL_QuitEvent event type. The - * event filter is only called when the window manager desires to close the - * application window. If the event filter returns 1, then the window will - * be closed, otherwise the window will remain open if possible. - * - * If the quit event is generated by an interrupt signal, it will bypass the - * internal queue and be delivered to the application at the next event poll. - */ -extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter, - void *userdata); - -/** - * Return the current event filter - can be used to "chain" filters. - * If there is no event filter set, this function returns SDL_FALSE. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter, - void **userdata); - -/** - * Add a function which is called when an event is added to the queue. - */ -extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter, - void *userdata); - -/** - * Remove an event watch function added with SDL_AddEventWatch() - */ -extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter, - void *userdata); - -/** - * Run the filter function on the current event queue, removing any - * events for which the filter returns 0. - */ -extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, - void *userdata); - -/* @{ */ -#define SDL_QUERY -1 -#define SDL_IGNORE 0 -#define SDL_DISABLE 0 -#define SDL_ENABLE 1 - -/** - * This function allows you to set the state of processing certain events. - * - If \c state is set to ::SDL_IGNORE, that event will be automatically - * dropped from the event queue and will not event be filtered. - * - If \c state is set to ::SDL_ENABLE, that event will be processed - * normally. - * - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the - * current processing state of the specified event. - */ -extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state); -/* @} */ -#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY) - -/** - * This function allocates a set of user-defined events, and returns - * the beginning event number for that set of events. - * - * If there aren't enough user-defined events left, this function - * returns (Uint32)-1 - */ -extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_events_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_filesystem.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_filesystem.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_filesystem.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_filesystem.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_filesystem.h - * - * \brief Include file for filesystem SDL API functions - */ - -#ifndef _SDL_filesystem_h -#define _SDL_filesystem_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Get the path where the application resides. - * - * Get the "base path". This is the directory where the application was run - * from, which is probably the installation directory, and may or may not - * be the process's current working directory. - * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). - * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. - * - * Some platforms can't determine the application's path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \return String of base dir in UTF-8 encoding, or NULL on error. - * - * \sa SDL_GetPrefPath - */ -extern DECLSPEC char *SDLCALL SDL_GetBasePath(void); - -/** - * \brief Get the user-and-app-specific path where files can be written. - * - * Get the "pref dir". This is meant to be where users can write personal - * files (preferences and save games, etc) that are specific to your - * application. This directory is unique per user, per application. - * - * This function will decide the appropriate location in the native filesystem, - * create the directory if necessary, and return a string of the absolute - * path to the directory in UTF-8 encoding. - * - * On Windows, the string might look like: - * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\" - * - * On Linux, the string might look like: - * "/home/bob/.local/share/My Program Name/" - * - * On Mac OS X, the string might look like: - * "/Users/bob/Library/Application Support/My Program Name/" - * - * (etc.) - * - * You specify the name of your organization (if it's not a real organization, - * your name or an Internet domain you own might do) and the name of your - * application. These should be untranslated proper names. - * - * Both the org and app strings may become part of a directory name, so - * please follow these rules: - * - * - Try to use the same org string (including case-sensitivity) for - * all your applications that use this function. - * - Always use a unique app string for each one, and make sure it never - * changes for an app once you've decided on it. - * - Unicode characters are legal, as long as it's UTF-8 encoded, but... - * - ...only use letters, numbers, and spaces. Avoid punctuation like - * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. - * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). - * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. - * - * You should assume the path returned by this function is the only safe - * place to write files (and that SDL_GetBasePath(), while it might be - * writable, or even the parent of the returned path, aren't where you - * should be writing things). - * - * Some platforms can't determine the pref path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \param org The name of your organization. - * \param app The name of your application. - * \return UTF-8 string of user dir in platform-dependent notation. NULL - * if there's a problem (creating directory failed, etc). - * - * \sa SDL_GetBasePath - */ -extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_system_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gamecontroller.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,316 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_gamecontroller.h - * - * Include file for SDL game controller event handling - */ - -#ifndef _SDL_gamecontroller_h -#define _SDL_gamecontroller_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_rwops.h" -#include "SDL_joystick.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_gamecontroller.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system - * for game controllers, and load appropriate drivers. - * - * If you would like to receive controller updates while the application - * is in the background, you should set the following hint before calling - * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS - */ - -/* The gamecontroller structure used to identify an SDL game controller */ -struct _SDL_GameController; -typedef struct _SDL_GameController SDL_GameController; - - -typedef enum -{ - SDL_CONTROLLER_BINDTYPE_NONE = 0, - SDL_CONTROLLER_BINDTYPE_BUTTON, - SDL_CONTROLLER_BINDTYPE_AXIS, - SDL_CONTROLLER_BINDTYPE_HAT -} SDL_GameControllerBindType; - -/** - * Get the SDL joystick layer binding for this controller button/axis mapping - */ -typedef struct SDL_GameControllerButtonBind -{ - SDL_GameControllerBindType bindType; - union - { - int button; - int axis; - struct { - int hat; - int hat_mask; - } hat; - } value; - -} SDL_GameControllerButtonBind; - - -/** - * To count the number of game controllers in the system for the following: - * int nJoysticks = SDL_NumJoysticks(); - * int nGameControllers = 0; - * for ( int i = 0; i < nJoysticks; i++ ) { - * if ( SDL_IsGameController(i) ) { - * nGameControllers++; - * } - * } - * - * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: - * guid,name,mappings - * - * Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones. - * Under Windows there is a reserved GUID of "xinput" that covers any XInput devices. - * The mapping format for joystick is: - * bX - a joystick button, index X - * hX.Y - hat X with value Y - * aX - axis X of the joystick - * Buttons can be used as a controller axis and vice versa. - * - * This string shows an example of a valid mapping for a controller - * "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", - * - */ - -/** - * Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform() - * A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt - * - * If \c freerw is non-zero, the stream will be closed after being read. - * - * \return number of mappings added, -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW( SDL_RWops * rw, int freerw ); - -/** - * Load a set of mappings from a file, filtered by the current SDL_GetPlatform() - * - * Convenience macro. - */ -#define SDL_GameControllerAddMappingsFromFile(file) SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1) - -/** - * Add or update an existing mapping configuration - * - * \return 1 if mapping is added, 0 if updated, -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping( const char* mappingString ); - -/** - * Get a mapping string for a GUID - * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available - */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid ); - -/** - * Get a mapping string for an open GameController - * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available - */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMapping( SDL_GameController * gamecontroller ); - -/** - * Is the joystick on this index supported by the game controller interface? - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); - - -/** - * Get the implementation dependent name of a game controller. - * This can be called before any controllers are opened. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); - -/** - * Open a game controller for use. - * The index passed as an argument refers to the N'th game controller on the system. - * This index is the value which will identify this controller in future controller - * events. - * - * \return A controller identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index); - -/** - * Return the name for this currently opened controller - */ -extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); - -/** - * Returns SDL_TRUE if the controller has been opened and currently connected, - * or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller); - -/** - * Get the underlying joystick object used by a controller - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller); - -/** - * Enable/disable controller event polling. - * - * If controller events are disabled, you must call SDL_GameControllerUpdate() - * yourself and check the state of the controller when you want controller - * information. - * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. - */ -extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state); - -/** - * Update the current state of the open game controllers. - * - * This is called automatically by the event loop if any game controller - * events are enabled. - */ -extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void); - - -/** - * The list of axes available from a controller - */ -typedef enum -{ - SDL_CONTROLLER_AXIS_INVALID = -1, - SDL_CONTROLLER_AXIS_LEFTX, - SDL_CONTROLLER_AXIS_LEFTY, - SDL_CONTROLLER_AXIS_RIGHTX, - SDL_CONTROLLER_AXIS_RIGHTY, - SDL_CONTROLLER_AXIS_TRIGGERLEFT, - SDL_CONTROLLER_AXIS_TRIGGERRIGHT, - SDL_CONTROLLER_AXIS_MAX -} SDL_GameControllerAxis; - -/** - * turn this string into a axis mapping - */ -extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString); - -/** - * turn this axis enum into a string mapping - */ -extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis); - -/** - * Get the SDL joystick layer binding for this controller button mapping - */ -extern DECLSPEC SDL_GameControllerButtonBind SDLCALL -SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); - -/** - * Get the current state of an axis control on a game controller. - * - * The state is a value ranging from -32768 to 32767. - * - * The axis indices start at index 0. - */ -extern DECLSPEC Sint16 SDLCALL -SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); - -/** - * The list of buttons available from a controller - */ -typedef enum -{ - SDL_CONTROLLER_BUTTON_INVALID = -1, - SDL_CONTROLLER_BUTTON_A, - SDL_CONTROLLER_BUTTON_B, - SDL_CONTROLLER_BUTTON_X, - SDL_CONTROLLER_BUTTON_Y, - SDL_CONTROLLER_BUTTON_BACK, - SDL_CONTROLLER_BUTTON_GUIDE, - SDL_CONTROLLER_BUTTON_START, - SDL_CONTROLLER_BUTTON_LEFTSTICK, - SDL_CONTROLLER_BUTTON_RIGHTSTICK, - SDL_CONTROLLER_BUTTON_LEFTSHOULDER, - SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, - SDL_CONTROLLER_BUTTON_DPAD_UP, - SDL_CONTROLLER_BUTTON_DPAD_DOWN, - SDL_CONTROLLER_BUTTON_DPAD_LEFT, - SDL_CONTROLLER_BUTTON_DPAD_RIGHT, - SDL_CONTROLLER_BUTTON_MAX -} SDL_GameControllerButton; - -/** - * turn this string into a button mapping - */ -extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString); - -/** - * turn this button enum into a string mapping - */ -extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button); - -/** - * Get the SDL joystick layer binding for this controller button mapping - */ -extern DECLSPEC SDL_GameControllerButtonBind SDLCALL -SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, - SDL_GameControllerButton button); - - -/** - * Get the current state of a button on a game controller. - * - * The button indices start at index 0. - */ -extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, - SDL_GameControllerButton button); - -/** - * Close a controller previously opened with SDL_GameControllerOpen(). - */ -extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_gamecontroller_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gesture.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gesture.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gesture.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_gesture.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_gesture.h - * - * Include file for SDL gesture event handling. - */ - -#ifndef _SDL_gesture_h -#define _SDL_gesture_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "SDL_touch.h" - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef Sint64 SDL_GestureID; - -/* Function prototypes */ - -/** - * \brief Begin Recording a gesture on the specified touch, or all touches (-1) - * - * - */ -extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId); - - -/** - * \brief Save all currently loaded Dollar Gesture templates - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst); - -/** - * \brief Save a currently loaded Dollar Gesture template - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst); - - -/** - * \brief Load Dollar Gesture templates from a file - * - * - */ -extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_gesture_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL.h - * - * Main include header for the SDL library - */ - -/** - * \mainpage Simple DirectMedia Layer (SDL) - * - * http://www.libsdl.org/ - * - * \section intro_sec Introduction - * - * Simple DirectMedia Layer is a cross-platform development library designed - * to provide low level access to audio, keyboard, mouse, joystick, and - * graphics hardware via OpenGL and Direct3D. It is used by video playback - * software, emulators, and popular games including Valve's award winning - * catalog and many Humble Bundle games. - * - * SDL officially supports Windows, Mac OS X, Linux, iOS, and Android. - * Support for other platforms may be found in the source code. - * - * SDL is written in C, works natively with C++, and there are bindings - * available for several other languages, including C# and Python. - * - * This library is distributed under the zlib license, which can be found - * in the file "COPYING.txt". - * - * The best way to learn how to use SDL is to check out the header files in - * the "include" subdirectory and the programs in the "test" subdirectory. - * The header files and test programs are well commented and always up to date. - * More documentation and FAQs are available online at: - * http://wiki.libsdl.org/ - * - * If you need help with the library, or just want to discuss SDL related - * issues, you can join the developers mailing list: - * http://www.libsdl.org/mailing-list.php - * - * Enjoy! - * Sam Lantinga (slouken@libsdl.org) - */ - -#ifndef _SDL_H -#define _SDL_H - -#include "SDL_main.h" -#include "SDL_stdinc.h" -#include "SDL_assert.h" -#include "SDL_atomic.h" -#include "SDL_audio.h" -#include "SDL_clipboard.h" -#include "SDL_cpuinfo.h" -#include "SDL_endian.h" -#include "SDL_error.h" -#include "SDL_events.h" -#include "SDL_filesystem.h" -#include "SDL_joystick.h" -#include "SDL_gamecontroller.h" -#include "SDL_haptic.h" -#include "SDL_hints.h" -#include "SDL_loadso.h" -#include "SDL_log.h" -#include "SDL_messagebox.h" -#include "SDL_mutex.h" -#include "SDL_power.h" -#include "SDL_render.h" -#include "SDL_rwops.h" -#include "SDL_system.h" -#include "SDL_thread.h" -#include "SDL_timer.h" -#include "SDL_version.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* As of version 0.5, SDL is loaded dynamically into the application */ - -/** - * \name SDL_INIT_* - * - * These are the flags which may be passed to SDL_Init(). You should - * specify the subsystems which you will be using in your application. - */ -/* @{ */ -#define SDL_INIT_TIMER 0x00000001 -#define SDL_INIT_AUDIO 0x00000010 -#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */ -#define SDL_INIT_JOYSTICK 0x00000200 /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */ -#define SDL_INIT_HAPTIC 0x00001000 -#define SDL_INIT_GAMECONTROLLER 0x00002000 /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */ -#define SDL_INIT_EVENTS 0x00004000 -#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */ -#define SDL_INIT_EVERYTHING ( \ - SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \ - SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \ - ) -/* @} */ - -/** - * This function initializes the subsystems specified by \c flags - * Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup - * signal handlers for some commonly ignored fatal signals (like SIGSEGV). - */ -extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); - -/** - * This function initializes specific SDL subsystems - */ -extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); - -/** - * This function cleans up specific SDL subsystems - */ -extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); - -/** - * This function returns a mask of the specified subsystems which have - * previously been initialized. - * - * If \c flags is 0, it returns a mask of all initialized subsystems. - */ -extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); - -/** - * This function cleans up all initialized subsystems. You should - * call it upon all exit conditions. - */ -extern DECLSPEC void SDLCALL SDL_Quit(void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_H */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_haptic.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_haptic.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_haptic.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_haptic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,1225 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_haptic.h - * - * \brief The SDL Haptic subsystem allows you to control haptic (force feedback) - * devices. - * - * The basic usage is as follows: - * - Initialize the Subsystem (::SDL_INIT_HAPTIC). - * - Open a Haptic Device. - * - SDL_HapticOpen() to open from index. - * - SDL_HapticOpenFromJoystick() to open from an existing joystick. - * - Create an effect (::SDL_HapticEffect). - * - Upload the effect with SDL_HapticNewEffect(). - * - Run the effect with SDL_HapticRunEffect(). - * - (optional) Free the effect with SDL_HapticDestroyEffect(). - * - Close the haptic device with SDL_HapticClose(). - * - * \par Simple rumble example: - * \code - * SDL_Haptic *haptic; - * - * // Open the device - * haptic = SDL_HapticOpen( 0 ); - * if (haptic == NULL) - * return -1; - * - * // Initialize simple rumble - * if (SDL_HapticRumbleInit( haptic ) != 0) - * return -1; - * - * // Play effect at 50% strength for 2 seconds - * if (SDL_HapticRumblePlay( haptic, 0.5, 2000 ) != 0) - * return -1; - * SDL_Delay( 2000 ); - * - * // Clean up - * SDL_HapticClose( haptic ); - * \endcode - * - * \par Complete example: - * \code - * int test_haptic( SDL_Joystick * joystick ) { - * SDL_Haptic *haptic; - * SDL_HapticEffect effect; - * int effect_id; - * - * // Open the device - * haptic = SDL_HapticOpenFromJoystick( joystick ); - * if (haptic == NULL) return -1; // Most likely joystick isn't haptic - * - * // See if it can do sine waves - * if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) { - * SDL_HapticClose(haptic); // No sine effect - * return -1; - * } - * - * // Create the effect - * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default - * effect.type = SDL_HAPTIC_SINE; - * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates - * effect.periodic.direction.dir[0] = 18000; // Force comes from south - * effect.periodic.period = 1000; // 1000 ms - * effect.periodic.magnitude = 20000; // 20000/32767 strength - * effect.periodic.length = 5000; // 5 seconds long - * effect.periodic.attack_length = 1000; // Takes 1 second to get max strength - * effect.periodic.fade_length = 1000; // Takes 1 second to fade away - * - * // Upload the effect - * effect_id = SDL_HapticNewEffect( haptic, &effect ); - * - * // Test the effect - * SDL_HapticRunEffect( haptic, effect_id, 1 ); - * SDL_Delay( 5000); // Wait for the effect to finish - * - * // We destroy the effect, although closing the device also does this - * SDL_HapticDestroyEffect( haptic, effect_id ); - * - * // Close the device - * SDL_HapticClose(haptic); - * - * return 0; // Success - * } - * \endcode - * - * You can also find out more information on my blog: - * http://bobbens.dyndns.org/journal/2010/sdl_haptic/ - * - * \author Edgar Simo Serra - */ - -#ifndef _SDL_haptic_h -#define _SDL_haptic_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_joystick.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** - * \typedef SDL_Haptic - * - * \brief The haptic structure used to identify an SDL haptic. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - */ -struct _SDL_Haptic; -typedef struct _SDL_Haptic SDL_Haptic; - - -/** - * \name Haptic features - * - * Different haptic features a device can have. - */ -/* @{ */ - -/** - * \name Haptic effects - */ -/* @{ */ - -/** - * \brief Constant effect supported. - * - * Constant haptic effect. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_CONSTANT (1<<0) - -/** - * \brief Sine wave effect supported. - * - * Periodic haptic effect that simulates sine waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SINE (1<<1) - -/** - * \brief Left/Right effect supported. - * - * Haptic effect for direct control over high/low frequency motors. - * - * \sa SDL_HapticLeftRight - * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry, - * we ran out of bits, and this is important for XInput devices. - */ -#define SDL_HAPTIC_LEFTRIGHT (1<<2) - -/* !!! FIXME: put this back when we have more bits in 2.1 */ -/* #define SDL_HAPTIC_SQUARE (1<<2) */ - -/** - * \brief Triangle wave effect supported. - * - * Periodic haptic effect that simulates triangular waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_TRIANGLE (1<<3) - -/** - * \brief Sawtoothup wave effect supported. - * - * Periodic haptic effect that simulates saw tooth up waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SAWTOOTHUP (1<<4) - -/** - * \brief Sawtoothdown wave effect supported. - * - * Periodic haptic effect that simulates saw tooth down waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5) - -/** - * \brief Ramp effect supported. - * - * Ramp haptic effect. - * - * \sa SDL_HapticRamp - */ -#define SDL_HAPTIC_RAMP (1<<6) - -/** - * \brief Spring effect supported - uses axes position. - * - * Condition haptic effect that simulates a spring. Effect is based on the - * axes position. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_SPRING (1<<7) - -/** - * \brief Damper effect supported - uses axes velocity. - * - * Condition haptic effect that simulates dampening. Effect is based on the - * axes velocity. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_DAMPER (1<<8) - -/** - * \brief Inertia effect supported - uses axes acceleration. - * - * Condition haptic effect that simulates inertia. Effect is based on the axes - * acceleration. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_INERTIA (1<<9) - -/** - * \brief Friction effect supported - uses axes movement. - * - * Condition haptic effect that simulates friction. Effect is based on the - * axes movement. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_FRICTION (1<<10) - -/** - * \brief Custom effect is supported. - * - * User defined custom haptic effect. - */ -#define SDL_HAPTIC_CUSTOM (1<<11) - -/* @} *//* Haptic effects */ - -/* These last few are features the device has, not effects */ - -/** - * \brief Device can set global gain. - * - * Device supports setting the global gain. - * - * \sa SDL_HapticSetGain - */ -#define SDL_HAPTIC_GAIN (1<<12) - -/** - * \brief Device can set autocenter. - * - * Device supports setting autocenter. - * - * \sa SDL_HapticSetAutocenter - */ -#define SDL_HAPTIC_AUTOCENTER (1<<13) - -/** - * \brief Device can be queried for effect status. - * - * Device can be queried for effect status. - * - * \sa SDL_HapticGetEffectStatus - */ -#define SDL_HAPTIC_STATUS (1<<14) - -/** - * \brief Device can be paused. - * - * \sa SDL_HapticPause - * \sa SDL_HapticUnpause - */ -#define SDL_HAPTIC_PAUSE (1<<15) - - -/** - * \name Direction encodings - */ -/* @{ */ - -/** - * \brief Uses polar coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_POLAR 0 - -/** - * \brief Uses cartesian coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_CARTESIAN 1 - -/** - * \brief Uses spherical coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_SPHERICAL 2 - -/* @} *//* Direction encodings */ - -/* @} *//* Haptic features */ - -/* - * Misc defines. - */ - -/** - * \brief Used to play a device an infinite number of times. - * - * \sa SDL_HapticRunEffect - */ -#define SDL_HAPTIC_INFINITY 4294967295U - - -/** - * \brief Structure that represents a haptic direction. - * - * Directions can be specified by: - * - ::SDL_HAPTIC_POLAR : Specified by polar coordinates. - * - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates. - * - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates. - * - * Cardinal directions of the haptic device are relative to the positioning - * of the device. North is considered to be away from the user. - * - * The following diagram represents the cardinal directions: - * \verbatim - .--. - |__| .-------. - |=.| |.-----.| - |--| || || - | | |'-----'| - |__|~')_____(' - [ COMPUTER ] - - - North (0,-1) - ^ - | - | - (1,0) West <----[ HAPTIC ]----> East (-1,0) - | - | - v - South (0,1) - - - [ USER ] - \|||/ - (o o) - ---ooO-(_)-Ooo--- - \endverbatim - * - * If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a - * degree starting north and turning clockwise. ::SDL_HAPTIC_POLAR only uses - * the first \c dir parameter. The cardinal directions would be: - * - North: 0 (0 degrees) - * - East: 9000 (90 degrees) - * - South: 18000 (180 degrees) - * - West: 27000 (270 degrees) - * - * If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions - * (X axis, Y axis and Z axis (with 3 axes)). ::SDL_HAPTIC_CARTESIAN uses - * the first three \c dir parameters. The cardinal directions would be: - * - North: 0,-1, 0 - * - East: -1, 0, 0 - * - South: 0, 1, 0 - * - West: 1, 0, 0 - * - * The Z axis represents the height of the effect if supported, otherwise - * it's unused. In cartesian encoding (1, 2) would be the same as (2, 4), you - * can use any multiple you want, only the direction matters. - * - * If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations. - * The first two \c dir parameters are used. The \c dir parameters are as - * follows (all values are in hundredths of degrees): - * - Degrees from (1, 0) rotated towards (0, 1). - * - Degrees towards (0, 0, 1) (device needs at least 3 axes). - * - * - * Example of force coming from the south with all encodings (force coming - * from the south means the user will have to pull the stick to counteract): - * \code - * SDL_HapticDirection direction; - * - * // Cartesian directions - * direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding. - * direction.dir[0] = 0; // X position - * direction.dir[1] = 1; // Y position - * // Assuming the device has 2 axes, we don't need to specify third parameter. - * - * // Polar directions - * direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding. - * direction.dir[0] = 18000; // Polar only uses first parameter - * - * // Spherical coordinates - * direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding - * direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters. - * \endcode - * - * \sa SDL_HAPTIC_POLAR - * \sa SDL_HAPTIC_CARTESIAN - * \sa SDL_HAPTIC_SPHERICAL - * \sa SDL_HapticEffect - * \sa SDL_HapticNumAxes - */ -typedef struct SDL_HapticDirection -{ - Uint8 type; /**< The type of encoding. */ - Sint32 dir[3]; /**< The encoded direction. */ -} SDL_HapticDirection; - - -/** - * \brief A structure containing a template for a Constant effect. - * - * The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect. - * - * A constant effect applies a constant force in the specified direction - * to the joystick. - * - * \sa SDL_HAPTIC_CONSTANT - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticConstant -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_CONSTANT */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Constant */ - Sint16 level; /**< Strength of the constant effect. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticConstant; - -/** - * \brief A structure containing a template for a Periodic effect. - * - * The struct handles the following effects: - * - ::SDL_HAPTIC_SINE - * - ::SDL_HAPTIC_LEFTRIGHT - * - ::SDL_HAPTIC_TRIANGLE - * - ::SDL_HAPTIC_SAWTOOTHUP - * - ::SDL_HAPTIC_SAWTOOTHDOWN - * - * A periodic effect consists in a wave-shaped effect that repeats itself - * over time. The type determines the shape of the wave and the parameters - * determine the dimensions of the wave. - * - * Phase is given by hundredth of a cycle meaning that giving the phase a value - * of 9000 will displace it 25% of its period. Here are sample values: - * - 0: No phase displacement. - * - 9000: Displaced 25% of its period. - * - 18000: Displaced 50% of its period. - * - 27000: Displaced 75% of its period. - * - 36000: Displaced 100% of its period, same as 0, but 0 is preferred. - * - * Examples: - * \verbatim - SDL_HAPTIC_SINE - __ __ __ __ - / \ / \ / \ / - / \__/ \__/ \__/ - - SDL_HAPTIC_SQUARE - __ __ __ __ __ - | | | | | | | | | | - | |__| |__| |__| |__| | - - SDL_HAPTIC_TRIANGLE - /\ /\ /\ /\ /\ - / \ / \ / \ / \ / - / \/ \/ \/ \/ - - SDL_HAPTIC_SAWTOOTHUP - /| /| /| /| /| /| /| - / | / | / | / | / | / | / | - / |/ |/ |/ |/ |/ |/ | - - SDL_HAPTIC_SAWTOOTHDOWN - \ |\ |\ |\ |\ |\ |\ | - \ | \ | \ | \ | \ | \ | \ | - \| \| \| \| \| \| \| - \endverbatim - * - * \sa SDL_HAPTIC_SINE - * \sa SDL_HAPTIC_LEFTRIGHT - * \sa SDL_HAPTIC_TRIANGLE - * \sa SDL_HAPTIC_SAWTOOTHUP - * \sa SDL_HAPTIC_SAWTOOTHDOWN - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticPeriodic -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT, - ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or - ::SDL_HAPTIC_SAWTOOTHDOWN */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Periodic */ - Uint16 period; /**< Period of the wave. */ - Sint16 magnitude; /**< Peak value. */ - Sint16 offset; /**< Mean value of the wave. */ - Uint16 phase; /**< Horizontal shift given by hundredth of a cycle. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticPeriodic; - -/** - * \brief A structure containing a template for a Condition effect. - * - * The struct handles the following effects: - * - ::SDL_HAPTIC_SPRING: Effect based on axes position. - * - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity. - * - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration. - * - ::SDL_HAPTIC_FRICTION: Effect based on axes movement. - * - * Direction is handled by condition internals instead of a direction member. - * The condition effect specific members have three parameters. The first - * refers to the X axis, the second refers to the Y axis and the third - * refers to the Z axis. The right terms refer to the positive side of the - * axis and the left terms refer to the negative side of the axis. Please - * refer to the ::SDL_HapticDirection diagram for which side is positive and - * which is negative. - * - * \sa SDL_HapticDirection - * \sa SDL_HAPTIC_SPRING - * \sa SDL_HAPTIC_DAMPER - * \sa SDL_HAPTIC_INERTIA - * \sa SDL_HAPTIC_FRICTION - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticCondition -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER, - ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */ - SDL_HapticDirection direction; /**< Direction of the effect - Not used ATM. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Condition */ - Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */ - Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */ - Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */ - Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */ - Uint16 deadband[3]; /**< Size of the dead zone. */ - Sint16 center[3]; /**< Position of the dead zone. */ -} SDL_HapticCondition; - -/** - * \brief A structure containing a template for a Ramp effect. - * - * This struct is exclusively for the ::SDL_HAPTIC_RAMP effect. - * - * The ramp effect starts at start strength and ends at end strength. - * It augments in linear fashion. If you use attack and fade with a ramp - * the effects get added to the ramp effect making the effect become - * quadratic instead of linear. - * - * \sa SDL_HAPTIC_RAMP - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticRamp -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_RAMP */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Ramp */ - Sint16 start; /**< Beginning strength level. */ - Sint16 end; /**< Ending strength level. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticRamp; - -/** - * \brief A structure containing a template for a Left/Right effect. - * - * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect. - * - * The Left/Right effect is used to explicitly control the large and small - * motors, commonly found in modern game controllers. One motor is high - * frequency, the other is low frequency. - * - * \sa SDL_HAPTIC_LEFTRIGHT - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticLeftRight -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_LEFTRIGHT */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - - /* Rumble */ - Uint16 large_magnitude; /**< Control of the large controller motor. */ - Uint16 small_magnitude; /**< Control of the small controller motor. */ -} SDL_HapticLeftRight; - -/** - * \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect. - * - * A custom force feedback effect is much like a periodic effect, where the - * application can define its exact shape. You will have to allocate the - * data yourself. Data should consist of channels * samples Uint16 samples. - * - * If channels is one, the effect is rotated using the defined direction. - * Otherwise it uses the samples in data for the different axes. - * - * \sa SDL_HAPTIC_CUSTOM - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticCustom -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_CUSTOM */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Custom */ - Uint8 channels; /**< Axes to use, minimum of one. */ - Uint16 period; /**< Sample periods. */ - Uint16 samples; /**< Amount of samples. */ - Uint16 *data; /**< Should contain channels*samples items. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticCustom; - -/** - * \brief The generic template for any haptic effect. - * - * All values max at 32767 (0x7FFF). Signed values also can be negative. - * Time values unless specified otherwise are in milliseconds. - * - * You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767 - * value. Neither delay, interval, attack_length nor fade_length support - * ::SDL_HAPTIC_INFINITY. Fade will also not be used since effect never ends. - * - * Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of - * ::SDL_HAPTIC_INFINITY. - * - * Button triggers may not be supported on all devices, it is advised to not - * use them if possible. Buttons start at index 1 instead of index 0 like - * the joystick. - * - * If both attack_length and fade_level are 0, the envelope is not used, - * otherwise both values are used. - * - * Common parts: - * \code - * // Replay - All effects have this - * Uint32 length; // Duration of effect (ms). - * Uint16 delay; // Delay before starting effect. - * - * // Trigger - All effects have this - * Uint16 button; // Button that triggers effect. - * Uint16 interval; // How soon before effect can be triggered again. - * - * // Envelope - All effects except condition effects have this - * Uint16 attack_length; // Duration of the attack (ms). - * Uint16 attack_level; // Level at the start of the attack. - * Uint16 fade_length; // Duration of the fade out (ms). - * Uint16 fade_level; // Level at the end of the fade. - * \endcode - * - * - * Here we have an example of a constant effect evolution in time: - * \verbatim - Strength - ^ - | - | effect level --> _________________ - | / \ - | / \ - | / \ - | / \ - | attack_level --> | \ - | | | <--- fade_level - | - +--------------------------------------------------> Time - [--] [---] - attack_length fade_length - - [------------------][-----------------------] - delay length - \endverbatim - * - * Note either the attack_level or the fade_level may be above the actual - * effect level. - * - * \sa SDL_HapticConstant - * \sa SDL_HapticPeriodic - * \sa SDL_HapticCondition - * \sa SDL_HapticRamp - * \sa SDL_HapticLeftRight - * \sa SDL_HapticCustom - */ -typedef union SDL_HapticEffect -{ - /* Common for all force feedback effects */ - Uint16 type; /**< Effect type. */ - SDL_HapticConstant constant; /**< Constant effect. */ - SDL_HapticPeriodic periodic; /**< Periodic effect. */ - SDL_HapticCondition condition; /**< Condition effect. */ - SDL_HapticRamp ramp; /**< Ramp effect. */ - SDL_HapticLeftRight leftright; /**< Left/Right effect. */ - SDL_HapticCustom custom; /**< Custom effect. */ -} SDL_HapticEffect; - - -/* Function prototypes */ -/** - * \brief Count the number of haptic devices attached to the system. - * - * \return Number of haptic devices detected on the system. - */ -extern DECLSPEC int SDLCALL SDL_NumHaptics(void); - -/** - * \brief Get the implementation dependent name of a Haptic device. - * - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. - * - * \param device_index Index of the device to get its name. - * \return Name of the device or NULL on error. - * - * \sa SDL_NumHaptics - */ -extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index); - -/** - * \brief Opens a Haptic device for usage. - * - * The index passed as an argument refers to the N'th Haptic device on this - * system. - * - * When opening a haptic device, its gain will be set to maximum and - * autocenter will be disabled. To modify these values use - * SDL_HapticSetGain() and SDL_HapticSetAutocenter(). - * - * \param device_index Index of the device to open. - * \return Device identifier or NULL on error. - * - * \sa SDL_HapticIndex - * \sa SDL_HapticOpenFromMouse - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - * \sa SDL_HapticSetGain - * \sa SDL_HapticSetAutocenter - * \sa SDL_HapticPause - * \sa SDL_HapticStopAll - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index); - -/** - * \brief Checks if the haptic device at index has been opened. - * - * \param device_index Index to check to see if it has been opened. - * \return 1 if it has been opened or 0 if it hasn't. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticIndex - */ -extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index); - -/** - * \brief Gets the index of a haptic device. - * - * \param haptic Haptic device to get the index of. - * \return The index of the haptic device or -1 on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpened - */ -extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic); - -/** - * \brief Gets whether or not the current mouse has haptic capabilities. - * - * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't. - * - * \sa SDL_HapticOpenFromMouse - */ -extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void); - -/** - * \brief Tries to open a haptic device from the current mouse. - * - * \return The haptic device identifier or NULL on error. - * - * \sa SDL_MouseIsHaptic - * \sa SDL_HapticOpen - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void); - -/** - * \brief Checks to see if a joystick has haptic features. - * - * \param joystick Joystick to test for haptic capabilities. - * \return 1 if the joystick is haptic, 0 if it isn't - * or -1 if an error ocurred. - * - * \sa SDL_HapticOpenFromJoystick - */ -extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick); - -/** - * \brief Opens a Haptic device for usage from a Joystick device. - * - * You must still close the haptic device seperately. It will not be closed - * with the joystick. - * - * When opening from a joystick you should first close the haptic device before - * closing the joystick device. If not, on some implementations the haptic - * device will also get unallocated and you'll be unable to use force feedback - * on that device. - * - * \param joystick Joystick to create a haptic device from. - * \return A valid haptic device identifier on success or NULL on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticClose - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick * - joystick); - -/** - * \brief Closes a Haptic device previously opened with SDL_HapticOpen(). - * - * \param haptic Haptic device to close. - */ -extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic); - -/** - * \brief Returns the number of effects a haptic device can store. - * - * On some platforms this isn't fully supported, and therefore is an - * approximation. Always check to see if your created effect was actually - * created and do not rely solely on SDL_HapticNumEffects(). - * - * \param haptic The haptic device to query effect max. - * \return The number of effects the haptic device can store or - * -1 on error. - * - * \sa SDL_HapticNumEffectsPlaying - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic); - -/** - * \brief Returns the number of effects a haptic device can play at the same - * time. - * - * This is not supported on all platforms, but will always return a value. - * Added here for the sake of completeness. - * - * \param haptic The haptic device to query maximum playing effects. - * \return The number of effects the haptic device can play at the same time - * or -1 on error. - * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic); - -/** - * \brief Gets the haptic devices supported features in bitwise matter. - * - * Example: - * \code - * if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) { - * printf("We have constant haptic effect!"); - * } - * \endcode - * - * \param haptic The haptic device to query. - * \return Haptic features in bitwise manner (OR'd). - * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticEffectSupported - */ -extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic); - - -/** - * \brief Gets the number of haptic axes the device has. - * - * \sa SDL_HapticDirection - */ -extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic); - -/** - * \brief Checks to see if effect is supported by haptic. - * - * \param haptic Haptic device to check on. - * \param effect Effect to check to see if it is supported. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. - * - * \sa SDL_HapticQuery - * \sa SDL_HapticNewEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic, - SDL_HapticEffect * - effect); - -/** - * \brief Creates a new haptic effect on the device. - * - * \param haptic Haptic device to create the effect on. - * \param effect Properties of the effect to create. - * \return The id of the effect on success or -1 on error. - * - * \sa SDL_HapticUpdateEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic, - SDL_HapticEffect * effect); - -/** - * \brief Updates the properties of an effect. - * - * Can be used dynamically, although behaviour when dynamically changing - * direction may be strange. Specifically the effect may reupload itself - * and start playing from the start. You cannot change the type either when - * running SDL_HapticUpdateEffect(). - * - * \param haptic Haptic device that has the effect. - * \param effect Effect to update. - * \param data New effect properties to use. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticNewEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic, - int effect, - SDL_HapticEffect * data); - -/** - * \brief Runs the haptic effect on its associated haptic device. - * - * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over - * repeating the envelope (attack and fade) every time. If you only want the - * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length - * parameter. - * - * \param haptic Haptic device to run the effect on. - * \param effect Identifier of the haptic effect to run. - * \param iterations Number of iterations to run the effect. Use - * ::SDL_HAPTIC_INFINITY for infinity. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticStopEffect - * \sa SDL_HapticDestroyEffect - * \sa SDL_HapticGetEffectStatus - */ -extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic, - int effect, - Uint32 iterations); - -/** - * \brief Stops the haptic effect on its associated haptic device. - * - * \param haptic Haptic device to stop the effect on. - * \param effect Identifier of the effect to stop. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic, - int effect); - -/** - * \brief Destroys a haptic effect on the device. - * - * This will stop the effect if it's running. Effects are automatically - * destroyed when the device is closed. - * - * \param haptic Device to destroy the effect on. - * \param effect Identifier of the effect to destroy. - * - * \sa SDL_HapticNewEffect - */ -extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic, - int effect); - -/** - * \brief Gets the status of the current effect on the haptic device. - * - * Device must support the ::SDL_HAPTIC_STATUS feature. - * - * \param haptic Haptic device to query the effect status on. - * \param effect Identifier of the effect to query its status. - * \return 0 if it isn't playing, 1 if it is playing or -1 on error. - * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticStopEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic, - int effect); - -/** - * \brief Sets the global gain of the device. - * - * Device must support the ::SDL_HAPTIC_GAIN feature. - * - * The user may specify the maximum gain by setting the environment variable - * SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to - * SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the - * maximum. - * - * \param haptic Haptic device to set the gain on. - * \param gain Value to set the gain to, should be between 0 and 100. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain); - -/** - * \brief Sets the global autocenter of the device. - * - * Autocenter should be between 0 and 100. Setting it to 0 will disable - * autocentering. - * - * Device must support the ::SDL_HAPTIC_AUTOCENTER feature. - * - * \param haptic Haptic device to set autocentering on. - * \param autocenter Value to set autocenter to, 0 disables autocentering. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic, - int autocenter); - -/** - * \brief Pauses a haptic device. - * - * Device must support the ::SDL_HAPTIC_PAUSE feature. Call - * SDL_HapticUnpause() to resume playback. - * - * Do not modify the effects nor add new ones while the device is paused. - * That can cause all sorts of weird errors. - * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticUnpause - */ -extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic); - -/** - * \brief Unpauses a haptic device. - * - * Call to unpause after SDL_HapticPause(). - * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticPause - */ -extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic); - -/** - * \brief Stops all the currently playing effects on a haptic device. - * - * \param haptic Haptic device to stop. - * \return 0 on success or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic); - -/** - * \brief Checks to see if rumble is supported on a haptic device. - * - * \param haptic Haptic device to check to see if it supports rumble. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. - * - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic); - -/** - * \brief Initializes the haptic device for simple rumble playback. - * - * \param haptic Haptic device to initialize for simple rumble playback. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic); - -/** - * \brief Runs simple rumble on a haptic device - * - * \param haptic Haptic device to play rumble effect on. - * \param strength Strength of the rumble to play as a 0-1 float value. - * \param length Length of the rumble to play in milliseconds. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length ); - -/** - * \brief Stops the simple rumble on a haptic device. - * - * \param haptic Haptic to stop the rumble on. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_haptic_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_hints.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_hints.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_hints.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_hints.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,517 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_hints.h - * - * Official documentation for SDL configuration variables - * - * This file contains functions to set and get configuration hints, - * as well as listing each of them alphabetically. - * - * The convention for naming hints is SDL_HINT_X, where "SDL_X" is - * the environment variable that can be used to override the default. - * - * In general these hints are just that - they may or may not be - * supported or applicable on any given platform, but they provide - * a way for an application or user to give the library a hint as - * to how they would like the library to work. - */ - -#ifndef _SDL_hints_h -#define _SDL_hints_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. - * - * SDL can try to accelerate the SDL screen surface by using streaming - * textures with a 3D rendering engine. This variable controls whether and - * how this is done. - * - * This variable can be set to the following values: - * "0" - Disable 3D acceleration - * "1" - Enable 3D acceleration, using the default renderer. - * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) - * - * By default SDL tries to make a best guess for each platform whether - * to use acceleration or not. - */ -#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" - -/** - * \brief A variable specifying which render driver to use. - * - * If the application doesn't pick a specific renderer to use, this variable - * specifies the name of the preferred renderer. If the preferred renderer - * can't be initialized, the normal default renderer is used. - * - * This variable is case insensitive and can be set to the following values: - * "direct3d" - * "opengl" - * "opengles2" - * "opengles" - * "software" - * - * The default varies by platform, but it's the first one in the list that - * is available on the current platform. - */ -#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" - -/** - * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. - * - * This variable can be set to the following values: - * "0" - Disable shaders - * "1" - Enable shaders - * - * By default shaders are used if OpenGL supports them. - */ -#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" - -/** - * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. - * - * This variable can be set to the following values: - * "0" - Thread-safety is not enabled (faster) - * "1" - Thread-safety is enabled - * - * By default the Direct3D device is created with thread-safety disabled. - */ -#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" - -/** - * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. - * - * This variable does not have any effect on the Direct3D 9 based renderer. - * - * This variable can be set to the following values: - * "0" - Disable Debug Layer use - * "1" - Enable Debug Layer use - * - * By default, SDL does not use Direct3D Debug Layer. - */ -#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_HINT_RENDER_DIRECT3D11_DEBUG" - -/** - * \brief A variable controlling the scaling quality - * - * This variable can be set to the following values: - * "0" or "nearest" - Nearest pixel sampling - * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) - * "2" or "best" - Currently this is the same as "linear" - * - * By default nearest pixel sampling is used - */ -#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" - -/** - * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. - * - * This variable can be set to the following values: - * "0" - Disable vsync - * "1" - Enable vsync - * - * By default SDL does not sync screen surface updates with vertical refresh. - */ -#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" - -/** - * \brief A variable controlling whether the screensaver is enabled. - * - * This variable can be set to the following values: - * "0" - Disable screensaver - * "1" - Enable screensaver - * - * By default SDL will disable the screensaver. - */ -#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" - -/** - * \brief A variable controlling whether the X11 VidMode extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XVidMode - * "1" - Enable XVidMode - * - * By default SDL will use XVidMode if it is available. - */ -#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" - -/** - * \brief A variable controlling whether the X11 Xinerama extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable Xinerama - * "1" - Enable Xinerama - * - * By default SDL will use Xinerama if it is available. - */ -#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" - -/** - * \brief A variable controlling whether the X11 XRandR extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XRandR - * "1" - Enable XRandR - * - * By default SDL will not use XRandR because of window manager issues. - */ -#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" - -/** - * \brief A variable controlling whether grabbing input grabs the keyboard - * - * This variable can be set to the following values: - * "0" - Grab will affect only the mouse - * "1" - Grab will affect mouse and keyboard - * - * By default SDL will not grab the keyboard so system shortcuts still work. - */ -#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" - -/** -* \brief A variable controlling whether relative mouse mode is implemented using mouse warping -* -* This variable can be set to the following values: -* "0" - Relative mouse mode uses raw input -* "1" - Relative mouse mode uses mouse warping -* -* By default SDL will use raw input for relative mouse mode -*/ -#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" - -/** - * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. - * - */ -#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" - -/** - * \brief A variable controlling whether the idle timer is disabled on iOS. - * - * When an iOS app does not receive touches for some time, the screen is - * dimmed automatically. For games where the accelerometer is the only input - * this is problematic. This functionality can be disabled by setting this - * hint. - * - * This variable can be set to the following values: - * "0" - Enable idle timer - * "1" - Disable idle timer - */ -#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" - -/** - * \brief A variable controlling which orientations are allowed on iOS. - * - * In some circumstances it is necessary to be able to explicitly control - * which UI orientations are allowed. - * - * This variable is a space delimited list of the following values: - * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" - */ -#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" - -/** - * \brief A variable controlling whether an Android built-in accelerometer should be - * listed as a joystick device, rather than listing actual joysticks only. - * - * This variable can be set to the following values: - * "0" - List only real joysticks and accept input from them - * "1" - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default). - */ -#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" - - -/** - * \brief A variable that lets you disable the detection and use of Xinput gamepad devices - * - * The variable can be set to the following values: - * "0" - Disable XInput detection (only uses direct input) - * "1" - Enable XInput detection (the default) - */ -#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" - - -/** - * \brief A variable that lets you manually hint extra gamecontroller db entries - * - * The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h - * - * This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER) - * You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping() - */ -#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG" - - -/** - * \brief A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background. - * - * The variable can be set to the following values: - * "0" - Disable joystick & gamecontroller input events when the - * application is in the background. - * "1" - Enable joystick & gamecontroller input events when the - * application is in the background. - * - * The default value is "0". This hint may be set at any time. - */ -#define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS" - - -/** - * \brief If set to 0 then never set the top most bit on a SDL Window, even if the video mode expects it. - * This is a debugging aid for developers and not expected to be used by end users. The default is "1" - * - * This variable can be set to the following values: - * "0" - don't allow topmost - * "1" - allow topmost - */ -#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" - - -/** - * \brief A variable that controls the timer resolution, in milliseconds. - * - * The higher resolution the timer, the more frequently the CPU services - * timer interrupts, and the more precise delays are, but this takes up - * power and CPU time. This hint is only used on Windows 7 and earlier. - * - * See this blog post for more information: - * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ - * - * If this variable is set to "0", the system timer resolution is not set. - * - * The default value is "1". This hint may be set at any time. - */ -#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" - - -/** - * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac) - */ -#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED" - -/** - * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac - * - * If present, holding ctrl while left clicking will generate a right click - * event when on Mac. - */ -#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" - -/** -* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries -* -* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It -* can use two different sets of binaries, those compiled by the user from source -* or those provided by the Chrome browser. In the later case, these binaries require -* that SDL loads a DLL providing the shader compiler. -* -* This variable can be set to the following values: -* "d3dcompiler_46.dll" - default, best for Vista or later. -* "d3dcompiler_43.dll" - for XP support. -* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. -* -*/ -#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" - -/** -* \brief A variable that is the address of another SDL_Window* (as a hex string formatted with "%p"). -* -* If this hint is set before SDL_CreateWindowFrom() and the SDL_Window* it is set to has -* SDL_WINDOW_OPENGL set (and running on WGL only, currently), then two things will occur on the newly -* created SDL_Window: -* -* 1. Its pixel format will be set to the same pixel format as this SDL_Window. This is -* needed for example when sharing an OpenGL context across multiple windows. -* -* 2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for -* OpenGL rendering. -* -* This variable can be set to the following values: -* The address (as a string "%p") of the SDL_Window* that new windows created with SDL_CreateWindowFrom() should -* share a pixel format with. -*/ -#define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT" - -/* - * \brief A URL to a WinRT app's privacy policy - * - * All network-enabled WinRT apps must make a privacy policy available to its - * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be - * be available in the Windows Settings charm, as accessed from within the app. - * SDL provides code to add a URL-based link there, which can point to the app's - * privacy policy. - * - * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init functions. The contents of the hint should - * be a valid URL. For example, "http://www.example.com". - * - * The default value is "", which will prevent SDL from adding a privacy policy - * link to the Settings charm. This hint should only be set during app init. - * - * The label text of an app's "Privacy Policy" link may be customized via another - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that on Windows Phone, Microsoft does not provide standard UI - * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL - * will not get used on that platform. Network-enabled phone apps should display - * their privacy policy through some other, in-app means. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_HINT_WINRT_PRIVACY_POLICY_URL" - -/** \brief Label text for a WinRT app's privacy policy link - * - * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, - * Microsoft mandates that this policy be available via the Windows Settings charm. - * SDL provides code to add a link there, with it's label text being set via the - * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that a privacy policy's contents are not set via this hint. A separate - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the - * policy. - * - * The contents of this hint should be encoded as a UTF8 string. - * - * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init. - * - * For additional information on linking to a privacy policy, see the documentation for - * SDL_HINT_WINRT_PRIVACY_POLICY_URL. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_HINT_WINRT_PRIVACY_POLICY_LABEL" - -/** \brief If set to 1, back button press events on Windows Phone 8+ will be marked as handled. - * - * TODO, WinRT: document SDL_HINT_WINRT_HANDLE_BACK_BUTTON need and use - * For now, more details on why this is needed can be found at the - * beginning of the following web page: - * http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj247550(v=vs.105).aspx - */ -#define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_HINT_WINRT_HANDLE_BACK_BUTTON" - -/** - * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. - * - * This hint only applies to Mac OS X. - * - * The variable can be set to the following values: - * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and - * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" - * button on their titlebars). - * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and - * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" - * button on their titlebars. - * - * The default value is "1". Spaces are disabled regardless of this hint if - * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before - * any windows are created. - */ -#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" - - -/** - * \brief An enumeration of hint priorities - */ -typedef enum -{ - SDL_HINT_DEFAULT, - SDL_HINT_NORMAL, - SDL_HINT_OVERRIDE -} SDL_HintPriority; - - -/** - * \brief Set a hint with a specific priority - * - * The priority controls the behavior when setting a hint that already - * has a value. Hints will replace existing hints of their priority and - * lower. Environment variables are considered to have override priority. - * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name, - const char *value, - SDL_HintPriority priority); - -/** - * \brief Set a hint with normal priority - * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, - const char *value); - -/** - * \brief Get a hint - * - * \return The string value of a hint variable. - */ -extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); - -/** - * \brief Add a function to watch a particular hint - * - * \param name The hint to watch - * \param callback The function to call when the hint value changes - * \param userdata A pointer to pass to the callback function - */ -typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); -extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, - SDL_HintCallback callback, - void *userdata); - -/** - * \brief Remove a function watching a particular hint - * - * \param name The hint being watched - * \param callback The function being called when the hint value changes - * \param userdata A pointer being passed to the callback function - */ -extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name, - SDL_HintCallback callback, - void *userdata); - -/** - * \brief Clear all hints - * - * This function is called during SDL_Quit() to free stored hints. - */ -extern DECLSPEC void SDLCALL SDL_ClearHints(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_hints_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_joystick.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_joystick.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_joystick.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_joystick.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,253 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_joystick.h - * - * Include file for SDL joystick event handling - * - * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick - * behind a device_index changing as joysticks are plugged and unplugged. - * - * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted - * then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in. - * - * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of - * the device (a X360 wired controller for example). This identifier is platform dependent. - * - * - */ - -#ifndef _SDL_joystick_h -#define _SDL_joystick_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_joystick.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system - * for joysticks, and load appropriate drivers. - * - * If you would like to receive joystick updates while the application - * is in the background, you should set the following hint before calling - * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS - */ - -/* The joystick structure used to identify an SDL joystick */ -struct _SDL_Joystick; -typedef struct _SDL_Joystick SDL_Joystick; - -/* A structure that encodes the stable unique id for a joystick device */ -typedef struct { - Uint8 data[16]; -} SDL_JoystickGUID; - -typedef Sint32 SDL_JoystickID; - - -/* Function prototypes */ -/** - * Count the number of joysticks attached to the system right now - */ -extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); - -/** - * Get the implementation dependent name of a joystick. - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); - -/** - * Open a joystick for use. - * The index passed as an argument refers tothe N'th joystick on the system. - * This index is the value which will identify this joystick in future joystick - * events. - * - * \return A joystick identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index); - -/** - * Return the name for this currently opened joystick. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); - -/** - * Return the GUID for the joystick at this index - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index); - -/** - * Return the GUID for this opened joystick - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick); - -/** - * Return a string representation for this guid. pszGUID must point to at least 33 bytes - * (32 for the string plus a NULL terminator). - */ -extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID); - -/** - * convert a string into a joystick formatted guid - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID); - -/** - * Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick); - -/** - * Get the instance ID of an opened joystick or -1 if the joystick is invalid. - */ -extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick); - -/** - * Get the number of general axis controls on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick); - -/** - * Get the number of trackballs on a joystick. - * - * Joystick trackballs have only relative motion events associated - * with them and their state cannot be polled. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick); - -/** - * Get the number of POV hats on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick); - -/** - * Get the number of buttons on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick); - -/** - * Update the current state of the open joysticks. - * - * This is called automatically by the event loop if any joystick - * events are enabled. - */ -extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void); - -/** - * Enable/disable joystick event polling. - * - * If joystick events are disabled, you must call SDL_JoystickUpdate() - * yourself and check the state of the joystick when you want joystick - * information. - * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. - */ -extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); - -/** - * Get the current state of an axis control on a joystick. - * - * The state is a value ranging from -32768 to 32767. - * - * The axis indices start at index 0. - */ -extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, - int axis); - -/** - * \name Hat positions - */ -/* @{ */ -#define SDL_HAT_CENTERED 0x00 -#define SDL_HAT_UP 0x01 -#define SDL_HAT_RIGHT 0x02 -#define SDL_HAT_DOWN 0x04 -#define SDL_HAT_LEFT 0x08 -#define SDL_HAT_RIGHTUP (SDL_HAT_RIGHT|SDL_HAT_UP) -#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT|SDL_HAT_DOWN) -#define SDL_HAT_LEFTUP (SDL_HAT_LEFT|SDL_HAT_UP) -#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT|SDL_HAT_DOWN) -/* @} */ - -/** - * Get the current state of a POV hat on a joystick. - * - * The hat indices start at index 0. - * - * \return The return value is one of the following positions: - * - ::SDL_HAT_CENTERED - * - ::SDL_HAT_UP - * - ::SDL_HAT_RIGHT - * - ::SDL_HAT_DOWN - * - ::SDL_HAT_LEFT - * - ::SDL_HAT_RIGHTUP - * - ::SDL_HAT_RIGHTDOWN - * - ::SDL_HAT_LEFTUP - * - ::SDL_HAT_LEFTDOWN - */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick, - int hat); - -/** - * Get the ball axis change since the last poll. - * - * \return 0, or -1 if you passed it invalid parameters. - * - * The ball indices start at index 0. - */ -extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, - int ball, int *dx, int *dy); - -/** - * Get the current state of a button on a joystick. - * - * The button indices start at index 0. - */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, - int button); - -/** - * Close a joystick previously opened with SDL_JoystickOpen(). - */ -extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_joystick_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keyboard.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keyboard.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keyboard.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keyboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_keyboard.h - * - * Include file for SDL keyboard event handling - */ - -#ifndef _SDL_keyboard_h -#define _SDL_keyboard_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_keycode.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The SDL keysym structure, used in key events. - * - * \note If you are looking for translated character input, see the ::SDL_TEXTINPUT event. - */ -typedef struct SDL_Keysym -{ - SDL_Scancode scancode; /**< SDL physical key code - see ::SDL_Scancode for details */ - SDL_Keycode sym; /**< SDL virtual key code - see ::SDL_Keycode for details */ - Uint16 mod; /**< current key modifiers */ - Uint32 unused; -} SDL_Keysym; - -/* Function prototypes */ - -/** - * \brief Get the window which currently has keyboard focus. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void); - -/** - * \brief Get a snapshot of the current state of the keyboard. - * - * \param numkeys if non-NULL, receives the length of the returned array. - * - * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values. - * - * \b Example: - * \code - * const Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode - */ -extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys); - -/** - * \brief Get the current key modifier state for the keyboard. - */ -extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void); - -/** - * \brief Set the current key modifier state for the keyboard. - * - * \note This does not change the keyboard state, only the key modifier flags. - */ -extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate); - -/** - * \brief Get the key code corresponding to the given scancode according - * to the current keyboard layout. - * - * See ::SDL_Keycode for details. - * - * \sa SDL_GetKeyName() - */ -extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode); - -/** - * \brief Get the scancode corresponding to the given key code according to the - * current keyboard layout. - * - * See ::SDL_Scancode for details. - * - * \sa SDL_GetScancodeName() - */ -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key); - -/** - * \brief Get a human-readable name for a scancode. - * - * \return A pointer to the name for the scancode. - * If the scancode doesn't have a name, this function returns - * an empty string (""). - * - * \sa SDL_Scancode - */ -extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode); - -/** - * \brief Get a scancode from a human-readable name - * - * \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized - * - * \sa SDL_Scancode - */ -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); - -/** - * \brief Get a human-readable name for a key. - * - * \return A pointer to a UTF-8 string that stays valid at least until the next - * call to this function. If you need it around any longer, you must - * copy it. If the key doesn't have a name, this function returns an - * empty string (""). - * - * \sa SDL_Key - */ -extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); - -/** - * \brief Get a key code from a human-readable name - * - * \return key code, or SDLK_UNKNOWN if the name wasn't recognized - * - * \sa SDL_Keycode - */ -extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); - -/** - * \brief Start accepting Unicode text input events. - * This function will show the on-screen keyboard if supported. - * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC void SDLCALL SDL_StartTextInput(void); - -/** - * \brief Return whether or not Unicode text input events are enabled. - * - * \sa SDL_StartTextInput() - * \sa SDL_StopTextInput() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void); - -/** - * \brief Stop receiving any text input events. - * This function will hide the on-screen keyboard if supported. - * - * \sa SDL_StartTextInput() - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC void SDLCALL SDL_StopTextInput(void); - -/** - * \brief Set the rectangle used to type Unicode text inputs. - * This is used as a hint for IME and on-screen keyboard placement. - * - * \sa SDL_StartTextInput() - */ -extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); - -/** - * \brief Returns whether the platform has some screen keyboard support. - * - * \return SDL_TRUE if some keyboard support is available else SDL_FALSE. - * - * \note Not all screen keyboard functions are supported on all platforms. - * - * \sa SDL_IsScreenKeyboardShown() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void); - -/** - * \brief Returns whether the screen keyboard is shown for given window. - * - * \param window The window for which screen keyboard should be queried. - * - * \return SDL_TRUE if screen keyboard is shown else SDL_FALSE. - * - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_keyboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keycode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keycode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keycode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_keycode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,341 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_keycode.h - * - * Defines constants which identify keyboard keys and modifiers. - */ - -#ifndef _SDL_keycode_h -#define _SDL_keycode_h - -#include "SDL_stdinc.h" -#include "SDL_scancode.h" - -/** - * \brief The SDL virtual key representation. - * - * Values of this type are used to represent keyboard keys using the current - * layout of the keyboard. These values include Unicode values representing - * the unmodified character that would be generated by pressing the key, or - * an SDLK_* constant for those keys that do not generate characters. - */ -typedef Sint32 SDL_Keycode; - -#define SDLK_SCANCODE_MASK (1<<30) -#define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) - -enum -{ - SDLK_UNKNOWN = 0, - - SDLK_RETURN = '\r', - SDLK_ESCAPE = '\033', - SDLK_BACKSPACE = '\b', - SDLK_TAB = '\t', - SDLK_SPACE = ' ', - SDLK_EXCLAIM = '!', - SDLK_QUOTEDBL = '"', - SDLK_HASH = '#', - SDLK_PERCENT = '%', - SDLK_DOLLAR = '$', - SDLK_AMPERSAND = '&', - SDLK_QUOTE = '\'', - SDLK_LEFTPAREN = '(', - SDLK_RIGHTPAREN = ')', - SDLK_ASTERISK = '*', - SDLK_PLUS = '+', - SDLK_COMMA = ',', - SDLK_MINUS = '-', - SDLK_PERIOD = '.', - SDLK_SLASH = '/', - SDLK_0 = '0', - SDLK_1 = '1', - SDLK_2 = '2', - SDLK_3 = '3', - SDLK_4 = '4', - SDLK_5 = '5', - SDLK_6 = '6', - SDLK_7 = '7', - SDLK_8 = '8', - SDLK_9 = '9', - SDLK_COLON = ':', - SDLK_SEMICOLON = ';', - SDLK_LESS = '<', - SDLK_EQUALS = '=', - SDLK_GREATER = '>', - SDLK_QUESTION = '?', - SDLK_AT = '@', - /* - Skip uppercase letters - */ - SDLK_LEFTBRACKET = '[', - SDLK_BACKSLASH = '\\', - SDLK_RIGHTBRACKET = ']', - SDLK_CARET = '^', - SDLK_UNDERSCORE = '_', - SDLK_BACKQUOTE = '`', - SDLK_a = 'a', - SDLK_b = 'b', - SDLK_c = 'c', - SDLK_d = 'd', - SDLK_e = 'e', - SDLK_f = 'f', - SDLK_g = 'g', - SDLK_h = 'h', - SDLK_i = 'i', - SDLK_j = 'j', - SDLK_k = 'k', - SDLK_l = 'l', - SDLK_m = 'm', - SDLK_n = 'n', - SDLK_o = 'o', - SDLK_p = 'p', - SDLK_q = 'q', - SDLK_r = 'r', - SDLK_s = 's', - SDLK_t = 't', - SDLK_u = 'u', - SDLK_v = 'v', - SDLK_w = 'w', - SDLK_x = 'x', - SDLK_y = 'y', - SDLK_z = 'z', - - SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK), - - SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1), - SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2), - SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3), - SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4), - SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5), - SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6), - SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7), - SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8), - SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9), - SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10), - SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11), - SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12), - - SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN), - SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK), - SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE), - SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), - SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), - SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - SDLK_DELETE = '\177', - SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), - SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), - SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), - SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT), - SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN), - SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP), - - SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR), - SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE), - SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY), - SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS), - SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS), - SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER), - SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1), - SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2), - SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3), - SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4), - SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5), - SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6), - SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7), - SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8), - SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9), - SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0), - SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD), - - SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION), - SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER), - SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS), - SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13), - SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14), - SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15), - SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16), - SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17), - SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18), - SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19), - SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20), - SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21), - SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22), - SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23), - SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24), - SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE), - SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP), - SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU), - SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT), - SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP), - SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN), - SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO), - SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT), - SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY), - SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE), - SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND), - SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE), - SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP), - SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN), - SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA), - SDLK_KP_EQUALSAS400 = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400), - - SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE), - SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ), - SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL), - SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR), - SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR), - SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2), - SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR), - SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT), - SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER), - SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN), - SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL), - SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL), - - SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00), - SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000), - SDLK_THOUSANDSSEPARATOR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR), - SDLK_DECIMALSEPARATOR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR), - SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT), - SDLK_CURRENCYSUBUNIT = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT), - SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN), - SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN), - SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE), - SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE), - SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB), - SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE), - SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A), - SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B), - SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C), - SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D), - SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E), - SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F), - SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR), - SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER), - SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT), - SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS), - SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER), - SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND), - SDLK_KP_DBLAMPERSAND = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND), - SDLK_KP_VERTICALBAR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR), - SDLK_KP_DBLVERTICALBAR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR), - SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON), - SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH), - SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE), - SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT), - SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM), - SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE), - SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL), - SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR), - SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD), - SDLK_KP_MEMSUBTRACT = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT), - SDLK_KP_MEMMULTIPLY = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY), - SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE), - SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS), - SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR), - SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY), - SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY), - SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL), - SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL), - SDLK_KP_HEXADECIMAL = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL), - - SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL), - SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT), - SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT), - SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI), - SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL), - SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT), - SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT), - SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI), - - SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE), - - SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT), - SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV), - SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP), - SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY), - SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE), - SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT), - SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW), - SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL), - SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR), - SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER), - SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH), - SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME), - SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK), - SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD), - SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP), - SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH), - SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS), - - SDLK_BRIGHTNESSDOWN = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN), - SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP), - SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH), - SDLK_KBDILLUMTOGGLE = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE), - SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN), - SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP), - SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT), - SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP) -}; - -/** - * \brief Enumeration of valid key mods (possibly OR'd together). - */ -typedef enum -{ - KMOD_NONE = 0x0000, - KMOD_LSHIFT = 0x0001, - KMOD_RSHIFT = 0x0002, - KMOD_LCTRL = 0x0040, - KMOD_RCTRL = 0x0080, - KMOD_LALT = 0x0100, - KMOD_RALT = 0x0200, - KMOD_LGUI = 0x0400, - KMOD_RGUI = 0x0800, - KMOD_NUM = 0x1000, - KMOD_CAPS = 0x2000, - KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDL_Keymod; - -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) - -#endif /* _SDL_keycode_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_loadso.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_loadso.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_loadso.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_loadso.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_loadso.h - * - * System dependent library loading routines - * - * Some things to keep in mind: - * \li These functions only work on C function names. Other languages may - * have name mangling and intrinsic language support that varies from - * compiler to compiler. - * \li Make sure you declare your function pointers with the same calling - * convention as the actual library function. Your code will crash - * mysteriously if you do not do this. - * \li Avoid namespace collisions. If you load a symbol from the library, - * it is not defined whether or not it goes into the global symbol - * namespace for the application. If it does and it conflicts with - * symbols in your code or other shared libraries, you will not get - * the results you expect. :) - */ - -#ifndef _SDL_loadso_h -#define _SDL_loadso_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * This function dynamically loads a shared object and returns a pointer - * to the object handle (or NULL if there was an error). - * The 'sofile' parameter is a system dependent name of the object file. - */ -extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); - -/** - * Given an object handle, this function looks up the address of the - * named function in the shared object and returns it. This address - * is no longer valid after calling SDL_UnloadObject(). - */ -extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle, - const char *name); - -/** - * Unload a shared object from memory. - */ -extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_loadso_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_log.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_log.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_log.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_log.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_log.h - * - * Simple log messages with categories and priorities. - * - * By default logs are quiet, but if you're debugging SDL you might want: - * - * SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN); - * - * Here's where the messages go on different platforms: - * Windows: debug output stream - * Android: log output - * Others: standard error output (stderr) - */ - -#ifndef _SDL_log_h -#define _SDL_log_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * \brief The maximum size of a log message - * - * Messages longer than the maximum size will be truncated - */ -#define SDL_MAX_LOG_MESSAGE 4096 - -/** - * \brief The predefined log categories - * - * By default the application category is enabled at the INFO level, - * the assert category is enabled at the WARN level, test is enabled - * at the VERBOSE level and all other categories are enabled at the - * CRITICAL level. - */ -enum -{ - SDL_LOG_CATEGORY_APPLICATION, - SDL_LOG_CATEGORY_ERROR, - SDL_LOG_CATEGORY_ASSERT, - SDL_LOG_CATEGORY_SYSTEM, - SDL_LOG_CATEGORY_AUDIO, - SDL_LOG_CATEGORY_VIDEO, - SDL_LOG_CATEGORY_RENDER, - SDL_LOG_CATEGORY_INPUT, - SDL_LOG_CATEGORY_TEST, - - /* Reserved for future SDL library use */ - SDL_LOG_CATEGORY_RESERVED1, - SDL_LOG_CATEGORY_RESERVED2, - SDL_LOG_CATEGORY_RESERVED3, - SDL_LOG_CATEGORY_RESERVED4, - SDL_LOG_CATEGORY_RESERVED5, - SDL_LOG_CATEGORY_RESERVED6, - SDL_LOG_CATEGORY_RESERVED7, - SDL_LOG_CATEGORY_RESERVED8, - SDL_LOG_CATEGORY_RESERVED9, - SDL_LOG_CATEGORY_RESERVED10, - - /* Beyond this point is reserved for application use, e.g. - enum { - MYAPP_CATEGORY_AWESOME1 = SDL_LOG_CATEGORY_CUSTOM, - MYAPP_CATEGORY_AWESOME2, - MYAPP_CATEGORY_AWESOME3, - ... - }; - */ - SDL_LOG_CATEGORY_CUSTOM -}; - -/** - * \brief The predefined log priorities - */ -typedef enum -{ - SDL_LOG_PRIORITY_VERBOSE = 1, - SDL_LOG_PRIORITY_DEBUG, - SDL_LOG_PRIORITY_INFO, - SDL_LOG_PRIORITY_WARN, - SDL_LOG_PRIORITY_ERROR, - SDL_LOG_PRIORITY_CRITICAL, - SDL_NUM_LOG_PRIORITIES -} SDL_LogPriority; - - -/** - * \brief Set the priority of all log categories - */ -extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority); - -/** - * \brief Set the priority of a particular log category - */ -extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category, - SDL_LogPriority priority); - -/** - * \brief Get the priority of a particular log category - */ -extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category); - -/** - * \brief Reset all priorities to default. - * - * \note This is called in SDL_Quit(). - */ -extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void); - -/** - * \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO - */ -extern DECLSPEC void SDLCALL SDL_Log(const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_VERBOSE - */ -extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_DEBUG - */ -extern DECLSPEC void SDLCALL SDL_LogDebug(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_INFO - */ -extern DECLSPEC void SDLCALL SDL_LogInfo(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_WARN - */ -extern DECLSPEC void SDLCALL SDL_LogWarn(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_ERROR - */ -extern DECLSPEC void SDLCALL SDL_LogError(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_CRITICAL - */ -extern DECLSPEC void SDLCALL SDL_LogCritical(int category, const char *fmt, ...); - -/** - * \brief Log a message with the specified category and priority. - */ -extern DECLSPEC void SDLCALL SDL_LogMessage(int category, - SDL_LogPriority priority, - const char *fmt, ...); - -/** - * \brief Log a message with the specified category and priority. - */ -extern DECLSPEC void SDLCALL SDL_LogMessageV(int category, - SDL_LogPriority priority, - const char *fmt, va_list ap); - -/** - * \brief The prototype for the log output function - */ -typedef void (*SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message); - -/** - * \brief Get the current log output function. - */ -extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata); - -/** - * \brief This function allows you to replace the default log output - * function with one of your own. - */ -extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_log_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_main.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_main.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_main.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_main.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_main_h -#define _SDL_main_h - -#include "SDL_stdinc.h" - -/** - * \file SDL_main.h - * - * Redefine main() on some platforms so that it is called by SDL. - */ - -#ifndef SDL_MAIN_HANDLED -#if defined(__WIN32__) -/* On Windows SDL provides WinMain(), which parses the command line and passes - the arguments to your main function. - - If you provide your own WinMain(), you may define SDL_MAIN_HANDLED - */ -#define SDL_MAIN_AVAILABLE - -#elif defined(__WINRT__) -/* On WinRT, SDL provides a main function that initializes CoreApplication, - creating an instance of IFrameworkView in the process. - - Please note that #include'ing SDL_main.h is not enough to get a main() - function working. In non-XAML apps, the file, - src/main/winrt/SDL_WinRT_main_NonXAML.cpp, or a copy of it, must be compiled - into the app itself. In XAML apps, the function, SDL_WinRTRunApp must be - called, with a pointer to the Direct3D-hosted XAML control passed in. -*/ -#define SDL_MAIN_NEEDED - -#elif defined(__IPHONEOS__) -/* On iOS SDL provides a main function that creates an application delegate - and starts the iOS application run loop. - - See src/video/uikit/SDL_uikitappdelegate.m for more details. - */ -#define SDL_MAIN_NEEDED - -#elif defined(__ANDROID__) -/* On Android SDL provides a Java class in SDLActivity.java that is the - main activity entry point. - - See README-android.txt for more details on extending that class. - */ -#define SDL_MAIN_NEEDED - -#endif -#endif /* SDL_MAIN_HANDLED */ - -#ifdef __cplusplus -#define C_LINKAGE "C" -#else -#define C_LINKAGE -#endif /* __cplusplus */ - -/** - * \file SDL_main.h - * - * The application's main() function must be called with C linkage, - * and should be declared like this: - * \code - * #ifdef __cplusplus - * extern "C" - * #endif - * int main(int argc, char *argv[]) - * { - * } - * \endcode - */ - -#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE) -#define main SDL_main -#endif - -/** - * The prototype for the application's main() function - */ -extern C_LINKAGE int SDL_main(int argc, char *argv[]); - - -#include "begin_code.h" -#ifdef __cplusplus -extern "C" { -#endif - -/** - * This is called by the real SDL main function to let the rest of the - * library know that initialization was done properly. - * - * Calling this yourself without knowing what you're doing can cause - * crashes and hard to diagnose problems with your application. - */ -extern DECLSPEC void SDLCALL SDL_SetMainReady(void); - -#ifdef __WIN32__ - -/** - * This can be called to set the application class at startup - */ -extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, - void *hInst); -extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); - -#endif /* __WIN32__ */ - - -#ifdef __WINRT__ - -/** - * \brief Initializes and launches an SDL/WinRT application. - * - * \param mainFunction The SDL app's C-style main(). - * \param xamlBackgroundPanel An optional, XAML-based, background panel. - * For Non-XAML apps, this value must be set to NULL. For XAML apps, - * pass in a pointer to a SwapChainBackgroundPanel, casted to an - * IInspectable (via reinterpret_cast). - * \ret 0 on success, -1 on failure. On failure, use SDL_GetError to retrieve more - * information on the failure. - */ -extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * xamlBackgroundPanel); - -#endif /* __WINRT__ */ - - -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_main_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_messagebox.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_messagebox.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_messagebox.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_messagebox.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_messagebox_h -#define _SDL_messagebox_h - -#include "SDL_stdinc.h" -#include "SDL_video.h" /* For SDL_Window */ - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief SDL_MessageBox flags. If supported will display warning icon, etc. - */ -typedef enum -{ - SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ - SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ - SDL_MESSAGEBOX_INFORMATION = 0x00000040 /**< informational dialog */ -} SDL_MessageBoxFlags; - -/** - * \brief Flags for SDL_MessageBoxButtonData. - */ -typedef enum -{ - SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001, /**< Marks the default button when return is hit */ - SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002 /**< Marks the default button when escape is hit */ -} SDL_MessageBoxButtonFlags; - -/** - * \brief Individual button data. - */ -typedef struct -{ - Uint32 flags; /**< ::SDL_MessageBoxButtonFlags */ - int buttonid; /**< User defined button id (value returned via SDL_ShowMessageBox) */ - const char * text; /**< The UTF-8 button text */ -} SDL_MessageBoxButtonData; - -/** - * \brief RGB value used in a message box color scheme - */ -typedef struct -{ - Uint8 r, g, b; -} SDL_MessageBoxColor; - -typedef enum -{ - SDL_MESSAGEBOX_COLOR_BACKGROUND, - SDL_MESSAGEBOX_COLOR_TEXT, - SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, - SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, - SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, - SDL_MESSAGEBOX_COLOR_MAX -} SDL_MessageBoxColorType; - -/** - * \brief A set of colors to use for message box dialogs - */ -typedef struct -{ - SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX]; -} SDL_MessageBoxColorScheme; - -/** - * \brief MessageBox structure containing title, text, window, etc. - */ -typedef struct -{ - Uint32 flags; /**< ::SDL_MessageBoxFlags */ - SDL_Window *window; /**< Parent window, can be NULL */ - const char *title; /**< UTF-8 title */ - const char *message; /**< UTF-8 message text */ - - int numbuttons; - const SDL_MessageBoxButtonData *buttons; - - const SDL_MessageBoxColorScheme *colorScheme; /**< ::SDL_MessageBoxColorScheme, can be NULL to use system settings */ -} SDL_MessageBoxData; - -/** - * \brief Create a modal message box. - * - * \param messageboxdata The SDL_MessageBoxData structure with title, text, etc. - * \param buttonid The pointer to which user id of hit button should be copied. - * - * \return -1 on error, otherwise 0 and buttonid contains user id of button - * hit or -1 if dialog was closed. - * - * \note This function should be called on the thread that created the parent - * window, or on the main thread if the messagebox has no parent. It will - * block execution of that thread until the user clicks a button or - * closes the messagebox. - */ -extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid); - -/** - * \brief Create a simple modal message box - * - * \param flags ::SDL_MessageBoxFlags - * \param title UTF-8 title text - * \param message UTF-8 message text - * \param window The parent window, or NULL for no parent - * - * \return 0 on success, -1 on error - * - * \sa SDL_ShowMessageBox - */ -extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_messagebox_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mouse.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mouse.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mouse.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mouse.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_mouse.h - * - * Include file for SDL mouse event handling. - */ - -#ifndef _SDL_mouse_h -#define _SDL_mouse_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct SDL_Cursor SDL_Cursor; /* Implementation dependent */ - -/** - * \brief Cursor types for SDL_CreateSystemCursor. - */ -typedef enum -{ - SDL_SYSTEM_CURSOR_ARROW, /**< Arrow */ - SDL_SYSTEM_CURSOR_IBEAM, /**< I-beam */ - SDL_SYSTEM_CURSOR_WAIT, /**< Wait */ - SDL_SYSTEM_CURSOR_CROSSHAIR, /**< Crosshair */ - SDL_SYSTEM_CURSOR_WAITARROW, /**< Small wait cursor (or Wait if not available) */ - SDL_SYSTEM_CURSOR_SIZENWSE, /**< Double arrow pointing northwest and southeast */ - SDL_SYSTEM_CURSOR_SIZENESW, /**< Double arrow pointing northeast and southwest */ - SDL_SYSTEM_CURSOR_SIZEWE, /**< Double arrow pointing west and east */ - SDL_SYSTEM_CURSOR_SIZENS, /**< Double arrow pointing north and south */ - SDL_SYSTEM_CURSOR_SIZEALL, /**< Four pointed arrow pointing north, south, east, and west */ - SDL_SYSTEM_CURSOR_NO, /**< Slashed circle or crossbones */ - SDL_SYSTEM_CURSOR_HAND, /**< Hand */ - SDL_NUM_SYSTEM_CURSORS -} SDL_SystemCursor; - -/* Function prototypes */ - -/** - * \brief Get the window which currently has mouse focus. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void); - -/** - * \brief Retrieve the current state of the mouse. - * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse cursor position relative to the focus window for the currently - * selected mouse. You can pass NULL for either x or y. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y); - -/** - * \brief Retrieve the relative state of the mouse. - * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse deltas since the last call to SDL_GetRelativeMouseState(). - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y); - -/** - * \brief Moves the mouse to the given position within the window. - * - * \param window The window to move the mouse into, or NULL for the current mouse focus - * \param x The x coordinate within the window - * \param y The y coordinate within the window - * - * \note This function generates a mouse motion event - */ -extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window, - int x, int y); - -/** - * \brief Set relative mouse mode. - * - * \param enabled Whether or not to enable relative mode - * - * \return 0 on success, or -1 if relative mode is not supported. - * - * While the mouse is in relative mode, the cursor is hidden, and the - * driver will try to report continuous motion in the current window. - * Only relative motion events will be delivered, the mouse position - * will not change. - * - * \note This function will flush any pending mouse motion. - * - * \sa SDL_GetRelativeMouseMode() - */ -extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled); - -/** - * \brief Query whether relative mouse mode is enabled. - * - * \sa SDL_SetRelativeMouseMode() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void); - -/** - * \brief Create a cursor, using the specified bitmap data and - * mask (in MSB format). - * - * The cursor width must be a multiple of 8 bits. - * - * The cursor is created in black and white according to the following: - * - * - * - * - * - * - *
data mask resulting pixel on screen
0 1 White
1 1 Black
0 0 Transparent
1 0 Inverted color if possible, black - * if not.
- * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, - const Uint8 * mask, - int w, int h, int hot_x, - int hot_y); - -/** - * \brief Create a color cursor. - * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface, - int hot_x, - int hot_y); - -/** - * \brief Create a system cursor. - * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id); - -/** - * \brief Set the active cursor. - */ -extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor); - -/** - * \brief Return the active cursor. - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); - -/** - * \brief Return the default cursor. - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); - -/** - * \brief Frees a cursor created with SDL_CreateCursor(). - * - * \sa SDL_CreateCursor() - */ -extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); - -/** - * \brief Toggle whether or not the cursor is shown. - * - * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current - * state. - * - * \return 1 if the cursor is shown, or 0 if the cursor is hidden. - */ -extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); - -/** - * Used as a mask when testing buttons in buttonstate. - * - Button 1: Left mouse button - * - Button 2: Middle mouse button - * - Button 3: Right mouse button - */ -#define SDL_BUTTON(X) (1 << ((X)-1)) -#define SDL_BUTTON_LEFT 1 -#define SDL_BUTTON_MIDDLE 2 -#define SDL_BUTTON_RIGHT 3 -#define SDL_BUTTON_X1 4 -#define SDL_BUTTON_X2 5 -#define SDL_BUTTON_LMASK SDL_BUTTON(SDL_BUTTON_LEFT) -#define SDL_BUTTON_MMASK SDL_BUTTON(SDL_BUTTON_MIDDLE) -#define SDL_BUTTON_RMASK SDL_BUTTON(SDL_BUTTON_RIGHT) -#define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) -#define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mutex.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mutex.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mutex.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_mutex.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_mutex_h -#define _SDL_mutex_h - -/** - * \file SDL_mutex.h - * - * Functions to provide thread synchronization primitives. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Synchronization functions which can time out return this value - * if they time out. - */ -#define SDL_MUTEX_TIMEDOUT 1 - -/** - * This is the timeout value which corresponds to never time out. - */ -#define SDL_MUTEX_MAXWAIT (~(Uint32)0) - - -/** - * \name Mutex functions - */ -/* @{ */ - -/* The SDL mutex structure, defined in SDL_sysmutex.c */ -struct SDL_mutex; -typedef struct SDL_mutex SDL_mutex; - -/** - * Create a mutex, initialized unlocked. - */ -extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void); - -/** - * Lock the mutex. - * - * \return 0, or -1 on error. - */ -#define SDL_mutexP(m) SDL_LockMutex(m) -extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex); - -/** - * Try to lock the mutex - * - * \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex); - -/** - * Unlock the mutex. - * - * \return 0, or -1 on error. - * - * \warning It is an error to unlock a mutex that has not been locked by - * the current thread, and doing so results in undefined behavior. - */ -#define SDL_mutexV(m) SDL_UnlockMutex(m) -extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex); - -/** - * Destroy a mutex. - */ -extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex); - -/* @} *//* Mutex functions */ - - -/** - * \name Semaphore functions - */ -/* @{ */ - -/* The SDL semaphore structure, defined in SDL_syssem.c */ -struct SDL_semaphore; -typedef struct SDL_semaphore SDL_sem; - -/** - * Create a semaphore, initialized with value, returns NULL on failure. - */ -extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value); - -/** - * Destroy a semaphore. - */ -extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem); - -/** - * This function suspends the calling thread until the semaphore pointed - * to by \c sem has a positive count. It then atomically decreases the - * semaphore count. - */ -extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem); - -/** - * Non-blocking variant of SDL_SemWait(). - * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would - * block, and -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem); - -/** - * Variant of SDL_SemWait() with a timeout in milliseconds. - * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not - * succeed in the allotted time, and -1 on error. - * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. - */ -extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms); - -/** - * Atomically increases the semaphore's count (not blocking). - * - * \return 0, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem); - -/** - * Returns the current count of the semaphore. - */ -extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem); - -/* @} *//* Semaphore functions */ - - -/** - * \name Condition variable functions - */ -/* @{ */ - -/* The SDL condition variable structure, defined in SDL_syscond.c */ -struct SDL_cond; -typedef struct SDL_cond SDL_cond; - -/** - * Create a condition variable. - * - * Typical use of condition variables: - * - * Thread A: - * SDL_LockMutex(lock); - * while ( ! condition ) { - * SDL_CondWait(cond, lock); - * } - * SDL_UnlockMutex(lock); - * - * Thread B: - * SDL_LockMutex(lock); - * ... - * condition = true; - * ... - * SDL_CondSignal(cond); - * SDL_UnlockMutex(lock); - * - * There is some discussion whether to signal the condition variable - * with the mutex locked or not. There is some potential performance - * benefit to unlocking first on some platforms, but there are some - * potential race conditions depending on how your code is structured. - * - * In general it's safer to signal the condition variable while the - * mutex is locked. - */ -extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void); - -/** - * Destroy a condition variable. - */ -extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond); - -/** - * Restart one of the threads that are waiting on the condition variable. - * - * \return 0 or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond); - -/** - * Restart all threads that are waiting on the condition variable. - * - * \return 0 or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond); - -/** - * Wait on the condition variable, unlocking the provided mutex. - * - * \warning The mutex must be locked before entering this function! - * - * The mutex is re-locked once the condition variable is signaled. - * - * \return 0 when it is signaled, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex); - -/** - * Waits for at most \c ms milliseconds, and returns 0 if the condition - * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not - * signaled in the allotted time, and -1 on error. - * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. - */ -extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, - SDL_mutex * mutex, Uint32 ms); - -/* @} *//* Condition variable functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_mutex_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_name.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_name.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_name.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_name.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDLname_h_ -#define _SDLname_h_ - -#if defined(__STDC__) || defined(__cplusplus) -#define NeedFunctionPrototypes 1 -#endif - -#define SDL_NAME(X) SDL_##X - -#endif /* _SDLname_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles2.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles2.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles2.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles2.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2790 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 2.0 API headers. - */ -#ifndef _MSC_VER -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#else /* _MSC_VER */ - -/* OpenGL ES2 headers for Visual Studio */ - -#ifndef __khrplatform_h_ -#define __khrplatform_h_ - -/* -** Copyright (c) 2008-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Khronos platform-specific types and definitions. -* -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ -* -* Adopters may modify this file to suit their platform. Adopters are -* encouraged to submit platform specific modifications to the Khronos -* group so that they can be included in future versions of this file. -* Please submit changes by sending them to the public Khronos Bugzilla -* (http://khronos.org/bugzilla) by filing a bug against product -* "Khronos (general)" component "Registry". -* -* A predefined template which fills in some of the bug fields can be -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you -* must create a Bugzilla login first. -* -* -* See the Implementer's Guidelines for information about where this file -* should be located on your system and for more details of its use: -* http://www.khronos.org/registry/implementers_guide.pdf -* -* This file should be included as -* #include -* by Khronos client API header files that use its types and defines. -* -* The types in khrplatform.h should only be used to define API-specific types. -* -* Types defined in khrplatform.h: -* khronos_int8_t signed 8 bit -* khronos_uint8_t unsigned 8 bit -* khronos_int16_t signed 16 bit -* khronos_uint16_t unsigned 16 bit -* khronos_int32_t signed 32 bit -* khronos_uint32_t unsigned 32 bit -* khronos_int64_t signed 64 bit -* khronos_uint64_t unsigned 64 bit -* khronos_intptr_t signed same number of bits as a pointer -* khronos_uintptr_t unsigned same number of bits as a pointer -* khronos_ssize_t signed size -* khronos_usize_t unsigned size -* khronos_float_t signed 32 bit floating point -* khronos_time_ns_t unsigned 64 bit time in nanoseconds -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in -* nanoseconds -* khronos_stime_nanoseconds_t signed time interval in nanoseconds -* khronos_boolean_enum_t enumerated boolean type. This should -* only be used as a base type when a client API's boolean type is -* an enum. Client APIs which use an integer or other type for -* booleans cannot use this as the base type for their boolean. -* -* Tokens defined in khrplatform.h: -* -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. -* -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. -* -* Calling convention macros defined in this file: -* KHRONOS_APICALL -* KHRONOS_APIENTRY -* KHRONOS_APIATTRIBUTES -* -* These may be used in function prototypes as: -* -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname( -* int arg1, -* int arg2) KHRONOS_APIATTRIBUTES; -*/ - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APICALL -*------------------------------------------------------------------------- -* This precedes the return type of the function in the function prototype. -*/ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) -# define KHRONOS_APICALL __declspec(dllimport) -#elif defined (__SYMBIAN32__) -# define KHRONOS_APICALL IMPORT_C -#else -# define KHRONOS_APICALL -#endif - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APIENTRY -*------------------------------------------------------------------------- -* This follows the return type of the function and precedes the function -* name in the function prototype. -*/ -#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -/* Win32 but not WinCE */ -# define KHRONOS_APIENTRY __stdcall -#else -# define KHRONOS_APIENTRY -#endif - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APIATTRIBUTES -*------------------------------------------------------------------------- -* This follows the closing parenthesis of the function prototype arguments. -*/ -#if defined (__ARMCC_2__) -#define KHRONOS_APIATTRIBUTES __softfp -#else -#define KHRONOS_APIATTRIBUTES -#endif - -/*------------------------------------------------------------------------- -* basic type definitions -*-----------------------------------------------------------------------*/ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) - - -/* -* Using -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__VMS ) || defined(__sgi) - -/* -* Using -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(_WIN32) && !defined(__SCITECH_SNAP__) - -/* -* Win32 -*/ -typedef __int32 khronos_int32_t; -typedef unsigned __int32 khronos_uint32_t; -typedef __int64 khronos_int64_t; -typedef unsigned __int64 khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__sun__) || defined(__digital__) - -/* -* Sun or Digital -*/ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#if defined(__arch64__) || defined(_LP64) -typedef long int khronos_int64_t; -typedef unsigned long int khronos_uint64_t; -#else -typedef long long int khronos_int64_t; -typedef unsigned long long int khronos_uint64_t; -#endif /* __arch64__ */ -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif 0 - -/* -* Hypothetical platform with no float or int64 support -*/ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#define KHRONOS_SUPPORT_INT64 0 -#define KHRONOS_SUPPORT_FLOAT 0 - -#else - -/* -* Generic fallback -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#endif - - -/* -* Types that are (so far) the same on all platforms -*/ -typedef signed char khronos_int8_t; -typedef unsigned char khronos_uint8_t; -typedef signed short int khronos_int16_t; -typedef unsigned short int khronos_uint16_t; - -/* -* Types that differ between LLP64 and LP64 architectures - in LLP64, -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears -* to be the only LLP64 architecture in current use. -*/ -#ifdef _WIN64 -typedef signed long long int khronos_intptr_t; -typedef unsigned long long int khronos_uintptr_t; -typedef signed long long int khronos_ssize_t; -typedef unsigned long long int khronos_usize_t; -#else -typedef signed long int khronos_intptr_t; -typedef unsigned long int khronos_uintptr_t; -typedef signed long int khronos_ssize_t; -typedef unsigned long int khronos_usize_t; -#endif - -#if KHRONOS_SUPPORT_FLOAT -/* -* Float type -*/ -typedef float khronos_float_t; -#endif - -#if KHRONOS_SUPPORT_INT64 -/* Time types -* -* These types can be used to represent a time interval in nanoseconds or -* an absolute Unadjusted System Time. Unadjusted System Time is the number -* of nanoseconds since some arbitrary system event (e.g. since the last -* time the system booted). The Unadjusted System Time is an unsigned -* 64 bit value that wraps back to 0 every 584 years. Time intervals -* may be either signed or unsigned. -*/ -typedef khronos_uint64_t khronos_utime_nanoseconds_t; -typedef khronos_int64_t khronos_stime_nanoseconds_t; -#endif - -/* -* Dummy value used to pad enum types to 32 bits. -*/ -#ifndef KHRONOS_MAX_ENUM -#define KHRONOS_MAX_ENUM 0x7FFFFFFF -#endif - -/* -* Enumerated boolean type -* -* Values other than zero should be considered to be true. Therefore -* comparisons should not be made against KHRONOS_TRUE. -*/ -typedef enum { - KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, - KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM -} khronos_boolean_enum_t; - -#endif /* __khrplatform_h_ */ - - -#ifndef __gl2platform_h_ -#define __gl2platform_h_ - -/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h - * - * Adopters may modify khrplatform.h and this file to suit their platform. - * You are encouraged to submit all modifications to the Khronos group so that - * they can be included in future versions of this file. Please submit changes - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) - * by filing a bug against product "OpenGL-ES" component "Registry". - */ - -/*#include */ - -#ifndef GL_APICALL -#define GL_APICALL KHRONOS_APICALL -#endif - -#ifndef GL_APIENTRY -#define GL_APIENTRY KHRONOS_APIENTRY -#endif - -#endif /* __gl2platform_h_ */ - -#ifndef __gl2_h_ -#define __gl2_h_ - -/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */ - -/*#include */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/*------------------------------------------------------------------------- - * Data type definitions - *-----------------------------------------------------------------------*/ - -typedef void GLvoid; -typedef char GLchar; -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef khronos_int8_t GLbyte; -typedef short GLshort; -typedef int GLint; -typedef int GLsizei; -typedef khronos_uint8_t GLubyte; -typedef unsigned short GLushort; -typedef unsigned int GLuint; -typedef khronos_float_t GLfloat; -typedef khronos_float_t GLclampf; -typedef khronos_int32_t GLfixed; - -/* GL types for handling large vertex buffer objects */ -typedef khronos_intptr_t GLintptr; -typedef khronos_ssize_t GLsizeiptr; - -/* OpenGL ES core versions */ -#define GL_ES_VERSION_2_0 1 - -/* ClearBufferMask */ -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_COLOR_BUFFER_BIT 0x00004000 - -/* Boolean */ -#define GL_FALSE 0 -#define GL_TRUE 1 - -/* BeginMode */ -#define GL_POINTS 0x0000 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_LINE_STRIP 0x0003 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 - -/* AlphaFunction (not supported in ES20) */ -/* GL_NEVER */ -/* GL_LESS */ -/* GL_EQUAL */ -/* GL_LEQUAL */ -/* GL_GREATER */ -/* GL_NOTEQUAL */ -/* GL_GEQUAL */ -/* GL_ALWAYS */ - -/* BlendingFactorDest */ -#define GL_ZERO 0 -#define GL_ONE 1 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 - -/* BlendingFactorSrc */ -/* GL_ZERO */ -/* GL_ONE */ -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -/* GL_SRC_ALPHA */ -/* GL_ONE_MINUS_SRC_ALPHA */ -/* GL_DST_ALPHA */ -/* GL_ONE_MINUS_DST_ALPHA */ - -/* BlendEquationSeparate */ -#define GL_FUNC_ADD 0x8006 -#define GL_BLEND_EQUATION 0x8009 -#define GL_BLEND_EQUATION_RGB 0x8009 /* same as BLEND_EQUATION */ -#define GL_BLEND_EQUATION_ALPHA 0x883D - -/* BlendSubtract */ -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B - -/* Separate Blend Functions */ -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 - -/* Buffer Objects */ -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 - -#define GL_STREAM_DRAW 0x88E0 -#define GL_STATIC_DRAW 0x88E4 -#define GL_DYNAMIC_DRAW 0x88E8 - -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 - -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 - -/* CullFaceMode */ -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_FRONT_AND_BACK 0x0408 - -/* DepthFunction */ -/* GL_NEVER */ -/* GL_LESS */ -/* GL_EQUAL */ -/* GL_LEQUAL */ -/* GL_GREATER */ -/* GL_NOTEQUAL */ -/* GL_GEQUAL */ -/* GL_ALWAYS */ - -/* EnableCap */ -#define GL_TEXTURE_2D 0x0DE1 -#define GL_CULL_FACE 0x0B44 -#define GL_BLEND 0x0BE2 -#define GL_DITHER 0x0BD0 -#define GL_STENCIL_TEST 0x0B90 -#define GL_DEPTH_TEST 0x0B71 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_COVERAGE 0x80A0 - -/* ErrorCode */ -#define GL_NO_ERROR 0 -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_OUT_OF_MEMORY 0x0505 - -/* FrontFaceDirection */ -#define GL_CW 0x0900 -#define GL_CCW 0x0901 - -/* GetPName */ -#define GL_LINE_WIDTH 0x0B21 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#define GL_VIEWPORT 0x0BA2 -#define GL_SCISSOR_BOX 0x0C10 -/* GL_SCISSOR_TEST */ -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -/* GL_POLYGON_OFFSET_FILL */ -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB - -/* GetTextureParameter */ -/* GL_TEXTURE_MAG_FILTER */ -/* GL_TEXTURE_MIN_FILTER */ -/* GL_TEXTURE_WRAP_S */ -/* GL_TEXTURE_WRAP_T */ - -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 - -/* HintMode */ -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 - -/* HintTarget */ -#define GL_GENERATE_MIPMAP_HINT 0x8192 - -/* DataType */ -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_FIXED 0x140C - -/* PixelFormat */ -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A - -/* PixelType */ -/* GL_UNSIGNED_BYTE */ -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 - -/* Shaders */ -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#define GL_SHADER_TYPE 0x8B4F -#define GL_DELETE_STATUS 0x8B80 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D - -/* StencilFunction */ -#define GL_NEVER 0x0200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 - -/* StencilOp */ -/* GL_ZERO */ -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_INVERT 0x150A -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 - -/* StringName */ -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 - -/* TextureMagFilter */ -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 - -/* TextureMinFilter */ -/* GL_NEAREST */ -/* GL_LINEAR */ -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 - -/* TextureParameterName */ -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 - -/* TextureTarget */ -/* GL_TEXTURE_2D */ -#define GL_TEXTURE 0x1702 - -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C - -/* TextureUnit */ -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 - -/* TextureWrapMode */ -#define GL_REPEAT 0x2901 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_MIRRORED_REPEAT 0x8370 - -/* Uniform Types */ -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_CUBE 0x8B60 - -/* Vertex Arrays */ -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F - -/* Read Format */ -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B - -/* Shader Source */ -#define GL_COMPILE_STATUS 0x8B81 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_SHADER_COMPILER 0x8DFA - -/* Shader Binary */ -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 - -/* Shader Precision-Specified Types */ -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 - -/* Framebuffer Object. */ -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 - -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGB565 0x8D62 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_STENCIL_INDEX8 0x8D48 - -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 - -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 - -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 - -#define GL_NONE 0 - -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD - -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 - -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 - -/*------------------------------------------------------------------------- - * GL core functions. - *-----------------------------------------------------------------------*/ - -GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); -GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name); -GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture); -GL_APICALL void GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GL_APICALL void GL_APIENTRY glBlendEquation ( GLenum mode ); -GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage); -GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data); -GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target); -GL_APICALL void GL_APIENTRY glClear (GLbitfield mask); -GL_APICALL void GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GL_APICALL void GL_APIENTRY glClearDepthf (GLclampf depth); -GL_APICALL void GL_APIENTRY glClearStencil (GLint s); -GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader); -GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL GLuint GL_APIENTRY glCreateProgram (void); -GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type); -GL_APICALL void GL_APIENTRY glCullFace (GLenum mode); -GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers); -GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers); -GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program); -GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers); -GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader); -GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures); -GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func); -GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag); -GL_APICALL void GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar); -GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glDisable (GLenum cap); -GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); -GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices); -GL_APICALL void GL_APIENTRY glEnable (GLenum cap); -GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glFinish (void); -GL_APICALL void GL_APIENTRY glFlush (void); -GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode); -GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers); -GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target); -GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers); -GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers); -GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); -GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); -GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params); -GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL GLenum GL_APIENTRY glGetError (void); -GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog); -GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog); -GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); -GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source); -GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name); -GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params); -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); -GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer); -GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode); -GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer); -GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap); -GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer); -GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program); -GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader); -GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture); -GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width); -GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program); -GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units); -GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); -GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void); -GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); -GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); -GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params); -GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params); -GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat x); -GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint x); -GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y); -GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z); -GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w); -GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUseProgram (GLuint program); -GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program); -GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x); -GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr); -GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - -#ifdef __cplusplus -} -#endif - -#endif /* __gl2_h_ */ - - -#ifndef __gl2ext_h_ -#define __gl2ext_h_ - -/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -#ifndef GL_APIENTRYP -# define GL_APIENTRYP GL_APIENTRY* -#endif - -/*------------------------------------------------------------------------* - * OES extension tokens - *------------------------------------------------------------------------*/ - -/* GL_OES_compressed_ETC1_RGB8_texture */ -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_ETC1_RGB8_OES 0x8D64 -#endif - -/* GL_OES_compressed_paletted_texture */ -#ifndef GL_OES_compressed_paletted_texture -#define GL_PALETTE4_RGB8_OES 0x8B90 -#define GL_PALETTE4_RGBA8_OES 0x8B91 -#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 -#define GL_PALETTE4_RGBA4_OES 0x8B93 -#define GL_PALETTE4_RGB5_A1_OES 0x8B94 -#define GL_PALETTE8_RGB8_OES 0x8B95 -#define GL_PALETTE8_RGBA8_OES 0x8B96 -#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 -#define GL_PALETTE8_RGBA4_OES 0x8B98 -#define GL_PALETTE8_RGB5_A1_OES 0x8B99 -#endif - -/* GL_OES_depth24 */ -#ifndef GL_OES_depth24 -#define GL_DEPTH_COMPONENT24_OES 0x81A6 -#endif - -/* GL_OES_depth32 */ -#ifndef GL_OES_depth32 -#define GL_DEPTH_COMPONENT32_OES 0x81A7 -#endif - -/* GL_OES_depth_texture */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_EGL_image */ -#ifndef GL_OES_EGL_image -typedef void* GLeglImageOES; -#endif - -/* GL_OES_EGL_image_external */ -#ifndef GL_OES_EGL_image_external -/* GLeglImageOES defined in GL_OES_EGL_image already. */ -#define GL_TEXTURE_EXTERNAL_OES 0x8D65 -#define GL_SAMPLER_EXTERNAL_OES 0x8D66 -#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 -#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 -#endif - -/* GL_OES_element_index_uint */ -#ifndef GL_OES_element_index_uint -#define GL_UNSIGNED_INT 0x1405 -#endif - -/* GL_OES_get_program_binary */ -#ifndef GL_OES_get_program_binary -#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS_OES 0x87FE -#define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF -#endif - -/* GL_OES_mapbuffer */ -#ifndef GL_OES_mapbuffer -#define GL_WRITE_ONLY_OES 0x88B9 -#define GL_BUFFER_ACCESS_OES 0x88BB -#define GL_BUFFER_MAPPED_OES 0x88BC -#define GL_BUFFER_MAP_POINTER_OES 0x88BD -#endif - -/* GL_OES_packed_depth_stencil */ -#ifndef GL_OES_packed_depth_stencil -#define GL_DEPTH_STENCIL_OES 0x84F9 -#define GL_UNSIGNED_INT_24_8_OES 0x84FA -#define GL_DEPTH24_STENCIL8_OES 0x88F0 -#endif - -/* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat -#define GL_ALPHA8_OES 0x803C -#define GL_DEPTH_COMPONENT16_OES 0x81A5 -/* reuse GL_DEPTH_COMPONENT24_OES */ -/* reuse GL_DEPTH24_STENCIL8_OES */ -/* reuse GL_DEPTH_COMPONENT32_OES */ -#define GL_LUMINANCE4_ALPHA4_OES 0x8043 -#define GL_LUMINANCE8_ALPHA8_OES 0x8045 -#define GL_LUMINANCE8_OES 0x8040 -#define GL_RGBA4_OES 0x8056 -#define GL_RGB5_A1_OES 0x8057 -#define GL_RGB565_OES 0x8D62 -/* reuse GL_RGB8_OES */ -/* reuse GL_RGBA8_OES */ -/* reuse GL_RGB10_EXT */ -/* reuse GL_RGB10_A2_EXT */ -#endif - -/* GL_OES_rgb8_rgba8 */ -#ifndef GL_OES_rgb8_rgba8 -#define GL_RGB8_OES 0x8051 -#define GL_RGBA8_OES 0x8058 -#endif - -/* GL_OES_standard_derivatives */ -#ifndef GL_OES_standard_derivatives -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES 0x8B8B -#endif - -/* GL_OES_stencil1 */ -#ifndef GL_OES_stencil1 -#define GL_STENCIL_INDEX1_OES 0x8D46 -#endif - -/* GL_OES_stencil4 */ -#ifndef GL_OES_stencil4 -#define GL_STENCIL_INDEX4_OES 0x8D47 -#endif - -#ifndef GL_OES_surfaceless_context -#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 -#endif - -/* GL_OES_texture_3D */ -#ifndef GL_OES_texture_3D -#define GL_TEXTURE_WRAP_R_OES 0x8072 -#define GL_TEXTURE_3D_OES 0x806F -#define GL_TEXTURE_BINDING_3D_OES 0x806A -#define GL_MAX_3D_TEXTURE_SIZE_OES 0x8073 -#define GL_SAMPLER_3D_OES 0x8B5F -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES 0x8CD4 -#endif - -/* GL_OES_texture_float */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_float_linear */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_half_float */ -#ifndef GL_OES_texture_half_float -#define GL_HALF_FLOAT_OES 0x8D61 -#endif - -/* GL_OES_texture_half_float_linear */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_npot */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_vertex_array_object */ -#ifndef GL_OES_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 -#endif - -/* GL_OES_vertex_half_float */ -/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */ - -/* GL_OES_vertex_type_10_10_10_2 */ -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_UNSIGNED_INT_10_10_10_2_OES 0x8DF6 -#define GL_INT_10_10_10_2_OES 0x8DF7 -#endif - -/*------------------------------------------------------------------------* - * KHR extension tokens - *------------------------------------------------------------------------*/ - -#ifndef GL_KHR_debug -typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_QUERY 0x82E3 -/* PROGRAM_PIPELINE only in GL */ -#define GL_SAMPLER 0x82E6 -/* DISPLAY_LIST only in GL */ -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#endif - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD -#endif - -/*------------------------------------------------------------------------* - * AMD extension tokens - *------------------------------------------------------------------------*/ - -/* GL_AMD_compressed_3DC_texture */ -#ifndef GL_AMD_compressed_3DC_texture -#define GL_3DC_X_AMD 0x87F9 -#define GL_3DC_XY_AMD 0x87FA -#endif - -/* GL_AMD_compressed_ATC_texture */ -#ifndef GL_AMD_compressed_ATC_texture -#define GL_ATC_RGB_AMD 0x8C92 -#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93 -#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE -#endif - -/* GL_AMD_performance_monitor */ -#ifndef GL_AMD_performance_monitor -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -#endif - -/* GL_AMD_program_binary_Z400 */ -#ifndef GL_AMD_program_binary_Z400 -#define GL_Z400_BINARY_AMD 0x8740 -#endif - -/*------------------------------------------------------------------------* - * ANGLE extension tokens - *------------------------------------------------------------------------*/ - -/* GL_ANGLE_framebuffer_blit */ -#ifndef GL_ANGLE_framebuffer_blit -#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA -#endif - -/* GL_ANGLE_framebuffer_multisample */ -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 -#define GL_MAX_SAMPLES_ANGLE 0x8D57 -#endif - -/* GL_ANGLE_instanced_arrays */ -#ifndef GL_ANGLE_instanced_arrays -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE -#endif - -/* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 -#endif - -/* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#endif - -/* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 -#endif - -/* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage -#define GL_TEXTURE_USAGE_ANGLE 0x93A2 -#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 -#endif - -/* GL_ANGLE_translated_shader_source */ -#ifndef GL_ANGLE_translated_shader_source -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 -#endif - -/*------------------------------------------------------------------------* - * APPLE extension tokens - *------------------------------------------------------------------------*/ - -/* GL_APPLE_copy_texture_levels */ -/* No new tokens introduced by this extension. */ - -/* GL_APPLE_framebuffer_multisample */ -#ifndef GL_APPLE_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 -#define GL_MAX_SAMPLES_APPLE 0x8D57 -#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA -#endif - -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -/* GL_APPLE_sync */ -#ifndef GL_APPLE_sync - -#ifndef __gl3_h_ -/* These types are defined with reference to - * in the Apple extension spec, but here we use the Khronos - * portable types in khrplatform.h, and assume those types - * are always defined. - * If any other extensions using these types are defined, - * the typedefs must move out of this block and be shared. - */ -typedef khronos_int64_t GLint64; -typedef khronos_uint64_t GLuint64; -typedef struct __GLsync *GLsync; -#endif - -#define GL_SYNC_OBJECT_APPLE 0x8A53 -#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 -#define GL_OBJECT_TYPE_APPLE 0x9112 -#define GL_SYNC_CONDITION_APPLE 0x9113 -#define GL_SYNC_STATUS_APPLE 0x9114 -#define GL_SYNC_FLAGS_APPLE 0x9115 -#define GL_SYNC_FENCE_APPLE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 -#define GL_UNSIGNALED_APPLE 0x9118 -#define GL_SIGNALED_APPLE 0x9119 -#define GL_ALREADY_SIGNALED_APPLE 0x911A -#define GL_TIMEOUT_EXPIRED_APPLE 0x911B -#define GL_CONDITION_SATISFIED_APPLE 0x911C -#define GL_WAIT_FAILED_APPLE 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 -#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull -#endif - -/* GL_APPLE_texture_format_BGRA8888 */ -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_BGRA_EXT 0x80E1 -#endif - -/* GL_APPLE_texture_max_level */ -#ifndef GL_APPLE_texture_max_level -#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D -#endif - -/*------------------------------------------------------------------------* - * ARM extension tokens - *------------------------------------------------------------------------*/ - -/* GL_ARM_mali_program_binary */ -#ifndef GL_ARM_mali_program_binary -#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 -#endif - -/* GL_ARM_mali_shader_binary */ -#ifndef GL_ARM_mali_shader_binary -#define GL_MALI_SHADER_BINARY_ARM 0x8F60 -#endif - -/* GL_ARM_rgba8 */ -/* No new tokens introduced by this extension. */ - -/*------------------------------------------------------------------------* - * EXT extension tokens - *------------------------------------------------------------------------*/ - -/* GL_EXT_blend_minmax */ -#ifndef GL_EXT_blend_minmax -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#endif - -/* GL_EXT_color_buffer_half_float */ -#ifndef GL_EXT_color_buffer_half_float -#define GL_RGBA16F_EXT 0x881A -#define GL_RGB16F_EXT 0x881B -#define GL_RG16F_EXT 0x822F -#define GL_R16F_EXT 0x822D -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 -#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 -#endif - -/* GL_EXT_debug_label */ -#ifndef GL_EXT_debug_label -#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F -#define GL_PROGRAM_OBJECT_EXT 0x8B40 -#define GL_SHADER_OBJECT_EXT 0x8B48 -#define GL_BUFFER_OBJECT_EXT 0x9151 -#define GL_QUERY_OBJECT_EXT 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 -#endif - -/* GL_EXT_debug_marker */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_discard_framebuffer */ -#ifndef GL_EXT_discard_framebuffer -#define GL_COLOR_EXT 0x1800 -#define GL_DEPTH_EXT 0x1801 -#define GL_STENCIL_EXT 0x1802 -#endif - -/* GL_EXT_map_buffer_range */ -#ifndef GL_EXT_map_buffer_range -#define GL_MAP_READ_BIT_EXT 0x0001 -#define GL_MAP_WRITE_BIT_EXT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 -#endif - -/* GL_EXT_multisampled_render_to_texture */ -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -/* GL_EXT_multiview_draw_buffers */ -#ifndef GL_EXT_multiview_draw_buffers -#define GL_COLOR_ATTACHMENT_EXT 0x90F0 -#define GL_MULTIVIEW_EXT 0x90F1 -#define GL_DRAW_BUFFER_EXT 0x0C01 -#define GL_READ_BUFFER_EXT 0x0C02 -#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 -#endif - -/* GL_EXT_multi_draw_arrays */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_occlusion_query_boolean */ -#ifndef GL_EXT_occlusion_query_boolean -#define GL_ANY_SAMPLES_PASSED_EXT 0x8C2F -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A -#define GL_CURRENT_QUERY_EXT 0x8865 -#define GL_QUERY_RESULT_EXT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 -#endif - -/* GL_EXT_read_format_bgra */ -#ifndef GL_EXT_read_format_bgra -#define GL_BGRA_EXT 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366 -#endif - -/* GL_EXT_robustness */ -#ifndef GL_EXT_robustness -/* reuse GL_NO_ERROR */ -#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 -#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 -#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 -#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 -#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 -#endif - -/* GL_EXT_separate_shader_objects */ -#ifndef GL_EXT_separate_shader_objects -#define GL_VERTEX_SHADER_BIT_EXT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 -#define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE_EXT 0x8258 -#define GL_ACTIVE_PROGRAM_EXT 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A -#endif - -/* GL_EXT_shader_framebuffer_fetch */ -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 -#endif - -/* GL_EXT_shader_texture_lod */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_shadow_samplers */ -#ifndef GL_EXT_shadow_samplers -#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C -#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D -#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E -#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 -#endif - -/* GL_EXT_sRGB */ -#ifndef GL_EXT_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 -#endif - -/* GL_EXT_texture_compression_dxt1 */ -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#endif - -/* GL_EXT_texture_filter_anisotropic */ -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -/* GL_EXT_texture_format_BGRA8888 */ -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_BGRA_EXT 0x80E1 -#endif - -/* GL_EXT_texture_rg */ -#ifndef GL_EXT_texture_rg -#define GL_RED_EXT 0x1903 -#define GL_RG_EXT 0x8227 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#endif - -/* GL_EXT_texture_storage */ -#ifndef GL_EXT_texture_storage -#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F -#define GL_ALPHA8_EXT 0x803C -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_RGBA32F_EXT 0x8814 -#define GL_RGB32F_EXT 0x8815 -#define GL_ALPHA32F_EXT 0x8816 -#define GL_LUMINANCE32F_EXT 0x8818 -#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 -/* reuse GL_RGBA16F_EXT */ -/* reuse GL_RGB16F_EXT */ -#define GL_ALPHA16F_EXT 0x881C -#define GL_LUMINANCE16F_EXT 0x881E -#define GL_LUMINANCE_ALPHA16F_EXT 0x881F -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGB10_EXT 0x8052 -#define GL_BGRA8_EXT 0x93A1 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#define GL_R32F_EXT 0x822E -#define GL_RG32F_EXT 0x8230 -#define GL_R16F_EXT 0x822D -#define GL_RG16F_EXT 0x822F -#endif - -/* GL_EXT_texture_type_2_10_10_10_REV */ -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 -#endif - -/* GL_EXT_unpack_subimage */ -#ifndef GL_EXT_unpack_subimage -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 -#endif - -/*------------------------------------------------------------------------* - * DMP extension tokens - *------------------------------------------------------------------------*/ - -/* GL_DMP_shader_binary */ -#ifndef GL_DMP_shader_binary -#define GL_SHADER_BINARY_DMP 0x9250 -#endif - -/*------------------------------------------------------------------------* - * FJ extension tokens - *------------------------------------------------------------------------*/ - -/* GL_FJ_shader_binary_GCCSO */ -#ifndef GL_FJ_shader_binary_GCCSO -#define GCCSO_SHADER_BINARY_FJ 0x9260 -#endif - -/*------------------------------------------------------------------------* - * IMG extension tokens - *------------------------------------------------------------------------*/ - -/* GL_IMG_program_binary */ -#ifndef GL_IMG_program_binary -#define GL_SGX_PROGRAM_BINARY_IMG 0x9130 -#endif - -/* GL_IMG_read_format */ -#ifndef GL_IMG_read_format -#define GL_BGRA_IMG 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 -#endif - -/* GL_IMG_shader_binary */ -#ifndef GL_IMG_shader_binary -#define GL_SGX_BINARY_IMG 0x8C0A -#endif - -/* GL_IMG_texture_compression_pvrtc */ -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 -#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -#endif - -/* GL_IMG_multisampled_render_to_texture */ -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 -#define GL_MAX_SAMPLES_IMG 0x9135 -#define GL_TEXTURE_SAMPLES_IMG 0x9136 -#endif - -/*------------------------------------------------------------------------* - * NV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_NV_coverage_sample */ -#ifndef GL_NV_coverage_sample -#define GL_COVERAGE_COMPONENT_NV 0x8ED0 -#define GL_COVERAGE_COMPONENT4_NV 0x8ED1 -#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 -#define GL_COVERAGE_BUFFERS_NV 0x8ED3 -#define GL_COVERAGE_SAMPLES_NV 0x8ED4 -#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 -#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 -#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 -#define GL_COVERAGE_BUFFER_BIT_NV 0x8000 -#endif - -/* GL_NV_depth_nonlinear */ -#ifndef GL_NV_depth_nonlinear -#define GL_DEPTH_COMPONENT16_NONLINEAR_NV 0x8E2C -#endif - -/* GL_NV_draw_buffers */ -#ifndef GL_NV_draw_buffers -#define GL_MAX_DRAW_BUFFERS_NV 0x8824 -#define GL_DRAW_BUFFER0_NV 0x8825 -#define GL_DRAW_BUFFER1_NV 0x8826 -#define GL_DRAW_BUFFER2_NV 0x8827 -#define GL_DRAW_BUFFER3_NV 0x8828 -#define GL_DRAW_BUFFER4_NV 0x8829 -#define GL_DRAW_BUFFER5_NV 0x882A -#define GL_DRAW_BUFFER6_NV 0x882B -#define GL_DRAW_BUFFER7_NV 0x882C -#define GL_DRAW_BUFFER8_NV 0x882D -#define GL_DRAW_BUFFER9_NV 0x882E -#define GL_DRAW_BUFFER10_NV 0x882F -#define GL_DRAW_BUFFER11_NV 0x8830 -#define GL_DRAW_BUFFER12_NV 0x8831 -#define GL_DRAW_BUFFER13_NV 0x8832 -#define GL_DRAW_BUFFER14_NV 0x8833 -#define GL_DRAW_BUFFER15_NV 0x8834 -#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 -#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 -#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 -#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 -#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 -#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 -#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 -#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 -#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 -#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 -#define GL_COLOR_ATTACHMENT10_NV 0x8CEA -#define GL_COLOR_ATTACHMENT11_NV 0x8CEB -#define GL_COLOR_ATTACHMENT12_NV 0x8CEC -#define GL_COLOR_ATTACHMENT13_NV 0x8CED -#define GL_COLOR_ATTACHMENT14_NV 0x8CEE -#define GL_COLOR_ATTACHMENT15_NV 0x8CEF -#endif - -/* GL_NV_fbo_color_attachments */ -#ifndef GL_NV_fbo_color_attachments -#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF -/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */ -#endif - -/* GL_NV_fence */ -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -/* GL_NV_read_buffer */ -#ifndef GL_NV_read_buffer -#define GL_READ_BUFFER_NV 0x0C02 -#endif - -/* GL_NV_read_buffer_front */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_depth */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_depth_stencil */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_stencil */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_texture_compression_s3tc_update */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_texture_npot_2D_mipmap */ -/* No new tokens introduced by this extension. */ - -/*------------------------------------------------------------------------* - * QCOM extension tokens - *------------------------------------------------------------------------*/ - -/* GL_QCOM_alpha_test */ -#ifndef GL_QCOM_alpha_test -#define GL_ALPHA_TEST_QCOM 0x0BC0 -#define GL_ALPHA_TEST_FUNC_QCOM 0x0BC1 -#define GL_ALPHA_TEST_REF_QCOM 0x0BC2 -#endif - -/* GL_QCOM_binning_control */ -#ifndef GL_QCOM_binning_control -#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 -#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 -#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 -#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 -#endif - -/* GL_QCOM_driver_control */ -/* No new tokens introduced by this extension. */ - -/* GL_QCOM_extended_get */ -#ifndef GL_QCOM_extended_get -#define GL_TEXTURE_WIDTH_QCOM 0x8BD2 -#define GL_TEXTURE_HEIGHT_QCOM 0x8BD3 -#define GL_TEXTURE_DEPTH_QCOM 0x8BD4 -#define GL_TEXTURE_INTERNAL_FORMAT_QCOM 0x8BD5 -#define GL_TEXTURE_FORMAT_QCOM 0x8BD6 -#define GL_TEXTURE_TYPE_QCOM 0x8BD7 -#define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 -#define GL_TEXTURE_NUM_LEVELS_QCOM 0x8BD9 -#define GL_TEXTURE_TARGET_QCOM 0x8BDA -#define GL_TEXTURE_OBJECT_VALID_QCOM 0x8BDB -#define GL_STATE_RESTORE 0x8BDC -#endif - -/* GL_QCOM_extended_get2 */ -/* No new tokens introduced by this extension. */ - -/* GL_QCOM_perfmon_global_mode */ -#ifndef GL_QCOM_perfmon_global_mode -#define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0 -#endif - -/* GL_QCOM_writeonly_rendering */ -#ifndef GL_QCOM_writeonly_rendering -#define GL_WRITEONLY_RENDERING_QCOM 0x8823 -#endif - -/* GL_QCOM_tiled_rendering */ -#ifndef GL_QCOM_tiled_rendering -#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 -#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 -#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 -#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 -#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 -#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 -#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 -#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 -#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 -#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 -#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 -#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 -#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 -#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 -#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 -#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 -#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 -#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 -#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 -#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 -#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 -#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 -#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 -#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 -#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 -#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 -#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 -#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 -#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 -#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 -#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 -#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 -#endif - -/*------------------------------------------------------------------------* - * VIV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_VIV_shader_binary */ -#ifndef GL_VIV_shader_binary -#define GL_SHADER_BINARY_VIV 0x8FC4 -#endif - -/*------------------------------------------------------------------------* - * End of extension tokens, start of corresponding extension functions - *------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------* - * OES extension functions - *------------------------------------------------------------------------*/ - -/* GL_OES_compressed_ETC1_RGB8_texture */ -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_OES_compressed_ETC1_RGB8_texture 1 -#endif - -/* GL_OES_compressed_paletted_texture */ -#ifndef GL_OES_compressed_paletted_texture -#define GL_OES_compressed_paletted_texture 1 -#endif - -/* GL_OES_depth24 */ -#ifndef GL_OES_depth24 -#define GL_OES_depth24 1 -#endif - -/* GL_OES_depth32 */ -#ifndef GL_OES_depth32 -#define GL_OES_depth32 1 -#endif - -/* GL_OES_depth_texture */ -#ifndef GL_OES_depth_texture -#define GL_OES_depth_texture 1 -#endif - -/* GL_OES_EGL_image */ -#ifndef GL_OES_EGL_image -#define GL_OES_EGL_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); -GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); -#endif -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); -#endif - -/* GL_OES_EGL_image_external */ -#ifndef GL_OES_EGL_image_external -#define GL_OES_EGL_image_external 1 -/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */ -#endif - -/* GL_OES_element_index_uint */ -#ifndef GL_OES_element_index_uint -#define GL_OES_element_index_uint 1 -#endif - -/* GL_OES_fbo_render_mipmap */ -#ifndef GL_OES_fbo_render_mipmap -#define GL_OES_fbo_render_mipmap 1 -#endif - -/* GL_OES_fragment_precision_high */ -#ifndef GL_OES_fragment_precision_high -#define GL_OES_fragment_precision_high 1 -#endif - -/* GL_OES_get_program_binary */ -#ifndef GL_OES_get_program_binary -#define GL_OES_get_program_binary 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); -#endif -typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); -#endif - -/* GL_OES_mapbuffer */ -#ifndef GL_OES_mapbuffer -#define GL_OES_mapbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access); -GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target); -GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access); -typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params); -#endif - -/* GL_OES_packed_depth_stencil */ -#ifndef GL_OES_packed_depth_stencil -#define GL_OES_packed_depth_stencil 1 -#endif - -/* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat -#define GL_OES_required_internalformat 1 -#endif - -/* GL_OES_rgb8_rgba8 */ -#ifndef GL_OES_rgb8_rgba8 -#define GL_OES_rgb8_rgba8 1 -#endif - -/* GL_OES_standard_derivatives */ -#ifndef GL_OES_standard_derivatives -#define GL_OES_standard_derivatives 1 -#endif - -/* GL_OES_stencil1 */ -#ifndef GL_OES_stencil1 -#define GL_OES_stencil1 1 -#endif - -/* GL_OES_stencil4 */ -#ifndef GL_OES_stencil4 -#define GL_OES_stencil4 1 -#endif - -#ifndef GL_OES_surfaceless_context -#define GL_OES_surfaceless_context 1 -#endif - -/* GL_OES_texture_3D */ -#ifndef GL_OES_texture_3D -#define GL_OES_texture_3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif -typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); -typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif - -/* GL_OES_texture_float */ -#ifndef GL_OES_texture_float -#define GL_OES_texture_float 1 -#endif - -/* GL_OES_texture_float_linear */ -#ifndef GL_OES_texture_float_linear -#define GL_OES_texture_float_linear 1 -#endif - -/* GL_OES_texture_half_float */ -#ifndef GL_OES_texture_half_float -#define GL_OES_texture_half_float 1 -#endif - -/* GL_OES_texture_half_float_linear */ -#ifndef GL_OES_texture_half_float_linear -#define GL_OES_texture_half_float_linear 1 -#endif - -/* GL_OES_texture_npot */ -#ifndef GL_OES_texture_npot -#define GL_OES_texture_npot 1 -#endif - -/* GL_OES_vertex_array_object */ -#ifndef GL_OES_vertex_array_object -#define GL_OES_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array); -GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays); -GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays); -GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array); -#endif -typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array); -typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays); -typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); -#endif - -/* GL_OES_vertex_half_float */ -#ifndef GL_OES_vertex_half_float -#define GL_OES_vertex_half_float 1 -#endif - -/* GL_OES_vertex_type_10_10_10_2 */ -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_OES_vertex_type_10_10_10_2 1 -#endif - -/*------------------------------------------------------------------------* - * KHR extension functions - *------------------------------------------------------------------------*/ - -#ifndef GL_KHR_debug -#define GL_KHR_debug 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); -GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); -GL_APICALL void GL_APIENTRY glPopDebugGroup (void); -GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); -#endif -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); -typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); -typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); -typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params); -#endif - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_KHR_texture_compression_astc_ldr 1 -#endif - - -/*------------------------------------------------------------------------* - * AMD extension functions - *------------------------------------------------------------------------*/ - -/* GL_AMD_compressed_3DC_texture */ -#ifndef GL_AMD_compressed_3DC_texture -#define GL_AMD_compressed_3DC_texture 1 -#endif - -/* GL_AMD_compressed_ATC_texture */ -#ifndef GL_AMD_compressed_ATC_texture -#define GL_AMD_compressed_ATC_texture 1 -#endif - -/* AMD_performance_monitor */ -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); -GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); -typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif - -/* GL_AMD_program_binary_Z400 */ -#ifndef GL_AMD_program_binary_Z400 -#define GL_AMD_program_binary_Z400 1 -#endif - -/*------------------------------------------------------------------------* - * ANGLE extension functions - *------------------------------------------------------------------------*/ - -/* GL_ANGLE_framebuffer_blit */ -#ifndef GL_ANGLE_framebuffer_blit -#define GL_ANGLE_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -/* GL_ANGLE_framebuffer_multisample */ -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_ANGLE_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_ANGLE_instanced_arrays -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor); -#endif -typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); -#endif - -/* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_ANGLE_pack_reverse_row_order 1 -#endif - -/* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_ANGLE_texture_compression_dxt3 1 -#endif - -/* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_ANGLE_texture_compression_dxt5 1 -#endif - -/* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage -#define GL_ANGLE_texture_usage 1 -#endif - -#ifndef GL_ANGLE_translated_shader_source -#define GL_ANGLE_translated_shader_source 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif -typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif - -/*------------------------------------------------------------------------* - * APPLE extension functions - *------------------------------------------------------------------------*/ - -/* GL_APPLE_copy_texture_levels */ -#ifndef GL_APPLE_copy_texture_levels -#define GL_APPLE_copy_texture_levels 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif -typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif - -/* GL_APPLE_framebuffer_multisample */ -#ifndef GL_APPLE_framebuffer_multisample -#define GL_APPLE_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); -#endif - -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#endif - -/* GL_APPLE_sync */ -#ifndef GL_APPLE_sync -#define GL_APPLE_sync 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); -GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); -GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); -GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); -GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif -typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); -typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); -typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); -typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif - -/* GL_APPLE_texture_format_BGRA8888 */ -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_APPLE_texture_format_BGRA8888 1 -#endif - -/* GL_APPLE_texture_max_level */ -#ifndef GL_APPLE_texture_max_level -#define GL_APPLE_texture_max_level 1 -#endif - -/*------------------------------------------------------------------------* - * ARM extension functions - *------------------------------------------------------------------------*/ - -/* GL_ARM_mali_program_binary */ -#ifndef GL_ARM_mali_program_binary -#define GL_ARM_mali_program_binary 1 -#endif - -/* GL_ARM_mali_shader_binary */ -#ifndef GL_ARM_mali_shader_binary -#define GL_ARM_mali_shader_binary 1 -#endif - -/* GL_ARM_rgba8 */ -#ifndef GL_ARM_rgba8 -#define GL_ARM_rgba8 1 -#endif - -/*------------------------------------------------------------------------* - * EXT extension functions - *------------------------------------------------------------------------*/ - -/* GL_EXT_blend_minmax */ -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#endif - -/* GL_EXT_color_buffer_half_float */ -#ifndef GL_EXT_color_buffer_half_float -#define GL_EXT_color_buffer_half_float 1 -#endif - -/* GL_EXT_debug_label */ -#ifndef GL_EXT_debug_label -#define GL_EXT_debug_label 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif -typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif - -/* GL_EXT_debug_marker */ -#ifndef GL_EXT_debug_marker -#define GL_EXT_debug_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void); -#endif -typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); -#endif - -/* GL_EXT_discard_framebuffer */ -#ifndef GL_EXT_discard_framebuffer -#define GL_EXT_discard_framebuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif -typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif - -/* GL_EXT_map_buffer_range */ -#ifndef GL_EXT_map_buffer_range -#define GL_EXT_map_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#endif - -/* GL_EXT_multisampled_render_to_texture */ -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_EXT_multisampled_render_to_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif - -/* GL_EXT_multiview_draw_buffers */ -#ifndef GL_EXT_multiview_draw_buffers -#define GL_EXT_multiview_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); -GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); -GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); -#endif -typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); -typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); -GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -/* GL_EXT_occlusion_query_boolean */ -#ifndef GL_EXT_occlusion_query_boolean -#define GL_EXT_occlusion_query_boolean 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids); -GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids); -GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id); -GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id); -GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); -GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); -#endif -typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); -typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); -typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); -typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -/* GL_EXT_read_format_bgra */ -#ifndef GL_EXT_read_format_bgra -#define GL_EXT_read_format_bgra 1 -#endif - -/* GL_EXT_robustness */ -#ifndef GL_EXT_robustness -#define GL_EXT_robustness 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void); -GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params); -GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif -typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void); -typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif - -/* GL_EXT_separate_shader_objects */ -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program); -GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program); -GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings); -GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines); -GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines); -GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x); -GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y); -GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z); -GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x); -GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif -typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program); -typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings); -typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines); -typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines); -typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif - -/* GL_EXT_shader_framebuffer_fetch */ -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_EXT_shader_framebuffer_fetch 1 -#endif - -/* GL_EXT_shader_texture_lod */ -#ifndef GL_EXT_shader_texture_lod -#define GL_EXT_shader_texture_lod 1 -#endif - -/* GL_EXT_shadow_samplers */ -#ifndef GL_EXT_shadow_samplers -#define GL_EXT_shadow_samplers 1 -#endif - -/* GL_EXT_sRGB */ -#ifndef GL_EXT_sRGB -#define GL_EXT_sRGB 1 -#endif - -/* GL_EXT_texture_compression_dxt1 */ -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_EXT_texture_compression_dxt1 1 -#endif - -/* GL_EXT_texture_filter_anisotropic */ -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -/* GL_EXT_texture_format_BGRA8888 */ -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_EXT_texture_format_BGRA8888 1 -#endif - -/* GL_EXT_texture_rg */ -#ifndef GL_EXT_texture_rg -#define GL_EXT_texture_rg 1 -#endif - -/* GL_EXT_texture_storage */ -#ifndef GL_EXT_texture_storage -#define GL_EXT_texture_storage 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif - -/* GL_EXT_texture_type_2_10_10_10_REV */ -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_EXT_texture_type_2_10_10_10_REV 1 -#endif - -/* GL_EXT_unpack_subimage */ -#ifndef GL_EXT_unpack_subimage -#define GL_EXT_unpack_subimage 1 -#endif - -/*------------------------------------------------------------------------* - * DMP extension functions - *------------------------------------------------------------------------*/ - -/* GL_DMP_shader_binary */ -#ifndef GL_DMP_shader_binary -#define GL_DMP_shader_binary 1 -#endif - -/*------------------------------------------------------------------------* - * FJ extension functions - *------------------------------------------------------------------------*/ - -/* GL_FJ_shader_binary_GCCSO */ -#ifndef GL_FJ_shader_binary_GCCSO -#define GL_FJ_shader_binary_GCCSO 1 -#endif - -/*------------------------------------------------------------------------* - * IMG extension functions - *------------------------------------------------------------------------*/ - -/* GL_IMG_program_binary */ -#ifndef GL_IMG_program_binary -#define GL_IMG_program_binary 1 -#endif - -/* GL_IMG_read_format */ -#ifndef GL_IMG_read_format -#define GL_IMG_read_format 1 -#endif - -/* GL_IMG_shader_binary */ -#ifndef GL_IMG_shader_binary -#define GL_IMG_shader_binary 1 -#endif - -/* GL_IMG_texture_compression_pvrtc */ -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_IMG_texture_compression_pvrtc 1 -#endif - -/* GL_IMG_multisampled_render_to_texture */ -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_IMG_multisampled_render_to_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif - -/*------------------------------------------------------------------------* - * NV extension functions - *------------------------------------------------------------------------*/ - -/* GL_NV_coverage_sample */ -#ifndef GL_NV_coverage_sample -#define GL_NV_coverage_sample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask); -GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation); -#endif -typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask); -typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation); -#endif - -/* GL_NV_depth_nonlinear */ -#ifndef GL_NV_depth_nonlinear -#define GL_NV_depth_nonlinear 1 -#endif - -/* GL_NV_draw_buffers */ -#ifndef GL_NV_draw_buffers -#define GL_NV_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs); -#endif -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs); -#endif - -/* GL_NV_fbo_color_attachments */ -#ifndef GL_NV_fbo_color_attachments -#define GL_NV_fbo_color_attachments 1 -#endif - -/* GL_NV_fence */ -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); -GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *); -GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint); -GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint); -GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); -GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint); -GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum); -#endif -typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -/* GL_NV_read_buffer */ -#ifndef GL_NV_read_buffer -#define GL_NV_read_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode); -#endif -typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode); -#endif - -/* GL_NV_read_buffer_front */ -#ifndef GL_NV_read_buffer_front -#define GL_NV_read_buffer_front 1 -#endif - -/* GL_NV_read_depth */ -#ifndef GL_NV_read_depth -#define GL_NV_read_depth 1 -#endif - -/* GL_NV_read_depth_stencil */ -#ifndef GL_NV_read_depth_stencil -#define GL_NV_read_depth_stencil 1 -#endif - -/* GL_NV_read_stencil */ -#ifndef GL_NV_read_stencil -#define GL_NV_read_stencil 1 -#endif - -/* GL_NV_texture_compression_s3tc_update */ -#ifndef GL_NV_texture_compression_s3tc_update -#define GL_NV_texture_compression_s3tc_update 1 -#endif - -/* GL_NV_texture_npot_2D_mipmap */ -#ifndef GL_NV_texture_npot_2D_mipmap -#define GL_NV_texture_npot_2D_mipmap 1 -#endif - -/*------------------------------------------------------------------------* - * QCOM extension functions - *------------------------------------------------------------------------*/ - -/* GL_QCOM_alpha_test */ -#ifndef GL_QCOM_alpha_test -#define GL_QCOM_alpha_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); -#endif -typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); -#endif - -/* GL_QCOM_binning_control */ -#ifndef GL_QCOM_binning_control -#define GL_QCOM_binning_control 1 -#endif - -/* GL_QCOM_driver_control */ -#ifndef GL_QCOM_driver_control -#define GL_QCOM_driver_control 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls); -GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl); -GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl); -#endif -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls); -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -#endif - -/* GL_QCOM_extended_get */ -#ifndef GL_QCOM_extended_get -#define GL_QCOM_extended_get 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures); -GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); -GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params); -#endif -typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params); -#endif - -/* GL_QCOM_extended_get2 */ -#ifndef GL_QCOM_extended_get2 -#define GL_QCOM_extended_get2 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders); -GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program); -GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif -typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif - -/* GL_QCOM_perfmon_global_mode */ -#ifndef GL_QCOM_perfmon_global_mode -#define GL_QCOM_perfmon_global_mode 1 -#endif - -/* GL_QCOM_writeonly_rendering */ -#ifndef GL_QCOM_writeonly_rendering -#define GL_QCOM_writeonly_rendering 1 -#endif - -/* GL_QCOM_tiled_rendering */ -#ifndef GL_QCOM_tiled_rendering -#define GL_QCOM_tiled_rendering 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); -#endif -typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); -#endif - -/*------------------------------------------------------------------------* - * VIV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_VIV_shader_binary */ -#ifndef GL_VIV_shader_binary -#define GL_VIV_shader_binary 1 -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __gl2ext_h_ */ - -#endif /* _MSC_VER */ - -#ifndef APIENTRY -#define APIENTRY GL_APIENTRY -#endif diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengles.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 1.X API headers. - */ - -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengl.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengl.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengl.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_opengl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,11126 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengl.h - * - * This is a simple file to encapsulate the OpenGL API headers. - */ - -#ifndef _SDL_opengl_h -#define _SDL_opengl_h - -#include "SDL_config.h" - -#ifndef __IPHONEOS__ - -#ifdef __WIN32__ -#define WIN32_LEAN_AND_MEAN -#ifndef NOMINMAX -#define NOMINMAX /* Don't defined min() and max() */ -#endif -#include -#endif - -#ifdef __glext_h_ -/* Someone has already included glext.h */ -#define NO_SDL_GLEXT -#endif -#ifndef NO_SDL_GLEXT -#define __glext_h_ /* Don't let gl.h include glext.h */ -#endif -#if defined(__MACOSX__) -#include /* Header File For The OpenGL Library */ -#define __X_GL_H -#else -#include /* Header File For The OpenGL Library */ -#endif -#ifndef NO_SDL_GLEXT -#undef __glext_h_ -#endif - -/** - * \file SDL_opengl.h - * - * This file is included because glext.h is not available on some systems. - * If you don't want this version included, simply define ::NO_SDL_GLEXT. - * - * The latest version is available from: - * http://www.opengl.org/registry/ - */ - -/** - * \def NO_SDL_GLEXT - * - * Define this if you have your own version of glext.h and want to disable the - * version included in SDL_opengl.h. - */ - -#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY) -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2007-2010 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated $Date: 2010-08-03 01:30:25 -0700 (Tue, 03 Aug 2010) $ */ -/* Current version at http://www.opengl.org/registry/ */ -#define GL_GLEXT_VERSION 64 -/* Function declaration macros - to move into glplatform.h */ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_RESCALE_NORMAL 0x803A -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#endif - -#ifndef GL_ARB_imaging_DEPRECATED -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#endif - -#ifndef GL_VERSION_1_5_DEPRECATED -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_FOG_COORD_SRC 0x8450 -#define GL_FOG_COORD 0x8451 -#define GL_CURRENT_FOG_COORD 0x8453 -#define GL_FOG_COORD_ARRAY_TYPE 0x8454 -#define GL_FOG_COORD_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORD_ARRAY_POINTER 0x8456 -#define GL_FOG_COORD_ARRAY 0x8457 -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D -#define GL_SRC0_RGB 0x8580 -#define GL_SRC1_RGB 0x8581 -#define GL_SRC2_RGB 0x8582 -#define GL_SRC0_ALPHA 0x8588 -#define GL_SRC1_ALPHA 0x8589 -#define GL_SRC2_ALPHA 0x858A -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB 0x8009 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_VERSION_2_0_DEPRECATED -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_TEXTURE_COORDS 0x8871 -#endif - -#ifndef GL_VERSION_2_1 -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#endif - -#ifndef GL_VERSION_2_1_DEPRECATED -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B -#endif - -#ifndef GL_VERSION_3_0 -#define GL_COMPARE_REF_TO_TEXTURE 0x884E -#define GL_CLIP_DISTANCE0 0x3000 -#define GL_CLIP_DISTANCE1 0x3001 -#define GL_CLIP_DISTANCE2 0x3002 -#define GL_CLIP_DISTANCE3 0x3003 -#define GL_CLIP_DISTANCE4 0x3004 -#define GL_CLIP_DISTANCE5 0x3005 -#define GL_CLIP_DISTANCE6 0x3006 -#define GL_CLIP_DISTANCE7 0x3007 -#define GL_MAX_CLIP_DISTANCES 0x0D32 -#define GL_MAJOR_VERSION 0x821B -#define GL_MINOR_VERSION 0x821C -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_DEPTH_BUFFER 0x8223 -#define GL_STENCIL_BUFFER 0x8224 -#define GL_COMPRESSED_RED 0x8225 -#define GL_COMPRESSED_RG 0x8226 -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 -#define GL_RGBA32F 0x8814 -#define GL_RGB32F 0x8815 -#define GL_RGBA16F 0x881A -#define GL_RGB16F 0x881B -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD -#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF -#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 -#define GL_CLAMP_READ_COLOR 0x891C -#define GL_FIXED_ONLY 0x891D -#define GL_MAX_VARYING_COMPONENTS 0x8B4B -#define GL_TEXTURE_1D_ARRAY 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 -#define GL_TEXTURE_2D_ARRAY 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D -#define GL_R11F_G11F_B10F 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B -#define GL_RGB9_E5 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E -#define GL_TEXTURE_SHARED_SIZE 0x8C3F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 -#define GL_PRIMITIVES_GENERATED 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 -#define GL_RASTERIZER_DISCARD 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B -#define GL_INTERLEAVED_ATTRIBS 0x8C8C -#define GL_SEPARATE_ATTRIBS 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F -#define GL_RGBA32UI 0x8D70 -#define GL_RGB32UI 0x8D71 -#define GL_RGBA16UI 0x8D76 -#define GL_RGB16UI 0x8D77 -#define GL_RGBA8UI 0x8D7C -#define GL_RGB8UI 0x8D7D -#define GL_RGBA32I 0x8D82 -#define GL_RGB32I 0x8D83 -#define GL_RGBA16I 0x8D88 -#define GL_RGB16I 0x8D89 -#define GL_RGBA8I 0x8D8E -#define GL_RGB8I 0x8D8F -#define GL_RED_INTEGER 0x8D94 -#define GL_GREEN_INTEGER 0x8D95 -#define GL_BLUE_INTEGER 0x8D96 -#define GL_RGB_INTEGER 0x8D98 -#define GL_RGBA_INTEGER 0x8D99 -#define GL_BGR_INTEGER 0x8D9A -#define GL_BGRA_INTEGER 0x8D9B -#define GL_SAMPLER_1D_ARRAY 0x8DC0 -#define GL_SAMPLER_2D_ARRAY 0x8DC1 -#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 -#define GL_UNSIGNED_INT_VEC2 0x8DC6 -#define GL_UNSIGNED_INT_VEC3 0x8DC7 -#define GL_UNSIGNED_INT_VEC4 0x8DC8 -#define GL_INT_SAMPLER_1D 0x8DC9 -#define GL_INT_SAMPLER_2D 0x8DCA -#define GL_INT_SAMPLER_3D 0x8DCB -#define GL_INT_SAMPLER_CUBE 0x8DCC -#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF -#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 -#define GL_QUERY_WAIT 0x8E13 -#define GL_QUERY_NO_WAIT 0x8E14 -#define GL_QUERY_BY_REGION_WAIT 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 -#define GL_BUFFER_ACCESS_FLAGS 0x911F -#define GL_BUFFER_MAP_LENGTH 0x9120 -#define GL_BUFFER_MAP_OFFSET 0x9121 -/* Reuse tokens from ARB_depth_buffer_float */ -/* reuse GL_DEPTH_COMPONENT32F */ -/* reuse GL_DEPTH32F_STENCIL8 */ -/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */ -/* Reuse tokens from ARB_framebuffer_object */ -/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */ -/* reuse GL_FRAMEBUFFER_DEFAULT */ -/* reuse GL_FRAMEBUFFER_UNDEFINED */ -/* reuse GL_DEPTH_STENCIL_ATTACHMENT */ -/* reuse GL_INDEX */ -/* reuse GL_MAX_RENDERBUFFER_SIZE */ -/* reuse GL_DEPTH_STENCIL */ -/* reuse GL_UNSIGNED_INT_24_8 */ -/* reuse GL_DEPTH24_STENCIL8 */ -/* reuse GL_TEXTURE_STENCIL_SIZE */ -/* reuse GL_TEXTURE_RED_TYPE */ -/* reuse GL_TEXTURE_GREEN_TYPE */ -/* reuse GL_TEXTURE_BLUE_TYPE */ -/* reuse GL_TEXTURE_ALPHA_TYPE */ -/* reuse GL_TEXTURE_DEPTH_TYPE */ -/* reuse GL_UNSIGNED_NORMALIZED */ -/* reuse GL_FRAMEBUFFER_BINDING */ -/* reuse GL_DRAW_FRAMEBUFFER_BINDING */ -/* reuse GL_RENDERBUFFER_BINDING */ -/* reuse GL_READ_FRAMEBUFFER */ -/* reuse GL_DRAW_FRAMEBUFFER */ -/* reuse GL_READ_FRAMEBUFFER_BINDING */ -/* reuse GL_RENDERBUFFER_SAMPLES */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -/* reuse GL_FRAMEBUFFER_COMPLETE */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */ -/* reuse GL_FRAMEBUFFER_UNSUPPORTED */ -/* reuse GL_MAX_COLOR_ATTACHMENTS */ -/* reuse GL_COLOR_ATTACHMENT0 */ -/* reuse GL_COLOR_ATTACHMENT1 */ -/* reuse GL_COLOR_ATTACHMENT2 */ -/* reuse GL_COLOR_ATTACHMENT3 */ -/* reuse GL_COLOR_ATTACHMENT4 */ -/* reuse GL_COLOR_ATTACHMENT5 */ -/* reuse GL_COLOR_ATTACHMENT6 */ -/* reuse GL_COLOR_ATTACHMENT7 */ -/* reuse GL_COLOR_ATTACHMENT8 */ -/* reuse GL_COLOR_ATTACHMENT9 */ -/* reuse GL_COLOR_ATTACHMENT10 */ -/* reuse GL_COLOR_ATTACHMENT11 */ -/* reuse GL_COLOR_ATTACHMENT12 */ -/* reuse GL_COLOR_ATTACHMENT13 */ -/* reuse GL_COLOR_ATTACHMENT14 */ -/* reuse GL_COLOR_ATTACHMENT15 */ -/* reuse GL_DEPTH_ATTACHMENT */ -/* reuse GL_STENCIL_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER */ -/* reuse GL_RENDERBUFFER */ -/* reuse GL_RENDERBUFFER_WIDTH */ -/* reuse GL_RENDERBUFFER_HEIGHT */ -/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */ -/* reuse GL_STENCIL_INDEX1 */ -/* reuse GL_STENCIL_INDEX4 */ -/* reuse GL_STENCIL_INDEX8 */ -/* reuse GL_STENCIL_INDEX16 */ -/* reuse GL_RENDERBUFFER_RED_SIZE */ -/* reuse GL_RENDERBUFFER_GREEN_SIZE */ -/* reuse GL_RENDERBUFFER_BLUE_SIZE */ -/* reuse GL_RENDERBUFFER_ALPHA_SIZE */ -/* reuse GL_RENDERBUFFER_DEPTH_SIZE */ -/* reuse GL_RENDERBUFFER_STENCIL_SIZE */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */ -/* reuse GL_MAX_SAMPLES */ -/* Reuse tokens from ARB_framebuffer_sRGB */ -/* reuse GL_FRAMEBUFFER_SRGB */ -/* Reuse tokens from ARB_half_float_vertex */ -/* reuse GL_HALF_FLOAT */ -/* Reuse tokens from ARB_map_buffer_range */ -/* reuse GL_MAP_READ_BIT */ -/* reuse GL_MAP_WRITE_BIT */ -/* reuse GL_MAP_INVALIDATE_RANGE_BIT */ -/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */ -/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */ -/* reuse GL_MAP_UNSYNCHRONIZED_BIT */ -/* Reuse tokens from ARB_texture_compression_rgtc */ -/* reuse GL_COMPRESSED_RED_RGTC1 */ -/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */ -/* reuse GL_COMPRESSED_RG_RGTC2 */ -/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */ -/* Reuse tokens from ARB_texture_rg */ -/* reuse GL_RG */ -/* reuse GL_RG_INTEGER */ -/* reuse GL_R8 */ -/* reuse GL_R16 */ -/* reuse GL_RG8 */ -/* reuse GL_RG16 */ -/* reuse GL_R16F */ -/* reuse GL_R32F */ -/* reuse GL_RG16F */ -/* reuse GL_RG32F */ -/* reuse GL_R8I */ -/* reuse GL_R8UI */ -/* reuse GL_R16I */ -/* reuse GL_R16UI */ -/* reuse GL_R32I */ -/* reuse GL_R32UI */ -/* reuse GL_RG8I */ -/* reuse GL_RG8UI */ -/* reuse GL_RG16I */ -/* reuse GL_RG16UI */ -/* reuse GL_RG32I */ -/* reuse GL_RG32UI */ -/* Reuse tokens from ARB_vertex_array_object */ -/* reuse GL_VERTEX_ARRAY_BINDING */ -#endif - -#ifndef GL_VERSION_3_0_DEPRECATED -#define GL_CLAMP_VERTEX_COLOR 0x891A -#define GL_CLAMP_FRAGMENT_COLOR 0x891B -#define GL_ALPHA_INTEGER 0x8D97 -/* Reuse tokens from ARB_framebuffer_object */ -/* reuse GL_TEXTURE_LUMINANCE_TYPE */ -/* reuse GL_TEXTURE_INTENSITY_TYPE */ -#endif - -#ifndef GL_VERSION_3_1 -#define GL_SAMPLER_2D_RECT 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 -#define GL_SAMPLER_BUFFER 0x8DC2 -#define GL_INT_SAMPLER_2D_RECT 0x8DCD -#define GL_INT_SAMPLER_BUFFER 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 -#define GL_TEXTURE_BUFFER 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E -#define GL_TEXTURE_RECTANGLE 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_PRIMITIVE_RESTART 0x8F9D -#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E -/* Reuse tokens from ARB_copy_buffer */ -/* reuse GL_COPY_READ_BUFFER */ -/* reuse GL_COPY_WRITE_BUFFER */ -/* Reuse tokens from ARB_draw_instanced (none) */ -/* Reuse tokens from ARB_uniform_buffer_object */ -/* reuse GL_UNIFORM_BUFFER */ -/* reuse GL_UNIFORM_BUFFER_BINDING */ -/* reuse GL_UNIFORM_BUFFER_START */ -/* reuse GL_UNIFORM_BUFFER_SIZE */ -/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */ -/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */ -/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */ -/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */ -/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */ -/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */ -/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */ -/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */ -/* reuse GL_ACTIVE_UNIFORM_BLOCKS */ -/* reuse GL_UNIFORM_TYPE */ -/* reuse GL_UNIFORM_SIZE */ -/* reuse GL_UNIFORM_NAME_LENGTH */ -/* reuse GL_UNIFORM_BLOCK_INDEX */ -/* reuse GL_UNIFORM_OFFSET */ -/* reuse GL_UNIFORM_ARRAY_STRIDE */ -/* reuse GL_UNIFORM_MATRIX_STRIDE */ -/* reuse GL_UNIFORM_IS_ROW_MAJOR */ -/* reuse GL_UNIFORM_BLOCK_BINDING */ -/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */ -/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */ -/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */ -/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */ -/* reuse GL_INVALID_INDEX */ -#endif - -#ifndef GL_VERSION_3_2 -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_LINES_ADJACENCY 0x000A -#define GL_LINE_STRIP_ADJACENCY 0x000B -#define GL_TRIANGLES_ADJACENCY 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D -#define GL_PROGRAM_POINT_SIZE 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 -#define GL_GEOMETRY_SHADER 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT 0x8916 -#define GL_GEOMETRY_INPUT_TYPE 0x8917 -#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 -#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 -#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 -#define GL_CONTEXT_PROFILE_MASK 0x9126 -/* reuse GL_MAX_VARYING_COMPONENTS */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -/* Reuse tokens from ARB_depth_clamp */ -/* reuse GL_DEPTH_CLAMP */ -/* Reuse tokens from ARB_draw_elements_base_vertex (none) */ -/* Reuse tokens from ARB_fragment_coord_conventions (none) */ -/* Reuse tokens from ARB_provoking_vertex */ -/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */ -/* reuse GL_FIRST_VERTEX_CONVENTION */ -/* reuse GL_LAST_VERTEX_CONVENTION */ -/* reuse GL_PROVOKING_VERTEX */ -/* Reuse tokens from ARB_seamless_cube_map */ -/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */ -/* Reuse tokens from ARB_sync */ -/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */ -/* reuse GL_OBJECT_TYPE */ -/* reuse GL_SYNC_CONDITION */ -/* reuse GL_SYNC_STATUS */ -/* reuse GL_SYNC_FLAGS */ -/* reuse GL_SYNC_FENCE */ -/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */ -/* reuse GL_UNSIGNALED */ -/* reuse GL_SIGNALED */ -/* reuse GL_ALREADY_SIGNALED */ -/* reuse GL_TIMEOUT_EXPIRED */ -/* reuse GL_CONDITION_SATISFIED */ -/* reuse GL_WAIT_FAILED */ -/* reuse GL_TIMEOUT_IGNORED */ -/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */ -/* reuse GL_TIMEOUT_IGNORED */ -/* Reuse tokens from ARB_texture_multisample */ -/* reuse GL_SAMPLE_POSITION */ -/* reuse GL_SAMPLE_MASK */ -/* reuse GL_SAMPLE_MASK_VALUE */ -/* reuse GL_MAX_SAMPLE_MASK_WORDS */ -/* reuse GL_TEXTURE_2D_MULTISAMPLE */ -/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */ -/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */ -/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_TEXTURE_SAMPLES */ -/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */ -/* reuse GL_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */ -/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */ -/* reuse GL_MAX_INTEGER_SAMPLES */ -/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */ -#endif - -#ifndef GL_VERSION_3_3 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE -/* Reuse tokens from ARB_blend_func_extended */ -/* reuse GL_SRC1_COLOR */ -/* reuse GL_ONE_MINUS_SRC1_COLOR */ -/* reuse GL_ONE_MINUS_SRC1_ALPHA */ -/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */ -/* Reuse tokens from ARB_explicit_attrib_location (none) */ -/* Reuse tokens from ARB_occlusion_query2 */ -/* reuse GL_ANY_SAMPLES_PASSED */ -/* Reuse tokens from ARB_sampler_objects */ -/* reuse GL_SAMPLER_BINDING */ -/* Reuse tokens from ARB_shader_bit_encoding (none) */ -/* Reuse tokens from ARB_texture_rgb10_a2ui */ -/* reuse GL_RGB10_A2UI */ -/* Reuse tokens from ARB_texture_swizzle */ -/* reuse GL_TEXTURE_SWIZZLE_R */ -/* reuse GL_TEXTURE_SWIZZLE_G */ -/* reuse GL_TEXTURE_SWIZZLE_B */ -/* reuse GL_TEXTURE_SWIZZLE_A */ -/* reuse GL_TEXTURE_SWIZZLE_RGBA */ -/* Reuse tokens from ARB_timer_query */ -/* reuse GL_TIME_ELAPSED */ -/* reuse GL_TIMESTAMP */ -/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */ -/* reuse GL_INT_2_10_10_10_REV */ -#endif - -#ifndef GL_VERSION_4_0 -#define GL_SAMPLE_SHADING 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F -#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F -/* Reuse tokens from ARB_texture_query_lod (none) */ -/* Reuse tokens from ARB_draw_buffers_blend (none) */ -/* Reuse tokens from ARB_draw_indirect */ -/* reuse GL_DRAW_INDIRECT_BUFFER */ -/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */ -/* Reuse tokens from ARB_gpu_shader5 */ -/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */ -/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */ -/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */ -/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */ -/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */ -/* reuse GL_MAX_VERTEX_STREAMS */ -/* Reuse tokens from ARB_gpu_shader_fp64 */ -/* reuse GL_DOUBLE_VEC2 */ -/* reuse GL_DOUBLE_VEC3 */ -/* reuse GL_DOUBLE_VEC4 */ -/* reuse GL_DOUBLE_MAT2 */ -/* reuse GL_DOUBLE_MAT3 */ -/* reuse GL_DOUBLE_MAT4 */ -/* reuse GL_DOUBLE_MAT2x3 */ -/* reuse GL_DOUBLE_MAT2x4 */ -/* reuse GL_DOUBLE_MAT3x2 */ -/* reuse GL_DOUBLE_MAT3x4 */ -/* reuse GL_DOUBLE_MAT4x2 */ -/* reuse GL_DOUBLE_MAT4x3 */ -/* Reuse tokens from ARB_shader_subroutine */ -/* reuse GL_ACTIVE_SUBROUTINES */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */ -/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */ -/* reuse GL_MAX_SUBROUTINES */ -/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */ -/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */ -/* reuse GL_COMPATIBLE_SUBROUTINES */ -/* Reuse tokens from ARB_tessellation_shader */ -/* reuse GL_PATCHES */ -/* reuse GL_PATCH_VERTICES */ -/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */ -/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */ -/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */ -/* reuse GL_TESS_GEN_MODE */ -/* reuse GL_TESS_GEN_SPACING */ -/* reuse GL_TESS_GEN_VERTEX_ORDER */ -/* reuse GL_TESS_GEN_POINT_MODE */ -/* reuse GL_ISOLINES */ -/* reuse GL_FRACTIONAL_ODD */ -/* reuse GL_FRACTIONAL_EVEN */ -/* reuse GL_MAX_PATCH_VERTICES */ -/* reuse GL_MAX_TESS_GEN_LEVEL */ -/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */ -/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */ -/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_PATCH_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */ -/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */ -/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */ -/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */ -/* reuse GL_TESS_EVALUATION_SHADER */ -/* reuse GL_TESS_CONTROL_SHADER */ -/* Reuse tokens from ARB_texture_buffer_object_rgb32 (none) */ -/* Reuse tokens from ARB_transform_feedback2 */ -/* reuse GL_TRANSFORM_FEEDBACK */ -/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */ -/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */ -/* reuse GL_TRANSFORM_FEEDBACK_BINDING */ -/* Reuse tokens from ARB_transform_feedback3 */ -/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */ -/* reuse GL_MAX_VERTEX_STREAMS */ -#endif - -#ifndef GL_VERSION_4_1 -/* Reuse tokens from ARB_ES2_compatibility */ -/* reuse GL_FIXED */ -/* reuse GL_IMPLEMENTATION_COLOR_READ_TYPE */ -/* reuse GL_IMPLEMENTATION_COLOR_READ_FORMAT */ -/* reuse GL_LOW_FLOAT */ -/* reuse GL_MEDIUM_FLOAT */ -/* reuse GL_HIGH_FLOAT */ -/* reuse GL_LOW_INT */ -/* reuse GL_MEDIUM_INT */ -/* reuse GL_HIGH_INT */ -/* reuse GL_SHADER_COMPILER */ -/* reuse GL_NUM_SHADER_BINARY_FORMATS */ -/* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */ -/* reuse GL_MAX_VARYING_VECTORS */ -/* reuse GL_MAX_FRAGMENT_UNIFORM_VECTORS */ -/* Reuse tokens from ARB_get_program_binary */ -/* reuse GL_PROGRAM_BINARY_RETRIEVABLE_HINT */ -/* reuse GL_PROGRAM_BINARY_LENGTH */ -/* reuse GL_NUM_PROGRAM_BINARY_FORMATS */ -/* reuse GL_PROGRAM_BINARY_FORMATS */ -/* Reuse tokens from ARB_separate_shader_objects */ -/* reuse GL_VERTEX_SHADER_BIT */ -/* reuse GL_FRAGMENT_SHADER_BIT */ -/* reuse GL_GEOMETRY_SHADER_BIT */ -/* reuse GL_TESS_CONTROL_SHADER_BIT */ -/* reuse GL_TESS_EVALUATION_SHADER_BIT */ -/* reuse GL_ALL_SHADER_BITS */ -/* reuse GL_PROGRAM_SEPARABLE */ -/* reuse GL_ACTIVE_PROGRAM */ -/* reuse GL_PROGRAM_PIPELINE_BINDING */ -/* Reuse tokens from ARB_shader_precision (none) */ -/* Reuse tokens from ARB_vertex_attrib_64bit - all are in GL 3.0 and 4.0 already */ -/* Reuse tokens from ARB_viewport_array - some are in GL 1.1 and ARB_provoking_vertex already */ -/* reuse GL_MAX_VIEWPORTS */ -/* reuse GL_VIEWPORT_SUBPIXEL_BITS */ -/* reuse GL_VIEWPORT_BOUNDS_RANGE */ -/* reuse GL_LAYER_PROVOKING_VERTEX */ -/* reuse GL_VIEWPORT_INDEX_PROVOKING_VERTEX */ -/* reuse GL_UNDEFINED_VERTEX */ -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_ARB_depth_buffer_float -#define GL_DEPTH_COMPONENT32F 0x8CAC -#define GL_DEPTH32F_STENCIL8 0x8CAD -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD -#endif - -#ifndef GL_ARB_draw_instanced -#endif - -#ifndef GL_ARB_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 -#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 -#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 -#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 -#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 -#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 -#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 -#define GL_FRAMEBUFFER_DEFAULT 0x8218 -#define GL_FRAMEBUFFER_UNDEFINED 0x8219 -#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_DEPTH_STENCIL 0x84F9 -#define GL_UNSIGNED_INT_24_8 0x84FA -#define GL_DEPTH24_STENCIL8 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE 0x88F1 -#define GL_TEXTURE_RED_TYPE 0x8C10 -#define GL_TEXTURE_GREEN_TYPE 0x8C11 -#define GL_TEXTURE_BLUE_TYPE 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE 0x8C13 -#define GL_TEXTURE_DEPTH_TYPE 0x8C16 -#define GL_UNSIGNED_NORMALIZED 0x8C17 -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_READ_FRAMEBUFFER 0x8CA8 -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_COLOR_ATTACHMENT1 0x8CE1 -#define GL_COLOR_ATTACHMENT2 0x8CE2 -#define GL_COLOR_ATTACHMENT3 0x8CE3 -#define GL_COLOR_ATTACHMENT4 0x8CE4 -#define GL_COLOR_ATTACHMENT5 0x8CE5 -#define GL_COLOR_ATTACHMENT6 0x8CE6 -#define GL_COLOR_ATTACHMENT7 0x8CE7 -#define GL_COLOR_ATTACHMENT8 0x8CE8 -#define GL_COLOR_ATTACHMENT9 0x8CE9 -#define GL_COLOR_ATTACHMENT10 0x8CEA -#define GL_COLOR_ATTACHMENT11 0x8CEB -#define GL_COLOR_ATTACHMENT12 0x8CEC -#define GL_COLOR_ATTACHMENT13 0x8CED -#define GL_COLOR_ATTACHMENT14 0x8CEE -#define GL_COLOR_ATTACHMENT15 0x8CEF -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_STENCIL_INDEX1 0x8D46 -#define GL_STENCIL_INDEX4 0x8D47 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_STENCIL_INDEX16 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#define GL_MAX_SAMPLES 0x8D57 -#endif - -#ifndef GL_ARB_framebuffer_object_DEPRECATED -#define GL_INDEX 0x8222 -#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 -#endif - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB 0x8DB9 -#endif - -#ifndef GL_ARB_geometry_shader4 -#define GL_LINES_ADJACENCY_ARB 0x000A -#define GL_LINE_STRIP_ADJACENCY_ARB 0x000B -#define GL_TRIANGLES_ADJACENCY_ARB 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0x000D -#define GL_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 -#define GL_GEOMETRY_SHADER_ARB 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1 -/* reuse GL_MAX_VARYING_COMPONENTS */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -#endif - -#ifndef GL_ARB_half_float_vertex -#define GL_HALF_FLOAT 0x140B -#endif - -#ifndef GL_ARB_instanced_arrays -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE -#endif - -#ifndef GL_ARB_map_buffer_range -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 -#endif - -#ifndef GL_ARB_texture_buffer_object -#define GL_TEXTURE_BUFFER_ARB 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E -#endif - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC -#define GL_COMPRESSED_RG_RGTC2 0x8DBD -#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE -#endif - -#ifndef GL_ARB_texture_rg -#define GL_RG 0x8227 -#define GL_RG_INTEGER 0x8228 -#define GL_R8 0x8229 -#define GL_R16 0x822A -#define GL_RG8 0x822B -#define GL_RG16 0x822C -#define GL_R16F 0x822D -#define GL_R32F 0x822E -#define GL_RG16F 0x822F -#define GL_RG32F 0x8230 -#define GL_R8I 0x8231 -#define GL_R8UI 0x8232 -#define GL_R16I 0x8233 -#define GL_R16UI 0x8234 -#define GL_R32I 0x8235 -#define GL_R32UI 0x8236 -#define GL_RG8I 0x8237 -#define GL_RG8UI 0x8238 -#define GL_RG16I 0x8239 -#define GL_RG16UI 0x823A -#define GL_RG32I 0x823B -#define GL_RG32UI 0x823C -#endif - -#ifndef GL_ARB_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING 0x85B5 -#endif - -#ifndef GL_ARB_uniform_buffer_object -#define GL_UNIFORM_BUFFER 0x8A11 -#define GL_UNIFORM_BUFFER_BINDING 0x8A28 -#define GL_UNIFORM_BUFFER_START 0x8A29 -#define GL_UNIFORM_BUFFER_SIZE 0x8A2A -#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C -#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D -#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E -#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F -#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 -#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 -#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 -#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 -#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 -#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 -#define GL_UNIFORM_TYPE 0x8A37 -#define GL_UNIFORM_SIZE 0x8A38 -#define GL_UNIFORM_NAME_LENGTH 0x8A39 -#define GL_UNIFORM_BLOCK_INDEX 0x8A3A -#define GL_UNIFORM_OFFSET 0x8A3B -#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C -#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D -#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E -#define GL_UNIFORM_BLOCK_BINDING 0x8A3F -#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 -#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFFu -#endif - -#ifndef GL_ARB_compatibility -/* ARB_compatibility just defines tokens from core 3.0 */ -#endif - -#ifndef GL_ARB_copy_buffer -#define GL_COPY_READ_BUFFER 0x8F36 -#define GL_COPY_WRITE_BUFFER 0x8F37 -#endif - -#ifndef GL_ARB_shader_texture_lod -#endif - -#ifndef GL_ARB_depth_clamp -#define GL_DEPTH_CLAMP 0x864F -#endif - -#ifndef GL_ARB_draw_elements_base_vertex -#endif - -#ifndef GL_ARB_fragment_coord_conventions -#endif - -#ifndef GL_ARB_provoking_vertex -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F -#endif - -#ifndef GL_ARB_seamless_cube_map -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F -#endif - -#ifndef GL_ARB_sync -#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 -#define GL_OBJECT_TYPE 0x9112 -#define GL_SYNC_CONDITION 0x9113 -#define GL_SYNC_STATUS 0x9114 -#define GL_SYNC_FLAGS 0x9115 -#define GL_SYNC_FENCE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 -#define GL_UNSIGNALED 0x9118 -#define GL_SIGNALED 0x9119 -#define GL_ALREADY_SIGNALED 0x911A -#define GL_TIMEOUT_EXPIRED 0x911B -#define GL_CONDITION_SATISFIED 0x911C -#define GL_WAIT_FAILED 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull -#endif - -#ifndef GL_ARB_texture_multisample -#define GL_SAMPLE_POSITION 0x8E50 -#define GL_SAMPLE_MASK 0x8E51 -#define GL_SAMPLE_MASK_VALUE 0x8E52 -#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 -#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 -#define GL_TEXTURE_SAMPLES 0x9106 -#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 -#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 -#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D -#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E -#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F -#define GL_MAX_INTEGER_SAMPLES 0x9110 -#endif - -#ifndef GL_ARB_vertex_array_bgra -/* reuse GL_BGRA */ -#endif - -#ifndef GL_ARB_draw_buffers_blend -#endif - -#ifndef GL_ARB_sample_shading -#define GL_SAMPLE_SHADING_ARB 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 -#endif - -#ifndef GL_ARB_texture_cube_map_array -#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F -#endif - -#ifndef GL_ARB_texture_gather -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F -#endif - -#ifndef GL_ARB_texture_query_lod -#endif - -#ifndef GL_ARB_shading_language_include -#define GL_SHADER_INCLUDE_ARB 0x8DAE -#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9 -#define GL_NAMED_STRING_TYPE_ARB 0x8DEA -#endif - -#ifndef GL_ARB_texture_compression_bptc -#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F -#endif - -#ifndef GL_ARB_blend_func_extended -#define GL_SRC1_COLOR 0x88F9 -/* reuse GL_SRC1_ALPHA */ -#define GL_ONE_MINUS_SRC1_COLOR 0x88FA -#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB -#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC -#endif - -#ifndef GL_ARB_explicit_attrib_location -#endif - -#ifndef GL_ARB_occlusion_query2 -#define GL_ANY_SAMPLES_PASSED 0x8C2F -#endif - -#ifndef GL_ARB_sampler_objects -#define GL_SAMPLER_BINDING 0x8919 -#endif - -#ifndef GL_ARB_shader_bit_encoding -#endif - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_RGB10_A2UI 0x906F -#endif - -#ifndef GL_ARB_texture_swizzle -#define GL_TEXTURE_SWIZZLE_R 0x8E42 -#define GL_TEXTURE_SWIZZLE_G 0x8E43 -#define GL_TEXTURE_SWIZZLE_B 0x8E44 -#define GL_TEXTURE_SWIZZLE_A 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 -#endif - -#ifndef GL_ARB_timer_query -#define GL_TIME_ELAPSED 0x88BF -#define GL_TIMESTAMP 0x8E28 -#endif - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */ -#define GL_INT_2_10_10_10_REV 0x8D9F -#endif - -#ifndef GL_ARB_draw_indirect -#define GL_DRAW_INDIRECT_BUFFER 0x8F3F -#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 -#endif - -#ifndef GL_ARB_gpu_shader5 -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D -/* reuse GL_MAX_VERTEX_STREAMS */ -#endif - -#ifndef GL_ARB_gpu_shader_fp64 -/* reuse GL_DOUBLE */ -#define GL_DOUBLE_VEC2 0x8FFC -#define GL_DOUBLE_VEC3 0x8FFD -#define GL_DOUBLE_VEC4 0x8FFE -#define GL_DOUBLE_MAT2 0x8F46 -#define GL_DOUBLE_MAT3 0x8F47 -#define GL_DOUBLE_MAT4 0x8F48 -#define GL_DOUBLE_MAT2x3 0x8F49 -#define GL_DOUBLE_MAT2x4 0x8F4A -#define GL_DOUBLE_MAT3x2 0x8F4B -#define GL_DOUBLE_MAT3x4 0x8F4C -#define GL_DOUBLE_MAT4x2 0x8F4D -#define GL_DOUBLE_MAT4x3 0x8F4E -#endif - -#ifndef GL_ARB_shader_subroutine -#define GL_ACTIVE_SUBROUTINES 0x8DE5 -#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 -#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 -#define GL_MAX_SUBROUTINES 0x8DE7 -#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 -#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A -#define GL_COMPATIBLE_SUBROUTINES 0x8E4B -/* reuse GL_UNIFORM_SIZE */ -/* reuse GL_UNIFORM_NAME_LENGTH */ -#endif - -#ifndef GL_ARB_tessellation_shader -#define GL_PATCHES 0x000E -#define GL_PATCH_VERTICES 0x8E72 -#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 -#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 -#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 -#define GL_TESS_GEN_MODE 0x8E76 -#define GL_TESS_GEN_SPACING 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 -#define GL_TESS_GEN_POINT_MODE 0x8E79 -/* reuse GL_TRIANGLES */ -/* reuse GL_QUADS */ -#define GL_ISOLINES 0x8E7A -/* reuse GL_EQUAL */ -#define GL_FRACTIONAL_ODD 0x8E7B -#define GL_FRACTIONAL_EVEN 0x8E7C -/* reuse GL_CCW */ -/* reuse GL_CW */ -#define GL_MAX_PATCH_VERTICES 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 -#define GL_TESS_EVALUATION_SHADER 0x8E87 -#define GL_TESS_CONTROL_SHADER 0x8E88 -#endif - -#ifndef GL_ARB_texture_buffer_object_rgb32 -/* reuse GL_RGB32F */ -/* reuse GL_RGB32UI */ -/* reuse GL_RGB32I */ -#endif - -#ifndef GL_ARB_transform_feedback2 -#define GL_TRANSFORM_FEEDBACK 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 -#endif - -#ifndef GL_ARB_transform_feedback3 -#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 -#define GL_MAX_VERTEX_STREAMS 0x8E71 -#endif - -#ifndef GL_ARB_ES2_compatibility -#define GL_FIXED 0x140C -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#endif - -#ifndef GL_ARB_get_program_binary -#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF -#endif - -#ifndef GL_ARB_separate_shader_objects -#define GL_VERTEX_SHADER_BIT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT 0x00000002 -#define GL_GEOMETRY_SHADER_BIT 0x00000004 -#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 -#define GL_ALL_SHADER_BITS 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE 0x8258 -#define GL_ACTIVE_PROGRAM 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING 0x825A -#endif - -#ifndef GL_ARB_shader_precision -#endif - -#ifndef GL_ARB_vertex_attrib_64bit -/* reuse GL_RGB32I */ -/* reuse GL_DOUBLE_VEC2 */ -/* reuse GL_DOUBLE_VEC3 */ -/* reuse GL_DOUBLE_VEC4 */ -/* reuse GL_DOUBLE_MAT2 */ -/* reuse GL_DOUBLE_MAT3 */ -/* reuse GL_DOUBLE_MAT4 */ -/* reuse GL_DOUBLE_MAT2x3 */ -/* reuse GL_DOUBLE_MAT2x4 */ -/* reuse GL_DOUBLE_MAT3x2 */ -/* reuse GL_DOUBLE_MAT3x4 */ -/* reuse GL_DOUBLE_MAT4x2 */ -/* reuse GL_DOUBLE_MAT4x3 */ -#endif - -#ifndef GL_ARB_viewport_array -/* reuse GL_SCISSOR_BOX */ -/* reuse GL_VIEWPORT */ -/* reuse GL_DEPTH_RANGE */ -/* reuse GL_SCISSOR_TEST */ -#define GL_MAX_VIEWPORTS 0x825B -#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C -#define GL_VIEWPORT_BOUNDS_RANGE 0x825D -#define GL_LAYER_PROVOKING_VERTEX 0x825E -#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F -#define GL_UNDEFINED_VERTEX 0x8260 -/* reuse GL_FIRST_VERTEX_CONVENTION */ -/* reuse GL_LAST_VERTEX_CONVENTION */ -/* reuse GL_PROVOKING_VERTEX */ -#endif - -#ifndef GL_ARB_cl_event -#define GL_SYNC_CL_EVENT_ARB 0x8240 -#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241 -#endif - -#ifndef GL_ARB_debug_output -#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 -#define GL_DEBUG_SOURCE_API_ARB 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A -#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B -#define GL_DEBUG_TYPE_ERROR_ARB 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E -#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 -#define GL_DEBUG_TYPE_OTHER_ARB 0x8251 -#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 -#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 -#endif - -#ifndef GL_ARB_robustness -/* reuse GL_NO_ERROR */ -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define GL_NO_RESET_NOTIFICATION_ARB 0x8261 -#endif - -#ifndef GL_ARB_shader_stencil_export -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS 0x8118 -#define GL_DUAL_INTENSITY8_SGIS 0x8119 -#define GL_DUAL_INTENSITY12_SGIS 0x811A -#define GL_DUAL_INTENSITY16_SGIS 0x811B -#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C -#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D -#define GL_QUAD_ALPHA4_SGIS 0x811E -#define GL_QUAD_ALPHA8_SGIS 0x811F -#define GL_QUAD_LUMINANCE4_SGIS 0x8120 -#define GL_QUAD_LUMINANCE8_SGIS 0x8121 -#define GL_QUAD_INTENSITY4_SGIS 0x8122 -#define GL_QUAD_INTENSITY8_SGIS 0x8123 -#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 -#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SPRITE_SGIX 0x8148 -#define GL_SPRITE_MODE_SGIX 0x8149 -#define GL_SPRITE_AXIS_SGIX 0x814A -#define GL_SPRITE_TRANSLATION_SGIX 0x814B -#define GL_SPRITE_AXIAL_SGIX 0x814C -#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D -#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E -#endif - -#ifndef GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_POINT_SIZE_MIN_SGIS 0x8126 -#define GL_POINT_SIZE_MAX_SGIS 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 -#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 -#endif - -#ifndef GL_SGIX_instruments -#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 -#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C -#endif - -#ifndef GL_SGIX_framezoom -#define GL_FRAMEZOOM_SGIX 0x818B -#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C -#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#endif - -#ifndef GL_FfdMaskSGIX -#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 -#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 -#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 -#define GL_DEFORMATIONS_MASK_SGIX 0x8196 -#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_REFERENCE_PLANE_SGIX 0x817D -#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E -#endif - -#ifndef GL_SGIX_flush_raster -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_FUNC_POINTS_SGIS 0x812B -#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#endif - -#ifndef GL_HP_image_transform -#define GL_IMAGE_SCALE_X_HP 0x8155 -#define GL_IMAGE_SCALE_Y_HP 0x8156 -#define GL_IMAGE_TRANSLATE_X_HP 0x8157 -#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 -#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 -#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A -#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B -#define GL_IMAGE_MAG_FILTER_HP 0x815C -#define GL_IMAGE_MIN_FILTER_HP 0x815D -#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E -#define GL_CUBIC_HP 0x815F -#define GL_AVERAGE_HP 0x8160 -#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 -#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 -#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_IGNORE_BORDER_HP 0x8150 -#define GL_CONSTANT_BORDER_HP 0x8151 -#define GL_REPLICATE_BORDER_HP 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 -#endif - -#ifndef GL_INGR_palette_buffer -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE -#endif - -#ifndef GL_EXT_color_subtable -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_VERTEX_DATA_HINT_PGI 0x1A22A -#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B -#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C -#define GL_MAX_VERTEX_HINT_PGI 0x1A22D -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 -#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD -#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 -#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C -#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E -#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F -#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 -#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 -#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 -#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 -#define GL_CLIP_NEAR_HINT_PGI 0x1A220 -#define GL_CLIP_FAR_HINT_PGI 0x1A221 -#define GL_WIDE_LINE_HINT_PGI 0x1A222 -#define GL_BACK_NORMALS_HINT_PGI 0x1A223 -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_LIST_PRIORITY_SGIX 0x8182 -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_IR_INSTRUMENT1_SGIX 0x817F -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E -#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F -#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SHADOW_AMBIENT_SGIX 0x80BF -#endif - -#ifndef GL_EXT_index_texture -#endif - -#ifndef GL_EXT_index_material -#define GL_INDEX_MATERIAL_EXT 0x81B8 -#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 -#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA -#endif - -#ifndef GL_EXT_index_func -#define GL_INDEX_TEST_EXT 0x81B5 -#define GL_INDEX_TEST_FUNC_EXT 0x81B6 -#define GL_INDEX_TEST_REF_EXT 0x81B7 -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_IUI_V2F_EXT 0x81AD -#define GL_IUI_V3F_EXT 0x81AE -#define GL_IUI_N3F_V2F_EXT 0x81AF -#define GL_IUI_N3F_V3F_EXT 0x81B0 -#define GL_T2F_IUI_V2F_EXT 0x81B1 -#define GL_T2F_IUI_V3F_EXT 0x81B2 -#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 -#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_YCRCB_422_SGIX 0x81BB -#define GL_YCRCB_444_SGIX 0x81BC -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 -#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 -#define GL_LIGHT_ENV_MODE_SGIX 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B -#define GL_FRAGMENT_LIGHT0_SGIX 0x840C -#define GL_FRAGMENT_LIGHT1_SGIX 0x840D -#define GL_FRAGMENT_LIGHT2_SGIX 0x840E -#define GL_FRAGMENT_LIGHT3_SGIX 0x840F -#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 -#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 -#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 -#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 -#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 -#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 -#endif - -#ifndef GL_WIN_phong_shading -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB -#endif - -#ifndef GL_WIN_specular_fog -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC -#endif - -#ifndef GL_EXT_light_texture -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 -/* reuse GL_FRAGMENT_DEPTH_EXT */ -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 -#endif - -#ifndef GL_SGIX_impact_pixel_texture -#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 -#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 -#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 -#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 -#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 -#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 -#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A -#endif - -#ifndef GL_EXT_bgra -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 -#endif - -#ifndef GL_SGIX_async -#define GL_ASYNC_MARKER_SGIX 0x8329 -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D -#endif - -#ifndef GL_INTEL_texture_scissor -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 -#endif - -#ifndef GL_HP_occlusion_test -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA -#endif - -#ifndef GL_EXT_secondary_color -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF -#endif - -#ifndef GL_EXT_multi_draw_arrays -#endif - -#ifndef GL_EXT_fog_coord -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_TRANSFORM_HINT_APPLE 0x85B1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD -#endif - -#ifndef GL_SUNX_constant_data -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 -#endif - -#ifndef GL_SUN_global_alpha -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA -#endif - -#ifndef GL_SUN_triangle_list -#define GL_RESTART_SUN 0x0001 -#define GL_REPLACE_MIDDLE_SUN 0x0002 -#define GL_REPLACE_OLDEST_SUN 0x0003 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB -#endif - -#ifndef GL_SUN_vertex -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB -#endif - -#ifndef GL_INGR_color_clamp -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INTERLACE_READ_INGR 0x8568 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 -#endif - -#ifndef GL_EXT_texture_cube_map -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_WRAP_BORDER_SUN 0x81D4 -#endif - -#ifndef GL_EXT_texture_env_add -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 -#endif - -#ifndef GL_NV_register_combiners -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 -/* reuse GL_TEXTURE0_ARB */ -/* reuse GL_TEXTURE1_ARB */ -/* reuse GL_ZERO */ -/* reuse GL_NONE */ -/* reuse GL_FOG */ -#endif - -#ifndef GL_NV_fog_distance -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C -/* reuse GL_EYE_PLANE */ -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F -#endif - -#ifndef GL_NV_blend_square -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B -#endif - -#ifndef GL_MESA_resize_buffers -#endif - -#ifndef GL_MESA_window_pos -#endif - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_CULL_VERTEX_IBM 103050 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 -#endif - -#ifndef GL_SGIX_subsample -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 -#endif - -#ifndef GL_SGI_depth_pass_instrument -#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 -#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 -#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 -#endif - -#ifndef GL_3DFX_tbuffer -#endif - -#ifndef GL_EXT_multisample -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_CONVOLUTION_HINT_SGIX 0x8316 -#endif - -#ifndef GL_SGIX_resample -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -#endif - -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_IBM 0x8370 -#endif - -#ifndef GL_NV_evaluators -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 -#endif - -#ifndef GL_NV_texture_compression_vtc -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 -#endif - -#ifndef GL_NV_texture_shader -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 -#endif - -#ifndef GL_NV_vertex_program -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SCALEBIAS_HINT_SGIX 0x8322 -#endif - -#ifndef GL_OML_interlace -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 -#endif - -#ifndef GL_OML_subsample -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 -#endif - -#ifndef GL_OML_resample -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_REG_6_ATI 0x8927 -#define GL_REG_7_ATI 0x8928 -#define GL_REG_8_ATI 0x8929 -#define GL_REG_9_ATI 0x892A -#define GL_REG_10_ATI 0x892B -#define GL_REG_11_ATI 0x892C -#define GL_REG_12_ATI 0x892D -#define GL_REG_13_ATI 0x892E -#define GL_REG_14_ATI 0x892F -#define GL_REG_15_ATI 0x8930 -#define GL_REG_16_ATI 0x8931 -#define GL_REG_17_ATI 0x8932 -#define GL_REG_18_ATI 0x8933 -#define GL_REG_19_ATI 0x8934 -#define GL_REG_20_ATI 0x8935 -#define GL_REG_21_ATI 0x8936 -#define GL_REG_22_ATI 0x8937 -#define GL_REG_23_ATI 0x8938 -#define GL_REG_24_ATI 0x8939 -#define GL_REG_25_ATI 0x893A -#define GL_REG_26_ATI 0x893B -#define GL_REG_27_ATI 0x893C -#define GL_REG_28_ATI 0x893D -#define GL_REG_29_ATI 0x893E -#define GL_REG_30_ATI 0x893F -#define GL_REG_31_ATI 0x8940 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_CON_8_ATI 0x8949 -#define GL_CON_9_ATI 0x894A -#define GL_CON_10_ATI 0x894B -#define GL_CON_11_ATI 0x894C -#define GL_CON_12_ATI 0x894D -#define GL_CON_13_ATI 0x894E -#define GL_CON_14_ATI 0x894F -#define GL_CON_15_ATI 0x8950 -#define GL_CON_16_ATI 0x8951 -#define GL_CON_17_ATI 0x8952 -#define GL_CON_18_ATI 0x8953 -#define GL_CON_19_ATI 0x8954 -#define GL_CON_20_ATI 0x8955 -#define GL_CON_21_ATI 0x8956 -#define GL_CON_22_ATI 0x8957 -#define GL_CON_23_ATI 0x8958 -#define GL_CON_24_ATI 0x8959 -#define GL_CON_25_ATI 0x895A -#define GL_CON_26_ATI 0x895B -#define GL_CON_27_ATI 0x895C -#define GL_CON_28_ATI 0x895D -#define GL_CON_29_ATI 0x895E -#define GL_CON_30_ATI 0x895F -#define GL_CON_31_ATI 0x8960 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B -#define GL_RED_BIT_ATI 0x00000001 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_2X_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_STREAM0_ATI 0x876C -#define GL_VERTEX_STREAM1_ATI 0x876D -#define GL_VERTEX_STREAM2_ATI 0x876E -#define GL_VERTEX_STREAM3_ATI 0x876F -#define GL_VERTEX_STREAM4_ATI 0x8770 -#define GL_VERTEX_STREAM5_ATI 0x8771 -#define GL_VERTEX_STREAM6_ATI 0x8772 -#define GL_VERTEX_STREAM7_ATI 0x8773 -#define GL_VERTEX_SOURCE_ATI 0x8774 -#endif - -#ifndef GL_ATI_element_array -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A -#endif - -#ifndef GL_SUN_mesh_array -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SLICE_ACCUM_SUN 0x85CC -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_DEPTH_CLAMP_NV 0x864F -#endif - -#ifndef GL_NV_occlusion_query -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif - -#ifndef GL_NV_point_sprite -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 -#endif - -#ifndef GL_NV_vertex_program1_1 -#endif - -#ifndef GL_EXT_shadow_funcs -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 -#endif - -#ifndef GL_APPLE_element_array -#define GL_ELEMENT_ARRAY_APPLE 0x8A0C -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E -#endif - -#ifndef GL_APPLE_fence -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CLIENT_APPLE 0x85B4 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_YCBCR_422_APPLE 0x85B9 -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -#ifndef GL_S3_s3tc -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 -#endif - -#ifndef GL_ATI_texture_float -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F -#endif - -#ifndef GL_NV_float_buffer -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E -#endif - -#ifndef GL_NV_fragment_program -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 -#endif - -#ifndef GL_NV_half_float -#define GL_HALF_FLOAT_NV 0x140B -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D -#endif - -#ifndef GL_NV_primitive_restart -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F -#endif - -#ifndef GL_NV_vertex_program2 -#endif - -#ifndef GL_ATI_map_object_buffer -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#endif - -#ifndef GL_OES_read_format -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_BLEND_EQUATION_RGB_EXT 0x8009 -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D -#endif - -#ifndef GL_MESA_pack_invert -#define GL_PACK_INVERT_MESA 0x8758 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF -#endif - -#ifndef GL_NV_fragment_program_option -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 -#endif - -#ifndef GL_NV_vertex_program2_option -/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ -/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ -#endif - -#ifndef GL_NV_vertex_program3 -/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 -#endif - -#ifndef GL_GREMEDY_string_marker -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_STENCIL_TAG_BITS_EXT 0x88F2 -#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING_EXT -#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_TEXTURE_1D_STACK_MESAX 0x8759 -#define GL_TEXTURE_2D_STACK_MESAX 0x875A -#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B -#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C -#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D -#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E -#endif - -#ifndef GL_EXT_timer_query -#define GL_TIME_ELAPSED_EXT 0x88BF -#endif - -#ifndef GL_EXT_gpu_program_parameters -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 -#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 -#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 -#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 -#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 -#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 -#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_LINES_ADJACENCY_EXT 0x000A -#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B -#define GL_TRIANGLES_ADJACENCY_EXT 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D -#define GL_GEOMETRY_PROGRAM_NV 0x8C26 -#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 -#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 -#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */ -/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */ -/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */ -/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */ -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE -#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 -/* reuse GL_LINES_ADJACENCY_EXT */ -/* reuse GL_LINE_STRIP_ADJACENCY_EXT */ -/* reuse GL_TRIANGLES_ADJACENCY_EXT */ -/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -/* reuse GL_PROGRAM_POINT_SIZE_EXT */ -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 -#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 -#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 -#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 -#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 -#define GL_INT_SAMPLER_1D_EXT 0x8DC9 -#define GL_INT_SAMPLER_2D_EXT 0x8DCA -#define GL_INT_SAMPLER_3D_EXT 0x8DCB -#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC -#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD -#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 -#endif - -#ifndef GL_EXT_draw_instanced -#endif - -#ifndef GL_EXT_packed_float -#define GL_R11F_G11F_B10F_EXT 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B -#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C -#endif - -#ifndef GL_EXT_texture_array -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 -#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 -#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 -#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_RGB9_E5_EXT 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E -#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_DEPTH_COMPONENT32F_NV 0x8DAB -#define GL_DEPTH32F_STENCIL8_NV 0x8DAC -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD -#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF -#endif - -#ifndef GL_NV_fragment_program4 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA -#endif - -#ifndef GL_NV_geometry_shader4 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 -#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 -#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 -#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 -#endif - -#ifndef GL_EXT_draw_buffers2 -#endif - -#ifndef GL_NV_transform_feedback -#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 -#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 -#define GL_TEXTURE_COORD_NV 0x8C79 -#define GL_CLIP_DISTANCE_NV 0x8C7A -#define GL_VERTEX_ID_NV 0x8C7B -#define GL_PRIMITIVE_ID_NV 0x8C7C -#define GL_GENERIC_ATTRIB_NV 0x8C7D -#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 -#define GL_ACTIVE_VARYINGS_NV 0x8C81 -#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 -#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 -#define GL_PRIMITIVES_GENERATED_NV 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 -#define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C -#define GL_SEPARATE_ATTRIBS_NV 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F -#define GL_LAYER_NV 0x8DAA -#define GL_NEXT_BUFFER_NV -2 -#define GL_SKIP_COMPONENTS4_NV -3 -#define GL_SKIP_COMPONENTS3_NV -4 -#define GL_SKIP_COMPONENTS2_NV -5 -#define GL_SKIP_COMPONENTS1_NV -6 -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 -#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 -#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 -#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED -#define GL_UNIFORM_BUFFER_EXT 0x8DEE -#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF -#endif - -#ifndef GL_EXT_texture_integer -#define GL_RGBA32UI_EXT 0x8D70 -#define GL_RGB32UI_EXT 0x8D71 -#define GL_ALPHA32UI_EXT 0x8D72 -#define GL_INTENSITY32UI_EXT 0x8D73 -#define GL_LUMINANCE32UI_EXT 0x8D74 -#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -#define GL_RGBA16UI_EXT 0x8D76 -#define GL_RGB16UI_EXT 0x8D77 -#define GL_ALPHA16UI_EXT 0x8D78 -#define GL_INTENSITY16UI_EXT 0x8D79 -#define GL_LUMINANCE16UI_EXT 0x8D7A -#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -#define GL_RGBA8UI_EXT 0x8D7C -#define GL_RGB8UI_EXT 0x8D7D -#define GL_ALPHA8UI_EXT 0x8D7E -#define GL_INTENSITY8UI_EXT 0x8D7F -#define GL_LUMINANCE8UI_EXT 0x8D80 -#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -#define GL_RGBA32I_EXT 0x8D82 -#define GL_RGB32I_EXT 0x8D83 -#define GL_ALPHA32I_EXT 0x8D84 -#define GL_INTENSITY32I_EXT 0x8D85 -#define GL_LUMINANCE32I_EXT 0x8D86 -#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -#define GL_RGBA16I_EXT 0x8D88 -#define GL_RGB16I_EXT 0x8D89 -#define GL_ALPHA16I_EXT 0x8D8A -#define GL_INTENSITY16I_EXT 0x8D8B -#define GL_LUMINANCE16I_EXT 0x8D8C -#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -#define GL_RGBA8I_EXT 0x8D8E -#define GL_RGB8I_EXT 0x8D8F -#define GL_ALPHA8I_EXT 0x8D90 -#define GL_INTENSITY8I_EXT 0x8D91 -#define GL_LUMINANCE8I_EXT 0x8D92 -#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -#define GL_RED_INTEGER_EXT 0x8D94 -#define GL_GREEN_INTEGER_EXT 0x8D95 -#define GL_BLUE_INTEGER_EXT 0x8D96 -#define GL_ALPHA_INTEGER_EXT 0x8D97 -#define GL_RGB_INTEGER_EXT 0x8D98 -#define GL_RGBA_INTEGER_EXT 0x8D99 -#define GL_BGR_INTEGER_EXT 0x8D9A -#define GL_BGRA_INTEGER_EXT 0x8D9B -#define GL_LUMINANCE_INTEGER_EXT 0x8D9C -#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D -#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E -#endif - -#ifndef GL_GREMEDY_frame_terminator -#endif - -#ifndef GL_NV_conditional_render -#define GL_QUERY_WAIT_NV 0x8E13 -#define GL_QUERY_NO_WAIT_NV 0x8E14 -#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 -#endif - -#ifndef GL_NV_present_video -#define GL_FRAME_NV 0x8E26 -#define GL_FIELDS_NV 0x8E27 -#define GL_CURRENT_TIME_NV 0x8E28 -#define GL_NUM_FILL_STREAMS_NV 0x8E29 -#define GL_PRESENT_TIME_NV 0x8E2A -#define GL_PRESENT_DURATION_NV 0x8E2B -#endif - -#ifndef GL_EXT_transform_feedback -#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85 -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F -#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C -#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D -#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88 -#define GL_RASTERIZER_DISCARD_EXT 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76 -#endif - -#ifndef GL_EXT_direct_state_access -#define GL_PROGRAM_MATRIX_EXT 0x8E2D -#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E -#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F -#endif - -#ifndef GL_EXT_vertex_array_bgra -/* reuse GL_BGRA */ -#endif - -#ifndef GL_EXT_texture_swizzle -#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42 -#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43 -#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44 -#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46 -#endif - -#ifndef GL_NV_explicit_multisample -#define GL_SAMPLE_POSITION_NV 0x8E50 -#define GL_SAMPLE_MASK_NV 0x8E51 -#define GL_SAMPLE_MASK_VALUE_NV 0x8E52 -#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53 -#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54 -#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55 -#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 -#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57 -#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58 -#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 -#endif - -#ifndef GL_NV_transform_feedback2 -#define GL_TRANSFORM_FEEDBACK_NV 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 -#endif - -#ifndef GL_ATI_meminfo -#define GL_VBO_FREE_MEMORY_ATI 0x87FB -#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC -#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD -#endif - -#ifndef GL_AMD_performance_monitor -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -#endif - -#ifndef GL_AMD_texture_texture4 -#endif - -#ifndef GL_AMD_vertex_shader_tesselator -#define GL_SAMPLER_BUFFER_AMD 0x9001 -#define GL_INT_SAMPLER_BUFFER_AMD 0x9002 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003 -#define GL_TESSELLATION_MODE_AMD 0x9004 -#define GL_TESSELLATION_FACTOR_AMD 0x9005 -#define GL_DISCRETE_AMD 0x9006 -#define GL_CONTINUOUS_AMD 0x9007 -#endif - -#ifndef GL_EXT_provoking_vertex -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D -#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E -#define GL_PROVOKING_VERTEX_EXT 0x8E4F -#endif - -#ifndef GL_EXT_texture_snorm -#define GL_ALPHA_SNORM 0x9010 -#define GL_LUMINANCE_SNORM 0x9011 -#define GL_LUMINANCE_ALPHA_SNORM 0x9012 -#define GL_INTENSITY_SNORM 0x9013 -#define GL_ALPHA8_SNORM 0x9014 -#define GL_LUMINANCE8_SNORM 0x9015 -#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 -#define GL_INTENSITY8_SNORM 0x9017 -#define GL_ALPHA16_SNORM 0x9018 -#define GL_LUMINANCE16_SNORM 0x9019 -#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A -#define GL_INTENSITY16_SNORM 0x901B -/* reuse GL_RED_SNORM */ -/* reuse GL_RG_SNORM */ -/* reuse GL_RGB_SNORM */ -/* reuse GL_RGBA_SNORM */ -/* reuse GL_R8_SNORM */ -/* reuse GL_RG8_SNORM */ -/* reuse GL_RGB8_SNORM */ -/* reuse GL_RGBA8_SNORM */ -/* reuse GL_R16_SNORM */ -/* reuse GL_RG16_SNORM */ -/* reuse GL_RGB16_SNORM */ -/* reuse GL_RGBA16_SNORM */ -/* reuse GL_SIGNED_NORMALIZED */ -#endif - -#ifndef GL_AMD_draw_buffers_blend -#endif - -#ifndef GL_APPLE_texture_range -#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7 -#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8 -#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC -#define GL_STORAGE_PRIVATE_APPLE 0x85BD -/* reuse GL_STORAGE_CACHED_APPLE */ -/* reuse GL_STORAGE_SHARED_APPLE */ -#endif - -#ifndef GL_APPLE_float_pixels -#define GL_HALF_APPLE 0x140B -#define GL_RGBA_FLOAT32_APPLE 0x8814 -#define GL_RGB_FLOAT32_APPLE 0x8815 -#define GL_ALPHA_FLOAT32_APPLE 0x8816 -#define GL_INTENSITY_FLOAT32_APPLE 0x8817 -#define GL_LUMINANCE_FLOAT32_APPLE 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819 -#define GL_RGBA_FLOAT16_APPLE 0x881A -#define GL_RGB_FLOAT16_APPLE 0x881B -#define GL_ALPHA_FLOAT16_APPLE 0x881C -#define GL_INTENSITY_FLOAT16_APPLE 0x881D -#define GL_LUMINANCE_FLOAT16_APPLE 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F -#define GL_COLOR_FLOAT_APPLE 0x8A0F -#endif - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00 -#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01 -#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02 -#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03 -#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04 -#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05 -#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06 -#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07 -#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08 -#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09 -#endif - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14 -#endif - -#ifndef GL_APPLE_object_purgeable -#define GL_BUFFER_OBJECT_APPLE 0x85B3 -#define GL_RELEASED_APPLE 0x8A19 -#define GL_VOLATILE_APPLE 0x8A1A -#define GL_RETAINED_APPLE 0x8A1B -#define GL_UNDEFINED_APPLE 0x8A1C -#define GL_PURGEABLE_APPLE 0x8A1D -#endif - -#ifndef GL_APPLE_row_bytes -#define GL_PACK_ROW_BYTES_APPLE 0x8A15 -#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 -#endif - -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */ -/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */ -#endif - -#ifndef GL_NV_video_capture -#define GL_VIDEO_BUFFER_NV 0x9020 -#define GL_VIDEO_BUFFER_BINDING_NV 0x9021 -#define GL_FIELD_UPPER_NV 0x9022 -#define GL_FIELD_LOWER_NV 0x9023 -#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 -#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 -#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026 -#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027 -#define GL_VIDEO_BUFFER_PITCH_NV 0x9028 -#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029 -#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A -#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B -#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C -#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D -#define GL_PARTIAL_SUCCESS_NV 0x902E -#define GL_SUCCESS_NV 0x902F -#define GL_FAILURE_NV 0x9030 -#define GL_YCBYCR8_422_NV 0x9031 -#define GL_YCBAYCR8A_4224_NV 0x9032 -#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033 -#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034 -#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035 -#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036 -#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037 -#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038 -#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039 -#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A -#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B -#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C -#endif - -#ifndef GL_NV_copy_image -#endif - -#ifndef GL_EXT_separate_shader_objects -#define GL_ACTIVE_PROGRAM_EXT 0x8B8D -#endif - -#ifndef GL_NV_parameter_buffer_object2 -#endif - -#ifndef GL_NV_shader_buffer_load -#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D -#define GL_GPU_ADDRESS_NV 0x8F34 -#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35 -#endif - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E -#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F -#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20 -#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 -#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22 -#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 -#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24 -#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25 -#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26 -#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 -#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28 -#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29 -#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A -#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B -#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C -#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D -#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E -#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F -#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30 -#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31 -#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32 -#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33 -#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40 -#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 -#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42 -#endif - -#ifndef GL_NV_texture_barrier -#endif - -#ifndef GL_AMD_shader_stencil_export -#endif - -#ifndef GL_AMD_seamless_cubemap_per_texture -/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */ -#endif - -#ifndef GL_AMD_conservative_depth -#endif - -#ifndef GL_EXT_shader_image_load_store -#define GL_MAX_IMAGE_UNITS_EXT 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 -#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A -#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B -#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C -#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D -#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E -#define GL_IMAGE_1D_EXT 0x904C -#define GL_IMAGE_2D_EXT 0x904D -#define GL_IMAGE_3D_EXT 0x904E -#define GL_IMAGE_2D_RECT_EXT 0x904F -#define GL_IMAGE_CUBE_EXT 0x9050 -#define GL_IMAGE_BUFFER_EXT 0x9051 -#define GL_IMAGE_1D_ARRAY_EXT 0x9052 -#define GL_IMAGE_2D_ARRAY_EXT 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056 -#define GL_INT_IMAGE_1D_EXT 0x9057 -#define GL_INT_IMAGE_2D_EXT 0x9058 -#define GL_INT_IMAGE_3D_EXT 0x9059 -#define GL_INT_IMAGE_2D_RECT_EXT 0x905A -#define GL_INT_IMAGE_CUBE_EXT 0x905B -#define GL_INT_IMAGE_BUFFER_EXT 0x905C -#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D -#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C -#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D -#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020 -#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000 -#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF -#endif - -#ifndef GL_EXT_vertex_attrib_64bit -/* reuse GL_DOUBLE */ -#define GL_DOUBLE_VEC2_EXT 0x8FFC -#define GL_DOUBLE_VEC3_EXT 0x8FFD -#define GL_DOUBLE_VEC4_EXT 0x8FFE -#define GL_DOUBLE_MAT2_EXT 0x8F46 -#define GL_DOUBLE_MAT3_EXT 0x8F47 -#define GL_DOUBLE_MAT4_EXT 0x8F48 -#define GL_DOUBLE_MAT2x3_EXT 0x8F49 -#define GL_DOUBLE_MAT2x4_EXT 0x8F4A -#define GL_DOUBLE_MAT3x2_EXT 0x8F4B -#define GL_DOUBLE_MAT3x4_EXT 0x8F4C -#define GL_DOUBLE_MAT4x2_EXT 0x8F4D -#define GL_DOUBLE_MAT4x3_EXT 0x8F4E -#endif - -#ifndef GL_NV_gpu_program5 -#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C -#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D -#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44 -#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV 0x8F45 -#endif - -#ifndef GL_NV_gpu_shader5 -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F -#define GL_INT8_NV 0x8FE0 -#define GL_INT8_VEC2_NV 0x8FE1 -#define GL_INT8_VEC3_NV 0x8FE2 -#define GL_INT8_VEC4_NV 0x8FE3 -#define GL_INT16_NV 0x8FE4 -#define GL_INT16_VEC2_NV 0x8FE5 -#define GL_INT16_VEC3_NV 0x8FE6 -#define GL_INT16_VEC4_NV 0x8FE7 -#define GL_INT64_VEC2_NV 0x8FE9 -#define GL_INT64_VEC3_NV 0x8FEA -#define GL_INT64_VEC4_NV 0x8FEB -#define GL_UNSIGNED_INT8_NV 0x8FEC -#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED -#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE -#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF -#define GL_UNSIGNED_INT16_NV 0x8FF0 -#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1 -#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 -#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 -#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 -#define GL_FLOAT16_NV 0x8FF8 -#define GL_FLOAT16_VEC2_NV 0x8FF9 -#define GL_FLOAT16_VEC3_NV 0x8FFA -#define GL_FLOAT16_VEC4_NV 0x8FFB -/* reuse GL_PATCHES */ -#endif - -#ifndef GL_NV_shader_buffer_store -#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010 -/* reuse GL_READ_WRITE */ -/* reuse GL_WRITE_ONLY */ -#endif - -#ifndef GL_NV_tessellation_program5 -#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 -#define GL_TESS_CONTROL_PROGRAM_NV 0x891E -#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F -#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74 -#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75 -#endif - -#ifndef GL_NV_vertex_attrib_integer_64bit -/* reuse GL_INT64_NV */ -/* reuse GL_UNSIGNED_INT64_NV */ -#endif - -#ifndef GL_NV_multisample_coverage -#define GL_COVERAGE_SAMPLES_NV 0x80A9 -#define GL_COLOR_SAMPLES_NV 0x8E20 -#endif - -#ifndef GL_AMD_name_gen_delete -#define GL_DATA_BUFFER_AMD 0x9151 -#define GL_PERFORMANCE_MONITOR_AMD 0x9152 -#define GL_QUERY_OBJECT_AMD 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154 -#define GL_SAMPLER_OBJECT_AMD 0x9155 -#endif - -#ifndef GL_AMD_debug_output -#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 -#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 -#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 -#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A -#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B -#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C -#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D -#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E -#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F -#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150 -#endif - -#ifndef GL_NV_vdpau_interop -#define GL_SURFACE_STATE_NV 0x86EB -#define GL_SURFACE_REGISTERED_NV 0x86FD -#define GL_SURFACE_MAPPED_NV 0x8700 -#define GL_WRITE_DISCARD_NV 0x88BE -#endif - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#endif - - -/*************************************************************/ - -#include -#ifndef GL_VERSION_2_0 -/* GL type for program/shader text */ -typedef char GLchar; -#endif - -#ifndef GL_VERSION_1_5 -/* GL types for handling large vertex buffer objects */ -#if defined(__APPLE__) -typedef long GLintptr; -typedef long GLsizeiptr; -#else -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -#if defined(__APPLE__) -typedef long GLintptrARB; -typedef long GLsizeiptrARB; -#else -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for program/shader text and shader object handles */ -typedef char GLcharARB; -#if defined(__APPLE__) -typedef void *GLhandleARB; -#else -typedef unsigned int GLhandleARB; -#endif -#endif - -/* GL type for "half" precision (s10e5) float data in host memory */ -#ifndef GL_ARB_half_float_pixel -typedef unsigned short GLhalfARB; -#endif - -#ifndef GL_NV_half_float -typedef unsigned short GLhalfNV; -#endif - -#ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include -#elif defined(__sun__) || defined(__digital__) -#include -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include -#elif defined(__SCO__) || defined(__USLC__) -#include -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include -#endif -#endif - -#ifndef GL_EXT_timer_query -typedef int64_t GLint64EXT; -typedef uint64_t GLuint64EXT; -#endif - -#ifndef GL_ARB_sync -typedef int64_t GLint64; -typedef uint64_t GLuint64; -typedef struct __GLsync *GLsync; -#endif - -#ifndef GL_ARB_cl_event -/* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */ -struct _cl_context; -struct _cl_event; -#endif - -#ifndef GL_ARB_debug_output -typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#endif - -#ifndef GL_AMD_debug_output -typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#endif - -#ifndef GL_NV_vdpau_interop -typedef GLintptr GLvdpauSurfaceNV; -#endif - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GLAPI void APIENTRY glBlendEquation (GLenum mode); -GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_VERSION_1_2_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table); -GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params); -GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params); -GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image); -GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glResetHistogram (GLenum target); -GLAPI void APIENTRY glResetMinmax (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); -#endif - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTexture (GLenum texture); -GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_VERSION_1_3_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClientActiveTexture (GLenum texture); -GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s); -GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s); -GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s); -GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s); -GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t); -GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t); -GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t); -GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t); -GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r); -GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m); -GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m); -GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m); -GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); -#endif - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param); -GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_VERSION_1_4_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordf (GLfloat coord); -GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord); -GLAPI void APIENTRY glFogCoordd (GLdouble coord); -GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord); -GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v); -GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v); -GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v); -GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue); -GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v); -GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue); -GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v); -GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v); -GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue); -GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v); -GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue); -GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v); -GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2iv (const GLint *v); -GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2sv (const GLshort *v); -GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3iv (const GLint *v); -GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3sv (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); -#endif - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsQuery (GLuint id); -GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id); -GLAPI void APIENTRY glEndQuery (GLenum target); -GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params); -GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers); -GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers); -GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer); -GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access); -GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target); -GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs); -GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader); -GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name); -GLAPI void APIENTRY glCompileShader (GLuint shader); -GLAPI GLuint APIENTRY glCreateProgram (void); -GLAPI GLuint APIENTRY glCreateShader (GLenum type); -GLAPI void APIENTRY glDeleteProgram (GLuint program); -GLAPI void APIENTRY glDeleteShader (GLuint shader); -GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader); -GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index); -GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index); -GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params); -GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params); -GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgram (GLuint program); -GLAPI GLboolean APIENTRY glIsShader (GLuint shader); -GLAPI void APIENTRY glLinkProgram (GLuint program); -GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -GLAPI void APIENTRY glUseProgram (GLuint program); -GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0); -GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glUniform1i (GLint location, GLint v0); -GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glValidateProgram (GLuint program); -GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); -typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif - -#ifndef GL_VERSION_3_0 -#define GL_VERSION_3_0 1 -/* OpenGL 3.0 also reuses entry points from these extensions: */ -/* ARB_framebuffer_object */ -/* ARB_map_buffer_range */ -/* ARB_vertex_array_object */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data); -GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data); -GLAPI void APIENTRY glEnablei (GLenum target, GLuint index); -GLAPI void APIENTRY glDisablei (GLenum target, GLuint index); -GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index); -GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedback (void); -GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp); -GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode); -GLAPI void APIENTRY glEndConditionalRender (void); -GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params); -GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x); -GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y); -GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x); -GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y); -GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params); -GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0); -GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value); -GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value); -GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value); -GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data); -typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index); -typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp); -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode); -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); -#endif - -#ifndef GL_VERSION_3_1 -#define GL_VERSION_3_1 1 -/* OpenGL 3.1 also reuses entry points from these extensions: */ -/* ARB_copy_buffer */ -/* ARB_uniform_buffer_object */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index); -#endif - -#ifndef GL_VERSION_3_2 -#define GL_VERSION_3_2 1 -/* OpenGL 3.2 also reuses entry points from these extensions: */ -/* ARB_draw_elements_base_vertex */ -/* ARB_provoking_vertex */ -/* ARB_sync */ -/* ARB_texture_multisample */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data); -GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params); -GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif - -#ifndef GL_VERSION_3_3 -#define GL_VERSION_3_3 1 -/* OpenGL 3.3 also reuses entry points from these extensions: */ -/* ARB_blend_func_extended */ -/* ARB_sampler_objects */ -/* ARB_explicit_attrib_location, but it has none */ -/* ARB_occlusion_query2 (no entry points) */ -/* ARB_shader_bit_encoding (no entry points) */ -/* ARB_texture_rgb10_a2ui (no entry points) */ -/* ARB_texture_swizzle (no entry points) */ -/* ARB_timer_query */ -/* ARB_vertex_type_2_10_10_10_rev */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor); -#endif - -#ifndef GL_VERSION_4_0 -#define GL_VERSION_4_0 1 -/* OpenGL 4.0 also reuses entry points from these extensions: */ -/* ARB_texture_query_lod (no entry points) */ -/* ARB_draw_indirect */ -/* ARB_gpu_shader5 (no entry points) */ -/* ARB_gpu_shader_fp64 */ -/* ARB_shader_subroutine */ -/* ARB_tessellation_shader */ -/* ARB_texture_buffer_object_rgb32 (no entry points) */ -/* ARB_texture_cube_map_array (no entry points) */ -/* ARB_texture_gather (no entry points) */ -/* ARB_transform_feedback2 */ -/* ARB_transform_feedback3 */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMinSampleShading (GLclampf value); -GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value); -typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif - -#ifndef GL_VERSION_4_1 -#define GL_VERSION_4_1 1 -/* OpenGL 4.1 also reuses entry points from these extensions: */ -/* ARB_ES2_compatibility */ -/* ARB_get_program_binary */ -/* ARB_separate_shader_objects */ -/* ARB_shader_precision (no entry points) */ -/* ARB_vertex_attrib_64bit */ -/* ARB_viewport_array */ -#endif - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTextureARB (GLenum texture); -GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture); -GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s); -GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s); -GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s); -GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s); -GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t); -GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t); -GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t); -GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t); -GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r); -GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m); -GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m); -GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m); -GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -#endif - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); -#endif - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 -#endif - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 -#endif - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights); -GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights); -GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights); -GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights); -GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights); -GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights); -GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights); -GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights); -GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glVertexBlendARB (GLint count); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights); -typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights); -typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights); -typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights); -typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights); -typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights); -typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count); -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index); -GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices); -GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices); -GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices); -GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 -#endif - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 -#endif - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v); -GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v); -GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v); -GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v); -#endif - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index); -GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index); -GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program); -GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs); -GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string); -GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program); -#endif - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 -/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer); -GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers); -GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers); -GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer); -GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access); -GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target); -GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id); -GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id); -GLAPI void APIENTRY glEndQueryARB (GLenum target); -GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj); -GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname); -GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj); -GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType); -GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj); -GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void); -GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj); -GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj); -GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj); -GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj); -GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0); -GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0); -GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name); -GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params); -GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params); -GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name); -GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 -#endif - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 -#endif - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 -#endif - -#ifndef GL_ARB_depth_buffer_float -#define GL_ARB_depth_buffer_float 1 -#endif - -#ifndef GL_ARB_draw_instanced -#define GL_ARB_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_ARB_framebuffer_object -#define GL_ARB_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers); -GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers); -GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer); -GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers); -GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers); -GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target); -GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateMipmap (GLenum target); -GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target); -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_ARB_framebuffer_sRGB 1 -#endif - -#ifndef GL_ARB_geometry_shader4 -#define GL_ARB_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value); -GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_ARB_half_float_vertex -#define GL_ARB_half_float_vertex 1 -#endif - -#ifndef GL_ARB_instanced_arrays -#define GL_ARB_instanced_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); -#endif - -#ifndef GL_ARB_map_buffer_range -#define GL_ARB_map_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#endif - -#ifndef GL_ARB_texture_buffer_object -#define GL_ARB_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_ARB_texture_compression_rgtc 1 -#endif - -#ifndef GL_ARB_texture_rg -#define GL_ARB_texture_rg 1 -#endif - -#ifndef GL_ARB_vertex_array_object -#define GL_ARB_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArray (GLuint array); -GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays); -GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays); -GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array); -#endif - -#ifndef GL_ARB_uniform_buffer_object -#define GL_ARB_uniform_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices); -GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName); -GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -#endif - -#ifndef GL_ARB_compatibility -#define GL_ARB_compatibility 1 -#endif - -#ifndef GL_ARB_copy_buffer -#define GL_ARB_copy_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif - -#ifndef GL_ARB_shader_texture_lod -#define GL_ARB_shader_texture_lod 1 -#endif - -#ifndef GL_ARB_depth_clamp -#define GL_ARB_depth_clamp 1 -#endif - -#ifndef GL_ARB_draw_elements_base_vertex -#define GL_ARB_draw_elements_base_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex); -#endif - -#ifndef GL_ARB_fragment_coord_conventions -#define GL_ARB_fragment_coord_conventions 1 -#endif - -#ifndef GL_ARB_provoking_vertex -#define GL_ARB_provoking_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProvokingVertex (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode); -#endif - -#ifndef GL_ARB_seamless_cube_map -#define GL_ARB_seamless_cube_map 1 -#endif - -#ifndef GL_ARB_sync -#define GL_ARB_sync 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags); -GLAPI GLboolean APIENTRY glIsSync (GLsync sync); -GLAPI void APIENTRY glDeleteSync (GLsync sync); -GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params); -GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync); -typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync); -typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif - -#ifndef GL_ARB_texture_multisample -#define GL_ARB_texture_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val); -GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val); -typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask); -#endif - -#ifndef GL_ARB_vertex_array_bgra -#define GL_ARB_vertex_array_bgra 1 -#endif - -#ifndef GL_ARB_draw_buffers_blend -#define GL_ARB_draw_buffers_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif - -#ifndef GL_ARB_sample_shading -#define GL_ARB_sample_shading 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMinSampleShadingARB (GLclampf value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value); -#endif - -#ifndef GL_ARB_texture_cube_map_array -#define GL_ARB_texture_cube_map_array 1 -#endif - -#ifndef GL_ARB_texture_gather -#define GL_ARB_texture_gather 1 -#endif - -#ifndef GL_ARB_texture_query_lod -#define GL_ARB_texture_query_lod 1 -#endif - -#ifndef GL_ARB_shading_language_include -#define GL_ARB_shading_language_include 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string); -GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name); -GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length); -GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name); -GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string); -GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string); -typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length); -typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name); -typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string); -typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params); -#endif - -#ifndef GL_ARB_texture_compression_bptc -#define GL_ARB_texture_compression_bptc 1 -#endif - -#ifndef GL_ARB_blend_func_extended -#define GL_ARB_blend_func_extended 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name); -#endif - -#ifndef GL_ARB_explicit_attrib_location -#define GL_ARB_explicit_attrib_location 1 -#endif - -#ifndef GL_ARB_occlusion_query2 -#define GL_ARB_occlusion_query2 1 -#endif - -#ifndef GL_ARB_sampler_objects -#define GL_ARB_sampler_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers); -GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers); -GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler); -GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler); -GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param); -GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param); -GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param); -GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param); -GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param); -GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param); -GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers); -typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers); -typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler); -typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_ARB_texture_rgb10_a2ui 1 -#endif - -#ifndef GL_ARB_texture_swizzle -#define GL_ARB_texture_swizzle 1 -#endif - -#ifndef GL_ARB_timer_query -#define GL_ARB_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target); -GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params); -GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params); -#endif - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -#define GL_ARB_vertex_type_2_10_10_10_rev 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color); -GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color); -GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color); -GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -#endif - -#ifndef GL_ARB_draw_indirect -#define GL_ARB_draw_indirect 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect); -GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect); -#endif - -#ifndef GL_ARB_gpu_shader5 -#define GL_ARB_gpu_shader5 1 -#endif - -#ifndef GL_ARB_gpu_shader_fp64 -#define GL_ARB_gpu_shader_fp64 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x); -GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y); -GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x); -typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params); -#endif - -#ifndef GL_ARB_shader_subroutine -#define GL_ARB_shader_subroutine 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name); -GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name); -GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices); -GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params); -GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name); -typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices); -typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values); -#endif - -#ifndef GL_ARB_tessellation_shader -#define GL_ARB_tessellation_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value); -GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value); -typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values); -#endif - -#ifndef GL_ARB_texture_buffer_object_rgb32 -#define GL_ARB_texture_buffer_object_rgb32 1 -#endif - -#ifndef GL_ARB_transform_feedback2 -#define GL_ARB_transform_feedback2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids); -GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids); -GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id); -GLAPI void APIENTRY glPauseTransformFeedback (void); -GLAPI void APIENTRY glResumeTransformFeedback (void); -GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids); -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id); -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id); -#endif - -#ifndef GL_ARB_transform_feedback3 -#define GL_ARB_transform_feedback3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream); -GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id); -GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index); -GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream); -typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_ARB_ES2_compatibility -#define GL_ARB_ES2_compatibility 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReleaseShaderCompiler (void); -GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); -GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f); -GLAPI void APIENTRY glClearDepthf (GLclampf d); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void); -typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); -typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f); -typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLclampf d); -#endif - -#ifndef GL_ARB_get_program_binary -#define GL_ARB_get_program_binary 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); -GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_ARB_separate_shader_objects -#define GL_ARB_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program); -GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program); -GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* *strings); -GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines); -GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines); -GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params); -GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0); -GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0); -GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0); -GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0); -GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1); -GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* *strings); -typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines); -typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif - -#ifndef GL_ARB_vertex_attrib_64bit -#define GL_ARB_vertex_attrib_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params); -#endif - -#ifndef GL_ARB_viewport_array -#define GL_ARB_viewport_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v); -GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v); -GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLclampd *v); -GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLclampd n, GLclampd f); -GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data); -GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v); -typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd *v); -typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f); -typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data); -typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data); -#endif - -#ifndef GL_ARB_cl_event -#define GL_ARB_cl_event 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); -#endif - -#ifndef GL_ARB_debug_output -#define GL_ARB_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -#endif - -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void); -GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values); -GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values); -GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values); -GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern); -GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); -GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); -GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); -GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params); -GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void); -typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values); -typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern); -typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); -typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); -typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); -typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); -#endif - -#ifndef GL_ARB_shader_stencil_export -#define GL_ARB_shader_stencil_export 1 -#endif - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 -#endif - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); -#endif - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 -#endif - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights); -GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights); -typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glResetHistogramEXT (GLenum target); -GLAPI void APIENTRY glResetMinmaxEXT (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target); -#endif - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params); -GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params); -GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image); -GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif - -#ifndef GL_SGI_color_matrix -#define GL_SGI_color_matrix 1 -#endif - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table); -GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params); -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param); -GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params); -GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params); -GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 -#endif - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 -#endif - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences); -GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture); -GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures); -GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures); -GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture); -GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures); -typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures); -typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 -#endif - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 -#endif - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glArrayElementEXT (GLint i); -GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer); -GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params); -GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer); -typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 -#endif - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 -#endif - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 -#endif - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_SGIX_pixel_tiles 1 -#endif - -#ifndef GL_SGIX_texture_select -#define GL_SGIX_texture_select 1 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param); -GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param); -GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 -#endif - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_SGIS_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIX_instruments -#define GL_SGIX_instruments 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetInstrumentsSGIX (void); -GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer); -GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p); -GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker); -GLAPI void APIENTRY glStartInstrumentsSGIX (void); -GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer); -typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p); -typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker); -typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker); -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 -#endif - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameZoomSGIX (GLint factor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor); -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTagSampleBufferSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_SGIX_polynomial_ffd 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -GLAPI void APIENTRY glDeformSGIX (GLbitfield mask); -GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask); -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation); -#endif - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushRasterSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points); -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 -#endif - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 -#endif - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode); -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data); -GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params); -GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param); -GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param); -GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_SGIX_calligraphic_fragment 1 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 -#endif - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 -#endif - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref); -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count); -GLAPI void APIENTRY glUnlockArraysEXT (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void); -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params); -GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_SGIX_fragment_lighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode); -GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params); -GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params); -GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params); -GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params); -GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 -#endif - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 -#endif - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glApplyTextureEXT (GLenum mode); -GLAPI void APIENTRY glTextureLightEXT (GLenum pname); -GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 -#endif - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 -#endif - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker); -GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp); -GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp); -GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range); -GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range); -GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp); -typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp); -typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -#endif - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 -#endif - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue); -GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v); -GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue); -GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v); -GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v); -GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue); -GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v); -GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue); -GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v); -GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureNormalEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord); -GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord); -GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord); -GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord); -GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz); -GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz); -GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz); -GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz); -GLAPI void APIENTRY glTangent3ivEXT (const GLint *v); -GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz); -GLAPI void APIENTRY glTangent3svEXT (const GLshort *v); -GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz); -GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz); -GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz); -GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz); -GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v); -GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz); -GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v); -GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz); -typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz); -typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz); -typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz); -typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz); -typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz); -typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz); -typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz); -typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz); -typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz); -typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_SGIX_fog_scale 1 -#endif - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFinishTextureSUNX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void); -#endif - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor); -GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor); -GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor); -GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor); -GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor); -GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor); -GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor); -GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -#endif - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code); -GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code); -GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code); -GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code); -GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code); -GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code); -GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_blend_func_separate -#define GL_INGR_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 -#endif - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight); -GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight); -GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushVertexArrayRangeNV (void); -GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer); -#endif - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param); -GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params); -GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param); -GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params); -#endif - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 -#endif - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 -#endif - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glResizeBuffersMESA (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); -#endif - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v); -GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v); -GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v); -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride); -GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif - -#ifndef GL_SGIX_subsample -#define GL_SGIX_subsample 1 -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_SGIX_ycrcba 1 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#define GL_SGIX_ycrcb_subsample 1 -#endif - -#ifndef GL_SGIX_depth_pass_instrument -#define GL_SGIX_depth_pass_instrument 1 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 -#endif - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); -#endif - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 -#endif - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_SGIS_texture_color_mask 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif - -#ifndef GL_SGIX_igloo_interface -#define GL_SGIX_igloo_interface 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params); -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 -#endif - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences); -GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences); -GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence); -GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence); -GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params); -GLAPI void APIENTRY glFinishFenceNV (GLuint fence); -GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 -#endif - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 -#endif - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences); -GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params); -GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs); -GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program); -GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id); -GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v); -GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v); -GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v); -GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v); -GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform); -GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v); -typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SGIX_scalebias_hint 1 -#endif - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 -#endif - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 -#endif - -#ifndef GL_OML_resample -#define GL_OML_resample 1 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param); -GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param); -GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param); -GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range); -GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id); -GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id); -GLAPI void APIENTRY glBeginFragmentShaderATI (void); -GLAPI void APIENTRY glEndFragmentShaderATI (void); -GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle); -GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle); -GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value); -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param); -GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage); -GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params); -GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); -typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params); -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVertexShaderEXT (void); -GLAPI void APIENTRY glEndVertexShaderEXT (void); -GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id); -GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range); -GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id); -GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1); -GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num); -GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num); -GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr); -GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr); -GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr); -GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr); -GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr); -GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr); -GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr); -GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr); -GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr); -GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr); -GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id); -GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id); -GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value); -GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value); -GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value); -GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value); -GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value); -GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap); -GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data); -GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr); -typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr); -typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr); -typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr); -typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr); -typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr); -typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr); -typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr); -typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data); -typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x); -GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x); -GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x); -GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x); -GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y); -GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords); -GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz); -GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream); -GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param); -GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer); -GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count); -GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 -#endif - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id); -GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id); -GLAPI void APIENTRY glEndOcclusionQueryNV (void); -GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param); -GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 -#endif - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 -#endif - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 -#endif - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer); -GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences); -GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences); -GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence); -GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name); -GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences); -typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); -typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array); -GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays); -GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays); -GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 -#endif - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_ATI_pixel_format_float 1 -/* This is really a WGL extension, but defines some associated GL enums. - * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. - */ -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 -#endif - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 -#endif - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 -#endif - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 -/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y); -GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z); -GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s); -GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t); -GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r); -GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s); -GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t); -GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog); -GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog); -GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight); -GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight); -GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x); -GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y); -GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s); -typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); -typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -#endif - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPrimitiveRestartNV (void); -GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 -#endif - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 -#endif - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 -#endif - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 -#endif - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 -#endif - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer); -GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers); -GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers); -GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer); -GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer); -GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers); -GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers); -GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target); -GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -#endif - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string); -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_EXT_packed_depth_stencil 1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_EXT_stencil_clear_tag 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag); -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_EXT_texture_sRGB 1 -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_MESAX_texture_stack 1 -#endif - -#ifndef GL_EXT_timer_query -#define GL_EXT_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_gpu_program_parameters -#define GL_EXT_gpu_program_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_APPLE_flush_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size); -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_NV_gpu_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params); -GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_NV_geometry_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit); -GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_EXT_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_NV_vertex_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x); -GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y); -GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x); -GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y); -GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params); -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_EXT_gpu_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params); -GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name); -GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0); -GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -#endif - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_packed_float -#define GL_EXT_packed_float 1 -#endif - -#ifndef GL_EXT_texture_array -#define GL_EXT_texture_array 1 -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_EXT_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_EXT_texture_compression_latc 1 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_EXT_texture_shared_exponent 1 -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_NV_depth_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glClearDepthdNV (GLdouble depth); -GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth); -typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax); -#endif - -#ifndef GL_NV_fragment_program4 -#define GL_NV_fragment_program4 1 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_NV_framebuffer_multisample_coverage 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_EXT_framebuffer_sRGB 1 -#endif - -#ifndef GL_NV_geometry_shader4 -#define GL_NV_geometry_shader4 1 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_NV_parameter_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif - -#ifndef GL_EXT_draw_buffers2 -#define GL_EXT_draw_buffers2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data); -GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data); -GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index); -GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index); -GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data); -typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); -#endif - -#ifndef GL_NV_transform_feedback -#define GL_NV_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedbackNV (void); -GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode); -GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name); -GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location); -GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode); -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_EXT_bindable_uniform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer); -GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location); -GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer); -typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location); -typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location); -#endif - -#ifndef GL_EXT_texture_integer -#define GL_EXT_texture_integer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha); -GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha); -typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif - -#ifndef GL_GREMEDY_frame_terminator -#define GL_GREMEDY_frame_terminator 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameTerminatorGREMEDY (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void); -#endif - -#ifndef GL_NV_conditional_render -#define GL_NV_conditional_render 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode); -GLAPI void APIENTRY glEndConditionalRenderNV (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode); -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void); -#endif - -#ifndef GL_NV_present_video -#define GL_NV_present_video 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); -GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params); -GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); -typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_transform_feedback -#define GL_EXT_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedbackEXT (void); -GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -#endif - -#ifndef GL_EXT_direct_state_access -#define GL_EXT_direct_state_access 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask); -GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask); -GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode); -GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glMatrixPopEXT (GLenum mode); -GLAPI void APIENTRY glMatrixPushEXT (GLenum mode); -GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture); -GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index); -GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index); -GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); -GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); -GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data); -GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data); -GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data); -GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img); -GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img); -GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string); -GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string); -GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params); -GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0); -GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0); -GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0); -GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data); -GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access); -GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer); -GLAPI GLvoid* APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length); -GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params); -GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data); -GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params); -GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target); -GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target); -GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target); -GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode); -GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs); -GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode); -GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x); -GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y); -GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); -typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data); -typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data); -typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer); -typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params); -typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target); -typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -#endif - -#ifndef GL_EXT_vertex_array_bgra -#define GL_EXT_vertex_array_bgra 1 -#endif - -#ifndef GL_EXT_texture_swizzle -#define GL_EXT_texture_swizzle 1 -#endif - -#ifndef GL_NV_explicit_multisample -#define GL_NV_explicit_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val); -GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask); -GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val); -typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask); -typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer); -#endif - -#ifndef GL_NV_transform_feedback2 -#define GL_NV_transform_feedback2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids); -GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids); -GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id); -GLAPI void APIENTRY glPauseTransformFeedbackNV (void); -GLAPI void APIENTRY glResumeTransformFeedbackNV (void); -GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids); -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id); -#endif - -#ifndef GL_ATI_meminfo -#define GL_ATI_meminfo 1 -#endif - -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif - -#ifndef GL_AMD_texture_texture4 -#define GL_AMD_texture_texture4 1 -#endif - -#ifndef GL_AMD_vertex_shader_tesselator -#define GL_AMD_vertex_shader_tesselator 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor); -GLAPI void APIENTRY glTessellationModeAMD (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_provoking_vertex -#define GL_EXT_provoking_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_texture_snorm -#define GL_EXT_texture_snorm 1 -#endif - -#ifndef GL_AMD_draw_buffers_blend -#define GL_AMD_draw_buffers_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_APPLE_texture_range -#define GL_APPLE_texture_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer); -GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_APPLE_float_pixels -#define GL_APPLE_float_pixels 1 -#endif - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_APPLE_vertex_program_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname); -GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname); -GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname); -GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -#endif - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_APPLE_aux_depth_stencil 1 -#endif - -#ifndef GL_APPLE_object_purgeable -#define GL_APPLE_object_purgeable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option); -GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option); -GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params); -#endif - -#ifndef GL_APPLE_row_bytes -#define GL_APPLE_row_bytes 1 -#endif - -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#endif - -#ifndef GL_NV_video_capture -#define GL_NV_video_capture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot); -GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot); -GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params); -GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time); -GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params); -GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params); -typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params); -#endif - -#ifndef GL_NV_copy_image -#define GL_NV_copy_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif - -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program); -GLAPI void APIENTRY glActiveProgramEXT (GLuint program); -GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program); -typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string); -#endif - -#ifndef GL_NV_parameter_buffer_object2 -#define GL_NV_parameter_buffer_object2 1 -#endif - -#ifndef GL_NV_shader_buffer_load -#define GL_NV_shader_buffer_load 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access); -GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target); -GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target); -GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access); -GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer); -GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer); -GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result); -GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value); -GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params); -GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value); -GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access); -typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target); -typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target); -typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access); -typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer); -typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result); -typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); -typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_NV_vertex_buffer_unified_memory 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride); -GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result); -#endif - -#ifndef GL_NV_texture_barrier -#define GL_NV_texture_barrier 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureBarrierNV (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void); -#endif - -#ifndef GL_AMD_shader_stencil_export -#define GL_AMD_shader_stencil_export 1 -#endif - -#ifndef GL_AMD_seamless_cubemap_per_texture -#define GL_AMD_seamless_cubemap_per_texture 1 -#endif - -#ifndef GL_AMD_conservative_depth -#define GL_AMD_conservative_depth 1 -#endif - -#ifndef GL_EXT_shader_image_load_store -#define GL_EXT_shader_image_load_store 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers); -#endif - -#ifndef GL_EXT_vertex_attrib_64bit -#define GL_EXT_vertex_attrib_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -#endif - -#ifndef GL_NV_gpu_program5 -#define GL_NV_gpu_program5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param); -#endif - -#ifndef GL_NV_gpu_shader5 -#define GL_NV_gpu_shader5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x); -GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x); -GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params); -GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x); -GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x); -GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); -typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x); -typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif - -#ifndef GL_NV_shader_buffer_store -#define GL_NV_shader_buffer_store 1 -#endif - -#ifndef GL_NV_tessellation_program5 -#define GL_NV_tessellation_program5 1 -#endif - -#ifndef GL_NV_vertex_attrib_integer_64bit -#define GL_NV_vertex_attrib_integer_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x); -GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x); -GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -#endif - -#ifndef GL_NV_multisample_coverage -#define GL_NV_multisample_coverage 1 -#endif - -#ifndef GL_AMD_name_gen_delete -#define GL_AMD_name_gen_delete 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names); -GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names); -GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names); -typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names); -typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name); -#endif - -#ifndef GL_AMD_debug_output -#define GL_AMD_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, GLvoid *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, GLvoid *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif - -#ifndef GL_NV_vdpau_interop -#define GL_NV_vdpau_interop 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVDPAUInitNV (const GLvoid *vdpDevice, const GLvoid *getProcAddress); -GLAPI void APIENTRY glVDPAUFiniNV (void); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface); -GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface); -GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access); -GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); -GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const GLvoid *vdpDevice, const GLvoid *getProcAddress); -typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access); -typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); -typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); -#endif - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#define GL_AMD_transform_feedback3_lines_triangles 1 -#endif - - -#ifdef __cplusplus -} -#endif - -#endif -#endif /* NO_SDL_GLEXT */ - -#endif /* !__IPHONEOS__ */ - -#endif /* _SDL_opengl_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_pixels.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_pixels.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_pixels.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_pixels.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,429 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_pixels.h - * - * Header for the enumerated pixel format definitions. - */ - -#ifndef _SDL_pixels_h -#define _SDL_pixels_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name Transparency definitions - * - * These define alpha as the opacity of a surface. - */ -/* @{ */ -#define SDL_ALPHA_OPAQUE 255 -#define SDL_ALPHA_TRANSPARENT 0 -/* @} */ - -/** Pixel type. */ -enum -{ - SDL_PIXELTYPE_UNKNOWN, - SDL_PIXELTYPE_INDEX1, - SDL_PIXELTYPE_INDEX4, - SDL_PIXELTYPE_INDEX8, - SDL_PIXELTYPE_PACKED8, - SDL_PIXELTYPE_PACKED16, - SDL_PIXELTYPE_PACKED32, - SDL_PIXELTYPE_ARRAYU8, - SDL_PIXELTYPE_ARRAYU16, - SDL_PIXELTYPE_ARRAYU32, - SDL_PIXELTYPE_ARRAYF16, - SDL_PIXELTYPE_ARRAYF32 -}; - -/** Bitmap pixel order, high bit -> low bit. */ -enum -{ - SDL_BITMAPORDER_NONE, - SDL_BITMAPORDER_4321, - SDL_BITMAPORDER_1234 -}; - -/** Packed component order, high bit -> low bit. */ -enum -{ - SDL_PACKEDORDER_NONE, - SDL_PACKEDORDER_XRGB, - SDL_PACKEDORDER_RGBX, - SDL_PACKEDORDER_ARGB, - SDL_PACKEDORDER_RGBA, - SDL_PACKEDORDER_XBGR, - SDL_PACKEDORDER_BGRX, - SDL_PACKEDORDER_ABGR, - SDL_PACKEDORDER_BGRA -}; - -/** Array component order, low byte -> high byte. */ -enum -{ - SDL_ARRAYORDER_NONE, - SDL_ARRAYORDER_RGB, - SDL_ARRAYORDER_RGBA, - SDL_ARRAYORDER_ARGB, - SDL_ARRAYORDER_BGR, - SDL_ARRAYORDER_BGRA, - SDL_ARRAYORDER_ABGR -}; - -/** Packed component layout. */ -enum -{ - SDL_PACKEDLAYOUT_NONE, - SDL_PACKEDLAYOUT_332, - SDL_PACKEDLAYOUT_4444, - SDL_PACKEDLAYOUT_1555, - SDL_PACKEDLAYOUT_5551, - SDL_PACKEDLAYOUT_565, - SDL_PACKEDLAYOUT_8888, - SDL_PACKEDLAYOUT_2101010, - SDL_PACKEDLAYOUT_1010102 -}; - -#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) - -#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \ - ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \ - ((bits) << 8) | ((bytes) << 0)) - -#define SDL_PIXELFLAG(X) (((X) >> 28) & 0x0F) -#define SDL_PIXELTYPE(X) (((X) >> 24) & 0x0F) -#define SDL_PIXELORDER(X) (((X) >> 20) & 0x0F) -#define SDL_PIXELLAYOUT(X) (((X) >> 16) & 0x0F) -#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF) -#define SDL_BYTESPERPIXEL(X) \ - (SDL_ISPIXELFORMAT_FOURCC(X) ? \ - ((((X) == SDL_PIXELFORMAT_YUY2) || \ - ((X) == SDL_PIXELFORMAT_UYVY) || \ - ((X) == SDL_PIXELFORMAT_YVYU)) ? 2 : 1) : (((X) >> 0) & 0xFF)) - -#define SDL_ISPIXELFORMAT_INDEXED(format) \ - (!SDL_ISPIXELFORMAT_FOURCC(format) && \ - ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \ - (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \ - (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8))) - -#define SDL_ISPIXELFORMAT_ALPHA(format) \ - (!SDL_ISPIXELFORMAT_FOURCC(format) && \ - ((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA))) - -/* The flag is set to 1 because 0x1? is not in the printable ASCII range */ -#define SDL_ISPIXELFORMAT_FOURCC(format) \ - ((format) && (SDL_PIXELFLAG(format) != 1)) - -/* Note: If you modify this list, update SDL_GetPixelFormatName() */ -enum -{ - SDL_PIXELFORMAT_UNKNOWN, - SDL_PIXELFORMAT_INDEX1LSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0, - 1, 0), - SDL_PIXELFORMAT_INDEX1MSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0, - 1, 0), - SDL_PIXELFORMAT_INDEX4LSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0, - 4, 0), - SDL_PIXELFORMAT_INDEX4MSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0, - 4, 0), - SDL_PIXELFORMAT_INDEX8 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1), - SDL_PIXELFORMAT_RGB332 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_332, 8, 1), - SDL_PIXELFORMAT_RGB444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_4444, 12, 2), - SDL_PIXELFORMAT_RGB555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_BGR555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_ARGB4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_RGBA4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_ABGR4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_BGRA4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_ARGB1555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_1555, 16, 2), - SDL_PIXELFORMAT_RGBA5551 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_5551, 16, 2), - SDL_PIXELFORMAT_ABGR1555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_1555, 16, 2), - SDL_PIXELFORMAT_BGRA5551 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_5551, 16, 2), - SDL_PIXELFORMAT_RGB565 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_565, 16, 2), - SDL_PIXELFORMAT_BGR565 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_565, 16, 2), - SDL_PIXELFORMAT_RGB24 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0, - 24, 3), - SDL_PIXELFORMAT_BGR24 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0, - 24, 3), - SDL_PIXELFORMAT_RGB888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_RGBX8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGR888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGRX8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_ARGB8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_RGBA8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_ABGR8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_BGRA8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_ARGB2101010 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_2101010, 32, 4), - - SDL_PIXELFORMAT_YV12 = /**< Planar mode: Y + V + U (3 planes) */ - SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'), - SDL_PIXELFORMAT_IYUV = /**< Planar mode: Y + U + V (3 planes) */ - SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'), - SDL_PIXELFORMAT_YUY2 = /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'), - SDL_PIXELFORMAT_UYVY = /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'), - SDL_PIXELFORMAT_YVYU = /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U') -}; - -typedef struct SDL_Color -{ - Uint8 r; - Uint8 g; - Uint8 b; - Uint8 a; -} SDL_Color; -#define SDL_Colour SDL_Color - -typedef struct SDL_Palette -{ - int ncolors; - SDL_Color *colors; - Uint32 version; - int refcount; -} SDL_Palette; - -/** - * \note Everything in the pixel format structure is read-only. - */ -typedef struct SDL_PixelFormat -{ - Uint32 format; - SDL_Palette *palette; - Uint8 BitsPerPixel; - Uint8 BytesPerPixel; - Uint8 padding[2]; - Uint32 Rmask; - Uint32 Gmask; - Uint32 Bmask; - Uint32 Amask; - Uint8 Rloss; - Uint8 Gloss; - Uint8 Bloss; - Uint8 Aloss; - Uint8 Rshift; - Uint8 Gshift; - Uint8 Bshift; - Uint8 Ashift; - int refcount; - struct SDL_PixelFormat *next; -} SDL_PixelFormat; - -/** - * \brief Get the human readable name of a pixel format - */ -extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format); - -/** - * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks. - * - * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible. - * - * \sa SDL_MasksToPixelFormatEnum() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, - int *bpp, - Uint32 * Rmask, - Uint32 * Gmask, - Uint32 * Bmask, - Uint32 * Amask); - -/** - * \brief Convert a bpp and RGBA masks to an enumerated pixel format. - * - * \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion - * wasn't possible. - * - * \sa SDL_PixelFormatEnumToMasks() - */ -extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, - Uint32 Rmask, - Uint32 Gmask, - Uint32 Bmask, - Uint32 Amask); - -/** - * \brief Create an SDL_PixelFormat structure from a pixel format enum. - */ -extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format); - -/** - * \brief Free an SDL_PixelFormat structure. - */ -extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format); - -/** - * \brief Create a palette structure with the specified number of color - * entries. - * - * \return A new palette, or NULL if there wasn't enough memory. - * - * \note The palette entries are initialized to white. - * - * \sa SDL_FreePalette() - */ -extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors); - -/** - * \brief Set the palette for a pixel format structure. - */ -extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format, - SDL_Palette *palette); - -/** - * \brief Set a range of colors in a palette. - * - * \param palette The palette to modify. - * \param colors An array of colors to copy into the palette. - * \param firstcolor The index of the first palette entry to modify. - * \param ncolors The number of entries to modify. - * - * \return 0 on success, or -1 if not all of the colors could be set. - */ -extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette, - const SDL_Color * colors, - int firstcolor, int ncolors); - -/** - * \brief Free a palette created with SDL_AllocPalette(). - * - * \sa SDL_AllocPalette() - */ -extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette); - -/** - * \brief Maps an RGB triple to an opaque pixel value for a given pixel format. - * - * \sa SDL_MapRGBA - */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format, - Uint8 r, Uint8 g, Uint8 b); - -/** - * \brief Maps an RGBA quadruple to a pixel value for a given pixel format. - * - * \sa SDL_MapRGB - */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the RGB components from a pixel of the specified format. - * - * \sa SDL_GetRGBA - */ -extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, - const SDL_PixelFormat * format, - Uint8 * r, Uint8 * g, Uint8 * b); - -/** - * \brief Get the RGBA components from a pixel of the specified format. - * - * \sa SDL_GetRGB - */ -extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, - const SDL_PixelFormat * format, - Uint8 * r, Uint8 * g, Uint8 * b, - Uint8 * a); - -/** - * \brief Calculate a 256 entry gamma ramp for a gamma value. - */ -extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_pixels_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_platform.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_platform.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_platform.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_platform.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_platform.h - * - * Try to get a standard set of platform defines. - */ - -#ifndef _SDL_platform_h -#define _SDL_platform_h - -#if defined(_AIX) -#undef __AIX__ -#define __AIX__ 1 -#endif -#if defined(__HAIKU__) -#undef __HAIKU__ -#define __HAIKU__ 1 -#endif -#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__) -#undef __BSDI__ -#define __BSDI__ 1 -#endif -#if defined(_arch_dreamcast) -#undef __DREAMCAST__ -#define __DREAMCAST__ 1 -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#undef __FREEBSD__ -#define __FREEBSD__ 1 -#endif -#if defined(hpux) || defined(__hpux) || defined(__hpux__) -#undef __HPUX__ -#define __HPUX__ 1 -#endif -#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE) -#undef __IRIX__ -#define __IRIX__ 1 -#endif -#if defined(linux) || defined(__linux) || defined(__linux__) -#undef __LINUX__ -#define __LINUX__ 1 -#endif -#if defined(ANDROID) || defined(__ANDROID__) -#undef __ANDROID__ -#undef __LINUX__ /* do we need to do this? */ -#define __ANDROID__ 1 -#endif - -#if defined(__APPLE__) -/* lets us know what version of Mac OS X we're compiling on */ -#include "AvailabilityMacros.h" -#include "TargetConditionals.h" -#if TARGET_OS_IPHONE -/* if compiling for iPhone */ -#undef __IPHONEOS__ -#define __IPHONEOS__ 1 -#undef __MACOSX__ -#else -/* if not compiling for iPhone */ -#undef __MACOSX__ -#define __MACOSX__ 1 -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -# error SDL for Mac OS X only supports deploying on 10.5 and above. -#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */ -#endif /* TARGET_OS_IPHONE */ -#endif /* defined(__APPLE__) */ - -#if defined(__NetBSD__) -#undef __NETBSD__ -#define __NETBSD__ 1 -#endif -#if defined(__OpenBSD__) -#undef __OPENBSD__ -#define __OPENBSD__ 1 -#endif -#if defined(__OS2__) -#undef __OS2__ -#define __OS2__ 1 -#endif -#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE) -#undef __OSF__ -#define __OSF__ 1 -#endif -#if defined(__QNXNTO__) -#undef __QNXNTO__ -#define __QNXNTO__ 1 -#endif -#if defined(riscos) || defined(__riscos) || defined(__riscos__) -#undef __RISCOS__ -#define __RISCOS__ 1 -#endif -#if defined(__SVR4) -#undef __SOLARIS__ -#define __SOLARIS__ 1 -#endif - -#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -/* Try to find out if we're compiling for WinRT or non-WinRT */ -/* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */ -#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_) /* _MSC_VER==1700 for MSVC 2012 */ -#include -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#undef __WINDOWS__ -#define __WINDOWS__ 1 -/* See if we're compiling for WinRT: */ -#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -#undef __WINRT__ -#define __WINRT__ 1 -#endif -#else -#undef __WINDOWS__ -#define __WINDOWS__ 1 -#endif /* _MSC_VER < 1700 */ -#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */ - -#if defined(__WINDOWS__) -#undef __WIN32__ -#define __WIN32__ 1 -#endif -#if defined(__PSP__) -#undef __PSP__ -#define __PSP__ 1 -#endif - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Gets the name of the platform. - */ -extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_platform_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_power.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_power.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_power.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_power.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_power_h -#define _SDL_power_h - -/** - * \file SDL_power.h - * - * Header for the SDL power management routines. - */ - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The basic state for the system's power supply. - */ -typedef enum -{ - SDL_POWERSTATE_UNKNOWN, /**< cannot determine power status */ - SDL_POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */ - SDL_POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */ - SDL_POWERSTATE_CHARGING, /**< Plugged in, charging battery */ - SDL_POWERSTATE_CHARGED /**< Plugged in, battery charged */ -} SDL_PowerState; - - -/** - * \brief Get the current power supply details. - * - * \param secs Seconds of battery life left. You can pass a NULL here if - * you don't care. Will return -1 if we can't determine a - * value, or we're not running on a battery. - * - * \param pct Percentage of battery life left, between 0 and 100. You can - * pass a NULL here if you don't care. Will return -1 if we - * can't determine a value, or we're not running on a battery. - * - * \return The state of the battery (if any). - */ -extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_power_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_quit.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_quit.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_quit.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_quit.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_quit.h - * - * Include file for SDL quit event handling. - */ - -#ifndef _SDL_quit_h -#define _SDL_quit_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -/** - * \file SDL_quit.h - * - * An ::SDL_QUIT event is generated when the user tries to close the application - * window. If it is ignored or filtered out, the window will remain open. - * If it is not ignored or filtered, it is queued normally and the window - * is allowed to close. When the window is closed, screen updates will - * complete, but have no effect. - * - * SDL_Init() installs signal handlers for SIGINT (keyboard interrupt) - * and SIGTERM (system termination request), if handlers do not already - * exist, that generate ::SDL_QUIT events as well. There is no way - * to determine the cause of an ::SDL_QUIT event, but setting a signal - * handler in your application will override the default generation of - * quit events for that signal. - * - * \sa SDL_Quit() - */ - -/* There are no functions directly affecting the quit event */ - -#define SDL_QuitRequested() \ - (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) - -#endif /* _SDL_quit_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rect.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rect.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rect.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rect.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_rect.h - * - * Header file for SDL_rect definition and management functions. - */ - -#ifndef _SDL_rect_h -#define _SDL_rect_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_pixels.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The structure that defines a point - * - * \sa SDL_EnclosePoints - */ -typedef struct SDL_Point -{ - int x; - int y; -} SDL_Point; - -/** - * \brief A rectangle, with the origin at the upper left. - * - * \sa SDL_RectEmpty - * \sa SDL_RectEquals - * \sa SDL_HasIntersection - * \sa SDL_IntersectRect - * \sa SDL_UnionRect - * \sa SDL_EnclosePoints - */ -typedef struct SDL_Rect -{ - int x, y; - int w, h; -} SDL_Rect; - -/** - * \brief Returns true if the rectangle has no area. - */ -SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) -{ - return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE; -} - -/** - * \brief Returns true if the two rectangles are equal. - */ -SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) -{ - return (a && b && (a->x == b->x) && (a->y == b->y) && - (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE; -} - -/** - * \brief Determine whether two rectangles intersect. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A, - const SDL_Rect * B); - -/** - * \brief Calculate the intersection of two rectangles. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A, - const SDL_Rect * B, - SDL_Rect * result); - -/** - * \brief Calculate the union of two rectangles. - */ -extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A, - const SDL_Rect * B, - SDL_Rect * result); - -/** - * \brief Calculate a minimal rectangle enclosing a set of points - * - * \return SDL_TRUE if any points were within the clipping rect - */ -extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, - int count, - const SDL_Rect * clip, - SDL_Rect * result); - -/** - * \brief Calculate the intersection of a rectangle and line segment. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * - rect, int *X1, - int *Y1, int *X2, - int *Y2); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_rect_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_render.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_render.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_render.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_render.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,870 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_render.h - * - * Header file for SDL 2D rendering functions. - * - * This API supports the following features: - * * single pixel points - * * single pixel lines - * * filled rectangles - * * texture images - * - * The primitives may be drawn in opaque, blended, or additive modes. - * - * The texture images may be drawn in opaque, blended, or additive modes. - * They can have an additional color tint or alpha modulation applied to - * them, and may also be stretched with linear interpolation. - * - * This API is designed to accelerate simple 2D operations. You may - * want more functionality such as polygons and particle effects and - * in that case you should use SDL's OpenGL/Direct3D support or one - * of the many good 3D engines. - * - * These functions must be called from the main thread. - * See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995 - */ - -#ifndef _SDL_render_h -#define _SDL_render_h - -#include "SDL_stdinc.h" -#include "SDL_rect.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Flags used when creating a rendering context - */ -typedef enum -{ - SDL_RENDERER_SOFTWARE = 0x00000001, /**< The renderer is a software fallback */ - SDL_RENDERER_ACCELERATED = 0x00000002, /**< The renderer uses hardware - acceleration */ - SDL_RENDERER_PRESENTVSYNC = 0x00000004, /**< Present is synchronized - with the refresh rate */ - SDL_RENDERER_TARGETTEXTURE = 0x00000008 /**< The renderer supports - rendering to texture */ -} SDL_RendererFlags; - -/** - * \brief Information on the capabilities of a render driver or context. - */ -typedef struct SDL_RendererInfo -{ - const char *name; /**< The name of the renderer */ - Uint32 flags; /**< Supported ::SDL_RendererFlags */ - Uint32 num_texture_formats; /**< The number of available texture formats */ - Uint32 texture_formats[16]; /**< The available texture formats */ - int max_texture_width; /**< The maximimum texture width */ - int max_texture_height; /**< The maximimum texture height */ -} SDL_RendererInfo; - -/** - * \brief The access pattern allowed for a texture. - */ -typedef enum -{ - SDL_TEXTUREACCESS_STATIC, /**< Changes rarely, not lockable */ - SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */ - SDL_TEXTUREACCESS_TARGET /**< Texture can be used as a render target */ -} SDL_TextureAccess; - -/** - * \brief The texture channel modulation used in SDL_RenderCopy(). - */ -typedef enum -{ - SDL_TEXTUREMODULATE_NONE = 0x00000000, /**< No modulation */ - SDL_TEXTUREMODULATE_COLOR = 0x00000001, /**< srcC = srcC * color */ - SDL_TEXTUREMODULATE_ALPHA = 0x00000002 /**< srcA = srcA * alpha */ -} SDL_TextureModulate; - -/** - * \brief Flip constants for SDL_RenderCopyEx - */ -typedef enum -{ - SDL_FLIP_NONE = 0x00000000, /**< Do not flip */ - SDL_FLIP_HORIZONTAL = 0x00000001, /**< flip horizontally */ - SDL_FLIP_VERTICAL = 0x00000002 /**< flip vertically */ -} SDL_RendererFlip; - -/** - * \brief A structure representing rendering state - */ -struct SDL_Renderer; -typedef struct SDL_Renderer SDL_Renderer; - -/** - * \brief An efficient driver-specific representation of pixel data - */ -struct SDL_Texture; -typedef struct SDL_Texture SDL_Texture; - - -/* Function prototypes */ - -/** - * \brief Get the number of 2D rendering drivers available for the current - * display. - * - * A render driver is a set of code that handles rendering and texture - * management on a particular display. Normally there is only one, but - * some drivers may have several available with different capabilities. - * - * \sa SDL_GetRenderDriverInfo() - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void); - -/** - * \brief Get information about a specific 2D rendering driver for the current - * display. - * - * \param index The index of the driver to query information about. - * \param info A pointer to an SDL_RendererInfo struct to be filled with - * information on the rendering driver. - * - * \return 0 on success, -1 if the index was out of range. - * - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index, - SDL_RendererInfo * info); - -/** - * \brief Create a window and default renderer - * - * \param width The width of the window - * \param height The height of the window - * \param window_flags The flags used to create the window - * \param window A pointer filled with the window, or NULL on error - * \param renderer A pointer filled with the renderer, or NULL on error - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( - int width, int height, Uint32 window_flags, - SDL_Window **window, SDL_Renderer **renderer); - - -/** - * \brief Create a 2D rendering context for a window. - * - * \param window The window where rendering is displayed. - * \param index The index of the rendering driver to initialize, or -1 to - * initialize the first one supporting the requested flags. - * \param flags ::SDL_RendererFlags. - * - * \return A valid rendering context or NULL if there was an error. - * - * \sa SDL_CreateSoftwareRenderer() - * \sa SDL_GetRendererInfo() - * \sa SDL_DestroyRenderer() - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window, - int index, Uint32 flags); - -/** - * \brief Create a 2D software rendering context for a surface. - * - * \param surface The surface where rendering is done. - * - * \return A valid rendering context or NULL if there was an error. - * - * \sa SDL_CreateRenderer() - * \sa SDL_DestroyRenderer() - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface); - -/** - * \brief Get the renderer associated with a window. - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window); - -/** - * \brief Get information about a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, - SDL_RendererInfo * info); - -/** - * \brief Get the output size of a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, - int *w, int *h); - -/** - * \brief Create a texture for a rendering context. - * - * \param renderer The renderer. - * \param format The format of the texture. - * \param access One of the enumerated values in ::SDL_TextureAccess. - * \param w The width of the texture in pixels. - * \param h The height of the texture in pixels. - * - * \return The created texture is returned, or 0 if no rendering context was - * active, the format was unsupported, or the width or height were out - * of range. - * - * \sa SDL_QueryTexture() - * \sa SDL_UpdateTexture() - * \sa SDL_DestroyTexture() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, - Uint32 format, - int access, int w, - int h); - -/** - * \brief Create a texture from an existing surface. - * - * \param renderer The renderer. - * \param surface The surface containing pixel data used to fill the texture. - * - * \return The created texture is returned, or 0 on error. - * - * \note The surface is not modified or freed by this function. - * - * \sa SDL_QueryTexture() - * \sa SDL_DestroyTexture() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface); - -/** - * \brief Query the attributes of a texture - * - * \param texture A texture to be queried. - * \param format A pointer filled in with the raw format of the texture. The - * actual format may differ, but pixel transfers will use this - * format. - * \param access A pointer filled in with the actual access to the texture. - * \param w A pointer filled in with the width of the texture in pixels. - * \param h A pointer filled in with the height of the texture in pixels. - * - * \return 0 on success, or -1 if the texture is not valid. - */ -extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture, - Uint32 * format, int *access, - int *w, int *h); - -/** - * \brief Set an additional color value used in render copy operations. - * - * \param texture The texture to update. - * \param r The red color value multiplied into copy operations. - * \param g The green color value multiplied into copy operations. - * \param b The blue color value multiplied into copy operations. - * - * \return 0 on success, or -1 if the texture is not valid or color modulation - * is not supported. - * - * \sa SDL_GetTextureColorMod() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture, - Uint8 r, Uint8 g, Uint8 b); - - -/** - * \brief Get the additional color value used in render copy operations. - * - * \param texture The texture to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureColorMod() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture, - Uint8 * r, Uint8 * g, - Uint8 * b); - -/** - * \brief Set an additional alpha value used in render copy operations. - * - * \param texture The texture to update. - * \param alpha The alpha value multiplied into copy operations. - * - * \return 0 on success, or -1 if the texture is not valid or alpha modulation - * is not supported. - * - * \sa SDL_GetTextureAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture, - Uint8 alpha); - -/** - * \brief Get the additional alpha value used in render copy operations. - * - * \param texture The texture to query. - * \param alpha A pointer filled in with the current alpha value. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture, - Uint8 * alpha); - -/** - * \brief Set the blend mode used for texture copy operations. - * - * \param texture The texture to update. - * \param blendMode ::SDL_BlendMode to use for texture blending. - * - * \return 0 on success, or -1 if the texture is not valid or the blend mode is - * not supported. - * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. - * - * \sa SDL_GetTextureBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for texture copy operations. - * - * \param texture The texture to query. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture, - SDL_BlendMode *blendMode); - -/** - * \brief Update the given texture rectangle with new pixel data. - * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param pixels The raw pixel data. - * \param pitch The number of bytes between rows of pixel data. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \note This is a fairly slow function. - */ -extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture, - const SDL_Rect * rect, - const void *pixels, int pitch); - -/** - * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data. - * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param Yplane The raw pixel data for the Y plane. - * \param Ypitch The number of bytes between rows of pixel data for the Y plane. - * \param Uplane The raw pixel data for the U plane. - * \param Upitch The number of bytes between rows of pixel data for the U plane. - * \param Vplane The raw pixel data for the V plane. - * \param Vpitch The number of bytes between rows of pixel data for the V plane. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \note You can use SDL_UpdateTexture() as long as your pixel data is - * a contiguous block of Y and U/V planes in the proper order, but - * this function is available if your pixel data is not contiguous. - */ -extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, - const SDL_Rect * rect, - const Uint8 *Yplane, int Ypitch, - const Uint8 *Uplane, int Upitch, - const Uint8 *Vplane, int Vpitch); - -/** - * \brief Lock a portion of the texture for write-only pixel access. - * - * \param texture The texture to lock for access, which was created with - * ::SDL_TEXTUREACCESS_STREAMING. - * \param rect A pointer to the rectangle to lock for access. If the rect - * is NULL, the entire texture will be locked. - * \param pixels This is filled in with a pointer to the locked pixels, - * appropriately offset by the locked area. - * \param pitch This is filled in with the pitch of the locked pixels. - * - * \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING. - * - * \sa SDL_UnlockTexture() - */ -extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture, - const SDL_Rect * rect, - void **pixels, int *pitch); - -/** - * \brief Unlock a texture, uploading the changes to video memory, if needed. - * - * \sa SDL_LockTexture() - */ -extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture); - -/** - * \brief Determines whether a window supports the use of render targets - * - * \param renderer The renderer that will be checked - * - * \return SDL_TRUE if supported, SDL_FALSE if not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer); - -/** - * \brief Set a texture as the current rendering target. - * - * \param renderer The renderer. - * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target - * - * \return 0 on success, or -1 on error - * - * \sa SDL_GetRenderTarget() - */ -extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, - SDL_Texture *texture); - -/** - * \brief Get the current render target or NULL for the default render target. - * - * \return The current render target - * - * \sa SDL_SetRenderTarget() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer); - -/** - * \brief Set device independent resolution for rendering - * - * \param renderer The renderer for which resolution should be set. - * \param w The width of the logical resolution - * \param h The height of the logical resolution - * - * This function uses the viewport and scaling functionality to allow a fixed logical - * resolution for rendering, regardless of the actual output resolution. If the actual - * output resolution doesn't have the same aspect ratio the output rendering will be - * centered within the output display. - * - * If the output display is a window, mouse events in the window will be filtered - * and scaled so they seem to arrive within the logical resolution. - * - * \note If this function results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. - * - * \sa SDL_RenderGetLogicalSize() - * \sa SDL_RenderSetScale() - * \sa SDL_RenderSetViewport() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h); - -/** - * \brief Get device independent resolution for rendering - * - * \param renderer The renderer from which resolution should be queried. - * \param w A pointer filled with the width of the logical resolution - * \param h A pointer filled with the height of the logical resolution - * - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); - -/** - * \brief Set the drawing area for rendering on the current target. - * - * \param renderer The renderer for which the drawing area should be set. - * \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target. - * - * The x,y of the viewport rect represents the origin for rendering. - * - * \return 0 on success, or -1 on error - * - * \note If the window associated with the renderer is resized, the viewport is automatically reset. - * - * \sa SDL_RenderGetViewport() - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the drawing area for the current target. - * - * \sa SDL_RenderSetViewport() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the clip rectangle for the current target. - * - * \param renderer The renderer for which clip rectangle should be set. - * \param rect A pointer to the rectangle to set as the clip rectangle, or - * NULL to disable clipping. - * - * \return 0 on success, or -1 on error - * - * \sa SDL_RenderGetClipRect() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the clip rectangle for the current target. - * - * \param renderer The renderer from which clip rectangle should be queried. - * \param rect A pointer filled in with the current clip rectangle, or - * an empty rectangle if clipping is disabled. - * - * \sa SDL_RenderSetClipRect() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the drawing scale for rendering on the current target. - * - * \param renderer The renderer for which the drawing scale should be set. - * \param scaleX The horizontal scaling factor - * \param scaleY The vertical scaling factor - * - * The drawing coordinates are scaled by the x/y scaling factors - * before they are used by the renderer. This allows resolution - * independent drawing with a single coordinate system. - * - * \note If this results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. For best results use integer scaling factors. - * - * \sa SDL_RenderGetScale() - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer, - float scaleX, float scaleY); - -/** - * \brief Get the drawing scale for the current target. - * - * \param renderer The renderer from which drawing scale should be queried. - * \param scaleX A pointer filled in with the horizontal scaling factor - * \param scaleY A pointer filled in with the vertical scaling factor - * - * \sa SDL_RenderSetScale() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer, - float *scaleX, float *scaleY); - -/** - * \brief Set the color used for drawing operations (Rect, Line and Clear). - * - * \param renderer The renderer for which drawing color should be set. - * \param r The red value used to draw on the rendering target. - * \param g The green value used to draw on the rendering target. - * \param b The blue value used to draw on the rendering target. - * \param a The alpha value used to draw on the rendering target, usually - * ::SDL_ALPHA_OPAQUE (255). - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the color used for drawing operations (Rect, Line and Clear). - * - * \param renderer The renderer from which drawing color should be queried. - * \param r A pointer to the red value used to draw on the rendering target. - * \param g A pointer to the green value used to draw on the rendering target. - * \param b A pointer to the blue value used to draw on the rendering target. - * \param a A pointer to the alpha value used to draw on the rendering target, - * usually ::SDL_ALPHA_OPAQUE (255). - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer, - Uint8 * r, Uint8 * g, Uint8 * b, - Uint8 * a); - -/** - * \brief Set the blend mode used for drawing operations (Fill and Line). - * - * \param renderer The renderer for which blend mode should be set. - * \param blendMode ::SDL_BlendMode to use for blending. - * - * \return 0 on success, or -1 on error - * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. - * - * \sa SDL_GetRenderDrawBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for drawing operations. - * - * \param renderer The renderer from which blend mode should be queried. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 on error - * - * \sa SDL_SetRenderDrawBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, - SDL_BlendMode *blendMode); - -/** - * \brief Clear the current rendering target with the drawing color - * - * This function clears the entire rendering target, ignoring the viewport. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); - -/** - * \brief Draw a point on the current rendering target. - * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer, - int x, int y); - -/** - * \brief Draw multiple points on the current rendering target. - * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer, - const SDL_Point * points, - int count); - -/** - * \brief Draw a line on the current rendering target. - * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer, - int x1, int y1, int x2, int y2); - -/** - * \brief Draw a series of connected lines on the current rendering target. - * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer, - const SDL_Point * points, - int count); - -/** - * \brief Draw a rectangle on the current rendering target. - * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Draw some number of rectangles on the current rendering target. - * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer, - const SDL_Rect * rects, - int count); - -/** - * \brief Fill a rectangle on the current rendering target with the drawing color. - * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. - * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer, - const SDL_Rect * rects, - int count); - -/** - * \brief Copy a portion of the texture to the current rendering target. - * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, - SDL_Texture * texture, - const SDL_Rect * srcrect, - const SDL_Rect * dstrect); - -/** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center - * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done aroud dstrect.w/2, dstrect.h/2) - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, - SDL_Texture * texture, - const SDL_Rect * srcrect, - const SDL_Rect * dstrect, - const double angle, - const SDL_Point *center, - const SDL_RendererFlip flip); - -/** - * \brief Read pixels from the current rendering target. - * - * \param renderer The renderer from which pixels should be read. - * \param rect A pointer to the rectangle to read, or NULL for the entire - * render target. - * \param format The desired format of the pixel data, or 0 to use the format - * of the rendering target - * \param pixels A pointer to be filled in with the pixel data - * \param pitch The pitch of the pixels parameter. - * - * \return 0 on success, or -1 if pixel reading is not supported. - * - * \warning This is a very slow operation, and should not be used frequently. - */ -extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, - const SDL_Rect * rect, - Uint32 format, - void *pixels, int pitch); - -/** - * \brief Update the screen with rendering performed. - */ -extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer); - -/** - * \brief Destroy the specified texture. - * - * \sa SDL_CreateTexture() - * \sa SDL_CreateTextureFromSurface() - */ -extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture); - -/** - * \brief Destroy the rendering context for a window and free associated - * textures. - * - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer); - - -/** - * \brief Bind the texture to the current OpenGL/ES/ES2 context for use with - * OpenGL instructions. - * - * \param texture The SDL texture to bind - * \param texw A pointer to a float that will be filled with the texture width - * \param texh A pointer to a float that will be filled with the texture height - * - * \return 0 on success, or -1 if the operation is not supported - */ -extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh); - -/** - * \brief Unbind a texture from the current OpenGL/ES/ES2 context. - * - * \param texture The SDL texture to unbind - * - * \return 0 on success, or -1 if the operation is not supported - */ -extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_render_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_revision.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_revision.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_revision.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_revision.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#define SDL_REVISION "hg-8628:b558f99d48f0" -#define SDL_REVISION_NUMBER 8628 diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rwops.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rwops.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rwops.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_rwops.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_rwops.h - * - * This file provides a general interface for SDL to read and write - * data streams. It can easily be extended to files, memory, etc. - */ - -#ifndef _SDL_rwops_h -#define _SDL_rwops_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* RWops Types */ -#define SDL_RWOPS_UNKNOWN 0 /* Unknown stream type */ -#define SDL_RWOPS_WINFILE 1 /* Win32 file */ -#define SDL_RWOPS_STDFILE 2 /* Stdio file */ -#define SDL_RWOPS_JNIFILE 3 /* Android asset */ -#define SDL_RWOPS_MEMORY 4 /* Memory stream */ -#define SDL_RWOPS_MEMORY_RO 5 /* Read-Only memory stream */ - -/** - * This is the read/write operation structure -- very basic. - */ -typedef struct SDL_RWops -{ - /** - * Return the size of the file in this rwops, or -1 if unknown - */ - Sint64 (SDLCALL * size) (struct SDL_RWops * context); - - /** - * Seek to \c offset relative to \c whence, one of stdio's whence values: - * RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END - * - * \return the final offset in the data stream, or -1 on error. - */ - Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset, - int whence); - - /** - * Read up to \c maxnum objects each of size \c size from the data - * stream to the area pointed at by \c ptr. - * - * \return the number of objects read, or 0 at error or end of file. - */ - size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr, - size_t size, size_t maxnum); - - /** - * Write exactly \c num objects each of size \c size from the area - * pointed at by \c ptr to data stream. - * - * \return the number of objects written, or 0 at error or end of file. - */ - size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr, - size_t size, size_t num); - - /** - * Close and free an allocated SDL_RWops structure. - * - * \return 0 if successful or -1 on write error when flushing data. - */ - int (SDLCALL * close) (struct SDL_RWops * context); - - Uint32 type; - union - { -#if defined(ANDROID) - struct - { - void *fileNameRef; - void *inputStreamRef; - void *readableByteChannelRef; - void *readMethod; - void *assetFileDescriptorRef; - long position; - long size; - long offset; - int fd; - } androidio; -#elif defined(__WIN32__) - struct - { - SDL_bool append; - void *h; - struct - { - void *data; - size_t size; - size_t left; - } buffer; - } windowsio; -#endif - -#ifdef HAVE_STDIO_H - struct - { - SDL_bool autoclose; - FILE *fp; - } stdio; -#endif - struct - { - Uint8 *base; - Uint8 *here; - Uint8 *stop; - } mem; - struct - { - void *data1; - void *data2; - } unknown; - } hidden; - -} SDL_RWops; - - -/** - * \name RWFrom functions - * - * Functions to create SDL_RWops structures from various data streams. - */ -/* @{ */ - -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file, - const char *mode); - -#ifdef HAVE_STDIO_H -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, - SDL_bool autoclose); -#else -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp, - SDL_bool autoclose); -#endif - -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size); -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem, - int size); - -/* @} *//* RWFrom functions */ - - -extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void); -extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); - -#define RW_SEEK_SET 0 /**< Seek from the beginning of data */ -#define RW_SEEK_CUR 1 /**< Seek relative to current read point */ -#define RW_SEEK_END 2 /**< Seek relative to the end of data */ - -/** - * \name Read/write macros - * - * Macros to easily read and write from an SDL_RWops structure. - */ -/* @{ */ -#define SDL_RWsize(ctx) (ctx)->size(ctx) -#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence) -#define SDL_RWtell(ctx) (ctx)->seek(ctx, 0, RW_SEEK_CUR) -#define SDL_RWread(ctx, ptr, size, n) (ctx)->read(ctx, ptr, size, n) -#define SDL_RWwrite(ctx, ptr, size, n) (ctx)->write(ctx, ptr, size, n) -#define SDL_RWclose(ctx) (ctx)->close(ctx) -/* @} *//* Read/write macros */ - - -/** - * \name Read endian functions - * - * Read an item of the specified endianness and return in native format. - */ -/* @{ */ -extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src); -extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src); -extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src); -extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src); -extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src); -extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src); -extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); -/* @} *//* Read endian functions */ - -/** - * \name Write endian functions - * - * Write an item of native format to the specified endianness. - */ -/* @{ */ -extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); -/* @} *//* Write endian functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_rwops_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_scancode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_scancode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_scancode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_scancode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,401 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_scancode.h - * - * Defines keyboard scancodes. - */ - -#ifndef _SDL_scancode_h -#define _SDL_scancode_h - -#include "SDL_stdinc.h" - -/** - * \brief The SDL keyboard scancode representation. - * - * Values of this type are used to represent keyboard keys, among other places - * in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the - * SDL_Event structure. - * - * The values in this enumeration are based on the USB usage page standard: - * http://www.usb.org/developers/devclass_docs/Hut1_12v2.pdf - */ -typedef enum -{ - SDL_SCANCODE_UNKNOWN = 0, - - /** - * \name Usage page 0x07 - * - * These values are from usage page 0x07 (USB keyboard page). - */ - /* @{ */ - - SDL_SCANCODE_A = 4, - SDL_SCANCODE_B = 5, - SDL_SCANCODE_C = 6, - SDL_SCANCODE_D = 7, - SDL_SCANCODE_E = 8, - SDL_SCANCODE_F = 9, - SDL_SCANCODE_G = 10, - SDL_SCANCODE_H = 11, - SDL_SCANCODE_I = 12, - SDL_SCANCODE_J = 13, - SDL_SCANCODE_K = 14, - SDL_SCANCODE_L = 15, - SDL_SCANCODE_M = 16, - SDL_SCANCODE_N = 17, - SDL_SCANCODE_O = 18, - SDL_SCANCODE_P = 19, - SDL_SCANCODE_Q = 20, - SDL_SCANCODE_R = 21, - SDL_SCANCODE_S = 22, - SDL_SCANCODE_T = 23, - SDL_SCANCODE_U = 24, - SDL_SCANCODE_V = 25, - SDL_SCANCODE_W = 26, - SDL_SCANCODE_X = 27, - SDL_SCANCODE_Y = 28, - SDL_SCANCODE_Z = 29, - - SDL_SCANCODE_1 = 30, - SDL_SCANCODE_2 = 31, - SDL_SCANCODE_3 = 32, - SDL_SCANCODE_4 = 33, - SDL_SCANCODE_5 = 34, - SDL_SCANCODE_6 = 35, - SDL_SCANCODE_7 = 36, - SDL_SCANCODE_8 = 37, - SDL_SCANCODE_9 = 38, - SDL_SCANCODE_0 = 39, - - SDL_SCANCODE_RETURN = 40, - SDL_SCANCODE_ESCAPE = 41, - SDL_SCANCODE_BACKSPACE = 42, - SDL_SCANCODE_TAB = 43, - SDL_SCANCODE_SPACE = 44, - - SDL_SCANCODE_MINUS = 45, - SDL_SCANCODE_EQUALS = 46, - SDL_SCANCODE_LEFTBRACKET = 47, - SDL_SCANCODE_RIGHTBRACKET = 48, - SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return - * key on ISO keyboards and at the right end - * of the QWERTY row on ANSI keyboards. - * Produces REVERSE SOLIDUS (backslash) and - * VERTICAL LINE in a US layout, REVERSE - * SOLIDUS and VERTICAL LINE in a UK Mac - * layout, NUMBER SIGN and TILDE in a UK - * Windows layout, DOLLAR SIGN and POUND SIGN - * in a Swiss German layout, NUMBER SIGN and - * APOSTROPHE in a German layout, GRAVE - * ACCENT and POUND SIGN in a French Mac - * layout, and ASTERISK and MICRO SIGN in a - * French Windows layout. - */ - SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code - * instead of 49 for the same key, but all - * OSes I've seen treat the two codes - * identically. So, as an implementor, unless - * your keyboard generates both of those - * codes and your OS treats them differently, - * you should generate SDL_SCANCODE_BACKSLASH - * instead of this code. As a user, you - * should not rely on this code because SDL - * will never generate it with most (all?) - * keyboards. - */ - SDL_SCANCODE_SEMICOLON = 51, - SDL_SCANCODE_APOSTROPHE = 52, - SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI - * and ISO keyboards). Produces GRAVE ACCENT and - * TILDE in a US Windows layout and in US and UK - * Mac layouts on ANSI keyboards, GRAVE ACCENT - * and NOT SIGN in a UK Windows layout, SECTION - * SIGN and PLUS-MINUS SIGN in US and UK Mac - * layouts on ISO keyboards, SECTION SIGN and - * DEGREE SIGN in a Swiss German layout (Mac: - * only on ISO keyboards), CIRCUMFLEX ACCENT and - * DEGREE SIGN in a German layout (Mac: only on - * ISO keyboards), SUPERSCRIPT TWO and TILDE in a - * French Windows layout, COMMERCIAL AT and - * NUMBER SIGN in a French Mac layout on ISO - * keyboards, and LESS-THAN SIGN and GREATER-THAN - * SIGN in a Swiss German, German, or French Mac - * layout on ANSI keyboards. - */ - SDL_SCANCODE_COMMA = 54, - SDL_SCANCODE_PERIOD = 55, - SDL_SCANCODE_SLASH = 56, - - SDL_SCANCODE_CAPSLOCK = 57, - - SDL_SCANCODE_F1 = 58, - SDL_SCANCODE_F2 = 59, - SDL_SCANCODE_F3 = 60, - SDL_SCANCODE_F4 = 61, - SDL_SCANCODE_F5 = 62, - SDL_SCANCODE_F6 = 63, - SDL_SCANCODE_F7 = 64, - SDL_SCANCODE_F8 = 65, - SDL_SCANCODE_F9 = 66, - SDL_SCANCODE_F10 = 67, - SDL_SCANCODE_F11 = 68, - SDL_SCANCODE_F12 = 69, - - SDL_SCANCODE_PRINTSCREEN = 70, - SDL_SCANCODE_SCROLLLOCK = 71, - SDL_SCANCODE_PAUSE = 72, - SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but - does send code 73, not 117) */ - SDL_SCANCODE_HOME = 74, - SDL_SCANCODE_PAGEUP = 75, - SDL_SCANCODE_DELETE = 76, - SDL_SCANCODE_END = 77, - SDL_SCANCODE_PAGEDOWN = 78, - SDL_SCANCODE_RIGHT = 79, - SDL_SCANCODE_LEFT = 80, - SDL_SCANCODE_DOWN = 81, - SDL_SCANCODE_UP = 82, - - SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards - */ - SDL_SCANCODE_KP_DIVIDE = 84, - SDL_SCANCODE_KP_MULTIPLY = 85, - SDL_SCANCODE_KP_MINUS = 86, - SDL_SCANCODE_KP_PLUS = 87, - SDL_SCANCODE_KP_ENTER = 88, - SDL_SCANCODE_KP_1 = 89, - SDL_SCANCODE_KP_2 = 90, - SDL_SCANCODE_KP_3 = 91, - SDL_SCANCODE_KP_4 = 92, - SDL_SCANCODE_KP_5 = 93, - SDL_SCANCODE_KP_6 = 94, - SDL_SCANCODE_KP_7 = 95, - SDL_SCANCODE_KP_8 = 96, - SDL_SCANCODE_KP_9 = 97, - SDL_SCANCODE_KP_0 = 98, - SDL_SCANCODE_KP_PERIOD = 99, - - SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO - * keyboards have over ANSI ones, - * located between left shift and Y. - * Produces GRAVE ACCENT and TILDE in a - * US or UK Mac layout, REVERSE SOLIDUS - * (backslash) and VERTICAL LINE in a - * US or UK Windows layout, and - * LESS-THAN SIGN and GREATER-THAN SIGN - * in a Swiss German, German, or French - * layout. */ - SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */ - SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag, - * not a physical key - but some Mac keyboards - * do have a power key. */ - SDL_SCANCODE_KP_EQUALS = 103, - SDL_SCANCODE_F13 = 104, - SDL_SCANCODE_F14 = 105, - SDL_SCANCODE_F15 = 106, - SDL_SCANCODE_F16 = 107, - SDL_SCANCODE_F17 = 108, - SDL_SCANCODE_F18 = 109, - SDL_SCANCODE_F19 = 110, - SDL_SCANCODE_F20 = 111, - SDL_SCANCODE_F21 = 112, - SDL_SCANCODE_F22 = 113, - SDL_SCANCODE_F23 = 114, - SDL_SCANCODE_F24 = 115, - SDL_SCANCODE_EXECUTE = 116, - SDL_SCANCODE_HELP = 117, - SDL_SCANCODE_MENU = 118, - SDL_SCANCODE_SELECT = 119, - SDL_SCANCODE_STOP = 120, - SDL_SCANCODE_AGAIN = 121, /**< redo */ - SDL_SCANCODE_UNDO = 122, - SDL_SCANCODE_CUT = 123, - SDL_SCANCODE_COPY = 124, - SDL_SCANCODE_PASTE = 125, - SDL_SCANCODE_FIND = 126, - SDL_SCANCODE_MUTE = 127, - SDL_SCANCODE_VOLUMEUP = 128, - SDL_SCANCODE_VOLUMEDOWN = 129, -/* not sure whether there's a reason to enable these */ -/* SDL_SCANCODE_LOCKINGCAPSLOCK = 130, */ -/* SDL_SCANCODE_LOCKINGNUMLOCK = 131, */ -/* SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */ - SDL_SCANCODE_KP_COMMA = 133, - SDL_SCANCODE_KP_EQUALSAS400 = 134, - - SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see - footnotes in USB doc */ - SDL_SCANCODE_INTERNATIONAL2 = 136, - SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */ - SDL_SCANCODE_INTERNATIONAL4 = 138, - SDL_SCANCODE_INTERNATIONAL5 = 139, - SDL_SCANCODE_INTERNATIONAL6 = 140, - SDL_SCANCODE_INTERNATIONAL7 = 141, - SDL_SCANCODE_INTERNATIONAL8 = 142, - SDL_SCANCODE_INTERNATIONAL9 = 143, - SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */ - SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */ - SDL_SCANCODE_LANG3 = 146, /**< Katakana */ - SDL_SCANCODE_LANG4 = 147, /**< Hiragana */ - SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */ - SDL_SCANCODE_LANG6 = 149, /**< reserved */ - SDL_SCANCODE_LANG7 = 150, /**< reserved */ - SDL_SCANCODE_LANG8 = 151, /**< reserved */ - SDL_SCANCODE_LANG9 = 152, /**< reserved */ - - SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */ - SDL_SCANCODE_SYSREQ = 154, - SDL_SCANCODE_CANCEL = 155, - SDL_SCANCODE_CLEAR = 156, - SDL_SCANCODE_PRIOR = 157, - SDL_SCANCODE_RETURN2 = 158, - SDL_SCANCODE_SEPARATOR = 159, - SDL_SCANCODE_OUT = 160, - SDL_SCANCODE_OPER = 161, - SDL_SCANCODE_CLEARAGAIN = 162, - SDL_SCANCODE_CRSEL = 163, - SDL_SCANCODE_EXSEL = 164, - - SDL_SCANCODE_KP_00 = 176, - SDL_SCANCODE_KP_000 = 177, - SDL_SCANCODE_THOUSANDSSEPARATOR = 178, - SDL_SCANCODE_DECIMALSEPARATOR = 179, - SDL_SCANCODE_CURRENCYUNIT = 180, - SDL_SCANCODE_CURRENCYSUBUNIT = 181, - SDL_SCANCODE_KP_LEFTPAREN = 182, - SDL_SCANCODE_KP_RIGHTPAREN = 183, - SDL_SCANCODE_KP_LEFTBRACE = 184, - SDL_SCANCODE_KP_RIGHTBRACE = 185, - SDL_SCANCODE_KP_TAB = 186, - SDL_SCANCODE_KP_BACKSPACE = 187, - SDL_SCANCODE_KP_A = 188, - SDL_SCANCODE_KP_B = 189, - SDL_SCANCODE_KP_C = 190, - SDL_SCANCODE_KP_D = 191, - SDL_SCANCODE_KP_E = 192, - SDL_SCANCODE_KP_F = 193, - SDL_SCANCODE_KP_XOR = 194, - SDL_SCANCODE_KP_POWER = 195, - SDL_SCANCODE_KP_PERCENT = 196, - SDL_SCANCODE_KP_LESS = 197, - SDL_SCANCODE_KP_GREATER = 198, - SDL_SCANCODE_KP_AMPERSAND = 199, - SDL_SCANCODE_KP_DBLAMPERSAND = 200, - SDL_SCANCODE_KP_VERTICALBAR = 201, - SDL_SCANCODE_KP_DBLVERTICALBAR = 202, - SDL_SCANCODE_KP_COLON = 203, - SDL_SCANCODE_KP_HASH = 204, - SDL_SCANCODE_KP_SPACE = 205, - SDL_SCANCODE_KP_AT = 206, - SDL_SCANCODE_KP_EXCLAM = 207, - SDL_SCANCODE_KP_MEMSTORE = 208, - SDL_SCANCODE_KP_MEMRECALL = 209, - SDL_SCANCODE_KP_MEMCLEAR = 210, - SDL_SCANCODE_KP_MEMADD = 211, - SDL_SCANCODE_KP_MEMSUBTRACT = 212, - SDL_SCANCODE_KP_MEMMULTIPLY = 213, - SDL_SCANCODE_KP_MEMDIVIDE = 214, - SDL_SCANCODE_KP_PLUSMINUS = 215, - SDL_SCANCODE_KP_CLEAR = 216, - SDL_SCANCODE_KP_CLEARENTRY = 217, - SDL_SCANCODE_KP_BINARY = 218, - SDL_SCANCODE_KP_OCTAL = 219, - SDL_SCANCODE_KP_DECIMAL = 220, - SDL_SCANCODE_KP_HEXADECIMAL = 221, - - SDL_SCANCODE_LCTRL = 224, - SDL_SCANCODE_LSHIFT = 225, - SDL_SCANCODE_LALT = 226, /**< alt, option */ - SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */ - SDL_SCANCODE_RCTRL = 228, - SDL_SCANCODE_RSHIFT = 229, - SDL_SCANCODE_RALT = 230, /**< alt gr, option */ - SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */ - - SDL_SCANCODE_MODE = 257, /**< I'm not sure if this is really not covered - * by any of the above, but since there's a - * special KMOD_MODE for it I'm adding it here - */ - - /* @} *//* Usage page 0x07 */ - - /** - * \name Usage page 0x0C - * - * These values are mapped from usage page 0x0C (USB consumer page). - */ - /* @{ */ - - SDL_SCANCODE_AUDIONEXT = 258, - SDL_SCANCODE_AUDIOPREV = 259, - SDL_SCANCODE_AUDIOSTOP = 260, - SDL_SCANCODE_AUDIOPLAY = 261, - SDL_SCANCODE_AUDIOMUTE = 262, - SDL_SCANCODE_MEDIASELECT = 263, - SDL_SCANCODE_WWW = 264, - SDL_SCANCODE_MAIL = 265, - SDL_SCANCODE_CALCULATOR = 266, - SDL_SCANCODE_COMPUTER = 267, - SDL_SCANCODE_AC_SEARCH = 268, - SDL_SCANCODE_AC_HOME = 269, - SDL_SCANCODE_AC_BACK = 270, - SDL_SCANCODE_AC_FORWARD = 271, - SDL_SCANCODE_AC_STOP = 272, - SDL_SCANCODE_AC_REFRESH = 273, - SDL_SCANCODE_AC_BOOKMARKS = 274, - - /* @} *//* Usage page 0x0C */ - - /** - * \name Walther keys - * - * These are values that Christian Walther added (for mac keyboard?). - */ - /* @{ */ - - SDL_SCANCODE_BRIGHTNESSDOWN = 275, - SDL_SCANCODE_BRIGHTNESSUP = 276, - SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display - switch, video mode switch */ - SDL_SCANCODE_KBDILLUMTOGGLE = 278, - SDL_SCANCODE_KBDILLUMDOWN = 279, - SDL_SCANCODE_KBDILLUMUP = 280, - SDL_SCANCODE_EJECT = 281, - SDL_SCANCODE_SLEEP = 282, - - SDL_SCANCODE_APP1 = 283, - SDL_SCANCODE_APP2 = 284, - - /* @} *//* Walther keys */ - - /* Add any other keys here. */ - - SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes - for array bounds */ -} SDL_Scancode; - -#endif /* _SDL_scancode_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_shape.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_shape.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_shape.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_shape.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_shape_h -#define _SDL_shape_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_surface.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** \file SDL_shape.h - * - * Header file for the shaped window API. - */ - -#define SDL_NONSHAPEABLE_WINDOW -1 -#define SDL_INVALID_SHAPE_ARGUMENT -2 -#define SDL_WINDOW_LACKS_SHAPE -3 - -/** - * \brief Create a window that can be shaped with the specified position, dimensions, and flags. - * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following: - * ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE, - * ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED, - * ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset. - * - * \return The window created, or NULL if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); - -/** - * \brief Return whether the given window is a shaped window. - * - * \param window The window to query for being shaped. - * - * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL. - * \sa SDL_CreateShapedWindow - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window); - -/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */ -typedef enum { - /** \brief The default mode, a binarized alpha cutoff of 1. */ - ShapeModeDefault, - /** \brief A binarized alpha cutoff with a given integer value. */ - ShapeModeBinarizeAlpha, - /** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */ - ShapeModeReverseBinarizeAlpha, - /** \brief A color key is applied. */ - ShapeModeColorKey -} WindowShapeMode; - -#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha) - -/** \brief A union containing parameters for shaped windows. */ -typedef union { - /** \brief a cutoff alpha value for binarization of the window shape's alpha channel. */ - Uint8 binarizationCutoff; - SDL_Color colorKey; -} SDL_WindowShapeParams; - -/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */ -typedef struct SDL_WindowShapeMode { - /** \brief The mode of these window-shape parameters. */ - WindowShapeMode mode; - /** \brief Window-shape parameters. */ - SDL_WindowShapeParams parameters; -} SDL_WindowShapeMode; - -/** - * \brief Set the shape and parameters of a shaped window. - * - * \param window The shaped window whose parameters should be set. - * \param shape A surface encoding the desired shape for the window. - * \param shape_mode The parameters to set for the shaped window. - * - * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on invalid an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW - * if the SDL_Window* given does not reference a valid shaped window. - * - * \sa SDL_WindowShapeMode - * \sa SDL_GetShapedWindowMode. - */ -extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); - -/** - * \brief Get the shape parameters of a shaped window. - * - * \param window The shaped window whose parameters should be retrieved. - * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape. - * - * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode - * data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if - * the SDL_Window* given is a shapeable window currently lacking a shape. - * - * \sa SDL_WindowShapeMode - * \sa SDL_SetWindowShape - */ -extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_shape_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_stdinc.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_stdinc.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_stdinc.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_stdinc.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,405 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_stdinc.h - * - * This is a general header that includes C language support. - */ - -#ifndef _SDL_stdinc_h -#define _SDL_stdinc_h - -#include "SDL_config.h" - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_STDIO_H -#include -#endif -#if defined(STDC_HEADERS) -# include -# include -# include -#else -# if defined(HAVE_STDLIB_H) -# include -# elif defined(HAVE_MALLOC_H) -# include -# endif -# if defined(HAVE_STDDEF_H) -# include -# endif -# if defined(HAVE_STDARG_H) -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#if defined(HAVE_INTTYPES_H) -# include -#elif defined(HAVE_STDINT_H) -# include -#endif -#ifdef HAVE_CTYPE_H -# include -#endif -#ifdef HAVE_MATH_H -# if defined(__WINRT__) -/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on - WinRT. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx - for more information. -*/ -# define _USE_MATH_DEFINES -# endif -# include -#endif -#ifdef HAVE_FLOAT_H -# include -#endif -#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) -# include -#endif - -/** - * The number of elements in an array. - */ -#define SDL_arraysize(array) (sizeof(array)/sizeof(array[0])) -#define SDL_TABLESIZE(table) SDL_arraysize(table) - -/** - * \name Cast operators - * - * Use proper C++ casts when compiled as C++ to be compatible with the option - * -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above). - */ -/* @{ */ -#ifdef __cplusplus -#define SDL_reinterpret_cast(type, expression) reinterpret_cast(expression) -#define SDL_static_cast(type, expression) static_cast(expression) -#define SDL_const_cast(type, expression) const_cast(expression) -#else -#define SDL_reinterpret_cast(type, expression) ((type)(expression)) -#define SDL_static_cast(type, expression) ((type)(expression)) -#define SDL_const_cast(type, expression) ((type)(expression)) -#endif -/* @} *//* Cast operators */ - -/* Define a four character code as a Uint32 */ -#define SDL_FOURCC(A, B, C, D) \ - ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24)) - -/** - * \name Basic data types - */ -/* @{ */ - -typedef enum -{ - SDL_FALSE = 0, - SDL_TRUE = 1 -} SDL_bool; - -/** - * \brief A signed 8-bit integer type. - */ -typedef int8_t Sint8; -/** - * \brief An unsigned 8-bit integer type. - */ -typedef uint8_t Uint8; -/** - * \brief A signed 16-bit integer type. - */ -typedef int16_t Sint16; -/** - * \brief An unsigned 16-bit integer type. - */ -typedef uint16_t Uint16; -/** - * \brief A signed 32-bit integer type. - */ -typedef int32_t Sint32; -/** - * \brief An unsigned 32-bit integer type. - */ -typedef uint32_t Uint32; - -/** - * \brief A signed 64-bit integer type. - */ -typedef int64_t Sint64; -/** - * \brief An unsigned 64-bit integer type. - */ -typedef uint64_t Uint64; - -/* @} *//* Basic data types */ - - -#define SDL_COMPILE_TIME_ASSERT(name, x) \ - typedef int SDL_dummy_ ## name[(x) * 2 - 1] -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1); -SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); -SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); -SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); -SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); -SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); -SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); -SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ -/** \endcond */ - -/* Check to make sure enums are the size of ints, for structure packing. - For both Watcom C/C++ and Borland C/C++ the compiler option that makes - enums having the size of an int must be enabled. - This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11). -*/ - -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__ANDROID__) - /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ -typedef enum -{ - DUMMY_ENUM_VALUE -} SDL_DUMMY_ENUM; - -SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int)); -#endif -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ -/** \endcond */ - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(HAVE_ALLOCA) && !defined(alloca) -# if defined(HAVE_ALLOCA_H) -# include -# elif defined(__GNUC__) -# define alloca __builtin_alloca -# elif defined(_MSC_VER) -# include -# define alloca _alloca -# elif defined(__WATCOMC__) -# include -# elif defined(__BORLANDC__) -# include -# elif defined(__DMC__) -# include -# elif defined(__AIX__) -#pragma alloca -# elif defined(__MRC__) -void *alloca(unsigned); -# else -char *alloca(); -# endif -#endif -#ifdef HAVE_ALLOCA -#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count)) -#define SDL_stack_free(data) -#else -#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count)) -#define SDL_stack_free(data) SDL_free(data) -#endif - -extern DECLSPEC void *SDLCALL SDL_malloc(size_t size); -extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size); -extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size); -extern DECLSPEC void SDLCALL SDL_free(void *mem); - -extern DECLSPEC char *SDLCALL SDL_getenv(const char *name); -extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite); - -extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *)); - -extern DECLSPEC int SDLCALL SDL_abs(int x); - -/* !!! FIXME: these have side effects. You probably shouldn't use them. */ -/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */ -#define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) -#define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) - -extern DECLSPEC int SDLCALL SDL_isdigit(int x); -extern DECLSPEC int SDLCALL SDL_isspace(int x); -extern DECLSPEC int SDLCALL SDL_toupper(int x); -extern DECLSPEC int SDLCALL SDL_tolower(int x); - -extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len); - -#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) -#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) - -/* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */ -SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) -{ -#if defined(__GNUC__) && defined(i386) - int u0, u1, u2; - __asm__ __volatile__ ( - "cld \n\t" - "rep ; stosl \n\t" - : "=&D" (u0), "=&a" (u1), "=&c" (u2) - : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords)) - : "memory" - ); -#else - size_t _n = (dwords + 3) / 4; - Uint32 *_p = SDL_static_cast(Uint32 *, dst); - Uint32 _val = (val); - if (dwords == 0) - return; - switch (dwords % 4) - { - case 0: do { *_p++ = _val; - case 3: *_p++ = _val; - case 2: *_p++ = _val; - case 1: *_p++ = _val; - } while ( --_n ); - } -#endif -} - - -extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len); - -SDL_FORCE_INLINE void *SDL_memcpy4(void *dst, const void *src, size_t dwords) -{ - return SDL_memcpy(dst, src, dwords * 4); -} - -extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, size_t len); -extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); - -extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); -extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen); -extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen); - -extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); -extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen); -extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes); -extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen); -extern DECLSPEC char *SDLCALL SDL_strdup(const char *str); -extern DECLSPEC char *SDLCALL SDL_strrev(char *str); -extern DECLSPEC char *SDLCALL SDL_strupr(char *str); -extern DECLSPEC char *SDLCALL SDL_strlwr(char *str); -extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c); -extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c); -extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle); - -extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix); - -extern DECLSPEC int SDLCALL SDL_atoi(const char *str); -extern DECLSPEC double SDLCALL SDL_atof(const char *str); -extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base); -extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base); -extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base); -extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base); -extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp); - -extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2); -extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen); -extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2); -extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len); - -extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...); -extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap); -extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...); -extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap); - -#ifndef HAVE_M_PI -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327950288 /* pi */ -#endif -#endif - -extern DECLSPEC double SDLCALL SDL_acos(double x); -extern DECLSPEC double SDLCALL SDL_asin(double x); -extern DECLSPEC double SDLCALL SDL_atan(double x); -extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); -extern DECLSPEC double SDLCALL SDL_ceil(double x); -extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); -extern DECLSPEC double SDLCALL SDL_cos(double x); -extern DECLSPEC float SDLCALL SDL_cosf(float x); -extern DECLSPEC double SDLCALL SDL_fabs(double x); -extern DECLSPEC double SDLCALL SDL_floor(double x); -extern DECLSPEC double SDLCALL SDL_log(double x); -extern DECLSPEC double SDLCALL SDL_pow(double x, double y); -extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); -extern DECLSPEC double SDLCALL SDL_sin(double x); -extern DECLSPEC float SDLCALL SDL_sinf(float x); -extern DECLSPEC double SDLCALL SDL_sqrt(double x); - -/* The SDL implementation of iconv() returns these error codes */ -#define SDL_ICONV_ERROR (size_t)-1 -#define SDL_ICONV_E2BIG (size_t)-2 -#define SDL_ICONV_EILSEQ (size_t)-3 -#define SDL_ICONV_EINVAL (size_t)-4 - -/* SDL_iconv_* are now always real symbols/types, not macros or inlined. */ -typedef struct _SDL_iconv_t *SDL_iconv_t; -extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, - const char *fromcode); -extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, - size_t * inbytesleft, char **outbuf, - size_t * outbytesleft); -/** - * This function converts a string between encodings in one pass, returning a - * string that must be freed with SDL_free() or NULL on error. - */ -extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, - const char *fromcode, - const char *inbuf, - size_t inbytesleft); -#define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_stdinc_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_surface.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_surface.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_surface.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_surface.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,503 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_surface.h - * - * Header file for ::SDL_Surface definition and management functions. - */ - -#ifndef _SDL_surface_h -#define _SDL_surface_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_blendmode.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name Surface flags - * - * These are the currently supported flags for the ::SDL_Surface. - * - * \internal - * Used internally (read-only). - */ -/* @{ */ -#define SDL_SWSURFACE 0 /**< Just here for compatibility */ -#define SDL_PREALLOC 0x00000001 /**< Surface uses preallocated memory */ -#define SDL_RLEACCEL 0x00000002 /**< Surface is RLE encoded */ -#define SDL_DONTFREE 0x00000004 /**< Surface is referenced internally */ -/* @} *//* Surface flags */ - -/** - * Evaluates to true if the surface needs to be locked before access. - */ -#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0) - -/** - * \brief A collection of pixels used in software blitting. - * - * \note This structure should be treated as read-only, except for \c pixels, - * which, if not NULL, contains the raw pixel data for the surface. - */ -typedef struct SDL_Surface -{ - Uint32 flags; /**< Read-only */ - SDL_PixelFormat *format; /**< Read-only */ - int w, h; /**< Read-only */ - int pitch; /**< Read-only */ - void *pixels; /**< Read-write */ - - /** Application data associated with the surface */ - void *userdata; /**< Read-write */ - - /** information needed for surfaces requiring locks */ - int locked; /**< Read-only */ - void *lock_data; /**< Read-only */ - - /** clipping information */ - SDL_Rect clip_rect; /**< Read-only */ - - /** info for fast blit mapping to other surfaces */ - struct SDL_BlitMap *map; /**< Private */ - - /** Reference count -- used when freeing surface */ - int refcount; /**< Read-mostly */ -} SDL_Surface; - -/** - * \brief The type of function used for surface blitting functions. - */ -typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect, - struct SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * Allocate and free an RGB surface. - * - * If the depth is 4 or 8 bits, an empty palette is allocated for the surface. - * If the depth is greater than 8 bits, the pixel format is set using the - * flags '[RGB]mask'. - * - * If the function runs out of memory, it will return NULL. - * - * \param flags The \c flags are obsolete and should be set to 0. - * \param width The width in pixels of the surface to create. - * \param height The height in pixels of the surface to create. - * \param depth The depth in bits of the surface to create. - * \param Rmask The red mask of the surface to create. - * \param Gmask The green mask of the surface to create. - * \param Bmask The blue mask of the surface to create. - * \param Amask The alpha mask of the surface to create. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface - (Uint32 flags, int width, int height, int depth, - Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); -extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, - int width, - int height, - int depth, - int pitch, - Uint32 Rmask, - Uint32 Gmask, - Uint32 Bmask, - Uint32 Amask); -extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); - -/** - * \brief Set the palette used by a surface. - * - * \return 0, or -1 if the surface format doesn't use a palette. - * - * \note A single palette can be shared with many surfaces. - */ -extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface, - SDL_Palette * palette); - -/** - * \brief Sets up a surface for directly accessing the pixels. - * - * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write - * to and read from \c surface->pixels, using the pixel format stored in - * \c surface->format. Once you are done accessing the surface, you should - * use SDL_UnlockSurface() to release it. - * - * Not all surfaces require locking. If SDL_MUSTLOCK(surface) evaluates - * to 0, then you can read and write to the surface at any time, and the - * pixel format of the surface will not change. - * - * No operating system or library calls should be made between lock/unlock - * pairs, as critical system locks may be held during this time. - * - * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked. - * - * \sa SDL_UnlockSurface() - */ -extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface); -/** \sa SDL_LockSurface() */ -extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface); - -/** - * Load a surface from a seekable SDL data stream (memory or file). - * - * If \c freesrc is non-zero, the stream will be closed after being read. - * - * The new surface should be freed with SDL_FreeSurface(). - * - * \return the new surface, or NULL if there was an error. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, - int freesrc); - -/** - * Load a surface from a file. - * - * Convenience macro. - */ -#define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1) - -/** - * Save a surface to a seekable SDL data stream (memory or file). - * - * If \c freedst is non-zero, the stream will be closed after being written. - * - * \return 0 if successful or -1 if there was an error. - */ -extern DECLSPEC int SDLCALL SDL_SaveBMP_RW - (SDL_Surface * surface, SDL_RWops * dst, int freedst); - -/** - * Save a surface to a file. - * - * Convenience macro. - */ -#define SDL_SaveBMP(surface, file) \ - SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1) - -/** - * \brief Sets the RLE acceleration hint for a surface. - * - * \return 0 on success, or -1 if the surface is not valid - * - * \note If RLE is enabled, colorkey and alpha blending blits are much faster, - * but the surface must be locked before directly accessing the pixels. - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, - int flag); - -/** - * \brief Sets the color key (transparent pixel) in a blittable surface. - * - * \param surface The surface to update - * \param flag Non-zero to enable colorkey and 0 to disable colorkey - * \param key The transparent pixel in the native surface format - * - * \return 0 on success, or -1 if the surface is not valid - * - * You can pass SDL_RLEACCEL to enable RLE accelerated blits. - */ -extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, - int flag, Uint32 key); - -/** - * \brief Gets the color key (transparent pixel) in a blittable surface. - * - * \param surface The surface to update - * \param key A pointer filled in with the transparent pixel in the native - * surface format - * - * \return 0 on success, or -1 if the surface is not valid or colorkey is not - * enabled. - */ -extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface, - Uint32 * key); - -/** - * \brief Set an additional color value used in blit operations. - * - * \param surface The surface to update. - * \param r The red color value multiplied into blit operations. - * \param g The green color value multiplied into blit operations. - * \param b The blue color value multiplied into blit operations. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_GetSurfaceColorMod() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface, - Uint8 r, Uint8 g, Uint8 b); - - -/** - * \brief Get the additional color value used in blit operations. - * - * \param surface The surface to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceColorMod() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface, - Uint8 * r, Uint8 * g, - Uint8 * b); - -/** - * \brief Set an additional alpha value used in blit operations. - * - * \param surface The surface to update. - * \param alpha The alpha value multiplied into blit operations. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_GetSurfaceAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface, - Uint8 alpha); - -/** - * \brief Get the additional alpha value used in blit operations. - * - * \param surface The surface to query. - * \param alpha A pointer filled in with the current alpha value. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface, - Uint8 * alpha); - -/** - * \brief Set the blend mode used for blit operations. - * - * \param surface The surface to update. - * \param blendMode ::SDL_BlendMode to use for blit blending. - * - * \return 0 on success, or -1 if the parameters are not valid. - * - * \sa SDL_GetSurfaceBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for blit operations. - * - * \param surface The surface to query. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface, - SDL_BlendMode *blendMode); - -/** - * Sets the clipping rectangle for the destination surface in a blit. - * - * If the clip rectangle is NULL, clipping will be disabled. - * - * If the clip rectangle doesn't intersect the surface, the function will - * return SDL_FALSE and blits will be completely clipped. Otherwise the - * function returns SDL_TRUE and blits to the surface will be clipped to - * the intersection of the surface area and the clipping rectangle. - * - * Note that blits are automatically clipped to the edges of the source - * and destination surfaces. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface, - const SDL_Rect * rect); - -/** - * Gets the clipping rectangle for the destination surface in a blit. - * - * \c rect must be a pointer to a valid rectangle which will be filled - * with the correct values. - */ -extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface, - SDL_Rect * rect); - -/** - * Creates a new surface of the specified format, and then copies and maps - * the given surface to it so the blit of the converted surface will be as - * fast as possible. If this function fails, it returns NULL. - * - * The \c flags parameter is passed to SDL_CreateRGBSurface() and has those - * semantics. You can also pass ::SDL_RLEACCEL in the flags parameter and - * SDL will try to RLE accelerate colorkey and alpha blits in the resulting - * surface. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface - (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags); -extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat - (SDL_Surface * src, Uint32 pixel_format, Uint32 flags); - -/** - * \brief Copy a block of pixels of one format to another format - * - * \return 0 on success, or -1 if there was an error - */ -extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, - Uint32 src_format, - const void * src, int src_pitch, - Uint32 dst_format, - void * dst, int dst_pitch); - -/** - * Performs a fast fill of the given rectangle with \c color. - * - * If \c rect is NULL, the whole surface will be filled with \c color. - * - * The color should be a pixel of the format used by the surface, and - * can be generated by the SDL_MapRGB() function. - * - * \return 0 on success, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_FillRect - (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color); -extern DECLSPEC int SDLCALL SDL_FillRects - (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color); - -/** - * Performs a fast blit from the source surface to the destination surface. - * - * This assumes that the source and destination rectangles are - * the same size. If either \c srcrect or \c dstrect are NULL, the entire - * surface (\c src or \c dst) is copied. The final blit rectangles are saved - * in \c srcrect and \c dstrect after all clipping is performed. - * - * \return If the blit is successful, it returns 0, otherwise it returns -1. - * - * The blit function should not be called on a locked surface. - * - * The blit semantics for surfaces with and without blending and colorkey - * are defined as follows: - * \verbatim - RGBA->RGB: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source alpha-channel and per-surface alpha) - SDL_SRCCOLORKEY ignored. - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source color key, ignoring alpha in the - comparison. - - RGB->RGBA: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source per-surface alpha) - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB, set destination alpha to source per-surface alpha value. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source color key. - - RGBA->RGBA: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source alpha-channel and per-surface alpha) - SDL_SRCCOLORKEY ignored. - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy all of RGBA to the destination. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source color key, ignoring alpha in the - comparison. - - RGB->RGB: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source per-surface alpha) - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source color key. - \endverbatim - * - * You should call SDL_BlitSurface() unless you know exactly how SDL - * blitting works internally and how to use the other blit functions. - */ -#define SDL_BlitSurface SDL_UpperBlit - -/** - * This is the public blit function, SDL_BlitSurface(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlit() - */ -extern DECLSPEC int SDLCALL SDL_UpperBlit - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * This is a semi-private blit function and it performs low-level surface - * blitting only. - */ -extern DECLSPEC int SDLCALL SDL_LowerBlit - (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * same pixel format. - * - * \note This function uses a static buffer, and is not thread-safe. - */ -extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src, - const SDL_Rect * srcrect, - SDL_Surface * dst, - const SDL_Rect * dstrect); - -#define SDL_BlitScaled SDL_UpperBlitScaled - -/** - * This is the public scaled blit function, SDL_BlitScaled(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlitScaled() - */ -extern DECLSPEC int SDLCALL SDL_UpperBlitScaled - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * This is a semi-private blit function and it performs low-level surface - * scaled blitting only. - */ -extern DECLSPEC int SDLCALL SDL_LowerBlitScaled - (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_surface_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_system.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_system.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_system.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_system.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,191 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_system.h - * - * Include file for platform specific SDL API functions - */ - -#ifndef _SDL_system_h -#define _SDL_system_h - -#include "SDL_stdinc.h" -#include "SDL_keyboard.h" -#include "SDL_render.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - - -/* Platform specific functions for Windows */ -#ifdef __WIN32__ - -/* Returns the D3D9 adapter index that matches the specified display index. - This adapter index can be passed to IDirect3D9::CreateDevice and controls - on which monitor a full screen application will appear. -*/ -extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex ); - -/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer. - Once you are done using the device, you should release it to avoid a resource leak. - */ -typedef struct IDirect3DDevice9 IDirect3DDevice9; -extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer); - -/* Returns the DXGI Adapter and Output indices for the specified display index. - These can be passed to EnumAdapters and EnumOutputs respectively to get the objects - required to create a DX10 or DX11 device and swap chain. - */ -extern DECLSPEC void SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex ); - -#endif /* __WIN32__ */ - - -/* Platform specific functions for iOS */ -#if defined(__IPHONEOS__) && __IPHONEOS__ - -extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); -extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled); - -#endif /* __IPHONEOS__ */ - - -/* Platform specific functions for Android */ -#if defined(__ANDROID__) && __ANDROID__ - -/* Get the JNI environment for the current thread - This returns JNIEnv*, but the prototype is void* so we don't need jni.h - */ -extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(); - -/* Get the SDL Activity object for the application - This returns jobject, but the prototype is void* so we don't need jni.h - The jobject returned by SDL_AndroidGetActivity is a local reference. - It is the caller's responsibility to properly release it - (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef) - */ -extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(); - -/* See the official Android developer guide for more information: - http://developer.android.com/guide/topics/data/data-storage.html -*/ -#define SDL_ANDROID_EXTERNAL_STORAGE_READ 0x01 -#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02 - -/* Get the path used for internal storage for this application. - This path is unique to your application and cannot be written to - by other applications. - */ -extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(); - -/* Get the current state of external storage, a bitmask of these values: - SDL_ANDROID_EXTERNAL_STORAGE_READ - SDL_ANDROID_EXTERNAL_STORAGE_WRITE - If external storage is currently unavailable, this will return 0. -*/ -extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(); - -/* Get the path used for external storage for this application. - This path is unique to your application, but is public and can be - written to by other applications. - */ -extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(); - -#endif /* __ANDROID__ */ - -/* Platform specific functions for WinRT */ -#if defined(__WINRT__) && __WINRT__ - -/** - * \brief WinRT / Windows Phone path types - */ -typedef enum -{ - /** \brief The installed app's root directory. - Files here are likely to be read-only. */ - SDL_WINRT_PATH_INSTALLED_LOCATION, - - /** \brief The app's local data store. Files may be written here */ - SDL_WINRT_PATH_LOCAL_FOLDER, - - /** \brief The app's roaming data store. Unsupported on Windows Phone. - Files written here may be copied to other machines via a network - connection. - */ - SDL_WINRT_PATH_ROAMING_FOLDER, - - /** \brief The app's temporary data store. Unsupported on Windows Phone. - Files written here may be deleted at any time. */ - SDL_WINRT_PATH_TEMP_FOLDER -} SDL_WinRT_Path; - - -/** - * \brief Retrieves a WinRT defined path on the local file system - * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx - * - * \param pathType The type of path to retrieve. - * \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. - */ -extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType); - -/** - * \brief Retrieves a WinRT defined path on the local file system - * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx - * - * \param pathType The type of path to retrieve. - * \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. - */ -extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); - -#endif /* __WINRT__ */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_system_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_syswm.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_syswm.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_syswm.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_syswm.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,272 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_syswm.h - * - * Include file for SDL custom system window manager hooks. - */ - -#ifndef _SDL_syswm_h -#define _SDL_syswm_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_version.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_syswm.h - * - * Your application has access to a special type of event ::SDL_SYSWMEVENT, - * which contains window-manager specific information and arrives whenever - * an unhandled window event occurs. This event is ignored by default, but - * you can enable it with SDL_EventState(). - */ -#ifdef SDL_PROTOTYPES_ONLY -struct SDL_SysWMinfo; -#else - -#if defined(SDL_VIDEO_DRIVER_WINDOWS) -#define WIN32_LEAN_AND_MEAN -#include -#endif - -#if defined(SDL_VIDEO_DRIVER_WINRT) -#include -#endif - -/* This is the structure for custom window manager events */ -#if defined(SDL_VIDEO_DRIVER_X11) -#if defined(__APPLE__) && defined(__MACH__) -/* conflicts with Quickdraw.h */ -#define Cursor X11Cursor -#endif - -#include -#include - -#if defined(__APPLE__) && defined(__MACH__) -/* matches the re-define above */ -#undef Cursor -#endif - -#endif /* defined(SDL_VIDEO_DRIVER_X11) */ - -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) -#include -#endif - -#if defined(SDL_VIDEO_DRIVER_COCOA) -#ifdef __OBJC__ -#include -#else -typedef struct _NSWindow NSWindow; -#endif -#endif - -#if defined(SDL_VIDEO_DRIVER_UIKIT) -#ifdef __OBJC__ -#include -#else -typedef struct _UIWindow UIWindow; -typedef struct _UIViewController UIViewController; -#endif -#endif - -#if defined(SDL_VIDEO_DRIVER_MIR) -#include -#endif - - -/** - * These are the various supported windowing subsystems - */ -typedef enum -{ - SDL_SYSWM_UNKNOWN, - SDL_SYSWM_WINDOWS, - SDL_SYSWM_X11, - SDL_SYSWM_DIRECTFB, - SDL_SYSWM_COCOA, - SDL_SYSWM_UIKIT, - SDL_SYSWM_WAYLAND, - SDL_SYSWM_MIR, - SDL_SYSWM_WINRT, -} SDL_SYSWM_TYPE; - -/** - * The custom event structure. - */ -struct SDL_SysWMmsg -{ - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union - { -#if defined(SDL_VIDEO_DRIVER_WINDOWS) - struct { - HWND hwnd; /**< The window for the message */ - UINT msg; /**< The type of message */ - WPARAM wParam; /**< WORD message parameter */ - LPARAM lParam; /**< LONG message parameter */ - } win; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) - struct { - XEvent event; - } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) - struct { - DFBEvent event; - } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) - struct - { - /* No Cocoa window events yet */ - } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) - struct - { - /* No UIKit window events yet */ - } uikit; -#endif - /* Can't have an empty union */ - int dummy; - } msg; -}; - -/** - * The custom window manager information structure. - * - * When this structure is returned, it holds information about which - * low level system it is using, and will be one of SDL_SYSWM_TYPE. - */ -struct SDL_SysWMinfo -{ - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union - { -#if defined(SDL_VIDEO_DRIVER_WINDOWS) - struct - { - HWND window; /**< The window handle */ - } win; -#endif -#if defined(SDL_VIDEO_DRIVER_WINRT) - struct - { - IInspectable * window; /**< The WinRT CoreWindow */ - } winrt; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) - struct - { - Display *display; /**< The X11 display */ - Window window; /**< The X11 window */ - } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) - struct - { - IDirectFB *dfb; /**< The directfb main interface */ - IDirectFBWindow *window; /**< The directfb window handle */ - IDirectFBSurface *surface; /**< The directfb client surface */ - } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) - struct - { - NSWindow *window; /* The Cocoa window */ - } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) - struct - { - UIWindow *window; /* The UIKit window */ - } uikit; -#endif -#if defined(SDL_VIDEO_DRIVER_WAYLAND) - struct - { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ - } wl; -#endif -#if defined(SDL_VIDEO_DRIVER_MIR) - struct - { - MirConnection *connection; /**< Mir display server connection */ - MirSurface *surface; /**< Mir surface */ - } mir; -#endif - - /* Can't have an empty union */ - int dummy; - } info; -}; - -#endif /* SDL_PROTOTYPES_ONLY */ - -typedef struct SDL_SysWMinfo SDL_SysWMinfo; - -/* Function prototypes */ -/** - * \brief This function allows access to driver-dependent window information. - * - * \param window The window about which information is being requested - * \param info This structure must be initialized with the SDL version, and is - * then filled in with information about the given window. - * - * \return SDL_TRUE if the function is implemented and the version member of - * the \c info struct is valid, SDL_FALSE otherwise. - * - * You typically use this function like this: - * \code - * SDL_SysWMinfo info; - * SDL_VERSION(&info.version); - * if ( SDL_GetWindowWMInfo(window, &info) ) { ... } - * \endcode - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, - SDL_SysWMinfo * info); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_syswm_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_thread.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_thread.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_thread.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_thread.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_thread_h -#define _SDL_thread_h - -/** - * \file SDL_thread.h - * - * Header for the SDL thread management routines. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -/* Thread synchronization primitives */ -#include "SDL_atomic.h" -#include "SDL_mutex.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* The SDL thread structure, defined in SDL_thread.c */ -struct SDL_Thread; -typedef struct SDL_Thread SDL_Thread; - -/* The SDL thread ID */ -typedef unsigned long SDL_threadID; - -/* Thread local storage ID, 0 is the invalid ID */ -typedef unsigned int SDL_TLSID; - -/** - * The SDL thread priority. - * - * \note On many systems you require special privileges to set high priority. - */ -typedef enum { - SDL_THREAD_PRIORITY_LOW, - SDL_THREAD_PRIORITY_NORMAL, - SDL_THREAD_PRIORITY_HIGH -} SDL_ThreadPriority; - -/** - * The function passed to SDL_CreateThread(). - * It is passed a void* user context parameter and returns an int. - */ -typedef int (SDLCALL * SDL_ThreadFunction) (void *data); - -#if defined(__WIN32__) && !defined(HAVE_LIBC) -/** - * \file SDL_thread.h - * - * We compile SDL into a DLL. This means, that it's the DLL which - * creates a new thread for the calling process with the SDL_CreateThread() - * API. There is a problem with this, that only the RTL of the SDL.DLL will - * be initialized for those threads, and not the RTL of the calling - * application! - * - * To solve this, we make a little hack here. - * - * We'll always use the caller's _beginthread() and _endthread() APIs to - * start a new thread. This way, if it's the SDL.DLL which uses this API, - * then the RTL of SDL.DLL will be used to create the new thread, and if it's - * the application, then the RTL of the application will be used. - * - * So, in short: - * Always use the _beginthread() and _endthread() of the calling runtime - * library! - */ -#define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#include /* This has _beginthread() and _endthread() defined! */ - -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, - unsigned (__stdcall * - func) (void - *), - void *arg, unsigned, - unsigned *threadID); -typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); - -/** - * Create a thread. - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, - pfnSDL_CurrentBeginThread pfnBeginThread, - pfnSDL_CurrentEndThread pfnEndThread); - -/** - * Create a thread. - */ -#if defined(SDL_CreateThread) && SDL_DYNAMIC_API -#undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#endif - -#else - -/** - * Create a thread. - * - * Thread naming is a little complicated: Most systems have very small - * limits for the string length (Haiku has 32 bytes, Linux currently has 16, - * Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll - * have to see what happens with your system's debugger. The name should be - * UTF-8 (but using the naming limits of C identifiers is a better bet). - * There are no requirements for thread naming conventions, so long as the - * string is null-terminated UTF-8, but these guidelines are helpful in - * choosing a name: - * - * http://stackoverflow.com/questions/149932/naming-conventions-for-threads - * - * If a system imposes requirements, SDL will try to munge the string for - * it (truncate, etc), but the original string contents will be available - * from SDL_GetThreadName(). - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); - -#endif - -/** - * Get the thread name, as it was specified in SDL_CreateThread(). - * This function returns a pointer to a UTF-8 string that names the - * specified thread, or NULL if it doesn't have a name. This is internal - * memory, not to be free()'d by the caller, and remains valid until the - * specified thread is cleaned up by SDL_WaitThread(). - */ -extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread); - -/** - * Get the thread identifier for the current thread. - */ -extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void); - -/** - * Get the thread identifier for the specified thread. - * - * Equivalent to SDL_ThreadID() if the specified thread is NULL. - */ -extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread); - -/** - * Set the priority for the current thread - */ -extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority); - -/** - * Wait for a thread to finish. Threads that haven't been detached will - * remain (as a "zombie") until this function cleans them up. Not doing so - * is a resource leak. - * - * Once a thread has been cleaned up through this function, the SDL_Thread - * that references it becomes invalid and should not be referenced again. - * As such, only one thread may call SDL_WaitThread() on another. - * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. - * - * You may not wait on a thread that has been used in a call to - * SDL_DetachThread(). Use either that function or this one, but not - * both, or behavior is undefined. - * - * It is safe to pass NULL to this function; it is a no-op. - */ -extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); - -/** - * A thread may be "detached" to signify that it should not remain until - * another thread has called SDL_WaitThread() on it. Detaching a thread - * is useful for long-running threads that nothing needs to synchronize - * with or further manage. When a detached thread is done, it simply - * goes away. - * - * There is no way to recover the return code of a detached thread. If you - * need this, don't detach the thread and instead use SDL_WaitThread(). - * - * Once a thread is detached, you should usually assume the SDL_Thread isn't - * safe to reference again, as it will become invalid immediately upon - * the detached thread's exit, instead of remaining until someone has called - * SDL_WaitThread() to finally clean it up. As such, don't detach the same - * thread more than once. - * - * If a thread has already exited when passed to SDL_DetachThread(), it will - * stop waiting for a call to SDL_WaitThread() and clean up immediately. - * It is not safe to detach a thread that might be used with SDL_WaitThread(). - * - * You may not call SDL_WaitThread() on a thread that has been detached. - * Use either that function or this one, but not both, or behavior is - * undefined. - * - * It is safe to pass NULL to this function; it is a no-op. - */ -extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread); - -/** - * \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific. - * - * \return The newly created thread local storage identifier, or 0 on error - * - * \code - * static SDL_SpinLock tls_lock; - * static SDL_TLSID thread_local_storage; - * - * void SetMyThreadData(void *value) - * { - * if (!thread_local_storage) { - * SDL_AtomicLock(&tls_lock); - * if (!thread_local_storage) { - * thread_local_storage = SDL_TLSCreate(); - * } - * SDL_AtomicUnLock(&tls_lock); - * } - * SDL_TLSSet(thread_local_storage, value); - * } - * - * void *GetMyThreadData(void) - * { - * return SDL_TLSGet(thread_local_storage); - * } - * \endcode - * - * \sa SDL_TLSGet() - * \sa SDL_TLSSet() - */ -extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void); - -/** - * \brief Get the value associated with a thread local storage ID for the current thread. - * - * \param id The thread local storage ID - * - * \return The value associated with the ID for the current thread, or NULL if no value has been set. - * - * \sa SDL_TLSCreate() - * \sa SDL_TLSSet() - */ -extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id); - -/** - * \brief Set the value associated with a thread local storage ID for the current thread. - * - * \param id The thread local storage ID - * \param value The value to associate with the ID for the current thread - * \param destructor A function called when the thread exits, to free the value. - * - * \return 0 on success, -1 on error - * - * \sa SDL_TLSCreate() - * \sa SDL_TLSGet() - */ -extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void*)); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_thread_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_timer.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_timer.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_timer.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_timer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_timer_h -#define _SDL_timer_h - -/** - * \file SDL_timer.h - * - * Header for the SDL time management routines. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Get the number of milliseconds since the SDL library initialization. - * - * \note This value wraps if the program runs for more than ~49 days. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void); - -/** - * \brief Compare SDL ticks values, and return true if A has passed B - * - * e.g. if you want to wait 100 ms, you could do this: - * Uint32 timeout = SDL_GetTicks() + 100; - * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { - * ... do work until timeout has elapsed - * } - */ -#define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0) - -/** - * \brief Get the current value of the high resolution counter - */ -extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void); - -/** - * \brief Get the count per second of the high resolution counter - */ -extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void); - -/** - * \brief Wait a specified number of milliseconds before returning. - */ -extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms); - -/** - * Function prototype for the timer callback function. - * - * The callback function is passed the current timer interval and returns - * the next timer interval. If the returned value is the same as the one - * passed in, the periodic alarm continues, otherwise a new alarm is - * scheduled. If the callback returns 0, the periodic alarm is cancelled. - */ -typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); - -/** - * Definition of the timer ID type. - */ -typedef int SDL_TimerID; - -/** - * \brief Add a new timer to the pool of timers already running. - * - * \return A timer ID, or NULL when an error occurs. - */ -extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, - SDL_TimerCallback callback, - void *param); - -/** - * \brief Remove a timer knowing its ID. - * - * \return A boolean value indicating success or failure. - * - * \warning It is not safe to remove a timer multiple times. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_timer_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_touch.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_touch.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_touch.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_touch.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_touch.h - * - * Include file for SDL touch event handling. - */ - -#ifndef _SDL_touch_h -#define _SDL_touch_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef Sint64 SDL_TouchID; -typedef Sint64 SDL_FingerID; - -typedef struct SDL_Finger -{ - SDL_FingerID id; - float x; - float y; - float pressure; -} SDL_Finger; - -/* Used as the device ID for mouse events simulated with touch input */ -#define SDL_TOUCH_MOUSEID ((Uint32)-1) - - -/* Function prototypes */ - -/** - * \brief Get the number of registered touch devices. - */ -extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void); - -/** - * \brief Get the touch ID with the given index, or 0 if the index is invalid. - */ -extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index); - -/** - * \brief Get the number of active fingers for a given touch device. - */ -extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID); - -/** - * \brief Get the finger object of the given touch, with the given index. - */ -extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_touch_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_types.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_types.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_types.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_types.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_types.h - * - * \deprecated - */ - -/* DEPRECATED */ -#include "SDL_stdinc.h" diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_version.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_version.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_version.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_version.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_version.h - * - * This header defines the current SDL version. - */ - -#ifndef _SDL_version_h -#define _SDL_version_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Information the version of SDL in use. - * - * Represents the library's version as three levels: major revision - * (increments with massive changes, additions, and enhancements), - * minor revision (increments with backwards-compatible changes to the - * major revision), and patchlevel (increments with fixes to the minor - * revision). - * - * \sa SDL_VERSION - * \sa SDL_GetVersion - */ -typedef struct SDL_version -{ - Uint8 major; /**< major version */ - Uint8 minor; /**< minor version */ - Uint8 patch; /**< update version */ -} SDL_version; - -/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL -*/ -#define SDL_MAJOR_VERSION 2 -#define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 3 - -/** - * \brief Macro to determine SDL version program was compiled against. - * - * This macro fills in a SDL_version structure with the version of the - * library you compiled against. This is determined by what header the - * compiler uses. Note that if you dynamically linked the library, you might - * have a slightly newer or older version at runtime. That version can be - * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), - * is not a macro. - * - * \param x A pointer to a SDL_version struct to initialize. - * - * \sa SDL_version - * \sa SDL_GetVersion - */ -#define SDL_VERSION(x) \ -{ \ - (x)->major = SDL_MAJOR_VERSION; \ - (x)->minor = SDL_MINOR_VERSION; \ - (x)->patch = SDL_PATCHLEVEL; \ -} - -/** - * This macro turns the version numbers into a numeric value: - * \verbatim - (1,2,3) -> (1203) - \endverbatim - * - * This assumes that there will never be more than 100 patchlevels. - */ -#define SDL_VERSIONNUM(X, Y, Z) \ - ((X)*1000 + (Y)*100 + (Z)) - -/** - * This is the version number macro for the current SDL version. - */ -#define SDL_COMPILEDVERSION \ - SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL) - -/** - * This macro will evaluate to true if compiled with SDL at least X.Y.Z. - */ -#define SDL_VERSION_ATLEAST(X, Y, Z) \ - (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) - -/** - * \brief Get the version of SDL that is linked against your program. - * - * If you are linking to SDL dynamically, then it is possible that the - * current version will be different than the version you compiled against. - * This function returns the current version, while SDL_VERSION() is a - * macro that tells you what version you compiled with. - * - * \code - * SDL_version compiled; - * SDL_version linked; - * - * SDL_VERSION(&compiled); - * SDL_GetVersion(&linked); - * printf("We compiled against SDL version %d.%d.%d ...\n", - * compiled.major, compiled.minor, compiled.patch); - * printf("But we linked against SDL version %d.%d.%d.\n", - * linked.major, linked.minor, linked.patch); - * \endcode - * - * This function may be called safely at any time, even before SDL_Init(). - * - * \sa SDL_VERSION - */ -extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver); - -/** - * \brief Get the code revision of SDL that is linked against your program. - * - * Returns an arbitrary string (a hash value) uniquely identifying the - * exact revision of the SDL library in use, and is only useful in comparing - * against other revisions. It is NOT an incrementing number. - */ -extern DECLSPEC const char *SDLCALL SDL_GetRevision(void); - -/** - * \brief Get the revision number of SDL that is linked against your program. - * - * Returns a number uniquely identifying the exact revision of the SDL - * library in use. It is an incrementing number based on commits to - * hg.libsdl.org. - */ -extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_version_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_video.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_video.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_video.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Headers/SDL_video.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,979 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_video.h - * - * Header file for SDL video functions. - */ - -#ifndef _SDL_video_h -#define _SDL_video_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_surface.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The structure that defines a display mode - * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() - * \sa SDL_GetDesktopDisplayMode() - * \sa SDL_GetCurrentDisplayMode() - * \sa SDL_GetClosestDisplayMode() - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() - */ -typedef struct -{ - Uint32 format; /**< pixel format */ - int w; /**< width */ - int h; /**< height */ - int refresh_rate; /**< refresh rate (or zero for unspecified) */ - void *driverdata; /**< driver-specific data, initialize to 0 */ -} SDL_DisplayMode; - -/** - * \brief The type used to identify a window - * - * \sa SDL_CreateWindow() - * \sa SDL_CreateWindowFrom() - * \sa SDL_DestroyWindow() - * \sa SDL_GetWindowData() - * \sa SDL_GetWindowFlags() - * \sa SDL_GetWindowGrab() - * \sa SDL_GetWindowPosition() - * \sa SDL_GetWindowSize() - * \sa SDL_GetWindowTitle() - * \sa SDL_HideWindow() - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() - * \sa SDL_RaiseWindow() - * \sa SDL_RestoreWindow() - * \sa SDL_SetWindowData() - * \sa SDL_SetWindowFullscreen() - * \sa SDL_SetWindowGrab() - * \sa SDL_SetWindowIcon() - * \sa SDL_SetWindowPosition() - * \sa SDL_SetWindowSize() - * \sa SDL_SetWindowBordered() - * \sa SDL_SetWindowTitle() - * \sa SDL_ShowWindow() - */ -typedef struct SDL_Window SDL_Window; - -/** - * \brief The flags on a window - * - * \sa SDL_GetWindowFlags() - */ -typedef enum -{ - SDL_WINDOW_FULLSCREEN = 0x00000001, /**< fullscreen window */ - SDL_WINDOW_OPENGL = 0x00000002, /**< window usable with OpenGL context */ - SDL_WINDOW_SHOWN = 0x00000004, /**< window is visible */ - SDL_WINDOW_HIDDEN = 0x00000008, /**< window is not visible */ - SDL_WINDOW_BORDERLESS = 0x00000010, /**< no window decoration */ - SDL_WINDOW_RESIZABLE = 0x00000020, /**< window can be resized */ - SDL_WINDOW_MINIMIZED = 0x00000040, /**< window is minimized */ - SDL_WINDOW_MAXIMIZED = 0x00000080, /**< window is maximized */ - SDL_WINDOW_INPUT_GRABBED = 0x00000100, /**< window has grabbed input focus */ - SDL_WINDOW_INPUT_FOCUS = 0x00000200, /**< window has input focus */ - SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */ - SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ), - SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */ - SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000 /**< window should be created in high-DPI mode if supported */ -} SDL_WindowFlags; - -/** - * \brief Used to indicate that you don't care what the window position is. - */ -#define SDL_WINDOWPOS_UNDEFINED_MASK 0x1FFF0000 -#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X) (SDL_WINDOWPOS_UNDEFINED_MASK|(X)) -#define SDL_WINDOWPOS_UNDEFINED SDL_WINDOWPOS_UNDEFINED_DISPLAY(0) -#define SDL_WINDOWPOS_ISUNDEFINED(X) \ - (((X)&0xFFFF0000) == SDL_WINDOWPOS_UNDEFINED_MASK) - -/** - * \brief Used to indicate that the window position should be centered. - */ -#define SDL_WINDOWPOS_CENTERED_MASK 0x2FFF0000 -#define SDL_WINDOWPOS_CENTERED_DISPLAY(X) (SDL_WINDOWPOS_CENTERED_MASK|(X)) -#define SDL_WINDOWPOS_CENTERED SDL_WINDOWPOS_CENTERED_DISPLAY(0) -#define SDL_WINDOWPOS_ISCENTERED(X) \ - (((X)&0xFFFF0000) == SDL_WINDOWPOS_CENTERED_MASK) - -/** - * \brief Event subtype for window events - */ -typedef enum -{ - SDL_WINDOWEVENT_NONE, /**< Never used */ - SDL_WINDOWEVENT_SHOWN, /**< Window has been shown */ - SDL_WINDOWEVENT_HIDDEN, /**< Window has been hidden */ - SDL_WINDOWEVENT_EXPOSED, /**< Window has been exposed and should be - redrawn */ - SDL_WINDOWEVENT_MOVED, /**< Window has been moved to data1, data2 - */ - SDL_WINDOWEVENT_RESIZED, /**< Window has been resized to data1xdata2 */ - SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */ - SDL_WINDOWEVENT_MINIMIZED, /**< Window has been minimized */ - SDL_WINDOWEVENT_MAXIMIZED, /**< Window has been maximized */ - SDL_WINDOWEVENT_RESTORED, /**< Window has been restored to normal size - and position */ - SDL_WINDOWEVENT_ENTER, /**< Window has gained mouse focus */ - SDL_WINDOWEVENT_LEAVE, /**< Window has lost mouse focus */ - SDL_WINDOWEVENT_FOCUS_GAINED, /**< Window has gained keyboard focus */ - SDL_WINDOWEVENT_FOCUS_LOST, /**< Window has lost keyboard focus */ - SDL_WINDOWEVENT_CLOSE /**< The window manager requests that the - window be closed */ -} SDL_WindowEventID; - -/** - * \brief An opaque handle to an OpenGL context. - */ -typedef void *SDL_GLContext; - -/** - * \brief OpenGL configuration attributes - */ -typedef enum -{ - SDL_GL_RED_SIZE, - SDL_GL_GREEN_SIZE, - SDL_GL_BLUE_SIZE, - SDL_GL_ALPHA_SIZE, - SDL_GL_BUFFER_SIZE, - SDL_GL_DOUBLEBUFFER, - SDL_GL_DEPTH_SIZE, - SDL_GL_STENCIL_SIZE, - SDL_GL_ACCUM_RED_SIZE, - SDL_GL_ACCUM_GREEN_SIZE, - SDL_GL_ACCUM_BLUE_SIZE, - SDL_GL_ACCUM_ALPHA_SIZE, - SDL_GL_STEREO, - SDL_GL_MULTISAMPLEBUFFERS, - SDL_GL_MULTISAMPLESAMPLES, - SDL_GL_ACCELERATED_VISUAL, - SDL_GL_RETAINED_BACKING, - SDL_GL_CONTEXT_MAJOR_VERSION, - SDL_GL_CONTEXT_MINOR_VERSION, - SDL_GL_CONTEXT_EGL, - SDL_GL_CONTEXT_FLAGS, - SDL_GL_CONTEXT_PROFILE_MASK, - SDL_GL_SHARE_WITH_CURRENT_CONTEXT, - SDL_GL_FRAMEBUFFER_SRGB_CAPABLE -} SDL_GLattr; - -typedef enum -{ - SDL_GL_CONTEXT_PROFILE_CORE = 0x0001, - SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002, - SDL_GL_CONTEXT_PROFILE_ES = 0x0004 /* GLX_CONTEXT_ES2_PROFILE_BIT_EXT */ -} SDL_GLprofile; - -typedef enum -{ - SDL_GL_CONTEXT_DEBUG_FLAG = 0x0001, - SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002, - SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = 0x0004, - SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = 0x0008 -} SDL_GLcontextFlag; - - -/* Function prototypes */ - -/** - * \brief Get the number of video drivers compiled into SDL - * - * \sa SDL_GetVideoDriver() - */ -extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void); - -/** - * \brief Get the name of a built in video driver. - * - * \note The video drivers are presented in the order in which they are - * normally checked during initialization. - * - * \sa SDL_GetNumVideoDrivers() - */ -extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index); - -/** - * \brief Initialize the video subsystem, optionally specifying a video driver. - * - * \param driver_name Initialize a specific driver by name, or NULL for the - * default video driver. - * - * \return 0 on success, -1 on error - * - * This function initializes the video subsystem; setting up a connection - * to the window manager, etc, and determines the available display modes - * and pixel formats, but does not initialize a window or graphics mode. - * - * \sa SDL_VideoQuit() - */ -extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name); - -/** - * \brief Shuts down the video subsystem. - * - * This function closes all windows, and restores the original video mode. - * - * \sa SDL_VideoInit() - */ -extern DECLSPEC void SDLCALL SDL_VideoQuit(void); - -/** - * \brief Returns the name of the currently initialized video driver. - * - * \return The name of the current video driver or NULL if no driver - * has been initialized - * - * \sa SDL_GetNumVideoDrivers() - * \sa SDL_GetVideoDriver() - */ -extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void); - -/** - * \brief Returns the number of available video displays. - * - * \sa SDL_GetDisplayBounds() - */ -extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void); - -/** - * \brief Get the name of a display in UTF-8 encoding - * - * \return The name of a display, or NULL for an invalid display index. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); - -/** - * \brief Get the desktop area represented by a display, with the primary - * display located at 0,0 - * - * \return 0 on success, or -1 if the index is out of range. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); - -/** - * \brief Returns the number of available display modes. - * - * \sa SDL_GetDisplayMode() - */ -extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex); - -/** - * \brief Fill in information about a specific display mode. - * - * \note The display modes are sorted in this priority: - * \li bits per pixel -> more colors to fewer colors - * \li width -> largest to smallest - * \li height -> largest to smallest - * \li refresh rate -> highest to lowest - * - * \sa SDL_GetNumDisplayModes() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex, - SDL_DisplayMode * mode); - -/** - * \brief Fill in information about the desktop display mode. - */ -extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode); - -/** - * \brief Fill in information about the current display mode. - */ -extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode); - - -/** - * \brief Get the closest match to the requested display mode. - * - * \param displayIndex The index of display from which mode should be queried. - * \param mode The desired display mode - * \param closest A pointer to a display mode to be filled in with the closest - * match of the available display modes. - * - * \return The passed in value \c closest, or NULL if no matching video mode - * was available. - * - * The available display modes are scanned, and \c closest is filled in with the - * closest mode matching the requested mode and returned. The mode format and - * refresh_rate default to the desktop mode if they are 0. The modes are - * scanned with size being first priority, format being second priority, and - * finally checking the refresh_rate. If all the available modes are too - * small, then NULL is returned. - * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() - */ -extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest); - -/** - * \brief Get the display index associated with a window. - * - * \return the display index of the display containing the center of the - * window, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window); - -/** - * \brief Set the display mode used when a fullscreen window is visible. - * - * By default the window's dimensions and the desktop format and refresh rate - * are used. - * - * \param window The window for which the display mode should be set. - * \param mode The mode to use, or NULL for the default mode. - * - * \return 0 on success, or -1 if setting the display mode failed. - * - * \sa SDL_GetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window, - const SDL_DisplayMode - * mode); - -/** - * \brief Fill in information about the display mode used when a fullscreen - * window is visible. - * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() - */ -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window, - SDL_DisplayMode * mode); - -/** - * \brief Get the pixel format associated with the window. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); - -/** - * \brief Create a window with the specified position, dimensions, and flags. - * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of any of the following: - * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_ALLOW_HIGHDPI. - * - * \return The id of the window created, or zero if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, - int x, int y, int w, - int h, Uint32 flags); - -/** - * \brief Create an SDL window from an existing native window. - * - * \param data A pointer to driver-dependent window creation data - * - * \return The id of the window created, or zero if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data); - -/** - * \brief Get the numeric ID of a window, for logging purposes. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window); - -/** - * \brief Get a window from a stored ID, or NULL if it doesn't exist. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id); - -/** - * \brief Get the window flags. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window); - -/** - * \brief Set the title of a window, in UTF-8 format. - * - * \sa SDL_GetWindowTitle() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window, - const char *title); - -/** - * \brief Get the title of a window, in UTF-8 format. - * - * \sa SDL_SetWindowTitle() - */ -extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window); - -/** - * \brief Set the icon for a window. - * - * \param window The window for which the icon should be set. - * \param icon The icon for the window. - */ -extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window, - SDL_Surface * icon); - -/** - * \brief Associate an arbitrary named pointer with a window. - * - * \param window The window to associate with the pointer. - * \param name The name of the pointer. - * \param userdata The associated pointer. - * - * \return The previous value associated with 'name' - * - * \note The name is case-sensitive. - * - * \sa SDL_GetWindowData() - */ -extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window, - const char *name, - void *userdata); - -/** - * \brief Retrieve the data pointer associated with a window. - * - * \param window The window to query. - * \param name The name of the pointer. - * - * \return The value associated with 'name' - * - * \sa SDL_SetWindowData() - */ -extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, - const char *name); - -/** - * \brief Set the position of a window. - * - * \param window The window to reposition. - * \param x The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * - * \note The window coordinate origin is the upper left of the display. - * - * \sa SDL_GetWindowPosition() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, - int x, int y); - -/** - * \brief Get the position of a window. - * - * \param window The window to query. - * \param x Pointer to variable for storing the x position, may be NULL - * \param y Pointer to variable for storing the y position, may be NULL - * - * \sa SDL_SetWindowPosition() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, - int *x, int *y); - -/** - * \brief Set the size of a window's client area. - * - * \param window The window to resize. - * \param w The width of the window, must be >0 - * \param h The height of the window, must be >0 - * - * \note You can't change the size of a fullscreen window, it automatically - * matches the size of the display mode. - * - * \sa SDL_GetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, - int h); - -/** - * \brief Get the size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL - * - * \sa SDL_SetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, - int *h); - -/** - * \brief Set the minimum size of a window's client area. - * - * \param window The window to set a new minimum size. - * \param min_w The minimum width of the window, must be >0 - * \param min_h The minimum height of the window, must be >0 - * - * \note You can't change the minimum size of a fullscreen window, it - * automatically matches the size of the display mode. - * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window, - int min_w, int min_h); - -/** - * \brief Get the minimum size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the minimum width, may be NULL - * \param h Pointer to variable for storing the minimum height, may be NULL - * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window, - int *w, int *h); - -/** - * \brief Set the maximum size of a window's client area. - * - * \param window The window to set a new maximum size. - * \param max_w The maximum width of the window, must be >0 - * \param max_h The maximum height of the window, must be >0 - * - * \note You can't change the maximum size of a fullscreen window, it - * automatically matches the size of the display mode. - * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window, - int max_w, int max_h); - -/** - * \brief Get the maximum size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the maximum width, may be NULL - * \param h Pointer to variable for storing the maximum height, may be NULL - * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window, - int *w, int *h); - -/** - * \brief Set the border state of a window. - * - * This will add or remove the window's SDL_WINDOW_BORDERLESS flag and - * add or remove the border from the actual window. This is a no-op if the - * window's border already matches the requested state. - * - * \param window The window of which to change the border state. - * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border. - * - * \note You can't change the border state of a fullscreen window. - * - * \sa SDL_GetWindowFlags() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window, - SDL_bool bordered); - -/** - * \brief Show a window. - * - * \sa SDL_HideWindow() - */ -extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window); - -/** - * \brief Hide a window. - * - * \sa SDL_ShowWindow() - */ -extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window); - -/** - * \brief Raise a window above other windows and set the input focus. - */ -extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window); - -/** - * \brief Make a window as large as possible. - * - * \sa SDL_RestoreWindow() - */ -extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window); - -/** - * \brief Minimize a window to an iconic representation. - * - * \sa SDL_RestoreWindow() - */ -extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window); - -/** - * \brief Restore the size and position of a minimized or maximized window. - * - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() - */ -extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window); - -/** - * \brief Set a window's fullscreen state. - * - * \return 0 on success, or -1 if setting the display mode failed. - * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window, - Uint32 flags); - -/** - * \brief Get the SDL surface associated with the window. - * - * \return The window's framebuffer surface, or NULL on error. - * - * A new surface will be created with the optimal format for the window, - * if necessary. This surface will be freed when the window is destroyed. - * - * \note You may not combine this with 3D or the rendering API on this window. - * - * \sa SDL_UpdateWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() - */ -extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window); - -/** - * \brief Copy the window surface to the screen. - * - * \return 0 on success, or -1 on error. - * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() - */ -extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window); - -/** - * \brief Copy a number of rectangles on the window surface to the screen. - * - * \return 0 on success, or -1 on error. - * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRect() - */ -extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window, - const SDL_Rect * rects, - int numrects); - -/** - * \brief Set a window's input grab mode. - * - * \param window The window for which the input grab mode should be set. - * \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input. - * - * \sa SDL_GetWindowGrab() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, - SDL_bool grabbed); - -/** - * \brief Get a window's input grab mode. - * - * \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise. - * - * \sa SDL_SetWindowGrab() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window); - -/** - * \brief Set the brightness (gamma correction) for a window. - * - * \return 0 on success, or -1 if setting the brightness isn't supported. - * - * \sa SDL_GetWindowBrightness() - * \sa SDL_SetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness); - -/** - * \brief Get the brightness (gamma correction) for a window. - * - * \return The last brightness value passed to SDL_SetWindowBrightness() - * - * \sa SDL_SetWindowBrightness() - */ -extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window); - -/** - * \brief Set the gamma ramp for a window. - * - * \param window The window for which the gamma ramp should be set. - * \param red The translation table for the red channel, or NULL. - * \param green The translation table for the green channel, or NULL. - * \param blue The translation table for the blue channel, or NULL. - * - * \return 0 on success, or -1 if gamma ramps are unsupported. - * - * Set the gamma translation table for the red, green, and blue channels - * of the video hardware. Each table is an array of 256 16-bit quantities, - * representing a mapping between the input and output for that channel. - * The input is the index into the array, and the output is the 16-bit - * gamma value at that index, scaled to the output color precision. - * - * \sa SDL_GetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, - const Uint16 * red, - const Uint16 * green, - const Uint16 * blue); - -/** - * \brief Get the gamma ramp for a window. - * - * \param window The window from which the gamma ramp should be queried. - * \param red A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the red channel, or NULL. - * \param green A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the green channel, or NULL. - * \param blue A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the blue channel, or NULL. - * - * \return 0 on success, or -1 if gamma ramps are unsupported. - * - * \sa SDL_SetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, - Uint16 * red, - Uint16 * green, - Uint16 * blue); - -/** - * \brief Destroy a window. - */ -extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window); - - -/** - * \brief Returns whether the screensaver is currently enabled (default on). - * - * \sa SDL_EnableScreenSaver() - * \sa SDL_DisableScreenSaver() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void); - -/** - * \brief Allow the screen to be blanked by a screensaver - * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_DisableScreenSaver() - */ -extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void); - -/** - * \brief Prevent the screen from being blanked by a screensaver - * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_EnableScreenSaver() - */ -extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); - - -/** - * \name OpenGL support functions - */ -/* @{ */ - -/** - * \brief Dynamically load an OpenGL library. - * - * \param path The platform dependent OpenGL library name, or NULL to open the - * default OpenGL library. - * - * \return 0 on success, or -1 if the library couldn't be loaded. - * - * This should be done after initializing the video driver, but before - * creating any OpenGL windows. If no OpenGL library is loaded, the default - * library will be loaded upon creation of the first OpenGL window. - * - * \note If you do this, you need to retrieve all of the GL functions used in - * your program from the dynamic library using SDL_GL_GetProcAddress(). - * - * \sa SDL_GL_GetProcAddress() - * \sa SDL_GL_UnloadLibrary() - */ -extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path); - -/** - * \brief Get the address of an OpenGL function. - */ -extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc); - -/** - * \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). - * - * \sa SDL_GL_LoadLibrary() - */ -extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void); - -/** - * \brief Return true if an OpenGL extension is supported for the current - * context. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char - *extension); - -/** - * \brief Reset all previously set OpenGL context attributes to their default values - */ -extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void); - -/** - * \brief Set an OpenGL window attribute before window creation. - */ -extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value); - -/** - * \brief Get the actual value for an attribute from the current context. - */ -extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value); - -/** - * \brief Create an OpenGL context for use with an OpenGL window, and make it - * current. - * - * \sa SDL_GL_DeleteContext() - */ -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window * - window); - -/** - * \brief Set up an OpenGL context for rendering into an OpenGL window. - * - * \note The context must have been created with a compatible window. - */ -extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window, - SDL_GLContext context); - -/** - * \brief Get the currently active OpenGL window. - */ -extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); - -/** - * \brief Get the currently active OpenGL context. - */ -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); - -/** - * \brief Get the size of a window's underlying drawable (for use with glViewport). - * - * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL - * - * This may differ from SDL_GetWindowSize if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. - * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() - */ -extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w, - int *h); - -/** - * \brief Set the swap interval for the current OpenGL context. - * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical retrace. If the system supports it, you may - * specify -1 to allow late swaps to happen immediately - * instead of waiting for the next retrace. - * - * \return 0 on success, or -1 if setting the swap interval is not supported. - * - * \sa SDL_GL_GetSwapInterval() - */ -extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval); - -/** - * \brief Get the swap interval for the current OpenGL context. - * - * \return 0 if there is no vertical retrace synchronization, 1 if the buffer - * swap is synchronized with the vertical retrace, and -1 if late - * swaps happen immediately instead of waiting for the next retrace. - * If the system can't determine the swap interval, or there isn't a - * valid current context, this will return 0 as a safe default. - * - * \sa SDL_GL_SetSwapInterval() - */ -extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void); - -/** - * \brief Swap the OpenGL buffers for a window, if double-buffering is - * supported. - */ -extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window); - -/** - * \brief Delete an OpenGL context. - * - * \sa SDL_GL_CreateContext() - */ -extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); - -/* @} *//* OpenGL support functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Resources/Info.plist projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Resources/Info.plist --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/Resources/Info.plist 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/Resources/Info.plist 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ - - - - - BuildMachineOSBuild - 13C64 - CFBundleDevelopmentRegion - English - CFBundleExecutable - SDL2 - CFBundleGetInfoString - http://www.libsdl.org - CFBundleIdentifier - org.libsdl.SDL2 - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Simple DirectMedia Layer - CFBundlePackageType - FMWK - CFBundleShortVersionString - 2.0.3 - CFBundleSignature - SDLX - CFBundleVersion - 2.0.3 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 5A3005 - DTPlatformVersion - GM - DTSDKBuild - 13A595 - DTSDKName - macosx10.9 - DTXcode - 0502 - DTXcodeBuild - 5A3005 - - Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/A/SDL2 and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/A/SDL2 differ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/_CodeSignature/CodeResources projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/_CodeSignature/CodeResources --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/_CodeSignature/CodeResources 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/_CodeSignature/CodeResources 1970-01-01 00:00:00.000000000 +0000 @@ -1,331 +0,0 @@ - - - - - files - - Resources/Info.plist - - d2/oGv37hzJiI02uqOn6tWDcYXg= - - - files2 - - Headers/SDL.h - - V1QWaDSl0nAm0vEYtj9XA3svgrk= - - Headers/SDL_assert.h - - A+ij0rtxdGfk7gc8R6s49k/JSZ4= - - Headers/SDL_atomic.h - - ZlwmoTPRbjyEzJqz6ZnI8O580bM= - - Headers/SDL_audio.h - - Fc9yNvRkakypgT4OZITeQo0sBxQ= - - Headers/SDL_bits.h - - UhPqnEjilCrF8s0HOGP7w5NLnSk= - - Headers/SDL_blendmode.h - - spiBz2bCXIHQJcL3NDs68kAbdA4= - - Headers/SDL_clipboard.h - - NzFBzlIVdDwe6BR6AqXDiR1YTz4= - - Headers/SDL_config.h - - 6UxefSe2Tl+lPT67U1Ux+W+oKIE= - - Headers/SDL_config_macosx.h - - CmgvosArIWjXlCODdGchorpVIQE= - - Headers/SDL_copying.h - - OvmsdAuQcE2bg1R1H0fOMp5/qRQ= - - Headers/SDL_cpuinfo.h - - j391ZF8LcaMfyzF1UXrldg8a7ho= - - Headers/SDL_endian.h - - p99jInDkUdRwbqec59eOp/GQ4rU= - - Headers/SDL_error.h - - ag6f/Hm+13QrR9p07cju5XbKvSE= - - Headers/SDL_events.h - - 0k79XbDGCX7yxKi/mty+869GbIc= - - Headers/SDL_filesystem.h - - 3wT4lJaVKpbsNWiM44VbPz8WHt4= - - Headers/SDL_gamecontroller.h - - F+/ctfs6RZGvLHmQIS9smmc0Xik= - - Headers/SDL_gesture.h - - 8wiTqdK35saUqErjOvlXivTiXVk= - - Headers/SDL_haptic.h - - oa68FWhNliE7F2tz3N5hJQzUxZU= - - Headers/SDL_hints.h - - uq66WfAIC63c4YdZj47y0l+gxgI= - - Headers/SDL_joystick.h - - 2vEN7qvUBuqvc/0fhBnGupEuY/I= - - Headers/SDL_keyboard.h - - XvF3ZIyOD54CoemusEc0wg8sLIQ= - - Headers/SDL_keycode.h - - qxtvZLZ+BOAWk9XvBB8ywRLrbJI= - - Headers/SDL_loadso.h - - tzkBoa1ccEUEs6EQoqFD+y59G9s= - - Headers/SDL_log.h - - 5+u+5Ws0ERngj9djx3aZEPNvOiw= - - Headers/SDL_main.h - - 5wmi6gkUFkpi5p65kKHH9Hb5Jrc= - - Headers/SDL_messagebox.h - - gAGlr7m3thQnx4wyzAaLZAMmJ4k= - - Headers/SDL_mouse.h - - Ga3nAm990weBvd0CkIvRVUkiFC0= - - Headers/SDL_mutex.h - - iPyVkuP4RrNbMUVEKvE35l9OrqQ= - - Headers/SDL_name.h - - 78vt0/b4lhJtAs7LthA9zGgvAeM= - - Headers/SDL_opengl.h - - UXQS2AWZNWQoyMC/DBJWHQNE3lY= - - Headers/SDL_opengles.h - - 9HDT4VHcWQHLcr8mRN/zQAxIwaY= - - Headers/SDL_opengles2.h - - 4GQ4IpKTxOxwxDXdTOwDGKiyfcI= - - Headers/SDL_pixels.h - - 38AJ5fWTwkPLu6JAG6tnzA1phQw= - - Headers/SDL_platform.h - - 7xpqeGpv91l0wCzOtEZZJx/XISY= - - Headers/SDL_power.h - - WDdEpBEDv/GnPdkf7epZKqzcf0Q= - - Headers/SDL_quit.h - - 4mMscyp/+n+3UUqr7x584Efy4LM= - - Headers/SDL_rect.h - - zUUib0allCqvVaRE3U+zoTjKWtM= - - Headers/SDL_render.h - - aeK6wmYO+oEwbiT+nweUdM5xXCY= - - Headers/SDL_revision.h - - BAH0o/ZreMGrmdBWnxc1nqmA1kU= - - Headers/SDL_rwops.h - - 355p5zkvsqZOPmYPLeWG+5SyupU= - - Headers/SDL_scancode.h - - INF4sgKOGtCULJnJCOokJHtR5XI= - - Headers/SDL_shape.h - - Xfr+F9W53TRs1xmQmetWSqr5J80= - - Headers/SDL_stdinc.h - - cYfn4UFpzaPnYpdyouDJu9cOVMA= - - Headers/SDL_surface.h - - IvWIDZA3/njVjOeUGPOCI1TgtYk= - - Headers/SDL_system.h - - AiH00EpXgPKdhet2G4xcmcH/ksM= - - Headers/SDL_syswm.h - - EWVOWAWmIEwtelxbObXBFBjeAhs= - - Headers/SDL_thread.h - - 6c/SdVyJYzPCpc9VReC4M2mkHsU= - - Headers/SDL_timer.h - - qRaDucrtFMo0wi2Ht1asTXT1KzQ= - - Headers/SDL_touch.h - - GuFayLe8ckqQ9fDTywrbkDqalF8= - - Headers/SDL_types.h - - cI11mHss4ZMZRb+tcavcqvyGyMU= - - Headers/SDL_version.h - - E+9SX+Ras/OOKs+Hx3Qqg9OmSJo= - - Headers/SDL_video.h - - 5JajflSoR/g19DlcFCyjlnc/11U= - - Headers/begin_code.h - - G/sTX6v+h2gKPdH8ly0VNFG9bH0= - - Headers/close_code.h - - +wrOrAXurJ3oZCk/811bnw6AHrc= - - Resources/Info.plist - - d2/oGv37hzJiI02uqOn6tWDcYXg= - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/begin_code.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/begin_code.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/begin_code.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/begin_code.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,140 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file begin_code.h - * - * This file sets things up for C dynamic library function definitions, - * static inlined functions, and structures aligned at 4-byte alignment. - * If you don't like ugly C preprocessor code, don't look at this file. :) - */ - -/* This shouldn't be nested -- included it around code only. */ -#ifdef _begin_code_h -#error Nested inclusion of begin_code.h -#endif -#define _begin_code_h - -#ifndef SDL_DEPRECATED -# if (__GNUC__ >= 4) /* technically, this arrived in gcc 3.1, but oh well. */ -# define SDL_DEPRECATED __attribute__((deprecated)) -# else -# define SDL_DEPRECATED -# endif -#endif - -/* Some compilers use a special export keyword */ -#ifndef DECLSPEC -# if defined(__WIN32__) || defined(__WINRT__) -# ifdef __BORLANDC__ -# ifdef BUILD_SDL -# define DECLSPEC -# else -# define DECLSPEC __declspec(dllimport) -# endif -# else -# define DECLSPEC __declspec(dllexport) -# endif -# else -# if defined(__GNUC__) && __GNUC__ >= 4 -# define DECLSPEC __attribute__ ((visibility("default"))) -# elif defined(__GNUC__) && __GNUC__ >= 2 -# define DECLSPEC __declspec(dllexport) -# else -# define DECLSPEC -# endif -# endif -#endif - -/* By default SDL uses the C calling convention */ -#ifndef SDLCALL -#if (defined(__WIN32__) || defined(__WINRT__)) && !defined(__GNUC__) -#define SDLCALL __cdecl -#else -#define SDLCALL -#endif -#endif /* SDLCALL */ - -/* Removed DECLSPEC on Symbian OS because SDL cannot be a DLL in EPOC */ -#ifdef __SYMBIAN32__ -#undef DECLSPEC -#define DECLSPEC -#endif /* __SYMBIAN32__ */ - -/* Force structure packing at 4 byte alignment. - This is necessary if the header is included in code which has structure - packing set to an alternate value, say for loading structures from disk. - The packing is reset to the previous value in close_code.h - */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__BORLANDC__) -#ifdef _MSC_VER -#pragma warning(disable: 4103) -#endif -#ifdef __BORLANDC__ -#pragma nopackwarning -#endif -#ifdef _M_X64 -/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */ -#pragma pack(push,8) -#else -#pragma pack(push,4) -#endif -#endif /* Compiler needs structure packing set */ - -#ifndef SDL_INLINE -#if defined(__GNUC__) -#define SDL_INLINE __inline__ -#elif defined(_MSC_VER) || defined(__BORLANDC__) || \ - defined(__DMC__) || defined(__SC__) || \ - defined(__WATCOMC__) || defined(__LCC__) || \ - defined(__DECC) -#define SDL_INLINE __inline -#ifndef __inline__ -#define __inline__ __inline -#endif -#else -#define SDL_INLINE inline -#ifndef __inline__ -#define __inline__ inline -#endif -#endif -#endif /* SDL_INLINE not defined */ - -#ifndef SDL_FORCE_INLINE -#if defined(_MSC_VER) -#define SDL_FORCE_INLINE __forceinline -#elif ( (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) ) -#define SDL_FORCE_INLINE __attribute__((always_inline)) static __inline__ -#else -#define SDL_FORCE_INLINE static SDL_INLINE -#endif -#endif /* SDL_FORCE_INLINE not defined */ - -/* Apparently this is needed by several Windows compilers */ -#if !defined(__MACH__) -#ifndef NULL -#ifdef __cplusplus -#define NULL 0 -#else -#define NULL ((void *)0) -#endif -#endif /* NULL */ -#endif /* ! Mac OS X - breaks precompiled headers */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/close_code.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/close_code.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/close_code.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/close_code.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file close_code.h - * - * This file reverses the effects of begin_code.h and should be included - * after you finish any function and structure declarations in your headers - */ - -#undef _begin_code_h - -/* Reset structure packing at previous byte alignment */ -#if defined(_MSC_VER) || defined(__MWERKS__) || defined(__WATCOMC__) || defined(__BORLANDC__) -#ifdef __BORLANDC__ -#pragma nopackwarning -#endif -#pragma pack(pop) -#endif /* Compiler needs structure packing set */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_assert.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_assert.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_assert.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_assert.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,284 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_assert_h -#define _SDL_assert_h - -#include "SDL_config.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef SDL_ASSERT_LEVEL -#ifdef SDL_DEFAULT_ASSERT_LEVEL -#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL -#elif defined(_DEBUG) || defined(DEBUG) || \ - (defined(__GNUC__) && !defined(__OPTIMIZE__)) -#define SDL_ASSERT_LEVEL 2 -#else -#define SDL_ASSERT_LEVEL 1 -#endif -#endif /* SDL_ASSERT_LEVEL */ - -/* -These are macros and not first class functions so that the debugger breaks -on the assertion line and not in some random guts of SDL, and so each -assert can have unique static variables associated with it. -*/ - -#if defined(_MSC_VER) -/* Don't include intrin.h here because it contains C++ code */ - extern void __cdecl __debugbreak(void); - #define SDL_TriggerBreakpoint() __debugbreak() -#elif (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) - #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" ) -#elif defined(HAVE_SIGNAL_H) - #include - #define SDL_TriggerBreakpoint() raise(SIGTRAP) -#else - /* How do we trigger breakpoints on this platform? */ - #define SDL_TriggerBreakpoint() -#endif - -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */ -# define SDL_FUNCTION __func__ -#elif ((__GNUC__ >= 2) || defined(_MSC_VER)) -# define SDL_FUNCTION __FUNCTION__ -#else -# define SDL_FUNCTION "???" -#endif -#define SDL_FILE __FILE__ -#define SDL_LINE __LINE__ - -/* -sizeof (x) makes the compiler still parse the expression even without -assertions enabled, so the code is always checked at compile time, but -doesn't actually generate code for it, so there are no side effects or -expensive checks at run time, just the constant size of what x WOULD be, -which presumably gets optimized out as unused. -This also solves the problem of... - - int somevalue = blah(); - SDL_assert(somevalue == 1); - -...which would cause compiles to complain that somevalue is unused if we -disable assertions. -*/ - -#ifdef _MSC_VER /* stupid /W4 warnings. */ -#define SDL_NULL_WHILE_LOOP_CONDITION (-1 == __LINE__) -#else -#define SDL_NULL_WHILE_LOOP_CONDITION (0) -#endif - -#define SDL_disabled_assert(condition) \ - do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION) - -typedef enum -{ - SDL_ASSERTION_RETRY, /**< Retry the assert immediately. */ - SDL_ASSERTION_BREAK, /**< Make the debugger trigger a breakpoint. */ - SDL_ASSERTION_ABORT, /**< Terminate the program. */ - SDL_ASSERTION_IGNORE, /**< Ignore the assert. */ - SDL_ASSERTION_ALWAYS_IGNORE /**< Ignore the assert from now on. */ -} SDL_assert_state; - -typedef struct SDL_assert_data -{ - int always_ignore; - unsigned int trigger_count; - const char *condition; - const char *filename; - int linenum; - const char *function; - const struct SDL_assert_data *next; -} SDL_assert_data; - -#if (SDL_ASSERT_LEVEL > 0) - -/* Never call this directly. Use the SDL_assert* macros. */ -extern DECLSPEC SDL_assert_state SDLCALL SDL_ReportAssertion(SDL_assert_data *, - const char *, - const char *, int) -#if defined(__clang__) -#if __has_feature(attribute_analyzer_noreturn) -/* this tells Clang's static analysis that we're a custom assert function, - and that the analyzer should assume the condition was always true past this - SDL_assert test. */ - __attribute__((analyzer_noreturn)) -#endif -#endif -; - -/* the do {} while(0) avoids dangling else problems: - if (x) SDL_assert(y); else blah(); - ... without the do/while, the "else" could attach to this macro's "if". - We try to handle just the minimum we need here in a macro...the loop, - the static vars, and break points. The heavy lifting is handled in - SDL_ReportAssertion(), in SDL_assert.c. -*/ -#define SDL_enabled_assert(condition) \ - do { \ - while ( !(condition) ) { \ - static struct SDL_assert_data assert_data = { \ - 0, 0, #condition, 0, 0, 0, 0 \ - }; \ - const SDL_assert_state state = SDL_ReportAssertion(&assert_data, \ - SDL_FUNCTION, \ - SDL_FILE, \ - SDL_LINE); \ - if (state == SDL_ASSERTION_RETRY) { \ - continue; /* go again. */ \ - } else if (state == SDL_ASSERTION_BREAK) { \ - SDL_TriggerBreakpoint(); \ - } \ - break; /* not retrying. */ \ - } \ - } while (SDL_NULL_WHILE_LOOP_CONDITION) - -#endif /* enabled assertions support code */ - -/* Enable various levels of assertions. */ -#if SDL_ASSERT_LEVEL == 0 /* assertions disabled */ -# define SDL_assert(condition) SDL_disabled_assert(condition) -# define SDL_assert_release(condition) SDL_disabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 1 /* release settings. */ -# define SDL_assert(condition) SDL_disabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 2 /* normal settings. */ -# define SDL_assert(condition) SDL_enabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_disabled_assert(condition) -#elif SDL_ASSERT_LEVEL == 3 /* paranoid settings. */ -# define SDL_assert(condition) SDL_enabled_assert(condition) -# define SDL_assert_release(condition) SDL_enabled_assert(condition) -# define SDL_assert_paranoid(condition) SDL_enabled_assert(condition) -#else -# error Unknown assertion level. -#endif - -/* this assertion is never disabled at any level. */ -#define SDL_assert_always(condition) SDL_enabled_assert(condition) - - -typedef SDL_assert_state (SDLCALL *SDL_AssertionHandler)( - const SDL_assert_data* data, void* userdata); - -/** - * \brief Set an application-defined assertion handler. - * - * This allows an app to show its own assertion UI and/or force the - * response to an assertion failure. If the app doesn't provide this, SDL - * will try to do the right thing, popping up a system-specific GUI dialog, - * and probably minimizing any fullscreen windows. - * - * This callback may fire from any thread, but it runs wrapped in a mutex, so - * it will only fire from one thread at a time. - * - * Setting the callback to NULL restores SDL's original internal handler. - * - * This callback is NOT reset to SDL's internal handler upon SDL_Quit()! - * - * \return SDL_assert_state value of how to handle the assertion failure. - * - * \param handler Callback function, called when an assertion fails. - * \param userdata A pointer passed to the callback as-is. - */ -extern DECLSPEC void SDLCALL SDL_SetAssertionHandler( - SDL_AssertionHandler handler, - void *userdata); - -/** - * \brief Get the default assertion handler. - * - * This returns the function pointer that is called by default when an - * assertion is triggered. This is an internal function provided by SDL, - * that is used for assertions when SDL_SetAssertionHandler() hasn't been - * used to provide a different function. - * - * \return The default SDL_AssertionHandler that is called when an assert triggers. - */ -extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetDefaultAssertionHandler(void); - -/** - * \brief Get the current assertion handler. - * - * This returns the function pointer that is called when an assertion is - * triggered. This is either the value last passed to - * SDL_SetAssertionHandler(), or if no application-specified function is - * set, is equivalent to calling SDL_GetDefaultAssertionHandler(). - * - * \param puserdata Pointer to a void*, which will store the "userdata" - * pointer that was passed to SDL_SetAssertionHandler(). - * This value will always be NULL for the default handler. - * If you don't care about this data, it is safe to pass - * a NULL pointer to this function to ignore it. - * \return The SDL_AssertionHandler that is called when an assert triggers. - */ -extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puserdata); - -/** - * \brief Get a list of all assertion failures. - * - * Get all assertions triggered since last call to SDL_ResetAssertionReport(), - * or the start of the program. - * - * The proper way to examine this data looks something like this: - * - * - * const SDL_assert_data *item = SDL_GetAssertionReport(); - * while (item) { - * printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n", - * item->condition, item->function, item->filename, - * item->linenum, item->trigger_count, - * item->always_ignore ? "yes" : "no"); - * item = item->next; - * } - * - * - * \return List of all assertions. - * \sa SDL_ResetAssertionReport - */ -extern DECLSPEC const SDL_assert_data * SDLCALL SDL_GetAssertionReport(void); - -/** - * \brief Reset the list of all assertion failures. - * - * Reset list of all assertions triggered. - * - * \sa SDL_GetAssertionReport - */ -extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_assert_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_atomic.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_atomic.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_atomic.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_atomic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,260 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_atomic.h - * - * Atomic operations. - * - * IMPORTANT: - * If you are not an expert in concurrent lockless programming, you should - * only be using the atomic lock and reference counting functions in this - * file. In all other cases you should be protecting your data structures - * with full mutexes. - * - * The list of "safe" functions to use are: - * SDL_AtomicLock() - * SDL_AtomicUnlock() - * SDL_AtomicIncRef() - * SDL_AtomicDecRef() - * - * Seriously, here be dragons! - * ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - * - * You can find out a little more about lockless programming and the - * subtle issues that can arise here: - * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx - * - * There's also lots of good information here: - * http://www.1024cores.net/home/lock-free-algorithms - * http://preshing.com/ - * - * These operations may or may not actually be implemented using - * processor specific atomic operations. When possible they are - * implemented as true processor specific atomic operations. When that - * is not possible the are implemented using locks that *do* use the - * available atomic operations. - * - * All of the atomic operations that modify memory are full memory barriers. - */ - -#ifndef _SDL_atomic_h_ -#define _SDL_atomic_h_ - -#include "SDL_stdinc.h" -#include "SDL_platform.h" - -#include "begin_code.h" - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name SDL AtomicLock - * - * The atomic locks are efficient spinlocks using CPU instructions, - * but are vulnerable to starvation and can spin forever if a thread - * holding a lock has been terminated. For this reason you should - * minimize the code executed inside an atomic lock and never do - * expensive things like API or system calls while holding them. - * - * The atomic locks are not safe to lock recursively. - * - * Porting Note: - * The spin lock functions and type are required and can not be - * emulated because they are used in the atomic emulation code. - */ -/* @{ */ - -typedef int SDL_SpinLock; - -/** - * \brief Try to lock a spin lock by setting it to a non-zero value. - * - * \param lock Points to the lock. - * - * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicTryLock(SDL_SpinLock *lock); - -/** - * \brief Lock a spin lock by setting it to a non-zero value. - * - * \param lock Points to the lock. - */ -extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock); - -/** - * \brief Unlock a spin lock by setting it to 0. Always returns immediately - * - * \param lock Points to the lock. - */ -extern DECLSPEC void SDLCALL SDL_AtomicUnlock(SDL_SpinLock *lock); - -/* @} *//* SDL AtomicLock */ - - -/** - * The compiler barrier prevents the compiler from reordering - * reads and writes to globally visible variables across the call. - */ -#if defined(_MSC_VER) && (_MSC_VER > 1200) -void _ReadWriteBarrier(void); -#pragma intrinsic(_ReadWriteBarrier) -#define SDL_CompilerBarrier() _ReadWriteBarrier() -#elif defined(__GNUC__) -#define SDL_CompilerBarrier() __asm__ __volatile__ ("" : : : "memory") -#else -#define SDL_CompilerBarrier() \ -{ SDL_SpinLock _tmp = 0; SDL_AtomicLock(&_tmp); SDL_AtomicUnlock(&_tmp); } -#endif - -/** - * Memory barriers are designed to prevent reads and writes from being - * reordered by the compiler and being seen out of order on multi-core CPUs. - * - * A typical pattern would be for thread A to write some data and a flag, - * and for thread B to read the flag and get the data. In this case you - * would insert a release barrier between writing the data and the flag, - * guaranteeing that the data write completes no later than the flag is - * written, and you would insert an acquire barrier between reading the - * flag and reading the data, to ensure that all the reads associated - * with the flag have completed. - * - * In this pattern you should always see a release barrier paired with - * an acquire barrier and you should gate the data reads/writes with a - * single flag variable. - * - * For more information on these semantics, take a look at the blog post: - * http://preshing.com/20120913/acquire-and-release-semantics - */ -#if defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("lwsync" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("lwsync" : : : "memory") -#elif defined(__GNUC__) && defined(__arm__) -#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("dmb ish" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("dmb ish" : : : "memory") -#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) -#ifdef __thumb__ -/* The mcr instruction isn't available in thumb mode, use real functions */ -extern DECLSPEC void SDLCALL SDL_MemoryBarrierRelease(); -extern DECLSPEC void SDLCALL SDL_MemoryBarrierAcquire(); -#else -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r"(0) : "memory") -#endif /* __thumb__ */ -#else -#define SDL_MemoryBarrierRelease() __asm__ __volatile__ ("" : : : "memory") -#define SDL_MemoryBarrierAcquire() __asm__ __volatile__ ("" : : : "memory") -#endif /* __GNUC__ && __arm__ */ -#else -/* This is correct for the x86 and x64 CPUs, and we'll expand this over time. */ -#define SDL_MemoryBarrierRelease() SDL_CompilerBarrier() -#define SDL_MemoryBarrierAcquire() SDL_CompilerBarrier() -#endif - -/** - * \brief A type representing an atomic integer value. It is a struct - * so people don't accidentally use numeric operations on it. - */ -typedef struct { int value; } SDL_atomic_t; - -/** - * \brief Set an atomic variable to a new value if it is currently an old value. - * - * \return SDL_TRUE if the atomic variable was set, SDL_FALSE otherwise. - * - * \note If you don't know what this function is for, you shouldn't use it! -*/ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCAS(SDL_atomic_t *a, int oldval, int newval); - -/** - * \brief Set an atomic variable to a value. - * - * \return The previous value of the atomic variable. - */ -extern DECLSPEC int SDLCALL SDL_AtomicSet(SDL_atomic_t *a, int v); - -/** - * \brief Get the value of an atomic variable - */ -extern DECLSPEC int SDLCALL SDL_AtomicGet(SDL_atomic_t *a); - -/** - * \brief Add to an atomic variable. - * - * \return The previous value of the atomic variable. - * - * \note This same style can be used for any number operation - */ -extern DECLSPEC int SDLCALL SDL_AtomicAdd(SDL_atomic_t *a, int v); - -/** - * \brief Increment an atomic variable used as a reference count. - */ -#ifndef SDL_AtomicIncRef -#define SDL_AtomicIncRef(a) SDL_AtomicAdd(a, 1) -#endif - -/** - * \brief Decrement an atomic variable used as a reference count. - * - * \return SDL_TRUE if the variable reached zero after decrementing, - * SDL_FALSE otherwise - */ -#ifndef SDL_AtomicDecRef -#define SDL_AtomicDecRef(a) (SDL_AtomicAdd(a, -1) == 1) -#endif - -/** - * \brief Set a pointer to a new value if it is currently an old value. - * - * \return SDL_TRUE if the pointer was set, SDL_FALSE otherwise. - * - * \note If you don't know what this function is for, you shouldn't use it! -*/ -extern DECLSPEC SDL_bool SDLCALL SDL_AtomicCASPtr(void **a, void *oldval, void *newval); - -/** - * \brief Set a pointer to a value atomically. - * - * \return The previous value of the pointer. - */ -extern DECLSPEC void* SDLCALL SDL_AtomicSetPtr(void **a, void* v); - -/** - * \brief Get the value of a pointer atomically. - */ -extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif - -#include "close_code.h" - -#endif /* _SDL_atomic_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_audio.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_audio.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_audio.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_audio.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,506 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_audio.h - * - * Access to the raw audio mixing buffer for the SDL library. - */ - -#ifndef _SDL_audio_h -#define _SDL_audio_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_endian.h" -#include "SDL_mutex.h" -#include "SDL_thread.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Audio format flags. - * - * These are what the 16 bits in SDL_AudioFormat currently mean... - * (Unspecified bits are always zero). - * - * \verbatim - ++-----------------------sample is signed if set - || - || ++-----------sample is bigendian if set - || || - || || ++---sample is float if set - || || || - || || || +---sample bit size---+ - || || || | | - 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 - \endverbatim - * - * There are macros in SDL 2.0 and later to query these bits. - */ -typedef Uint16 SDL_AudioFormat; - -/** - * \name Audio flags - */ -/* @{ */ - -#define SDL_AUDIO_MASK_BITSIZE (0xFF) -#define SDL_AUDIO_MASK_DATATYPE (1<<8) -#define SDL_AUDIO_MASK_ENDIAN (1<<12) -#define SDL_AUDIO_MASK_SIGNED (1<<15) -#define SDL_AUDIO_BITSIZE(x) (x & SDL_AUDIO_MASK_BITSIZE) -#define SDL_AUDIO_ISFLOAT(x) (x & SDL_AUDIO_MASK_DATATYPE) -#define SDL_AUDIO_ISBIGENDIAN(x) (x & SDL_AUDIO_MASK_ENDIAN) -#define SDL_AUDIO_ISSIGNED(x) (x & SDL_AUDIO_MASK_SIGNED) -#define SDL_AUDIO_ISINT(x) (!SDL_AUDIO_ISFLOAT(x)) -#define SDL_AUDIO_ISLITTLEENDIAN(x) (!SDL_AUDIO_ISBIGENDIAN(x)) -#define SDL_AUDIO_ISUNSIGNED(x) (!SDL_AUDIO_ISSIGNED(x)) - -/** - * \name Audio format flags - * - * Defaults to LSB byte order. - */ -/* @{ */ -#define AUDIO_U8 0x0008 /**< Unsigned 8-bit samples */ -#define AUDIO_S8 0x8008 /**< Signed 8-bit samples */ -#define AUDIO_U16LSB 0x0010 /**< Unsigned 16-bit samples */ -#define AUDIO_S16LSB 0x8010 /**< Signed 16-bit samples */ -#define AUDIO_U16MSB 0x1010 /**< As above, but big-endian byte order */ -#define AUDIO_S16MSB 0x9010 /**< As above, but big-endian byte order */ -#define AUDIO_U16 AUDIO_U16LSB -#define AUDIO_S16 AUDIO_S16LSB -/* @} */ - -/** - * \name int32 support - */ -/* @{ */ -#define AUDIO_S32LSB 0x8020 /**< 32-bit integer samples */ -#define AUDIO_S32MSB 0x9020 /**< As above, but big-endian byte order */ -#define AUDIO_S32 AUDIO_S32LSB -/* @} */ - -/** - * \name float32 support - */ -/* @{ */ -#define AUDIO_F32LSB 0x8120 /**< 32-bit floating point samples */ -#define AUDIO_F32MSB 0x9120 /**< As above, but big-endian byte order */ -#define AUDIO_F32 AUDIO_F32LSB -/* @} */ - -/** - * \name Native audio byte ordering - */ -/* @{ */ -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define AUDIO_U16SYS AUDIO_U16LSB -#define AUDIO_S16SYS AUDIO_S16LSB -#define AUDIO_S32SYS AUDIO_S32LSB -#define AUDIO_F32SYS AUDIO_F32LSB -#else -#define AUDIO_U16SYS AUDIO_U16MSB -#define AUDIO_S16SYS AUDIO_S16MSB -#define AUDIO_S32SYS AUDIO_S32MSB -#define AUDIO_F32SYS AUDIO_F32MSB -#endif -/* @} */ - -/** - * \name Allow change flags - * - * Which audio format changes are allowed when opening a device. - */ -/* @{ */ -#define SDL_AUDIO_ALLOW_FREQUENCY_CHANGE 0x00000001 -#define SDL_AUDIO_ALLOW_FORMAT_CHANGE 0x00000002 -#define SDL_AUDIO_ALLOW_CHANNELS_CHANGE 0x00000004 -#define SDL_AUDIO_ALLOW_ANY_CHANGE (SDL_AUDIO_ALLOW_FREQUENCY_CHANGE|SDL_AUDIO_ALLOW_FORMAT_CHANGE|SDL_AUDIO_ALLOW_CHANNELS_CHANGE) -/* @} */ - -/* @} *//* Audio flags */ - -/** - * This function is called when the audio device needs more data. - * - * \param userdata An application-specific parameter saved in - * the SDL_AudioSpec structure - * \param stream A pointer to the audio data buffer. - * \param len The length of that buffer in bytes. - * - * Once the callback returns, the buffer will no longer be valid. - * Stereo samples are stored in a LRLRLR ordering. - */ -typedef void (SDLCALL * SDL_AudioCallback) (void *userdata, Uint8 * stream, - int len); - -/** - * The calculated values in this structure are calculated by SDL_OpenAudio(). - */ -typedef struct SDL_AudioSpec -{ - int freq; /**< DSP frequency -- samples per second */ - SDL_AudioFormat format; /**< Audio data format */ - Uint8 channels; /**< Number of channels: 1 mono, 2 stereo */ - Uint8 silence; /**< Audio buffer silence value (calculated) */ - Uint16 samples; /**< Audio buffer size in samples (power of 2) */ - Uint16 padding; /**< Necessary for some compile environments */ - Uint32 size; /**< Audio buffer size in bytes (calculated) */ - SDL_AudioCallback callback; - void *userdata; -} SDL_AudioSpec; - - -struct SDL_AudioCVT; -typedef void (SDLCALL * SDL_AudioFilter) (struct SDL_AudioCVT * cvt, - SDL_AudioFormat format); - -/** - * A structure to hold a set of audio conversion filters and buffers. - */ -#ifdef __GNUC__ -/* This structure is 84 bytes on 32-bit architectures, make sure GCC doesn't - pad it out to 88 bytes to guarantee ABI compatibility between compilers. - vvv - The next time we rev the ABI, make sure to size the ints and add padding. -*/ -#define SDL_AUDIOCVT_PACKED __attribute__((packed)) -#else -#define SDL_AUDIOCVT_PACKED -#endif -/* */ -typedef struct SDL_AudioCVT -{ - int needed; /**< Set to 1 if conversion possible */ - SDL_AudioFormat src_format; /**< Source audio format */ - SDL_AudioFormat dst_format; /**< Target audio format */ - double rate_incr; /**< Rate conversion increment */ - Uint8 *buf; /**< Buffer to hold entire audio data */ - int len; /**< Length of original audio buffer */ - int len_cvt; /**< Length of converted audio buffer */ - int len_mult; /**< buffer must be len*len_mult big */ - double len_ratio; /**< Given len, final size is len*len_ratio */ - SDL_AudioFilter filters[10]; /**< Filter list */ - int filter_index; /**< Current audio conversion function */ -} SDL_AUDIOCVT_PACKED SDL_AudioCVT; - - -/* Function prototypes */ - -/** - * \name Driver discovery functions - * - * These functions return the list of built in audio drivers, in the - * order that they are normally initialized by default. - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_GetNumAudioDrivers(void); -extern DECLSPEC const char *SDLCALL SDL_GetAudioDriver(int index); -/* @} */ - -/** - * \name Initialization and cleanup - * - * \internal These functions are used internally, and should not be used unless - * you have a specific need to specify the audio driver you want to - * use. You should normally use SDL_Init() or SDL_InitSubSystem(). - */ -/* @{ */ -extern DECLSPEC int SDLCALL SDL_AudioInit(const char *driver_name); -extern DECLSPEC void SDLCALL SDL_AudioQuit(void); -/* @} */ - -/** - * This function returns the name of the current audio driver, or NULL - * if no driver has been initialized. - */ -extern DECLSPEC const char *SDLCALL SDL_GetCurrentAudioDriver(void); - -/** - * This function opens the audio device with the desired parameters, and - * returns 0 if successful, placing the actual hardware parameters in the - * structure pointed to by \c obtained. If \c obtained is NULL, the audio - * data passed to the callback function will be guaranteed to be in the - * requested format, and will be automatically converted to the hardware - * audio format if necessary. This function returns -1 if it failed - * to open the audio device, or couldn't set up the audio thread. - * - * When filling in the desired audio spec structure, - * - \c desired->freq should be the desired audio frequency in samples-per- - * second. - * - \c desired->format should be the desired audio format. - * - \c desired->samples is the desired size of the audio buffer, in - * samples. This number should be a power of two, and may be adjusted by - * the audio driver to a value more suitable for the hardware. Good values - * seem to range between 512 and 8096 inclusive, depending on the - * application and CPU speed. Smaller values yield faster response time, - * but can lead to underflow if the application is doing heavy processing - * and cannot fill the audio buffer in time. A stereo sample consists of - * both right and left channels in LR ordering. - * Note that the number of samples is directly related to time by the - * following formula: \code ms = (samples*1000)/freq \endcode - * - \c desired->size is the size in bytes of the audio buffer, and is - * calculated by SDL_OpenAudio(). - * - \c desired->silence is the value used to set the buffer to silence, - * and is calculated by SDL_OpenAudio(). - * - \c desired->callback should be set to a function that will be called - * when the audio device is ready for more data. It is passed a pointer - * to the audio buffer, and the length in bytes of the audio buffer. - * This function usually runs in a separate thread, and so you should - * protect data structures that it accesses by calling SDL_LockAudio() - * and SDL_UnlockAudio() in your code. - * - \c desired->userdata is passed as the first parameter to your callback - * function. - * - * The audio device starts out playing silence when it's opened, and should - * be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready - * for your audio callback function to be called. Since the audio driver - * may modify the requested size of the audio buffer, you should allocate - * any local mixing buffers after you open the audio device. - */ -extern DECLSPEC int SDLCALL SDL_OpenAudio(SDL_AudioSpec * desired, - SDL_AudioSpec * obtained); - -/** - * SDL Audio Device IDs. - * - * A successful call to SDL_OpenAudio() is always device id 1, and legacy - * SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls - * always returns devices >= 2 on success. The legacy calls are good both - * for backwards compatibility and when you don't care about multiple, - * specific, or capture devices. - */ -typedef Uint32 SDL_AudioDeviceID; - -/** - * Get the number of available devices exposed by the current driver. - * Only valid after a successfully initializing the audio subsystem. - * Returns -1 if an explicit list of devices can't be determined; this is - * not an error. For example, if SDL is set up to talk to a remote audio - * server, it can't list every one available on the Internet, but it will - * still allow a specific host to be specified to SDL_OpenAudioDevice(). - * - * In many common cases, when this function returns a value <= 0, it can still - * successfully open the default device (NULL for first argument of - * SDL_OpenAudioDevice()). - */ -extern DECLSPEC int SDLCALL SDL_GetNumAudioDevices(int iscapture); - -/** - * Get the human-readable name of a specific audio device. - * Must be a value between 0 and (number of audio devices-1). - * Only valid after a successfully initializing the audio subsystem. - * The values returned by this function reflect the latest call to - * SDL_GetNumAudioDevices(); recall that function to redetect available - * hardware. - * - * The string returned by this function is UTF-8 encoded, read-only, and - * managed internally. You are not to free it. If you need to keep the - * string for any length of time, you should make your own copy of it, as it - * will be invalid next time any of several other SDL functions is called. - */ -extern DECLSPEC const char *SDLCALL SDL_GetAudioDeviceName(int index, - int iscapture); - - -/** - * Open a specific audio device. Passing in a device name of NULL requests - * the most reasonable default (and is equivalent to calling SDL_OpenAudio()). - * - * The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but - * some drivers allow arbitrary and driver-specific strings, such as a - * hostname/IP address for a remote audio server, or a filename in the - * diskaudio driver. - * - * \return 0 on error, a valid device ID that is >= 2 on success. - * - * SDL_OpenAudio(), unlike this function, always acts on device ID 1. - */ -extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char - *device, - int iscapture, - const - SDL_AudioSpec * - desired, - SDL_AudioSpec * - obtained, - int - allowed_changes); - - - -/** - * \name Audio state - * - * Get the current audio state. - */ -/* @{ */ -typedef enum -{ - SDL_AUDIO_STOPPED = 0, - SDL_AUDIO_PLAYING, - SDL_AUDIO_PAUSED -} SDL_AudioStatus; -extern DECLSPEC SDL_AudioStatus SDLCALL SDL_GetAudioStatus(void); - -extern DECLSPEC SDL_AudioStatus SDLCALL -SDL_GetAudioDeviceStatus(SDL_AudioDeviceID dev); -/* @} *//* Audio State */ - -/** - * \name Pause audio functions - * - * These functions pause and unpause the audio callback processing. - * They should be called with a parameter of 0 after opening the audio - * device to start playing sound. This is so you can safely initialize - * data for your callback function after opening the audio device. - * Silence will be written to the audio device during the pause. - */ -/* @{ */ -extern DECLSPEC void SDLCALL SDL_PauseAudio(int pause_on); -extern DECLSPEC void SDLCALL SDL_PauseAudioDevice(SDL_AudioDeviceID dev, - int pause_on); -/* @} *//* Pause audio functions */ - -/** - * This function loads a WAVE from the data source, automatically freeing - * that source if \c freesrc is non-zero. For example, to load a WAVE file, - * you could do: - * \code - * SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...); - * \endcode - * - * If this function succeeds, it returns the given SDL_AudioSpec, - * filled with the audio data format of the wave data, and sets - * \c *audio_buf to a malloc()'d buffer containing the audio data, - * and sets \c *audio_len to the length of that audio buffer, in bytes. - * You need to free the audio buffer with SDL_FreeWAV() when you are - * done with it. - * - * This function returns NULL and sets the SDL error message if the - * wave file cannot be opened, uses an unknown data format, or is - * corrupt. Currently raw and MS-ADPCM WAVE files are supported. - */ -extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src, - int freesrc, - SDL_AudioSpec * spec, - Uint8 ** audio_buf, - Uint32 * audio_len); - -/** - * Loads a WAV from a file. - * Compatibility convenience function. - */ -#define SDL_LoadWAV(file, spec, audio_buf, audio_len) \ - SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len) - -/** - * This function frees data previously allocated with SDL_LoadWAV_RW() - */ -extern DECLSPEC void SDLCALL SDL_FreeWAV(Uint8 * audio_buf); - -/** - * This function takes a source format and rate and a destination format - * and rate, and initializes the \c cvt structure with information needed - * by SDL_ConvertAudio() to convert a buffer of audio data from one format - * to the other. - * - * \return -1 if the format conversion is not supported, 0 if there's - * no conversion needed, or 1 if the audio filter is set up. - */ -extern DECLSPEC int SDLCALL SDL_BuildAudioCVT(SDL_AudioCVT * cvt, - SDL_AudioFormat src_format, - Uint8 src_channels, - int src_rate, - SDL_AudioFormat dst_format, - Uint8 dst_channels, - int dst_rate); - -/** - * Once you have initialized the \c cvt structure using SDL_BuildAudioCVT(), - * created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of - * audio data in the source format, this function will convert it in-place - * to the desired format. - * - * The data conversion may expand the size of the audio data, so the buffer - * \c cvt->buf should be allocated after the \c cvt structure is initialized by - * SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long. - */ -extern DECLSPEC int SDLCALL SDL_ConvertAudio(SDL_AudioCVT * cvt); - -#define SDL_MIX_MAXVOLUME 128 -/** - * This takes two audio buffers of the playing audio format and mixes - * them, performing addition, volume adjustment, and overflow clipping. - * The volume ranges from 0 - 128, and should be set to ::SDL_MIX_MAXVOLUME - * for full audio volume. Note this does not change hardware volume. - * This is provided for convenience -- you can mix your own audio data. - */ -extern DECLSPEC void SDLCALL SDL_MixAudio(Uint8 * dst, const Uint8 * src, - Uint32 len, int volume); - -/** - * This works like SDL_MixAudio(), but you specify the audio format instead of - * using the format of audio device 1. Thus it can be used when no audio - * device is open at all. - */ -extern DECLSPEC void SDLCALL SDL_MixAudioFormat(Uint8 * dst, - const Uint8 * src, - SDL_AudioFormat format, - Uint32 len, int volume); - -/** - * \name Audio lock functions - * - * The lock manipulated by these functions protects the callback function. - * During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that - * the callback function is not running. Do not call these from the callback - * function or you will cause deadlock. - */ -/* @{ */ -extern DECLSPEC void SDLCALL SDL_LockAudio(void); -extern DECLSPEC void SDLCALL SDL_LockAudioDevice(SDL_AudioDeviceID dev); -extern DECLSPEC void SDLCALL SDL_UnlockAudio(void); -extern DECLSPEC void SDLCALL SDL_UnlockAudioDevice(SDL_AudioDeviceID dev); -/* @} *//* Audio lock functions */ - -/** - * This function shuts down audio processing and closes the audio device. - */ -extern DECLSPEC void SDLCALL SDL_CloseAudio(void); -extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_audio_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_bits.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_bits.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_bits.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_bits.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,97 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_bits.h - * - * Functions for fiddling with bits and bitmasks. - */ - -#ifndef _SDL_bits_h -#define _SDL_bits_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_bits.h - */ - -/** - * Get the index of the most significant bit. Result is undefined when called - * with 0. This operation can also be stated as "count leading zeroes" and - * "log base 2". - * - * \return Index of the most significant bit, or -1 if the value is 0. - */ -SDL_FORCE_INLINE int -SDL_MostSignificantBitIndex32(Uint32 x) -{ -#if defined(__GNUC__) && __GNUC__ >= 4 - /* Count Leading Zeroes builtin in GCC. - * http://gcc.gnu.org/onlinedocs/gcc-4.3.4/gcc/Other-Builtins.html - */ - if (x == 0) { - return -1; - } - return 31 - __builtin_clz(x); -#else - /* Based off of Bit Twiddling Hacks by Sean Eron Anderson - * , released in the public domain. - * http://graphics.stanford.edu/~seander/bithacks.html#IntegerLog - */ - const Uint32 b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000}; - const int S[] = {1, 2, 4, 8, 16}; - - int msbIndex = 0; - int i; - - if (x == 0) { - return -1; - } - - for (i = 4; i >= 0; i--) - { - if (x & b[i]) - { - x >>= S[i]; - msbIndex |= S[i]; - } - } - - return msbIndex; -#endif -} - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_bits_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_blendmode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_blendmode.h - * - * Header file declaring the SDL_BlendMode enumeration - */ - -#ifndef _SDL_blendmode_h -#define _SDL_blendmode_h - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The blend mode used in SDL_RenderCopy() and drawing operations. - */ -typedef enum -{ - SDL_BLENDMODE_NONE = 0x00000000, /**< no blending - dstRGBA = srcRGBA */ - SDL_BLENDMODE_BLEND = 0x00000001, /**< alpha blending - dstRGB = (srcRGB * srcA) + (dstRGB * (1-srcA)) - dstA = srcA + (dstA * (1-srcA)) */ - SDL_BLENDMODE_ADD = 0x00000002, /**< additive blending - dstRGB = (srcRGB * srcA) + dstRGB - dstA = dstA */ - SDL_BLENDMODE_MOD = 0x00000004 /**< color modulate - dstRGB = srcRGB * dstRGB - dstA = dstA */ -} SDL_BlendMode; - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_clipboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_clipboard.h - * - * Include file for SDL clipboard handling - */ - -#ifndef _SDL_clipboard_h -#define _SDL_clipboard_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* Function prototypes */ - -/** - * \brief Put UTF-8 text into the clipboard - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC int SDLCALL SDL_SetClipboardText(const char *text); - -/** - * \brief Get UTF-8 text from the clipboard, which must be freed with SDL_free() - * - * \sa SDL_SetClipboardText() - */ -extern DECLSPEC char * SDLCALL SDL_GetClipboardText(void); - -/** - * \brief Returns a flag indicating whether the clipboard exists and contains a text string that is non-empty - * - * \sa SDL_GetClipboardText() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_clipboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_config_h -#define _SDL_config_h - -#include "SDL_platform.h" - -/** - * \file SDL_config.h - */ - -/* Add any platform that doesn't build using the configure system. */ -#ifdef USING_PREMAKE_CONFIG_H -#include "SDL_config_premake.h" -#elif defined(__WIN32__) -#include "SDL_config_windows.h" -#elif defined(__WINRT__) -#include "SDL_config_winrt.h" -#elif defined(__MACOSX__) -#include "SDL_config_macosx.h" -#elif defined(__IPHONEOS__) -#include "SDL_config_iphoneos.h" -#elif defined(__ANDROID__) -#include "SDL_config_android.h" -#elif defined(__PSP__) -#include "SDL_config_psp.h" -#else -/* This is a minimal configuration just to get SDL running on new platforms */ -#include "SDL_config_minimal.h" -#endif /* platform config */ - -#ifdef USING_GENERATED_CONFIG_H -#error Wrong SDL_config.h, check your include path? -#endif - -#endif /* _SDL_config_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_config_macosx.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,184 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_config_macosx_h -#define _SDL_config_macosx_h - -#include "SDL_platform.h" - -/* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */ -#include - -/* This is a set of defines to configure the SDL features */ - -#ifdef __LP64__ - #define SIZEOF_VOIDP 8 -#else - #define SIZEOF_VOIDP 4 -#endif - -/* Useful headers */ -#define HAVE_ALLOCA_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_STDIO_H 1 -#define STDC_HEADERS 1 -#define HAVE_STRING_H 1 -#define HAVE_INTTYPES_H 1 -#define HAVE_STDINT_H 1 -#define HAVE_CTYPE_H 1 -#define HAVE_MATH_H 1 -#define HAVE_SIGNAL_H 1 - -/* C library functions */ -#define HAVE_MALLOC 1 -#define HAVE_CALLOC 1 -#define HAVE_REALLOC 1 -#define HAVE_FREE 1 -#define HAVE_ALLOCA 1 -#define HAVE_GETENV 1 -#define HAVE_SETENV 1 -#define HAVE_PUTENV 1 -#define HAVE_UNSETENV 1 -#define HAVE_QSORT 1 -#define HAVE_ABS 1 -#define HAVE_BCOPY 1 -#define HAVE_MEMSET 1 -#define HAVE_MEMCPY 1 -#define HAVE_MEMMOVE 1 -#define HAVE_MEMCMP 1 -#define HAVE_STRLEN 1 -#define HAVE_STRLCPY 1 -#define HAVE_STRLCAT 1 -#define HAVE_STRDUP 1 -#define HAVE_STRCHR 1 -#define HAVE_STRRCHR 1 -#define HAVE_STRSTR 1 -#define HAVE_STRTOL 1 -#define HAVE_STRTOUL 1 -#define HAVE_STRTOLL 1 -#define HAVE_STRTOULL 1 -#define HAVE_STRTOD 1 -#define HAVE_ATOI 1 -#define HAVE_ATOF 1 -#define HAVE_STRCMP 1 -#define HAVE_STRNCMP 1 -#define HAVE_STRCASECMP 1 -#define HAVE_STRNCASECMP 1 -#define HAVE_VSSCANF 1 -#define HAVE_VSNPRINTF 1 -#define HAVE_CEIL 1 -#define HAVE_COPYSIGN 1 -#define HAVE_COS 1 -#define HAVE_COSF 1 -#define HAVE_FABS 1 -#define HAVE_FLOOR 1 -#define HAVE_LOG 1 -#define HAVE_POW 1 -#define HAVE_SCALBN 1 -#define HAVE_SIN 1 -#define HAVE_SINF 1 -#define HAVE_SQRT 1 -#define HAVE_SIGACTION 1 -#define HAVE_SETJMP 1 -#define HAVE_NANOSLEEP 1 -#define HAVE_SYSCONF 1 -#define HAVE_SYSCTLBYNAME 1 -#define HAVE_ATAN 1 -#define HAVE_ATAN2 1 -#define HAVE_ACOS 1 -#define HAVE_ASIN 1 - -/* Enable various audio drivers */ -#define SDL_AUDIO_DRIVER_COREAUDIO 1 -#define SDL_AUDIO_DRIVER_DISK 1 -#define SDL_AUDIO_DRIVER_DUMMY 1 - -/* Enable various input drivers */ -#define SDL_JOYSTICK_IOKIT 1 -#define SDL_HAPTIC_IOKIT 1 - -/* Enable various shared object loading systems */ -#define SDL_LOADSO_DLOPEN 1 - -/* Enable various threading systems */ -#define SDL_THREAD_PTHREAD 1 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1 - -/* Enable various timer systems */ -#define SDL_TIMER_UNIX 1 - -/* Enable various video drivers */ -#define SDL_VIDEO_DRIVER_COCOA 1 -#define SDL_VIDEO_DRIVER_DUMMY 1 -#undef SDL_VIDEO_DRIVER_X11 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib" -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib" -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1 -#define SDL_VIDEO_DRIVER_X11_XRANDR 1 -#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1 -#define SDL_VIDEO_DRIVER_X11_XSHAPE 1 -#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1 -#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1 - -#ifdef MAC_OS_X_VERSION_10_8 -/* - * No matter the versions targeted, this is the 10.8 or later SDK, so you have - * to use the external Xquartz, which is a more modern Xlib. Previous SDKs - * used an older Xlib. - */ -#define SDL_VIDEO_DRIVER_X11_XINPUT2 1 -#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 -#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1 -#endif - -#ifndef SDL_VIDEO_RENDER_OGL -#define SDL_VIDEO_RENDER_OGL 1 -#endif - -/* Enable OpenGL support */ -#ifndef SDL_VIDEO_OPENGL -#define SDL_VIDEO_OPENGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_CGL -#define SDL_VIDEO_OPENGL_CGL 1 -#endif -#ifndef SDL_VIDEO_OPENGL_GLX -#define SDL_VIDEO_OPENGL_GLX 1 -#endif - -/* Enable system power support */ -#define SDL_POWER_MACOSX 1 - -/* enable filesystem support */ -#define SDL_FILESYSTEM_COCOA 1 - -/* Enable assembly routines */ -#define SDL_ASSEMBLY_ROUTINES 1 -#ifdef __ppc__ -#define SDL_ALTIVEC_BLITTERS 1 -#endif - -#endif /* _SDL_config_macosx_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_copying.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_copying.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_copying.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_copying.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_cpuinfo.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,156 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_cpuinfo.h - * - * CPU feature detection for SDL. - */ - -#ifndef _SDL_cpuinfo_h -#define _SDL_cpuinfo_h - -#include "SDL_stdinc.h" - -/* Need to do this here because intrin.h has C++ code in it */ -/* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */ -#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_IX86) || defined(_M_X64)) -#include -#ifndef _WIN64 -#define __MMX__ -#define __3dNOW__ -#endif -#define __SSE__ -#define __SSE2__ -#elif defined(__MINGW64_VERSION_MAJOR) -#include -#else -#ifdef __ALTIVEC__ -#if HAVE_ALTIVEC_H && !defined(__APPLE_ALTIVEC__) -#include -#undef pixel -#endif -#endif -#ifdef __MMX__ -#include -#endif -#ifdef __3dNOW__ -#include -#endif -#ifdef __SSE__ -#include -#endif -#ifdef __SSE2__ -#include -#endif -#endif - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* This is a guess for the cacheline size used for padding. - * Most x86 processors have a 64 byte cache line. - * The 64-bit PowerPC processors have a 128 byte cache line. - * We'll use the larger value to be generally safe. - */ -#define SDL_CACHELINE_SIZE 128 - -/** - * This function returns the number of CPU cores available. - */ -extern DECLSPEC int SDLCALL SDL_GetCPUCount(void); - -/** - * This function returns the L1 cache line size of the CPU - * - * This is useful for determining multi-threaded structure padding - * or SIMD prefetch sizes. - */ -extern DECLSPEC int SDLCALL SDL_GetCPUCacheLineSize(void); - -/** - * This function returns true if the CPU has the RDTSC instruction. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasRDTSC(void); - -/** - * This function returns true if the CPU has AltiVec features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAltiVec(void); - -/** - * This function returns true if the CPU has MMX features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasMMX(void); - -/** - * This function returns true if the CPU has 3DNow! features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_Has3DNow(void); - -/** - * This function returns true if the CPU has SSE features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE(void); - -/** - * This function returns true if the CPU has SSE2 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE2(void); - -/** - * This function returns true if the CPU has SSE3 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE3(void); - -/** - * This function returns true if the CPU has SSE4.1 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE41(void); - -/** - * This function returns true if the CPU has SSE4.2 features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasSSE42(void); - -/** - * This function returns true if the CPU has AVX features. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void); - -/** - * This function returns the amount of RAM configured in the system, in MB. - */ -extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_cpuinfo_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_endian.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_endian.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_endian.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_endian.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_endian.h - * - * Functions for reading and writing endian-specific values - */ - -#ifndef _SDL_endian_h -#define _SDL_endian_h - -#include "SDL_stdinc.h" - -/** - * \name The two types of endianness - */ -/* @{ */ -#define SDL_LIL_ENDIAN 1234 -#define SDL_BIG_ENDIAN 4321 -/* @} */ - -#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */ -#ifdef __linux__ -#include -#define SDL_BYTEORDER __BYTE_ORDER -#else /* __linux __ */ -#if defined(__hppa__) || \ - defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \ - (defined(__MIPS__) && defined(__MISPEB__)) || \ - defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \ - defined(__sparc__) -#define SDL_BYTEORDER SDL_BIG_ENDIAN -#else -#define SDL_BYTEORDER SDL_LIL_ENDIAN -#endif -#endif /* __linux __ */ -#endif /* !SDL_BYTEORDER */ - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_endian.h - */ -#if defined(__GNUC__) && defined(__i386__) && \ - !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - int result; - - __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x)); - return (Uint16)result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -SDL_FORCE_INLINE Uint16 -SDL_Swap16(Uint16 x) -{ - return SDL_static_cast(Uint16, ((x << 8) | (x >> 8))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswap %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("bswapl %0": "=r"(x):"0"(x)); - return x; -} -#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__)) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - Uint32 result; - - __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x)); - __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x)); - __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x)); - return result; -} -#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__) -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc"); - return x; -} -#else -SDL_FORCE_INLINE Uint32 -SDL_Swap32(Uint32 x) -{ - return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) | - ((x >> 8) & 0x0000FF00) | (x >> 24))); -} -#endif - -#if defined(__GNUC__) && defined(__i386__) -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - union - { - struct - { - Uint32 a, b; - } s; - Uint64 u; - } v; - v.u = x; - __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a), - "1"(v.s. - b)); - return v.u; -} -#elif defined(__GNUC__) && defined(__x86_64__) -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - __asm__("bswapq %0": "=r"(x):"0"(x)); - return x; -} -#else -SDL_FORCE_INLINE Uint64 -SDL_Swap64(Uint64 x) -{ - Uint32 hi, lo; - - /* Separate into high and low 32-bit values and swap them */ - lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF); - x >>= 32; - hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF); - x = SDL_Swap32(lo); - x <<= 32; - x |= SDL_Swap32(hi); - return (x); -} -#endif - - -SDL_FORCE_INLINE float -SDL_SwapFloat(float x) -{ - union - { - float f; - Uint32 ui32; - } swapper; - swapper.f = x; - swapper.ui32 = SDL_Swap32(swapper.ui32); - return swapper.f; -} - - -/** - * \name Swap to native - * Byteswap item from the specified endianness to the native endianness. - */ -/* @{ */ -#if SDL_BYTEORDER == SDL_LIL_ENDIAN -#define SDL_SwapLE16(X) (X) -#define SDL_SwapLE32(X) (X) -#define SDL_SwapLE64(X) (X) -#define SDL_SwapFloatLE(X) (X) -#define SDL_SwapBE16(X) SDL_Swap16(X) -#define SDL_SwapBE32(X) SDL_Swap32(X) -#define SDL_SwapBE64(X) SDL_Swap64(X) -#define SDL_SwapFloatBE(X) SDL_SwapFloat(X) -#else -#define SDL_SwapLE16(X) SDL_Swap16(X) -#define SDL_SwapLE32(X) SDL_Swap32(X) -#define SDL_SwapLE64(X) SDL_Swap64(X) -#define SDL_SwapFloatLE(X) SDL_SwapFloat(X) -#define SDL_SwapBE16(X) (X) -#define SDL_SwapBE32(X) (X) -#define SDL_SwapBE64(X) (X) -#define SDL_SwapFloatBE(X) (X) -#endif -/* @} *//* Swap to native */ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_endian_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_error.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_error.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_error.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_error.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_error.h - * - * Simple error message routines for SDL. - */ - -#ifndef _SDL_error_h -#define _SDL_error_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* Public functions */ -/* SDL_SetError() unconditionally returns -1. */ -extern DECLSPEC int SDLCALL SDL_SetError(const char *fmt, ...); -extern DECLSPEC const char *SDLCALL SDL_GetError(void); -extern DECLSPEC void SDLCALL SDL_ClearError(void); - -/** - * \name Internal error functions - * - * \internal - * Private error reporting function - used internally. - */ -/* @{ */ -#define SDL_OutOfMemory() SDL_Error(SDL_ENOMEM) -#define SDL_Unsupported() SDL_Error(SDL_UNSUPPORTED) -#define SDL_InvalidParamError(param) SDL_SetError("Parameter '%s' is invalid", (param)) -typedef enum -{ - SDL_ENOMEM, - SDL_EFREAD, - SDL_EFWRITE, - SDL_EFSEEK, - SDL_UNSUPPORTED, - SDL_LASTERROR -} SDL_errorcode; -/* SDL_Error() unconditionally returns -1. */ -extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code); -/* @} *//* Internal error functions */ - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_error_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_events.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_events.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_events.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_events.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,723 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_events.h - * - * Include file for SDL event handling. - */ - -#ifndef _SDL_events_h -#define _SDL_events_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_keyboard.h" -#include "SDL_mouse.h" -#include "SDL_joystick.h" -#include "SDL_gamecontroller.h" -#include "SDL_quit.h" -#include "SDL_gesture.h" -#include "SDL_touch.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* General keyboard/mouse state definitions */ -#define SDL_RELEASED 0 -#define SDL_PRESSED 1 - -/** - * \brief The types of events that can be delivered. - */ -typedef enum -{ - SDL_FIRSTEVENT = 0, /**< Unused (do not remove) */ - - /* Application events */ - SDL_QUIT = 0x100, /**< User-requested quit */ - - /* These application events have special meaning on iOS, see README-ios.txt for details */ - SDL_APP_TERMINATING, /**< The application is being terminated by the OS - Called on iOS in applicationWillTerminate() - Called on Android in onDestroy() - */ - SDL_APP_LOWMEMORY, /**< The application is low on memory, free memory if possible. - Called on iOS in applicationDidReceiveMemoryWarning() - Called on Android in onLowMemory() - */ - SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background - Called on iOS in applicationWillResignActive() - Called on Android in onPause() - */ - SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time - Called on iOS in applicationDidEnterBackground() - Called on Android in onPause() - */ - SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground - Called on iOS in applicationWillEnterForeground() - Called on Android in onResume() - */ - SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive - Called on iOS in applicationDidBecomeActive() - Called on Android in onResume() - */ - - /* Window events */ - SDL_WINDOWEVENT = 0x200, /**< Window state change */ - SDL_SYSWMEVENT, /**< System specific event */ - - /* Keyboard events */ - SDL_KEYDOWN = 0x300, /**< Key pressed */ - SDL_KEYUP, /**< Key released */ - SDL_TEXTEDITING, /**< Keyboard text editing (composition) */ - SDL_TEXTINPUT, /**< Keyboard text input */ - - /* Mouse events */ - SDL_MOUSEMOTION = 0x400, /**< Mouse moved */ - SDL_MOUSEBUTTONDOWN, /**< Mouse button pressed */ - SDL_MOUSEBUTTONUP, /**< Mouse button released */ - SDL_MOUSEWHEEL, /**< Mouse wheel motion */ - - /* Joystick events */ - SDL_JOYAXISMOTION = 0x600, /**< Joystick axis motion */ - SDL_JOYBALLMOTION, /**< Joystick trackball motion */ - SDL_JOYHATMOTION, /**< Joystick hat position change */ - SDL_JOYBUTTONDOWN, /**< Joystick button pressed */ - SDL_JOYBUTTONUP, /**< Joystick button released */ - SDL_JOYDEVICEADDED, /**< A new joystick has been inserted into the system */ - SDL_JOYDEVICEREMOVED, /**< An opened joystick has been removed */ - - /* Game controller events */ - SDL_CONTROLLERAXISMOTION = 0x650, /**< Game controller axis motion */ - SDL_CONTROLLERBUTTONDOWN, /**< Game controller button pressed */ - SDL_CONTROLLERBUTTONUP, /**< Game controller button released */ - SDL_CONTROLLERDEVICEADDED, /**< A new Game controller has been inserted into the system */ - SDL_CONTROLLERDEVICEREMOVED, /**< An opened Game controller has been removed */ - SDL_CONTROLLERDEVICEREMAPPED, /**< The controller mapping was updated */ - - /* Touch events */ - SDL_FINGERDOWN = 0x700, - SDL_FINGERUP, - SDL_FINGERMOTION, - - /* Gesture events */ - SDL_DOLLARGESTURE = 0x800, - SDL_DOLLARRECORD, - SDL_MULTIGESTURE, - - /* Clipboard events */ - SDL_CLIPBOARDUPDATE = 0x900, /**< The clipboard changed */ - - /* Drag and drop events */ - SDL_DROPFILE = 0x1000, /**< The system requests a file open */ - - /* Render events */ - SDL_RENDER_TARGETS_RESET = 0x2000, /**< The render targets have been reset */ - - /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use, - * and should be allocated with SDL_RegisterEvents() - */ - SDL_USEREVENT = 0x8000, - - /** - * This last event is only for bounding internal arrays - */ - SDL_LASTEVENT = 0xFFFF -} SDL_EventType; - -/** - * \brief Fields shared by every event - */ -typedef struct SDL_CommonEvent -{ - Uint32 type; - Uint32 timestamp; -} SDL_CommonEvent; - -/** - * \brief Window state change event data (event.window.*) - */ -typedef struct SDL_WindowEvent -{ - Uint32 type; /**< ::SDL_WINDOWEVENT */ - Uint32 timestamp; - Uint32 windowID; /**< The associated window */ - Uint8 event; /**< ::SDL_WindowEventID */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint32 data1; /**< event dependent data */ - Sint32 data2; /**< event dependent data */ -} SDL_WindowEvent; - -/** - * \brief Keyboard button event structure (event.key.*) - */ -typedef struct SDL_KeyboardEvent -{ - Uint32 type; /**< ::SDL_KEYDOWN or ::SDL_KEYUP */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 repeat; /**< Non-zero if this is a key repeat */ - Uint8 padding2; - Uint8 padding3; - SDL_Keysym keysym; /**< The key that was pressed or released */ -} SDL_KeyboardEvent; - -#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32) -/** - * \brief Keyboard text editing event structure (event.edit.*) - */ -typedef struct SDL_TextEditingEvent -{ - Uint32 type; /**< ::SDL_TEXTEDITING */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE]; /**< The editing text */ - Sint32 start; /**< The start cursor of selected editing text */ - Sint32 length; /**< The length of selected editing text */ -} SDL_TextEditingEvent; - - -#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32) -/** - * \brief Keyboard text input event structure (event.text.*) - */ -typedef struct SDL_TextInputEvent -{ - Uint32 type; /**< ::SDL_TEXTINPUT */ - Uint32 timestamp; - Uint32 windowID; /**< The window with keyboard focus, if any */ - char text[SDL_TEXTINPUTEVENT_TEXT_SIZE]; /**< The input text */ -} SDL_TextInputEvent; - -/** - * \brief Mouse motion event structure (event.motion.*) - */ -typedef struct SDL_MouseMotionEvent -{ - Uint32 type; /**< ::SDL_MOUSEMOTION */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Uint32 state; /**< The current button state */ - Sint32 x; /**< X coordinate, relative to window */ - Sint32 y; /**< Y coordinate, relative to window */ - Sint32 xrel; /**< The relative motion in the X direction */ - Sint32 yrel; /**< The relative motion in the Y direction */ -} SDL_MouseMotionEvent; - -/** - * \brief Mouse button event structure (event.button.*) - */ -typedef struct SDL_MouseButtonEvent -{ - Uint32 type; /**< ::SDL_MOUSEBUTTONDOWN or ::SDL_MOUSEBUTTONUP */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Uint8 button; /**< The mouse button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 clicks; /**< 1 for single-click, 2 for double-click, etc. */ - Uint8 padding1; - Sint32 x; /**< X coordinate, relative to window */ - Sint32 y; /**< Y coordinate, relative to window */ -} SDL_MouseButtonEvent; - -/** - * \brief Mouse wheel event structure (event.wheel.*) - */ -typedef struct SDL_MouseWheelEvent -{ - Uint32 type; /**< ::SDL_MOUSEWHEEL */ - Uint32 timestamp; - Uint32 windowID; /**< The window with mouse focus, if any */ - Uint32 which; /**< The mouse instance id, or SDL_TOUCH_MOUSEID */ - Sint32 x; /**< The amount scrolled horizontally, positive to the right and negative to the left */ - Sint32 y; /**< The amount scrolled vertically, positive away from the user and negative toward the user */ -} SDL_MouseWheelEvent; - -/** - * \brief Joystick axis motion event structure (event.jaxis.*) - */ -typedef struct SDL_JoyAxisEvent -{ - Uint32 type; /**< ::SDL_JOYAXISMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 axis; /**< The joystick axis index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 value; /**< The axis value (range: -32768 to 32767) */ - Uint16 padding4; -} SDL_JoyAxisEvent; - -/** - * \brief Joystick trackball motion event structure (event.jball.*) - */ -typedef struct SDL_JoyBallEvent -{ - Uint32 type; /**< ::SDL_JOYBALLMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 ball; /**< The joystick trackball index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 xrel; /**< The relative motion in the X direction */ - Sint16 yrel; /**< The relative motion in the Y direction */ -} SDL_JoyBallEvent; - -/** - * \brief Joystick hat position change event structure (event.jhat.*) - */ -typedef struct SDL_JoyHatEvent -{ - Uint32 type; /**< ::SDL_JOYHATMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 hat; /**< The joystick hat index */ - Uint8 value; /**< The hat position value. - * \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP - * \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT - * \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN - * - * Note that zero means the POV is centered. - */ - Uint8 padding1; - Uint8 padding2; -} SDL_JoyHatEvent; - -/** - * \brief Joystick button event structure (event.jbutton.*) - */ -typedef struct SDL_JoyButtonEvent -{ - Uint32 type; /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 button; /**< The joystick button index */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; -} SDL_JoyButtonEvent; - -/** - * \brief Joystick device event structure (event.jdevice.*) - */ -typedef struct SDL_JoyDeviceEvent -{ - Uint32 type; /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */ - Uint32 timestamp; - Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED event */ -} SDL_JoyDeviceEvent; - - -/** - * \brief Game controller axis motion event structure (event.caxis.*) - */ -typedef struct SDL_ControllerAxisEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERAXISMOTION */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 axis; /**< The controller axis (SDL_GameControllerAxis) */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 value; /**< The axis value (range: -32768 to 32767) */ - Uint16 padding4; -} SDL_ControllerAxisEvent; - - -/** - * \brief Game controller button event structure (event.cbutton.*) - */ -typedef struct SDL_ControllerButtonEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */ - Uint32 timestamp; - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 button; /**< The controller button (SDL_GameControllerButton) */ - Uint8 state; /**< ::SDL_PRESSED or ::SDL_RELEASED */ - Uint8 padding1; - Uint8 padding2; -} SDL_ControllerButtonEvent; - - -/** - * \brief Controller device event structure (event.cdevice.*) - */ -typedef struct SDL_ControllerDeviceEvent -{ - Uint32 type; /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */ - Uint32 timestamp; - Sint32 which; /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */ -} SDL_ControllerDeviceEvent; - - -/** - * \brief Touch finger event structure (event.tfinger.*) - */ -typedef struct SDL_TouchFingerEvent -{ - Uint32 type; /**< ::SDL_FINGERMOTION or ::SDL_FINGERDOWN or ::SDL_FINGERUP */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device id */ - SDL_FingerID fingerId; - float x; /**< Normalized in the range 0...1 */ - float y; /**< Normalized in the range 0...1 */ - float dx; /**< Normalized in the range 0...1 */ - float dy; /**< Normalized in the range 0...1 */ - float pressure; /**< Normalized in the range 0...1 */ -} SDL_TouchFingerEvent; - - -/** - * \brief Multiple Finger Gesture Event (event.mgesture.*) - */ -typedef struct SDL_MultiGestureEvent -{ - Uint32 type; /**< ::SDL_MULTIGESTURE */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device index */ - float dTheta; - float dDist; - float x; - float y; - Uint16 numFingers; - Uint16 padding; -} SDL_MultiGestureEvent; - - -/** - * \brief Dollar Gesture Event (event.dgesture.*) - */ -typedef struct SDL_DollarGestureEvent -{ - Uint32 type; /**< ::SDL_DOLLARGESTURE */ - Uint32 timestamp; - SDL_TouchID touchId; /**< The touch device id */ - SDL_GestureID gestureId; - Uint32 numFingers; - float error; - float x; /**< Normalized center of gesture */ - float y; /**< Normalized center of gesture */ -} SDL_DollarGestureEvent; - - -/** - * \brief An event used to request a file open by the system (event.drop.*) - * This event is disabled by default, you can enable it with SDL_EventState() - * \note If you enable this event, you must free the filename in the event. - */ -typedef struct SDL_DropEvent -{ - Uint32 type; /**< ::SDL_DROPFILE */ - Uint32 timestamp; - char *file; /**< The file name, which should be freed with SDL_free() */ -} SDL_DropEvent; - - -/** - * \brief The "quit requested" event - */ -typedef struct SDL_QuitEvent -{ - Uint32 type; /**< ::SDL_QUIT */ - Uint32 timestamp; -} SDL_QuitEvent; - -/** - * \brief OS Specific event - */ -typedef struct SDL_OSEvent -{ - Uint32 type; /**< ::SDL_QUIT */ - Uint32 timestamp; -} SDL_OSEvent; - -/** - * \brief A user-defined event type (event.user.*) - */ -typedef struct SDL_UserEvent -{ - Uint32 type; /**< ::SDL_USEREVENT through ::SDL_LASTEVENT-1 */ - Uint32 timestamp; - Uint32 windowID; /**< The associated window if any */ - Sint32 code; /**< User defined event code */ - void *data1; /**< User defined data pointer */ - void *data2; /**< User defined data pointer */ -} SDL_UserEvent; - - -struct SDL_SysWMmsg; -typedef struct SDL_SysWMmsg SDL_SysWMmsg; - -/** - * \brief A video driver dependent system event (event.syswm.*) - * This event is disabled by default, you can enable it with SDL_EventState() - * - * \note If you want to use this event, you should include SDL_syswm.h. - */ -typedef struct SDL_SysWMEvent -{ - Uint32 type; /**< ::SDL_SYSWMEVENT */ - Uint32 timestamp; - SDL_SysWMmsg *msg; /**< driver dependent data, defined in SDL_syswm.h */ -} SDL_SysWMEvent; - -/** - * \brief General event structure - */ -typedef union SDL_Event -{ - Uint32 type; /**< Event type, shared with all events */ - SDL_CommonEvent common; /**< Common event data */ - SDL_WindowEvent window; /**< Window event data */ - SDL_KeyboardEvent key; /**< Keyboard event data */ - SDL_TextEditingEvent edit; /**< Text editing event data */ - SDL_TextInputEvent text; /**< Text input event data */ - SDL_MouseMotionEvent motion; /**< Mouse motion event data */ - SDL_MouseButtonEvent button; /**< Mouse button event data */ - SDL_MouseWheelEvent wheel; /**< Mouse wheel event data */ - SDL_JoyAxisEvent jaxis; /**< Joystick axis event data */ - SDL_JoyBallEvent jball; /**< Joystick ball event data */ - SDL_JoyHatEvent jhat; /**< Joystick hat event data */ - SDL_JoyButtonEvent jbutton; /**< Joystick button event data */ - SDL_JoyDeviceEvent jdevice; /**< Joystick device change event data */ - SDL_ControllerAxisEvent caxis; /**< Game Controller axis event data */ - SDL_ControllerButtonEvent cbutton; /**< Game Controller button event data */ - SDL_ControllerDeviceEvent cdevice; /**< Game Controller device event data */ - SDL_QuitEvent quit; /**< Quit request event data */ - SDL_UserEvent user; /**< Custom event data */ - SDL_SysWMEvent syswm; /**< System dependent window event data */ - SDL_TouchFingerEvent tfinger; /**< Touch finger event data */ - SDL_MultiGestureEvent mgesture; /**< Gesture event data */ - SDL_DollarGestureEvent dgesture; /**< Gesture event data */ - SDL_DropEvent drop; /**< Drag and drop event data */ - - /* This is necessary for ABI compatibility between Visual C++ and GCC - Visual C++ will respect the push pack pragma and use 52 bytes for - this structure, and GCC will use the alignment of the largest datatype - within the union, which is 8 bytes. - - So... we'll add padding to force the size to be 56 bytes for both. - */ - Uint8 padding[56]; -} SDL_Event; - - -/* Function prototypes */ - -/** - * Pumps the event loop, gathering events from the input devices. - * - * This function updates the event queue and internal input device state. - * - * This should only be run in the thread that sets the video mode. - */ -extern DECLSPEC void SDLCALL SDL_PumpEvents(void); - -/* @{ */ -typedef enum -{ - SDL_ADDEVENT, - SDL_PEEKEVENT, - SDL_GETEVENT -} SDL_eventaction; - -/** - * Checks the event queue for messages and optionally returns them. - * - * If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to - * the back of the event queue. - * - * If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will not be removed from the queue. - * - * If \c action is ::SDL_GETEVENT, up to \c numevents events at the front - * of the event queue, within the specified minimum and maximum type, - * will be returned and will be removed from the queue. - * - * \return The number of events actually stored, or -1 if there was an error. - * - * This function is thread-safe. - */ -extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents, - SDL_eventaction action, - Uint32 minType, Uint32 maxType); -/* @} */ - -/** - * Checks to see if certain event types are in the event queue. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasEvent(Uint32 type); -extern DECLSPEC SDL_bool SDLCALL SDL_HasEvents(Uint32 minType, Uint32 maxType); - -/** - * This function clears events from the event queue - */ -extern DECLSPEC void SDLCALL SDL_FlushEvent(Uint32 type); -extern DECLSPEC void SDLCALL SDL_FlushEvents(Uint32 minType, Uint32 maxType); - -/** - * \brief Polls for currently pending events. - * - * \return 1 if there are any pending events, or 0 if there are none available. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - */ -extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event); - -/** - * \brief Waits indefinitely for the next available event. - * - * \return 1, or 0 if there was an error while waiting for events. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - */ -extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event); - -/** - * \brief Waits until the specified timeout (in milliseconds) for the next - * available event. - * - * \return 1, or 0 if there was an error while waiting for events. - * - * \param event If not NULL, the next event is removed from the queue and - * stored in that area. - * \param timeout The timeout (in milliseconds) to wait for next event. - */ -extern DECLSPEC int SDLCALL SDL_WaitEventTimeout(SDL_Event * event, - int timeout); - -/** - * \brief Add an event to the event queue. - * - * \return 1 on success, 0 if the event was filtered, or -1 if the event queue - * was full or there was some other error. - */ -extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event); - -typedef int (SDLCALL * SDL_EventFilter) (void *userdata, SDL_Event * event); - -/** - * Sets up a filter to process all events before they change internal state and - * are posted to the internal event queue. - * - * The filter is prototyped as: - * \code - * int SDL_EventFilter(void *userdata, SDL_Event * event); - * \endcode - * - * If the filter returns 1, then the event will be added to the internal queue. - * If it returns 0, then the event will be dropped from the queue, but the - * internal state will still be updated. This allows selective filtering of - * dynamically arriving events. - * - * \warning Be very careful of what you do in the event filter function, as - * it may run in a different thread! - * - * There is one caveat when dealing with the ::SDL_QuitEvent event type. The - * event filter is only called when the window manager desires to close the - * application window. If the event filter returns 1, then the window will - * be closed, otherwise the window will remain open if possible. - * - * If the quit event is generated by an interrupt signal, it will bypass the - * internal queue and be delivered to the application at the next event poll. - */ -extern DECLSPEC void SDLCALL SDL_SetEventFilter(SDL_EventFilter filter, - void *userdata); - -/** - * Return the current event filter - can be used to "chain" filters. - * If there is no event filter set, this function returns SDL_FALSE. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetEventFilter(SDL_EventFilter * filter, - void **userdata); - -/** - * Add a function which is called when an event is added to the queue. - */ -extern DECLSPEC void SDLCALL SDL_AddEventWatch(SDL_EventFilter filter, - void *userdata); - -/** - * Remove an event watch function added with SDL_AddEventWatch() - */ -extern DECLSPEC void SDLCALL SDL_DelEventWatch(SDL_EventFilter filter, - void *userdata); - -/** - * Run the filter function on the current event queue, removing any - * events for which the filter returns 0. - */ -extern DECLSPEC void SDLCALL SDL_FilterEvents(SDL_EventFilter filter, - void *userdata); - -/* @{ */ -#define SDL_QUERY -1 -#define SDL_IGNORE 0 -#define SDL_DISABLE 0 -#define SDL_ENABLE 1 - -/** - * This function allows you to set the state of processing certain events. - * - If \c state is set to ::SDL_IGNORE, that event will be automatically - * dropped from the event queue and will not event be filtered. - * - If \c state is set to ::SDL_ENABLE, that event will be processed - * normally. - * - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the - * current processing state of the specified event. - */ -extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state); -/* @} */ -#define SDL_GetEventState(type) SDL_EventState(type, SDL_QUERY) - -/** - * This function allocates a set of user-defined events, and returns - * the beginning event number for that set of events. - * - * If there aren't enough user-defined events left, this function - * returns (Uint32)-1 - */ -extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_events_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_filesystem.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_filesystem.h - * - * \brief Include file for filesystem SDL API functions - */ - -#ifndef _SDL_filesystem_h -#define _SDL_filesystem_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" - -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Get the path where the application resides. - * - * Get the "base path". This is the directory where the application was run - * from, which is probably the installation directory, and may or may not - * be the process's current working directory. - * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). - * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. - * - * Some platforms can't determine the application's path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \return String of base dir in UTF-8 encoding, or NULL on error. - * - * \sa SDL_GetPrefPath - */ -extern DECLSPEC char *SDLCALL SDL_GetBasePath(void); - -/** - * \brief Get the user-and-app-specific path where files can be written. - * - * Get the "pref dir". This is meant to be where users can write personal - * files (preferences and save games, etc) that are specific to your - * application. This directory is unique per user, per application. - * - * This function will decide the appropriate location in the native filesystem, - * create the directory if necessary, and return a string of the absolute - * path to the directory in UTF-8 encoding. - * - * On Windows, the string might look like: - * "C:\\Users\\bob\\AppData\\Roaming\\My Company\\My Program Name\\" - * - * On Linux, the string might look like: - * "/home/bob/.local/share/My Program Name/" - * - * On Mac OS X, the string might look like: - * "/Users/bob/Library/Application Support/My Program Name/" - * - * (etc.) - * - * You specify the name of your organization (if it's not a real organization, - * your name or an Internet domain you own might do) and the name of your - * application. These should be untranslated proper names. - * - * Both the org and app strings may become part of a directory name, so - * please follow these rules: - * - * - Try to use the same org string (including case-sensitivity) for - * all your applications that use this function. - * - Always use a unique app string for each one, and make sure it never - * changes for an app once you've decided on it. - * - Unicode characters are legal, as long as it's UTF-8 encoded, but... - * - ...only use letters, numbers, and spaces. Avoid punctuation like - * "Game Name 2: Bad Guy's Revenge!" ... "Game Name 2" is sufficient. - * - * This returns an absolute path in UTF-8 encoding, and is guaranteed to - * end with a path separator ('\\' on Windows, '/' most other places). - * - * The pointer returned by this function is owned by you. Please call - * SDL_free() on the pointer when you are done with it, or it will be a - * memory leak. This is not necessarily a fast call, though, so you should - * call this once near startup and save the string if you need it. - * - * You should assume the path returned by this function is the only safe - * place to write files (and that SDL_GetBasePath(), while it might be - * writable, or even the parent of the returned path, aren't where you - * should be writing things). - * - * Some platforms can't determine the pref path, and on other - * platforms, this might be meaningless. In such cases, this function will - * return NULL. - * - * \param org The name of your organization. - * \param app The name of your application. - * \return UTF-8 string of user dir in platform-dependent notation. NULL - * if there's a problem (creating directory failed, etc). - * - * \sa SDL_GetBasePath - */ -extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_system_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gamecontroller.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,316 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_gamecontroller.h - * - * Include file for SDL game controller event handling - */ - -#ifndef _SDL_gamecontroller_h -#define _SDL_gamecontroller_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_rwops.h" -#include "SDL_joystick.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_gamecontroller.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system - * for game controllers, and load appropriate drivers. - * - * If you would like to receive controller updates while the application - * is in the background, you should set the following hint before calling - * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS - */ - -/* The gamecontroller structure used to identify an SDL game controller */ -struct _SDL_GameController; -typedef struct _SDL_GameController SDL_GameController; - - -typedef enum -{ - SDL_CONTROLLER_BINDTYPE_NONE = 0, - SDL_CONTROLLER_BINDTYPE_BUTTON, - SDL_CONTROLLER_BINDTYPE_AXIS, - SDL_CONTROLLER_BINDTYPE_HAT -} SDL_GameControllerBindType; - -/** - * Get the SDL joystick layer binding for this controller button/axis mapping - */ -typedef struct SDL_GameControllerButtonBind -{ - SDL_GameControllerBindType bindType; - union - { - int button; - int axis; - struct { - int hat; - int hat_mask; - } hat; - } value; - -} SDL_GameControllerButtonBind; - - -/** - * To count the number of game controllers in the system for the following: - * int nJoysticks = SDL_NumJoysticks(); - * int nGameControllers = 0; - * for ( int i = 0; i < nJoysticks; i++ ) { - * if ( SDL_IsGameController(i) ) { - * nGameControllers++; - * } - * } - * - * Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is: - * guid,name,mappings - * - * Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones. - * Under Windows there is a reserved GUID of "xinput" that covers any XInput devices. - * The mapping format for joystick is: - * bX - a joystick button, index X - * hX.Y - hat X with value Y - * aX - axis X of the joystick - * Buttons can be used as a controller axis and vice versa. - * - * This string shows an example of a valid mapping for a controller - * "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7", - * - */ - -/** - * Load a set of mappings from a seekable SDL data stream (memory or file), filtered by the current SDL_GetPlatform() - * A community sourced database of controllers is available at https://raw.github.com/gabomdq/SDL_GameControllerDB/master/gamecontrollerdb.txt - * - * If \c freerw is non-zero, the stream will be closed after being read. - * - * \return number of mappings added, -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GameControllerAddMappingsFromRW( SDL_RWops * rw, int freerw ); - -/** - * Load a set of mappings from a file, filtered by the current SDL_GetPlatform() - * - * Convenience macro. - */ -#define SDL_GameControllerAddMappingsFromFile(file) SDL_GameControllerAddMappingsFromRW(SDL_RWFromFile(file, "rb"), 1) - -/** - * Add or update an existing mapping configuration - * - * \return 1 if mapping is added, 0 if updated, -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GameControllerAddMapping( const char* mappingString ); - -/** - * Get a mapping string for a GUID - * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available - */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMappingForGUID( SDL_JoystickGUID guid ); - -/** - * Get a mapping string for an open GameController - * - * \return the mapping string. Must be freed with SDL_free. Returns NULL if no mapping is available - */ -extern DECLSPEC char * SDLCALL SDL_GameControllerMapping( SDL_GameController * gamecontroller ); - -/** - * Is the joystick on this index supported by the game controller interface? - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsGameController(int joystick_index); - - -/** - * Get the implementation dependent name of a game controller. - * This can be called before any controllers are opened. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_GameControllerNameForIndex(int joystick_index); - -/** - * Open a game controller for use. - * The index passed as an argument refers to the N'th game controller on the system. - * This index is the value which will identify this controller in future controller - * events. - * - * \return A controller identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_GameController *SDLCALL SDL_GameControllerOpen(int joystick_index); - -/** - * Return the name for this currently opened controller - */ -extern DECLSPEC const char *SDLCALL SDL_GameControllerName(SDL_GameController *gamecontroller); - -/** - * Returns SDL_TRUE if the controller has been opened and currently connected, - * or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GameControllerGetAttached(SDL_GameController *gamecontroller); - -/** - * Get the underlying joystick object used by a controller - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_GameControllerGetJoystick(SDL_GameController *gamecontroller); - -/** - * Enable/disable controller event polling. - * - * If controller events are disabled, you must call SDL_GameControllerUpdate() - * yourself and check the state of the controller when you want controller - * information. - * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. - */ -extern DECLSPEC int SDLCALL SDL_GameControllerEventState(int state); - -/** - * Update the current state of the open game controllers. - * - * This is called automatically by the event loop if any game controller - * events are enabled. - */ -extern DECLSPEC void SDLCALL SDL_GameControllerUpdate(void); - - -/** - * The list of axes available from a controller - */ -typedef enum -{ - SDL_CONTROLLER_AXIS_INVALID = -1, - SDL_CONTROLLER_AXIS_LEFTX, - SDL_CONTROLLER_AXIS_LEFTY, - SDL_CONTROLLER_AXIS_RIGHTX, - SDL_CONTROLLER_AXIS_RIGHTY, - SDL_CONTROLLER_AXIS_TRIGGERLEFT, - SDL_CONTROLLER_AXIS_TRIGGERRIGHT, - SDL_CONTROLLER_AXIS_MAX -} SDL_GameControllerAxis; - -/** - * turn this string into a axis mapping - */ -extern DECLSPEC SDL_GameControllerAxis SDLCALL SDL_GameControllerGetAxisFromString(const char *pchString); - -/** - * turn this axis enum into a string mapping - */ -extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForAxis(SDL_GameControllerAxis axis); - -/** - * Get the SDL joystick layer binding for this controller button mapping - */ -extern DECLSPEC SDL_GameControllerButtonBind SDLCALL -SDL_GameControllerGetBindForAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); - -/** - * Get the current state of an axis control on a game controller. - * - * The state is a value ranging from -32768 to 32767. - * - * The axis indices start at index 0. - */ -extern DECLSPEC Sint16 SDLCALL -SDL_GameControllerGetAxis(SDL_GameController *gamecontroller, - SDL_GameControllerAxis axis); - -/** - * The list of buttons available from a controller - */ -typedef enum -{ - SDL_CONTROLLER_BUTTON_INVALID = -1, - SDL_CONTROLLER_BUTTON_A, - SDL_CONTROLLER_BUTTON_B, - SDL_CONTROLLER_BUTTON_X, - SDL_CONTROLLER_BUTTON_Y, - SDL_CONTROLLER_BUTTON_BACK, - SDL_CONTROLLER_BUTTON_GUIDE, - SDL_CONTROLLER_BUTTON_START, - SDL_CONTROLLER_BUTTON_LEFTSTICK, - SDL_CONTROLLER_BUTTON_RIGHTSTICK, - SDL_CONTROLLER_BUTTON_LEFTSHOULDER, - SDL_CONTROLLER_BUTTON_RIGHTSHOULDER, - SDL_CONTROLLER_BUTTON_DPAD_UP, - SDL_CONTROLLER_BUTTON_DPAD_DOWN, - SDL_CONTROLLER_BUTTON_DPAD_LEFT, - SDL_CONTROLLER_BUTTON_DPAD_RIGHT, - SDL_CONTROLLER_BUTTON_MAX -} SDL_GameControllerButton; - -/** - * turn this string into a button mapping - */ -extern DECLSPEC SDL_GameControllerButton SDLCALL SDL_GameControllerGetButtonFromString(const char *pchString); - -/** - * turn this button enum into a string mapping - */ -extern DECLSPEC const char* SDLCALL SDL_GameControllerGetStringForButton(SDL_GameControllerButton button); - -/** - * Get the SDL joystick layer binding for this controller button mapping - */ -extern DECLSPEC SDL_GameControllerButtonBind SDLCALL -SDL_GameControllerGetBindForButton(SDL_GameController *gamecontroller, - SDL_GameControllerButton button); - - -/** - * Get the current state of a button on a game controller. - * - * The button indices start at index 0. - */ -extern DECLSPEC Uint8 SDLCALL SDL_GameControllerGetButton(SDL_GameController *gamecontroller, - SDL_GameControllerButton button); - -/** - * Close a controller previously opened with SDL_GameControllerOpen(). - */ -extern DECLSPEC void SDLCALL SDL_GameControllerClose(SDL_GameController *gamecontroller); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_gamecontroller_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gesture.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gesture.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gesture.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_gesture.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_gesture.h - * - * Include file for SDL gesture event handling. - */ - -#ifndef _SDL_gesture_h -#define _SDL_gesture_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "SDL_touch.h" - - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef Sint64 SDL_GestureID; - -/* Function prototypes */ - -/** - * \brief Begin Recording a gesture on the specified touch, or all touches (-1) - * - * - */ -extern DECLSPEC int SDLCALL SDL_RecordGesture(SDL_TouchID touchId); - - -/** - * \brief Save all currently loaded Dollar Gesture templates - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveAllDollarTemplates(SDL_RWops *dst); - -/** - * \brief Save a currently loaded Dollar Gesture template - * - * - */ -extern DECLSPEC int SDLCALL SDL_SaveDollarTemplate(SDL_GestureID gestureId,SDL_RWops *dst); - - -/** - * \brief Load Dollar Gesture templates from a file - * - * - */ -extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWops *src); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_gesture_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL.h - * - * Main include header for the SDL library - */ - -/** - * \mainpage Simple DirectMedia Layer (SDL) - * - * http://www.libsdl.org/ - * - * \section intro_sec Introduction - * - * Simple DirectMedia Layer is a cross-platform development library designed - * to provide low level access to audio, keyboard, mouse, joystick, and - * graphics hardware via OpenGL and Direct3D. It is used by video playback - * software, emulators, and popular games including Valve's award winning - * catalog and many Humble Bundle games. - * - * SDL officially supports Windows, Mac OS X, Linux, iOS, and Android. - * Support for other platforms may be found in the source code. - * - * SDL is written in C, works natively with C++, and there are bindings - * available for several other languages, including C# and Python. - * - * This library is distributed under the zlib license, which can be found - * in the file "COPYING.txt". - * - * The best way to learn how to use SDL is to check out the header files in - * the "include" subdirectory and the programs in the "test" subdirectory. - * The header files and test programs are well commented and always up to date. - * More documentation and FAQs are available online at: - * http://wiki.libsdl.org/ - * - * If you need help with the library, or just want to discuss SDL related - * issues, you can join the developers mailing list: - * http://www.libsdl.org/mailing-list.php - * - * Enjoy! - * Sam Lantinga (slouken@libsdl.org) - */ - -#ifndef _SDL_H -#define _SDL_H - -#include "SDL_main.h" -#include "SDL_stdinc.h" -#include "SDL_assert.h" -#include "SDL_atomic.h" -#include "SDL_audio.h" -#include "SDL_clipboard.h" -#include "SDL_cpuinfo.h" -#include "SDL_endian.h" -#include "SDL_error.h" -#include "SDL_events.h" -#include "SDL_filesystem.h" -#include "SDL_joystick.h" -#include "SDL_gamecontroller.h" -#include "SDL_haptic.h" -#include "SDL_hints.h" -#include "SDL_loadso.h" -#include "SDL_log.h" -#include "SDL_messagebox.h" -#include "SDL_mutex.h" -#include "SDL_power.h" -#include "SDL_render.h" -#include "SDL_rwops.h" -#include "SDL_system.h" -#include "SDL_thread.h" -#include "SDL_timer.h" -#include "SDL_version.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* As of version 0.5, SDL is loaded dynamically into the application */ - -/** - * \name SDL_INIT_* - * - * These are the flags which may be passed to SDL_Init(). You should - * specify the subsystems which you will be using in your application. - */ -/* @{ */ -#define SDL_INIT_TIMER 0x00000001 -#define SDL_INIT_AUDIO 0x00000010 -#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */ -#define SDL_INIT_JOYSTICK 0x00000200 /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */ -#define SDL_INIT_HAPTIC 0x00001000 -#define SDL_INIT_GAMECONTROLLER 0x00002000 /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */ -#define SDL_INIT_EVENTS 0x00004000 -#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */ -#define SDL_INIT_EVERYTHING ( \ - SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \ - SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \ - ) -/* @} */ - -/** - * This function initializes the subsystems specified by \c flags - * Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup - * signal handlers for some commonly ignored fatal signals (like SIGSEGV). - */ -extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags); - -/** - * This function initializes specific SDL subsystems - */ -extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags); - -/** - * This function cleans up specific SDL subsystems - */ -extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags); - -/** - * This function returns a mask of the specified subsystems which have - * previously been initialized. - * - * If \c flags is 0, it returns a mask of all initialized subsystems. - */ -extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags); - -/** - * This function cleans up all initialized subsystems. You should - * call it upon all exit conditions. - */ -extern DECLSPEC void SDLCALL SDL_Quit(void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_H */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_haptic.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_haptic.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_haptic.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_haptic.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,1225 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_haptic.h - * - * \brief The SDL Haptic subsystem allows you to control haptic (force feedback) - * devices. - * - * The basic usage is as follows: - * - Initialize the Subsystem (::SDL_INIT_HAPTIC). - * - Open a Haptic Device. - * - SDL_HapticOpen() to open from index. - * - SDL_HapticOpenFromJoystick() to open from an existing joystick. - * - Create an effect (::SDL_HapticEffect). - * - Upload the effect with SDL_HapticNewEffect(). - * - Run the effect with SDL_HapticRunEffect(). - * - (optional) Free the effect with SDL_HapticDestroyEffect(). - * - Close the haptic device with SDL_HapticClose(). - * - * \par Simple rumble example: - * \code - * SDL_Haptic *haptic; - * - * // Open the device - * haptic = SDL_HapticOpen( 0 ); - * if (haptic == NULL) - * return -1; - * - * // Initialize simple rumble - * if (SDL_HapticRumbleInit( haptic ) != 0) - * return -1; - * - * // Play effect at 50% strength for 2 seconds - * if (SDL_HapticRumblePlay( haptic, 0.5, 2000 ) != 0) - * return -1; - * SDL_Delay( 2000 ); - * - * // Clean up - * SDL_HapticClose( haptic ); - * \endcode - * - * \par Complete example: - * \code - * int test_haptic( SDL_Joystick * joystick ) { - * SDL_Haptic *haptic; - * SDL_HapticEffect effect; - * int effect_id; - * - * // Open the device - * haptic = SDL_HapticOpenFromJoystick( joystick ); - * if (haptic == NULL) return -1; // Most likely joystick isn't haptic - * - * // See if it can do sine waves - * if ((SDL_HapticQuery(haptic) & SDL_HAPTIC_SINE)==0) { - * SDL_HapticClose(haptic); // No sine effect - * return -1; - * } - * - * // Create the effect - * memset( &effect, 0, sizeof(SDL_HapticEffect) ); // 0 is safe default - * effect.type = SDL_HAPTIC_SINE; - * effect.periodic.direction.type = SDL_HAPTIC_POLAR; // Polar coordinates - * effect.periodic.direction.dir[0] = 18000; // Force comes from south - * effect.periodic.period = 1000; // 1000 ms - * effect.periodic.magnitude = 20000; // 20000/32767 strength - * effect.periodic.length = 5000; // 5 seconds long - * effect.periodic.attack_length = 1000; // Takes 1 second to get max strength - * effect.periodic.fade_length = 1000; // Takes 1 second to fade away - * - * // Upload the effect - * effect_id = SDL_HapticNewEffect( haptic, &effect ); - * - * // Test the effect - * SDL_HapticRunEffect( haptic, effect_id, 1 ); - * SDL_Delay( 5000); // Wait for the effect to finish - * - * // We destroy the effect, although closing the device also does this - * SDL_HapticDestroyEffect( haptic, effect_id ); - * - * // Close the device - * SDL_HapticClose(haptic); - * - * return 0; // Success - * } - * \endcode - * - * You can also find out more information on my blog: - * http://bobbens.dyndns.org/journal/2010/sdl_haptic/ - * - * \author Edgar Simo Serra - */ - -#ifndef _SDL_haptic_h -#define _SDL_haptic_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_joystick.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/** - * \typedef SDL_Haptic - * - * \brief The haptic structure used to identify an SDL haptic. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - */ -struct _SDL_Haptic; -typedef struct _SDL_Haptic SDL_Haptic; - - -/** - * \name Haptic features - * - * Different haptic features a device can have. - */ -/* @{ */ - -/** - * \name Haptic effects - */ -/* @{ */ - -/** - * \brief Constant effect supported. - * - * Constant haptic effect. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_CONSTANT (1<<0) - -/** - * \brief Sine wave effect supported. - * - * Periodic haptic effect that simulates sine waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SINE (1<<1) - -/** - * \brief Left/Right effect supported. - * - * Haptic effect for direct control over high/low frequency motors. - * - * \sa SDL_HapticLeftRight - * \warning this value was SDL_HAPTIC_SQUARE right before 2.0.0 shipped. Sorry, - * we ran out of bits, and this is important for XInput devices. - */ -#define SDL_HAPTIC_LEFTRIGHT (1<<2) - -/* !!! FIXME: put this back when we have more bits in 2.1 */ -/* #define SDL_HAPTIC_SQUARE (1<<2) */ - -/** - * \brief Triangle wave effect supported. - * - * Periodic haptic effect that simulates triangular waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_TRIANGLE (1<<3) - -/** - * \brief Sawtoothup wave effect supported. - * - * Periodic haptic effect that simulates saw tooth up waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SAWTOOTHUP (1<<4) - -/** - * \brief Sawtoothdown wave effect supported. - * - * Periodic haptic effect that simulates saw tooth down waves. - * - * \sa SDL_HapticPeriodic - */ -#define SDL_HAPTIC_SAWTOOTHDOWN (1<<5) - -/** - * \brief Ramp effect supported. - * - * Ramp haptic effect. - * - * \sa SDL_HapticRamp - */ -#define SDL_HAPTIC_RAMP (1<<6) - -/** - * \brief Spring effect supported - uses axes position. - * - * Condition haptic effect that simulates a spring. Effect is based on the - * axes position. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_SPRING (1<<7) - -/** - * \brief Damper effect supported - uses axes velocity. - * - * Condition haptic effect that simulates dampening. Effect is based on the - * axes velocity. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_DAMPER (1<<8) - -/** - * \brief Inertia effect supported - uses axes acceleration. - * - * Condition haptic effect that simulates inertia. Effect is based on the axes - * acceleration. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_INERTIA (1<<9) - -/** - * \brief Friction effect supported - uses axes movement. - * - * Condition haptic effect that simulates friction. Effect is based on the - * axes movement. - * - * \sa SDL_HapticCondition - */ -#define SDL_HAPTIC_FRICTION (1<<10) - -/** - * \brief Custom effect is supported. - * - * User defined custom haptic effect. - */ -#define SDL_HAPTIC_CUSTOM (1<<11) - -/* @} *//* Haptic effects */ - -/* These last few are features the device has, not effects */ - -/** - * \brief Device can set global gain. - * - * Device supports setting the global gain. - * - * \sa SDL_HapticSetGain - */ -#define SDL_HAPTIC_GAIN (1<<12) - -/** - * \brief Device can set autocenter. - * - * Device supports setting autocenter. - * - * \sa SDL_HapticSetAutocenter - */ -#define SDL_HAPTIC_AUTOCENTER (1<<13) - -/** - * \brief Device can be queried for effect status. - * - * Device can be queried for effect status. - * - * \sa SDL_HapticGetEffectStatus - */ -#define SDL_HAPTIC_STATUS (1<<14) - -/** - * \brief Device can be paused. - * - * \sa SDL_HapticPause - * \sa SDL_HapticUnpause - */ -#define SDL_HAPTIC_PAUSE (1<<15) - - -/** - * \name Direction encodings - */ -/* @{ */ - -/** - * \brief Uses polar coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_POLAR 0 - -/** - * \brief Uses cartesian coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_CARTESIAN 1 - -/** - * \brief Uses spherical coordinates for the direction. - * - * \sa SDL_HapticDirection - */ -#define SDL_HAPTIC_SPHERICAL 2 - -/* @} *//* Direction encodings */ - -/* @} *//* Haptic features */ - -/* - * Misc defines. - */ - -/** - * \brief Used to play a device an infinite number of times. - * - * \sa SDL_HapticRunEffect - */ -#define SDL_HAPTIC_INFINITY 4294967295U - - -/** - * \brief Structure that represents a haptic direction. - * - * Directions can be specified by: - * - ::SDL_HAPTIC_POLAR : Specified by polar coordinates. - * - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates. - * - ::SDL_HAPTIC_SPHERICAL : Specified by spherical coordinates. - * - * Cardinal directions of the haptic device are relative to the positioning - * of the device. North is considered to be away from the user. - * - * The following diagram represents the cardinal directions: - * \verbatim - .--. - |__| .-------. - |=.| |.-----.| - |--| || || - | | |'-----'| - |__|~')_____(' - [ COMPUTER ] - - - North (0,-1) - ^ - | - | - (1,0) West <----[ HAPTIC ]----> East (-1,0) - | - | - v - South (0,1) - - - [ USER ] - \|||/ - (o o) - ---ooO-(_)-Ooo--- - \endverbatim - * - * If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a - * degree starting north and turning clockwise. ::SDL_HAPTIC_POLAR only uses - * the first \c dir parameter. The cardinal directions would be: - * - North: 0 (0 degrees) - * - East: 9000 (90 degrees) - * - South: 18000 (180 degrees) - * - West: 27000 (270 degrees) - * - * If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions - * (X axis, Y axis and Z axis (with 3 axes)). ::SDL_HAPTIC_CARTESIAN uses - * the first three \c dir parameters. The cardinal directions would be: - * - North: 0,-1, 0 - * - East: -1, 0, 0 - * - South: 0, 1, 0 - * - West: 1, 0, 0 - * - * The Z axis represents the height of the effect if supported, otherwise - * it's unused. In cartesian encoding (1, 2) would be the same as (2, 4), you - * can use any multiple you want, only the direction matters. - * - * If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations. - * The first two \c dir parameters are used. The \c dir parameters are as - * follows (all values are in hundredths of degrees): - * - Degrees from (1, 0) rotated towards (0, 1). - * - Degrees towards (0, 0, 1) (device needs at least 3 axes). - * - * - * Example of force coming from the south with all encodings (force coming - * from the south means the user will have to pull the stick to counteract): - * \code - * SDL_HapticDirection direction; - * - * // Cartesian directions - * direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding. - * direction.dir[0] = 0; // X position - * direction.dir[1] = 1; // Y position - * // Assuming the device has 2 axes, we don't need to specify third parameter. - * - * // Polar directions - * direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding. - * direction.dir[0] = 18000; // Polar only uses first parameter - * - * // Spherical coordinates - * direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding - * direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters. - * \endcode - * - * \sa SDL_HAPTIC_POLAR - * \sa SDL_HAPTIC_CARTESIAN - * \sa SDL_HAPTIC_SPHERICAL - * \sa SDL_HapticEffect - * \sa SDL_HapticNumAxes - */ -typedef struct SDL_HapticDirection -{ - Uint8 type; /**< The type of encoding. */ - Sint32 dir[3]; /**< The encoded direction. */ -} SDL_HapticDirection; - - -/** - * \brief A structure containing a template for a Constant effect. - * - * The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect. - * - * A constant effect applies a constant force in the specified direction - * to the joystick. - * - * \sa SDL_HAPTIC_CONSTANT - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticConstant -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_CONSTANT */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Constant */ - Sint16 level; /**< Strength of the constant effect. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticConstant; - -/** - * \brief A structure containing a template for a Periodic effect. - * - * The struct handles the following effects: - * - ::SDL_HAPTIC_SINE - * - ::SDL_HAPTIC_LEFTRIGHT - * - ::SDL_HAPTIC_TRIANGLE - * - ::SDL_HAPTIC_SAWTOOTHUP - * - ::SDL_HAPTIC_SAWTOOTHDOWN - * - * A periodic effect consists in a wave-shaped effect that repeats itself - * over time. The type determines the shape of the wave and the parameters - * determine the dimensions of the wave. - * - * Phase is given by hundredth of a cycle meaning that giving the phase a value - * of 9000 will displace it 25% of its period. Here are sample values: - * - 0: No phase displacement. - * - 9000: Displaced 25% of its period. - * - 18000: Displaced 50% of its period. - * - 27000: Displaced 75% of its period. - * - 36000: Displaced 100% of its period, same as 0, but 0 is preferred. - * - * Examples: - * \verbatim - SDL_HAPTIC_SINE - __ __ __ __ - / \ / \ / \ / - / \__/ \__/ \__/ - - SDL_HAPTIC_SQUARE - __ __ __ __ __ - | | | | | | | | | | - | |__| |__| |__| |__| | - - SDL_HAPTIC_TRIANGLE - /\ /\ /\ /\ /\ - / \ / \ / \ / \ / - / \/ \/ \/ \/ - - SDL_HAPTIC_SAWTOOTHUP - /| /| /| /| /| /| /| - / | / | / | / | / | / | / | - / |/ |/ |/ |/ |/ |/ | - - SDL_HAPTIC_SAWTOOTHDOWN - \ |\ |\ |\ |\ |\ |\ | - \ | \ | \ | \ | \ | \ | \ | - \| \| \| \| \| \| \| - \endverbatim - * - * \sa SDL_HAPTIC_SINE - * \sa SDL_HAPTIC_LEFTRIGHT - * \sa SDL_HAPTIC_TRIANGLE - * \sa SDL_HAPTIC_SAWTOOTHUP - * \sa SDL_HAPTIC_SAWTOOTHDOWN - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticPeriodic -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_SINE, ::SDL_HAPTIC_LEFTRIGHT, - ::SDL_HAPTIC_TRIANGLE, ::SDL_HAPTIC_SAWTOOTHUP or - ::SDL_HAPTIC_SAWTOOTHDOWN */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Periodic */ - Uint16 period; /**< Period of the wave. */ - Sint16 magnitude; /**< Peak value. */ - Sint16 offset; /**< Mean value of the wave. */ - Uint16 phase; /**< Horizontal shift given by hundredth of a cycle. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticPeriodic; - -/** - * \brief A structure containing a template for a Condition effect. - * - * The struct handles the following effects: - * - ::SDL_HAPTIC_SPRING: Effect based on axes position. - * - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity. - * - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration. - * - ::SDL_HAPTIC_FRICTION: Effect based on axes movement. - * - * Direction is handled by condition internals instead of a direction member. - * The condition effect specific members have three parameters. The first - * refers to the X axis, the second refers to the Y axis and the third - * refers to the Z axis. The right terms refer to the positive side of the - * axis and the left terms refer to the negative side of the axis. Please - * refer to the ::SDL_HapticDirection diagram for which side is positive and - * which is negative. - * - * \sa SDL_HapticDirection - * \sa SDL_HAPTIC_SPRING - * \sa SDL_HAPTIC_DAMPER - * \sa SDL_HAPTIC_INERTIA - * \sa SDL_HAPTIC_FRICTION - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticCondition -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_SPRING, ::SDL_HAPTIC_DAMPER, - ::SDL_HAPTIC_INERTIA or ::SDL_HAPTIC_FRICTION */ - SDL_HapticDirection direction; /**< Direction of the effect - Not used ATM. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Condition */ - Uint16 right_sat[3]; /**< Level when joystick is to the positive side. */ - Uint16 left_sat[3]; /**< Level when joystick is to the negative side. */ - Sint16 right_coeff[3]; /**< How fast to increase the force towards the positive side. */ - Sint16 left_coeff[3]; /**< How fast to increase the force towards the negative side. */ - Uint16 deadband[3]; /**< Size of the dead zone. */ - Sint16 center[3]; /**< Position of the dead zone. */ -} SDL_HapticCondition; - -/** - * \brief A structure containing a template for a Ramp effect. - * - * This struct is exclusively for the ::SDL_HAPTIC_RAMP effect. - * - * The ramp effect starts at start strength and ends at end strength. - * It augments in linear fashion. If you use attack and fade with a ramp - * the effects get added to the ramp effect making the effect become - * quadratic instead of linear. - * - * \sa SDL_HAPTIC_RAMP - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticRamp -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_RAMP */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Ramp */ - Sint16 start; /**< Beginning strength level. */ - Sint16 end; /**< Ending strength level. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticRamp; - -/** - * \brief A structure containing a template for a Left/Right effect. - * - * This struct is exclusively for the ::SDL_HAPTIC_LEFTRIGHT effect. - * - * The Left/Right effect is used to explicitly control the large and small - * motors, commonly found in modern game controllers. One motor is high - * frequency, the other is low frequency. - * - * \sa SDL_HAPTIC_LEFTRIGHT - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticLeftRight -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_LEFTRIGHT */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - - /* Rumble */ - Uint16 large_magnitude; /**< Control of the large controller motor. */ - Uint16 small_magnitude; /**< Control of the small controller motor. */ -} SDL_HapticLeftRight; - -/** - * \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect. - * - * A custom force feedback effect is much like a periodic effect, where the - * application can define its exact shape. You will have to allocate the - * data yourself. Data should consist of channels * samples Uint16 samples. - * - * If channels is one, the effect is rotated using the defined direction. - * Otherwise it uses the samples in data for the different axes. - * - * \sa SDL_HAPTIC_CUSTOM - * \sa SDL_HapticEffect - */ -typedef struct SDL_HapticCustom -{ - /* Header */ - Uint16 type; /**< ::SDL_HAPTIC_CUSTOM */ - SDL_HapticDirection direction; /**< Direction of the effect. */ - - /* Replay */ - Uint32 length; /**< Duration of the effect. */ - Uint16 delay; /**< Delay before starting the effect. */ - - /* Trigger */ - Uint16 button; /**< Button that triggers the effect. */ - Uint16 interval; /**< How soon it can be triggered again after button. */ - - /* Custom */ - Uint8 channels; /**< Axes to use, minimum of one. */ - Uint16 period; /**< Sample periods. */ - Uint16 samples; /**< Amount of samples. */ - Uint16 *data; /**< Should contain channels*samples items. */ - - /* Envelope */ - Uint16 attack_length; /**< Duration of the attack. */ - Uint16 attack_level; /**< Level at the start of the attack. */ - Uint16 fade_length; /**< Duration of the fade. */ - Uint16 fade_level; /**< Level at the end of the fade. */ -} SDL_HapticCustom; - -/** - * \brief The generic template for any haptic effect. - * - * All values max at 32767 (0x7FFF). Signed values also can be negative. - * Time values unless specified otherwise are in milliseconds. - * - * You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767 - * value. Neither delay, interval, attack_length nor fade_length support - * ::SDL_HAPTIC_INFINITY. Fade will also not be used since effect never ends. - * - * Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of - * ::SDL_HAPTIC_INFINITY. - * - * Button triggers may not be supported on all devices, it is advised to not - * use them if possible. Buttons start at index 1 instead of index 0 like - * the joystick. - * - * If both attack_length and fade_level are 0, the envelope is not used, - * otherwise both values are used. - * - * Common parts: - * \code - * // Replay - All effects have this - * Uint32 length; // Duration of effect (ms). - * Uint16 delay; // Delay before starting effect. - * - * // Trigger - All effects have this - * Uint16 button; // Button that triggers effect. - * Uint16 interval; // How soon before effect can be triggered again. - * - * // Envelope - All effects except condition effects have this - * Uint16 attack_length; // Duration of the attack (ms). - * Uint16 attack_level; // Level at the start of the attack. - * Uint16 fade_length; // Duration of the fade out (ms). - * Uint16 fade_level; // Level at the end of the fade. - * \endcode - * - * - * Here we have an example of a constant effect evolution in time: - * \verbatim - Strength - ^ - | - | effect level --> _________________ - | / \ - | / \ - | / \ - | / \ - | attack_level --> | \ - | | | <--- fade_level - | - +--------------------------------------------------> Time - [--] [---] - attack_length fade_length - - [------------------][-----------------------] - delay length - \endverbatim - * - * Note either the attack_level or the fade_level may be above the actual - * effect level. - * - * \sa SDL_HapticConstant - * \sa SDL_HapticPeriodic - * \sa SDL_HapticCondition - * \sa SDL_HapticRamp - * \sa SDL_HapticLeftRight - * \sa SDL_HapticCustom - */ -typedef union SDL_HapticEffect -{ - /* Common for all force feedback effects */ - Uint16 type; /**< Effect type. */ - SDL_HapticConstant constant; /**< Constant effect. */ - SDL_HapticPeriodic periodic; /**< Periodic effect. */ - SDL_HapticCondition condition; /**< Condition effect. */ - SDL_HapticRamp ramp; /**< Ramp effect. */ - SDL_HapticLeftRight leftright; /**< Left/Right effect. */ - SDL_HapticCustom custom; /**< Custom effect. */ -} SDL_HapticEffect; - - -/* Function prototypes */ -/** - * \brief Count the number of haptic devices attached to the system. - * - * \return Number of haptic devices detected on the system. - */ -extern DECLSPEC int SDLCALL SDL_NumHaptics(void); - -/** - * \brief Get the implementation dependent name of a Haptic device. - * - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. - * - * \param device_index Index of the device to get its name. - * \return Name of the device or NULL on error. - * - * \sa SDL_NumHaptics - */ -extern DECLSPEC const char *SDLCALL SDL_HapticName(int device_index); - -/** - * \brief Opens a Haptic device for usage. - * - * The index passed as an argument refers to the N'th Haptic device on this - * system. - * - * When opening a haptic device, its gain will be set to maximum and - * autocenter will be disabled. To modify these values use - * SDL_HapticSetGain() and SDL_HapticSetAutocenter(). - * - * \param device_index Index of the device to open. - * \return Device identifier or NULL on error. - * - * \sa SDL_HapticIndex - * \sa SDL_HapticOpenFromMouse - * \sa SDL_HapticOpenFromJoystick - * \sa SDL_HapticClose - * \sa SDL_HapticSetGain - * \sa SDL_HapticSetAutocenter - * \sa SDL_HapticPause - * \sa SDL_HapticStopAll - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpen(int device_index); - -/** - * \brief Checks if the haptic device at index has been opened. - * - * \param device_index Index to check to see if it has been opened. - * \return 1 if it has been opened or 0 if it hasn't. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticIndex - */ -extern DECLSPEC int SDLCALL SDL_HapticOpened(int device_index); - -/** - * \brief Gets the index of a haptic device. - * - * \param haptic Haptic device to get the index of. - * \return The index of the haptic device or -1 on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticOpened - */ -extern DECLSPEC int SDLCALL SDL_HapticIndex(SDL_Haptic * haptic); - -/** - * \brief Gets whether or not the current mouse has haptic capabilities. - * - * \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't. - * - * \sa SDL_HapticOpenFromMouse - */ -extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void); - -/** - * \brief Tries to open a haptic device from the current mouse. - * - * \return The haptic device identifier or NULL on error. - * - * \sa SDL_MouseIsHaptic - * \sa SDL_HapticOpen - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromMouse(void); - -/** - * \brief Checks to see if a joystick has haptic features. - * - * \param joystick Joystick to test for haptic capabilities. - * \return 1 if the joystick is haptic, 0 if it isn't - * or -1 if an error ocurred. - * - * \sa SDL_HapticOpenFromJoystick - */ -extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick); - -/** - * \brief Opens a Haptic device for usage from a Joystick device. - * - * You must still close the haptic device seperately. It will not be closed - * with the joystick. - * - * When opening from a joystick you should first close the haptic device before - * closing the joystick device. If not, on some implementations the haptic - * device will also get unallocated and you'll be unable to use force feedback - * on that device. - * - * \param joystick Joystick to create a haptic device from. - * \return A valid haptic device identifier on success or NULL on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticClose - */ -extern DECLSPEC SDL_Haptic *SDLCALL SDL_HapticOpenFromJoystick(SDL_Joystick * - joystick); - -/** - * \brief Closes a Haptic device previously opened with SDL_HapticOpen(). - * - * \param haptic Haptic device to close. - */ -extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic); - -/** - * \brief Returns the number of effects a haptic device can store. - * - * On some platforms this isn't fully supported, and therefore is an - * approximation. Always check to see if your created effect was actually - * created and do not rely solely on SDL_HapticNumEffects(). - * - * \param haptic The haptic device to query effect max. - * \return The number of effects the haptic device can store or - * -1 on error. - * - * \sa SDL_HapticNumEffectsPlaying - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic); - -/** - * \brief Returns the number of effects a haptic device can play at the same - * time. - * - * This is not supported on all platforms, but will always return a value. - * Added here for the sake of completeness. - * - * \param haptic The haptic device to query maximum playing effects. - * \return The number of effects the haptic device can play at the same time - * or -1 on error. - * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticNumEffectsPlaying(SDL_Haptic * haptic); - -/** - * \brief Gets the haptic devices supported features in bitwise matter. - * - * Example: - * \code - * if (SDL_HapticQuery(haptic) & SDL_HAPTIC_CONSTANT) { - * printf("We have constant haptic effect!"); - * } - * \endcode - * - * \param haptic The haptic device to query. - * \return Haptic features in bitwise manner (OR'd). - * - * \sa SDL_HapticNumEffects - * \sa SDL_HapticEffectSupported - */ -extern DECLSPEC unsigned int SDLCALL SDL_HapticQuery(SDL_Haptic * haptic); - - -/** - * \brief Gets the number of haptic axes the device has. - * - * \sa SDL_HapticDirection - */ -extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic); - -/** - * \brief Checks to see if effect is supported by haptic. - * - * \param haptic Haptic device to check on. - * \param effect Effect to check to see if it is supported. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. - * - * \sa SDL_HapticQuery - * \sa SDL_HapticNewEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticEffectSupported(SDL_Haptic * haptic, - SDL_HapticEffect * - effect); - -/** - * \brief Creates a new haptic effect on the device. - * - * \param haptic Haptic device to create the effect on. - * \param effect Properties of the effect to create. - * \return The id of the effect on success or -1 on error. - * - * \sa SDL_HapticUpdateEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticNewEffect(SDL_Haptic * haptic, - SDL_HapticEffect * effect); - -/** - * \brief Updates the properties of an effect. - * - * Can be used dynamically, although behaviour when dynamically changing - * direction may be strange. Specifically the effect may reupload itself - * and start playing from the start. You cannot change the type either when - * running SDL_HapticUpdateEffect(). - * - * \param haptic Haptic device that has the effect. - * \param effect Effect to update. - * \param data New effect properties to use. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticNewEffect - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticUpdateEffect(SDL_Haptic * haptic, - int effect, - SDL_HapticEffect * data); - -/** - * \brief Runs the haptic effect on its associated haptic device. - * - * If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over - * repeating the envelope (attack and fade) every time. If you only want the - * effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length - * parameter. - * - * \param haptic Haptic device to run the effect on. - * \param effect Identifier of the haptic effect to run. - * \param iterations Number of iterations to run the effect. Use - * ::SDL_HAPTIC_INFINITY for infinity. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticStopEffect - * \sa SDL_HapticDestroyEffect - * \sa SDL_HapticGetEffectStatus - */ -extern DECLSPEC int SDLCALL SDL_HapticRunEffect(SDL_Haptic * haptic, - int effect, - Uint32 iterations); - -/** - * \brief Stops the haptic effect on its associated haptic device. - * - * \param haptic Haptic device to stop the effect on. - * \param effect Identifier of the effect to stop. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticDestroyEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticStopEffect(SDL_Haptic * haptic, - int effect); - -/** - * \brief Destroys a haptic effect on the device. - * - * This will stop the effect if it's running. Effects are automatically - * destroyed when the device is closed. - * - * \param haptic Device to destroy the effect on. - * \param effect Identifier of the effect to destroy. - * - * \sa SDL_HapticNewEffect - */ -extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic, - int effect); - -/** - * \brief Gets the status of the current effect on the haptic device. - * - * Device must support the ::SDL_HAPTIC_STATUS feature. - * - * \param haptic Haptic device to query the effect status on. - * \param effect Identifier of the effect to query its status. - * \return 0 if it isn't playing, 1 if it is playing or -1 on error. - * - * \sa SDL_HapticRunEffect - * \sa SDL_HapticStopEffect - */ -extern DECLSPEC int SDLCALL SDL_HapticGetEffectStatus(SDL_Haptic * haptic, - int effect); - -/** - * \brief Sets the global gain of the device. - * - * Device must support the ::SDL_HAPTIC_GAIN feature. - * - * The user may specify the maximum gain by setting the environment variable - * SDL_HAPTIC_GAIN_MAX which should be between 0 and 100. All calls to - * SDL_HapticSetGain() will scale linearly using SDL_HAPTIC_GAIN_MAX as the - * maximum. - * - * \param haptic Haptic device to set the gain on. - * \param gain Value to set the gain to, should be between 0 and 100. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain); - -/** - * \brief Sets the global autocenter of the device. - * - * Autocenter should be between 0 and 100. Setting it to 0 will disable - * autocentering. - * - * Device must support the ::SDL_HAPTIC_AUTOCENTER feature. - * - * \param haptic Haptic device to set autocentering on. - * \param autocenter Value to set autocenter to, 0 disables autocentering. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticQuery - */ -extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic, - int autocenter); - -/** - * \brief Pauses a haptic device. - * - * Device must support the ::SDL_HAPTIC_PAUSE feature. Call - * SDL_HapticUnpause() to resume playback. - * - * Do not modify the effects nor add new ones while the device is paused. - * That can cause all sorts of weird errors. - * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticUnpause - */ -extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic); - -/** - * \brief Unpauses a haptic device. - * - * Call to unpause after SDL_HapticPause(). - * - * \param haptic Haptic device to pause. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticPause - */ -extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic); - -/** - * \brief Stops all the currently playing effects on a haptic device. - * - * \param haptic Haptic device to stop. - * \return 0 on success or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_HapticStopAll(SDL_Haptic * haptic); - -/** - * \brief Checks to see if rumble is supported on a haptic device. - * - * \param haptic Haptic device to check to see if it supports rumble. - * \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error. - * - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleSupported(SDL_Haptic * haptic); - -/** - * \brief Initializes the haptic device for simple rumble playback. - * - * \param haptic Haptic device to initialize for simple rumble playback. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticOpen - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumblePlay - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleInit(SDL_Haptic * haptic); - -/** - * \brief Runs simple rumble on a haptic device - * - * \param haptic Haptic device to play rumble effect on. - * \param strength Strength of the rumble to play as a 0-1 float value. - * \param length Length of the rumble to play in milliseconds. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumbleStop - */ -extern DECLSPEC int SDLCALL SDL_HapticRumblePlay(SDL_Haptic * haptic, float strength, Uint32 length ); - -/** - * \brief Stops the simple rumble on a haptic device. - * - * \param haptic Haptic to stop the rumble on. - * \return 0 on success or -1 on error. - * - * \sa SDL_HapticRumbleSupported - * \sa SDL_HapticRumbleInit - * \sa SDL_HapticRumblePlay - */ -extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_haptic_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_hints.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_hints.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_hints.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_hints.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,517 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_hints.h - * - * Official documentation for SDL configuration variables - * - * This file contains functions to set and get configuration hints, - * as well as listing each of them alphabetically. - * - * The convention for naming hints is SDL_HINT_X, where "SDL_X" is - * the environment variable that can be used to override the default. - * - * In general these hints are just that - they may or may not be - * supported or applicable on any given platform, but they provide - * a way for an application or user to give the library a hint as - * to how they would like the library to work. - */ - -#ifndef _SDL_hints_h -#define _SDL_hints_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief A variable controlling how 3D acceleration is used to accelerate the SDL screen surface. - * - * SDL can try to accelerate the SDL screen surface by using streaming - * textures with a 3D rendering engine. This variable controls whether and - * how this is done. - * - * This variable can be set to the following values: - * "0" - Disable 3D acceleration - * "1" - Enable 3D acceleration, using the default renderer. - * "X" - Enable 3D acceleration, using X where X is one of the valid rendering drivers. (e.g. "direct3d", "opengl", etc.) - * - * By default SDL tries to make a best guess for each platform whether - * to use acceleration or not. - */ -#define SDL_HINT_FRAMEBUFFER_ACCELERATION "SDL_FRAMEBUFFER_ACCELERATION" - -/** - * \brief A variable specifying which render driver to use. - * - * If the application doesn't pick a specific renderer to use, this variable - * specifies the name of the preferred renderer. If the preferred renderer - * can't be initialized, the normal default renderer is used. - * - * This variable is case insensitive and can be set to the following values: - * "direct3d" - * "opengl" - * "opengles2" - * "opengles" - * "software" - * - * The default varies by platform, but it's the first one in the list that - * is available on the current platform. - */ -#define SDL_HINT_RENDER_DRIVER "SDL_RENDER_DRIVER" - -/** - * \brief A variable controlling whether the OpenGL render driver uses shaders if they are available. - * - * This variable can be set to the following values: - * "0" - Disable shaders - * "1" - Enable shaders - * - * By default shaders are used if OpenGL supports them. - */ -#define SDL_HINT_RENDER_OPENGL_SHADERS "SDL_RENDER_OPENGL_SHADERS" - -/** - * \brief A variable controlling whether the Direct3D device is initialized for thread-safe operations. - * - * This variable can be set to the following values: - * "0" - Thread-safety is not enabled (faster) - * "1" - Thread-safety is enabled - * - * By default the Direct3D device is created with thread-safety disabled. - */ -#define SDL_HINT_RENDER_DIRECT3D_THREADSAFE "SDL_RENDER_DIRECT3D_THREADSAFE" - -/** - * \brief A variable controlling whether to enable Direct3D 11+'s Debug Layer. - * - * This variable does not have any effect on the Direct3D 9 based renderer. - * - * This variable can be set to the following values: - * "0" - Disable Debug Layer use - * "1" - Enable Debug Layer use - * - * By default, SDL does not use Direct3D Debug Layer. - */ -#define SDL_HINT_RENDER_DIRECT3D11_DEBUG "SDL_HINT_RENDER_DIRECT3D11_DEBUG" - -/** - * \brief A variable controlling the scaling quality - * - * This variable can be set to the following values: - * "0" or "nearest" - Nearest pixel sampling - * "1" or "linear" - Linear filtering (supported by OpenGL and Direct3D) - * "2" or "best" - Currently this is the same as "linear" - * - * By default nearest pixel sampling is used - */ -#define SDL_HINT_RENDER_SCALE_QUALITY "SDL_RENDER_SCALE_QUALITY" - -/** - * \brief A variable controlling whether updates to the SDL screen surface should be synchronized with the vertical refresh, to avoid tearing. - * - * This variable can be set to the following values: - * "0" - Disable vsync - * "1" - Enable vsync - * - * By default SDL does not sync screen surface updates with vertical refresh. - */ -#define SDL_HINT_RENDER_VSYNC "SDL_RENDER_VSYNC" - -/** - * \brief A variable controlling whether the screensaver is enabled. - * - * This variable can be set to the following values: - * "0" - Disable screensaver - * "1" - Enable screensaver - * - * By default SDL will disable the screensaver. - */ -#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER "SDL_VIDEO_ALLOW_SCREENSAVER" - -/** - * \brief A variable controlling whether the X11 VidMode extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XVidMode - * "1" - Enable XVidMode - * - * By default SDL will use XVidMode if it is available. - */ -#define SDL_HINT_VIDEO_X11_XVIDMODE "SDL_VIDEO_X11_XVIDMODE" - -/** - * \brief A variable controlling whether the X11 Xinerama extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable Xinerama - * "1" - Enable Xinerama - * - * By default SDL will use Xinerama if it is available. - */ -#define SDL_HINT_VIDEO_X11_XINERAMA "SDL_VIDEO_X11_XINERAMA" - -/** - * \brief A variable controlling whether the X11 XRandR extension should be used. - * - * This variable can be set to the following values: - * "0" - Disable XRandR - * "1" - Enable XRandR - * - * By default SDL will not use XRandR because of window manager issues. - */ -#define SDL_HINT_VIDEO_X11_XRANDR "SDL_VIDEO_X11_XRANDR" - -/** - * \brief A variable controlling whether grabbing input grabs the keyboard - * - * This variable can be set to the following values: - * "0" - Grab will affect only the mouse - * "1" - Grab will affect mouse and keyboard - * - * By default SDL will not grab the keyboard so system shortcuts still work. - */ -#define SDL_HINT_GRAB_KEYBOARD "SDL_GRAB_KEYBOARD" - -/** -* \brief A variable controlling whether relative mouse mode is implemented using mouse warping -* -* This variable can be set to the following values: -* "0" - Relative mouse mode uses raw input -* "1" - Relative mouse mode uses mouse warping -* -* By default SDL will use raw input for relative mouse mode -*/ -#define SDL_HINT_MOUSE_RELATIVE_MODE_WARP "SDL_MOUSE_RELATIVE_MODE_WARP" - -/** - * \brief Minimize your SDL_Window if it loses key focus when in fullscreen mode. Defaults to true. - * - */ -#define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS" - -/** - * \brief A variable controlling whether the idle timer is disabled on iOS. - * - * When an iOS app does not receive touches for some time, the screen is - * dimmed automatically. For games where the accelerometer is the only input - * this is problematic. This functionality can be disabled by setting this - * hint. - * - * This variable can be set to the following values: - * "0" - Enable idle timer - * "1" - Disable idle timer - */ -#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED" - -/** - * \brief A variable controlling which orientations are allowed on iOS. - * - * In some circumstances it is necessary to be able to explicitly control - * which UI orientations are allowed. - * - * This variable is a space delimited list of the following values: - * "LandscapeLeft", "LandscapeRight", "Portrait" "PortraitUpsideDown" - */ -#define SDL_HINT_ORIENTATIONS "SDL_IOS_ORIENTATIONS" - -/** - * \brief A variable controlling whether an Android built-in accelerometer should be - * listed as a joystick device, rather than listing actual joysticks only. - * - * This variable can be set to the following values: - * "0" - List only real joysticks and accept input from them - * "1" - List real joysticks along with the accelerometer as if it were a 3 axis joystick (the default). - */ -#define SDL_HINT_ACCELEROMETER_AS_JOYSTICK "SDL_ACCELEROMETER_AS_JOYSTICK" - - -/** - * \brief A variable that lets you disable the detection and use of Xinput gamepad devices - * - * The variable can be set to the following values: - * "0" - Disable XInput detection (only uses direct input) - * "1" - Enable XInput detection (the default) - */ -#define SDL_HINT_XINPUT_ENABLED "SDL_XINPUT_ENABLED" - - -/** - * \brief A variable that lets you manually hint extra gamecontroller db entries - * - * The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h - * - * This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER) - * You can update mappings after the system is initialized with SDL_GameControllerMappingForGUID() and SDL_GameControllerAddMapping() - */ -#define SDL_HINT_GAMECONTROLLERCONFIG "SDL_GAMECONTROLLERCONFIG" - - -/** - * \brief A variable that lets you enable joystick (and gamecontroller) events even when your app is in the background. - * - * The variable can be set to the following values: - * "0" - Disable joystick & gamecontroller input events when the - * application is in the background. - * "1" - Enable joystick & gamecontroller input events when the - * application is in the background. - * - * The default value is "0". This hint may be set at any time. - */ -#define SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS" - - -/** - * \brief If set to 0 then never set the top most bit on a SDL Window, even if the video mode expects it. - * This is a debugging aid for developers and not expected to be used by end users. The default is "1" - * - * This variable can be set to the following values: - * "0" - don't allow topmost - * "1" - allow topmost - */ -#define SDL_HINT_ALLOW_TOPMOST "SDL_ALLOW_TOPMOST" - - -/** - * \brief A variable that controls the timer resolution, in milliseconds. - * - * The higher resolution the timer, the more frequently the CPU services - * timer interrupts, and the more precise delays are, but this takes up - * power and CPU time. This hint is only used on Windows 7 and earlier. - * - * See this blog post for more information: - * http://randomascii.wordpress.com/2013/07/08/windows-timer-resolution-megawatts-wasted/ - * - * If this variable is set to "0", the system timer resolution is not set. - * - * The default value is "1". This hint may be set at any time. - */ -#define SDL_HINT_TIMER_RESOLUTION "SDL_TIMER_RESOLUTION" - - -/** - * \brief If set to 1, then do not allow high-DPI windows. ("Retina" on Mac) - */ -#define SDL_HINT_VIDEO_HIGHDPI_DISABLED "SDL_VIDEO_HIGHDPI_DISABLED" - -/** - * \brief A variable that determines whether ctrl+click should generate a right-click event on Mac - * - * If present, holding ctrl while left clicking will generate a right click - * event when on Mac. - */ -#define SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK "SDL_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK" - -/** -* \brief A variable specifying which shader compiler to preload when using the Chrome ANGLE binaries -* -* SDL has EGL and OpenGL ES2 support on Windows via the ANGLE project. It -* can use two different sets of binaries, those compiled by the user from source -* or those provided by the Chrome browser. In the later case, these binaries require -* that SDL loads a DLL providing the shader compiler. -* -* This variable can be set to the following values: -* "d3dcompiler_46.dll" - default, best for Vista or later. -* "d3dcompiler_43.dll" - for XP support. -* "none" - do not load any library, useful if you compiled ANGLE from source and included the compiler in your binaries. -* -*/ -#define SDL_HINT_VIDEO_WIN_D3DCOMPILER "SDL_VIDEO_WIN_D3DCOMPILER" - -/** -* \brief A variable that is the address of another SDL_Window* (as a hex string formatted with "%p"). -* -* If this hint is set before SDL_CreateWindowFrom() and the SDL_Window* it is set to has -* SDL_WINDOW_OPENGL set (and running on WGL only, currently), then two things will occur on the newly -* created SDL_Window: -* -* 1. Its pixel format will be set to the same pixel format as this SDL_Window. This is -* needed for example when sharing an OpenGL context across multiple windows. -* -* 2. The flag SDL_WINDOW_OPENGL will be set on the new window so it can be used for -* OpenGL rendering. -* -* This variable can be set to the following values: -* The address (as a string "%p") of the SDL_Window* that new windows created with SDL_CreateWindowFrom() should -* share a pixel format with. -*/ -#define SDL_HINT_VIDEO_WINDOW_SHARE_PIXEL_FORMAT "SDL_VIDEO_WINDOW_SHARE_PIXEL_FORMAT" - -/* - * \brief A URL to a WinRT app's privacy policy - * - * All network-enabled WinRT apps must make a privacy policy available to its - * users. On Windows 8, 8.1, and RT, Microsoft mandates that this policy be - * be available in the Windows Settings charm, as accessed from within the app. - * SDL provides code to add a URL-based link there, which can point to the app's - * privacy policy. - * - * To setup a URL to an app's privacy policy, set SDL_HINT_WINRT_PRIVACY_POLICY_URL - * before calling any SDL_Init functions. The contents of the hint should - * be a valid URL. For example, "http://www.example.com". - * - * The default value is "", which will prevent SDL from adding a privacy policy - * link to the Settings charm. This hint should only be set during app init. - * - * The label text of an app's "Privacy Policy" link may be customized via another - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that on Windows Phone, Microsoft does not provide standard UI - * for displaying a privacy policy link, and as such, SDL_HINT_WINRT_PRIVACY_POLICY_URL - * will not get used on that platform. Network-enabled phone apps should display - * their privacy policy through some other, in-app means. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_URL "SDL_HINT_WINRT_PRIVACY_POLICY_URL" - -/** \brief Label text for a WinRT app's privacy policy link - * - * Network-enabled WinRT apps must include a privacy policy. On Windows 8, 8.1, and RT, - * Microsoft mandates that this policy be available via the Windows Settings charm. - * SDL provides code to add a link there, with it's label text being set via the - * optional hint, SDL_HINT_WINRT_PRIVACY_POLICY_LABEL. - * - * Please note that a privacy policy's contents are not set via this hint. A separate - * hint, SDL_HINT_WINRT_PRIVACY_POLICY_URL, is used to link to the actual text of the - * policy. - * - * The contents of this hint should be encoded as a UTF8 string. - * - * The default value is "Privacy Policy". This hint should only be set during app - * initialization, preferably before any calls to SDL_Init. - * - * For additional information on linking to a privacy policy, see the documentation for - * SDL_HINT_WINRT_PRIVACY_POLICY_URL. - */ -#define SDL_HINT_WINRT_PRIVACY_POLICY_LABEL "SDL_HINT_WINRT_PRIVACY_POLICY_LABEL" - -/** \brief If set to 1, back button press events on Windows Phone 8+ will be marked as handled. - * - * TODO, WinRT: document SDL_HINT_WINRT_HANDLE_BACK_BUTTON need and use - * For now, more details on why this is needed can be found at the - * beginning of the following web page: - * http://msdn.microsoft.com/en-us/library/windowsphone/develop/jj247550(v=vs.105).aspx - */ -#define SDL_HINT_WINRT_HANDLE_BACK_BUTTON "SDL_HINT_WINRT_HANDLE_BACK_BUTTON" - -/** - * \brief A variable that dictates policy for fullscreen Spaces on Mac OS X. - * - * This hint only applies to Mac OS X. - * - * The variable can be set to the following values: - * "0" - Disable Spaces support (FULLSCREEN_DESKTOP won't use them and - * SDL_WINDOW_RESIZABLE windows won't offer the "fullscreen" - * button on their titlebars). - * "1" - Enable Spaces support (FULLSCREEN_DESKTOP will use them and - * SDL_WINDOW_RESIZABLE windows will offer the "fullscreen" - * button on their titlebars. - * - * The default value is "1". Spaces are disabled regardless of this hint if - * the OS isn't at least Mac OS X Lion (10.7). This hint must be set before - * any windows are created. - */ -#define SDL_HINT_VIDEO_MAC_FULLSCREEN_SPACES "SDL_VIDEO_MAC_FULLSCREEN_SPACES" - - -/** - * \brief An enumeration of hint priorities - */ -typedef enum -{ - SDL_HINT_DEFAULT, - SDL_HINT_NORMAL, - SDL_HINT_OVERRIDE -} SDL_HintPriority; - - -/** - * \brief Set a hint with a specific priority - * - * The priority controls the behavior when setting a hint that already - * has a value. Hints will replace existing hints of their priority and - * lower. Environment variables are considered to have override priority. - * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name, - const char *value, - SDL_HintPriority priority); - -/** - * \brief Set a hint with normal priority - * - * \return SDL_TRUE if the hint was set, SDL_FALSE otherwise - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name, - const char *value); - -/** - * \brief Get a hint - * - * \return The string value of a hint variable. - */ -extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name); - -/** - * \brief Add a function to watch a particular hint - * - * \param name The hint to watch - * \param callback The function to call when the hint value changes - * \param userdata A pointer to pass to the callback function - */ -typedef void (*SDL_HintCallback)(void *userdata, const char *name, const char *oldValue, const char *newValue); -extern DECLSPEC void SDLCALL SDL_AddHintCallback(const char *name, - SDL_HintCallback callback, - void *userdata); - -/** - * \brief Remove a function watching a particular hint - * - * \param name The hint being watched - * \param callback The function being called when the hint value changes - * \param userdata A pointer being passed to the callback function - */ -extern DECLSPEC void SDLCALL SDL_DelHintCallback(const char *name, - SDL_HintCallback callback, - void *userdata); - -/** - * \brief Clear all hints - * - * This function is called during SDL_Quit() to free stored hints. - */ -extern DECLSPEC void SDLCALL SDL_ClearHints(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_hints_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_joystick.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_joystick.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_joystick.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_joystick.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,253 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_joystick.h - * - * Include file for SDL joystick event handling - * - * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick - * behind a device_index changing as joysticks are plugged and unplugged. - * - * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted - * then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in. - * - * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of - * the device (a X360 wired controller for example). This identifier is platform dependent. - * - * - */ - -#ifndef _SDL_joystick_h -#define _SDL_joystick_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_joystick.h - * - * In order to use these functions, SDL_Init() must have been called - * with the ::SDL_INIT_JOYSTICK flag. This causes SDL to scan the system - * for joysticks, and load appropriate drivers. - * - * If you would like to receive joystick updates while the application - * is in the background, you should set the following hint before calling - * SDL_Init(): SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS - */ - -/* The joystick structure used to identify an SDL joystick */ -struct _SDL_Joystick; -typedef struct _SDL_Joystick SDL_Joystick; - -/* A structure that encodes the stable unique id for a joystick device */ -typedef struct { - Uint8 data[16]; -} SDL_JoystickGUID; - -typedef Sint32 SDL_JoystickID; - - -/* Function prototypes */ -/** - * Count the number of joysticks attached to the system right now - */ -extern DECLSPEC int SDLCALL SDL_NumJoysticks(void); - -/** - * Get the implementation dependent name of a joystick. - * This can be called before any joysticks are opened. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index); - -/** - * Open a joystick for use. - * The index passed as an argument refers tothe N'th joystick on the system. - * This index is the value which will identify this joystick in future joystick - * events. - * - * \return A joystick identifier, or NULL if an error occurred. - */ -extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index); - -/** - * Return the name for this currently opened joystick. - * If no name can be found, this function returns NULL. - */ -extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick); - -/** - * Return the GUID for the joystick at this index - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetDeviceGUID(int device_index); - -/** - * Return the GUID for this opened joystick - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUID(SDL_Joystick * joystick); - -/** - * Return a string representation for this guid. pszGUID must point to at least 33 bytes - * (32 for the string plus a NULL terminator). - */ -extern DECLSPEC void SDLCALL SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID); - -/** - * convert a string into a joystick formatted guid - */ -extern DECLSPEC SDL_JoystickGUID SDLCALL SDL_JoystickGetGUIDFromString(const char *pchGUID); - -/** - * Returns SDL_TRUE if the joystick has been opened and currently connected, or SDL_FALSE if it has not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_JoystickGetAttached(SDL_Joystick * joystick); - -/** - * Get the instance ID of an opened joystick or -1 if the joystick is invalid. - */ -extern DECLSPEC SDL_JoystickID SDLCALL SDL_JoystickInstanceID(SDL_Joystick * joystick); - -/** - * Get the number of general axis controls on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumAxes(SDL_Joystick * joystick); - -/** - * Get the number of trackballs on a joystick. - * - * Joystick trackballs have only relative motion events associated - * with them and their state cannot be polled. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumBalls(SDL_Joystick * joystick); - -/** - * Get the number of POV hats on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumHats(SDL_Joystick * joystick); - -/** - * Get the number of buttons on a joystick. - */ -extern DECLSPEC int SDLCALL SDL_JoystickNumButtons(SDL_Joystick * joystick); - -/** - * Update the current state of the open joysticks. - * - * This is called automatically by the event loop if any joystick - * events are enabled. - */ -extern DECLSPEC void SDLCALL SDL_JoystickUpdate(void); - -/** - * Enable/disable joystick event polling. - * - * If joystick events are disabled, you must call SDL_JoystickUpdate() - * yourself and check the state of the joystick when you want joystick - * information. - * - * The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE. - */ -extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state); - -/** - * Get the current state of an axis control on a joystick. - * - * The state is a value ranging from -32768 to 32767. - * - * The axis indices start at index 0. - */ -extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick, - int axis); - -/** - * \name Hat positions - */ -/* @{ */ -#define SDL_HAT_CENTERED 0x00 -#define SDL_HAT_UP 0x01 -#define SDL_HAT_RIGHT 0x02 -#define SDL_HAT_DOWN 0x04 -#define SDL_HAT_LEFT 0x08 -#define SDL_HAT_RIGHTUP (SDL_HAT_RIGHT|SDL_HAT_UP) -#define SDL_HAT_RIGHTDOWN (SDL_HAT_RIGHT|SDL_HAT_DOWN) -#define SDL_HAT_LEFTUP (SDL_HAT_LEFT|SDL_HAT_UP) -#define SDL_HAT_LEFTDOWN (SDL_HAT_LEFT|SDL_HAT_DOWN) -/* @} */ - -/** - * Get the current state of a POV hat on a joystick. - * - * The hat indices start at index 0. - * - * \return The return value is one of the following positions: - * - ::SDL_HAT_CENTERED - * - ::SDL_HAT_UP - * - ::SDL_HAT_RIGHT - * - ::SDL_HAT_DOWN - * - ::SDL_HAT_LEFT - * - ::SDL_HAT_RIGHTUP - * - ::SDL_HAT_RIGHTDOWN - * - ::SDL_HAT_LEFTUP - * - ::SDL_HAT_LEFTDOWN - */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetHat(SDL_Joystick * joystick, - int hat); - -/** - * Get the ball axis change since the last poll. - * - * \return 0, or -1 if you passed it invalid parameters. - * - * The ball indices start at index 0. - */ -extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick, - int ball, int *dx, int *dy); - -/** - * Get the current state of a button on a joystick. - * - * The button indices start at index 0. - */ -extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick, - int button); - -/** - * Close a joystick previously opened with SDL_JoystickOpen(). - */ -extern DECLSPEC void SDLCALL SDL_JoystickClose(SDL_Joystick * joystick); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_joystick_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keyboard.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_keyboard.h - * - * Include file for SDL keyboard event handling - */ - -#ifndef _SDL_keyboard_h -#define _SDL_keyboard_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_keycode.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The SDL keysym structure, used in key events. - * - * \note If you are looking for translated character input, see the ::SDL_TEXTINPUT event. - */ -typedef struct SDL_Keysym -{ - SDL_Scancode scancode; /**< SDL physical key code - see ::SDL_Scancode for details */ - SDL_Keycode sym; /**< SDL virtual key code - see ::SDL_Keycode for details */ - Uint16 mod; /**< current key modifiers */ - Uint32 unused; -} SDL_Keysym; - -/* Function prototypes */ - -/** - * \brief Get the window which currently has keyboard focus. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetKeyboardFocus(void); - -/** - * \brief Get a snapshot of the current state of the keyboard. - * - * \param numkeys if non-NULL, receives the length of the returned array. - * - * \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values. - * - * \b Example: - * \code - * const Uint8 *state = SDL_GetKeyboardState(NULL); - * if ( state[SDL_SCANCODE_RETURN] ) { - * printf(" is pressed.\n"); - * } - * \endcode - */ -extern DECLSPEC const Uint8 *SDLCALL SDL_GetKeyboardState(int *numkeys); - -/** - * \brief Get the current key modifier state for the keyboard. - */ -extern DECLSPEC SDL_Keymod SDLCALL SDL_GetModState(void); - -/** - * \brief Set the current key modifier state for the keyboard. - * - * \note This does not change the keyboard state, only the key modifier flags. - */ -extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate); - -/** - * \brief Get the key code corresponding to the given scancode according - * to the current keyboard layout. - * - * See ::SDL_Keycode for details. - * - * \sa SDL_GetKeyName() - */ -extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode); - -/** - * \brief Get the scancode corresponding to the given key code according to the - * current keyboard layout. - * - * See ::SDL_Scancode for details. - * - * \sa SDL_GetScancodeName() - */ -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key); - -/** - * \brief Get a human-readable name for a scancode. - * - * \return A pointer to the name for the scancode. - * If the scancode doesn't have a name, this function returns - * an empty string (""). - * - * \sa SDL_Scancode - */ -extern DECLSPEC const char *SDLCALL SDL_GetScancodeName(SDL_Scancode scancode); - -/** - * \brief Get a scancode from a human-readable name - * - * \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized - * - * \sa SDL_Scancode - */ -extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromName(const char *name); - -/** - * \brief Get a human-readable name for a key. - * - * \return A pointer to a UTF-8 string that stays valid at least until the next - * call to this function. If you need it around any longer, you must - * copy it. If the key doesn't have a name, this function returns an - * empty string (""). - * - * \sa SDL_Key - */ -extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key); - -/** - * \brief Get a key code from a human-readable name - * - * \return key code, or SDLK_UNKNOWN if the name wasn't recognized - * - * \sa SDL_Keycode - */ -extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromName(const char *name); - -/** - * \brief Start accepting Unicode text input events. - * This function will show the on-screen keyboard if supported. - * - * \sa SDL_StopTextInput() - * \sa SDL_SetTextInputRect() - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC void SDLCALL SDL_StartTextInput(void); - -/** - * \brief Return whether or not Unicode text input events are enabled. - * - * \sa SDL_StartTextInput() - * \sa SDL_StopTextInput() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsTextInputActive(void); - -/** - * \brief Stop receiving any text input events. - * This function will hide the on-screen keyboard if supported. - * - * \sa SDL_StartTextInput() - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC void SDLCALL SDL_StopTextInput(void); - -/** - * \brief Set the rectangle used to type Unicode text inputs. - * This is used as a hint for IME and on-screen keyboard placement. - * - * \sa SDL_StartTextInput() - */ -extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect); - -/** - * \brief Returns whether the platform has some screen keyboard support. - * - * \return SDL_TRUE if some keyboard support is available else SDL_FALSE. - * - * \note Not all screen keyboard functions are supported on all platforms. - * - * \sa SDL_IsScreenKeyboardShown() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void); - -/** - * \brief Returns whether the screen keyboard is shown for given window. - * - * \param window The window for which screen keyboard should be queried. - * - * \return SDL_TRUE if screen keyboard is shown else SDL_FALSE. - * - * \sa SDL_HasScreenKeyboardSupport() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_keyboard_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keycode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keycode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keycode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_keycode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,341 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_keycode.h - * - * Defines constants which identify keyboard keys and modifiers. - */ - -#ifndef _SDL_keycode_h -#define _SDL_keycode_h - -#include "SDL_stdinc.h" -#include "SDL_scancode.h" - -/** - * \brief The SDL virtual key representation. - * - * Values of this type are used to represent keyboard keys using the current - * layout of the keyboard. These values include Unicode values representing - * the unmodified character that would be generated by pressing the key, or - * an SDLK_* constant for those keys that do not generate characters. - */ -typedef Sint32 SDL_Keycode; - -#define SDLK_SCANCODE_MASK (1<<30) -#define SDL_SCANCODE_TO_KEYCODE(X) (X | SDLK_SCANCODE_MASK) - -enum -{ - SDLK_UNKNOWN = 0, - - SDLK_RETURN = '\r', - SDLK_ESCAPE = '\033', - SDLK_BACKSPACE = '\b', - SDLK_TAB = '\t', - SDLK_SPACE = ' ', - SDLK_EXCLAIM = '!', - SDLK_QUOTEDBL = '"', - SDLK_HASH = '#', - SDLK_PERCENT = '%', - SDLK_DOLLAR = '$', - SDLK_AMPERSAND = '&', - SDLK_QUOTE = '\'', - SDLK_LEFTPAREN = '(', - SDLK_RIGHTPAREN = ')', - SDLK_ASTERISK = '*', - SDLK_PLUS = '+', - SDLK_COMMA = ',', - SDLK_MINUS = '-', - SDLK_PERIOD = '.', - SDLK_SLASH = '/', - SDLK_0 = '0', - SDLK_1 = '1', - SDLK_2 = '2', - SDLK_3 = '3', - SDLK_4 = '4', - SDLK_5 = '5', - SDLK_6 = '6', - SDLK_7 = '7', - SDLK_8 = '8', - SDLK_9 = '9', - SDLK_COLON = ':', - SDLK_SEMICOLON = ';', - SDLK_LESS = '<', - SDLK_EQUALS = '=', - SDLK_GREATER = '>', - SDLK_QUESTION = '?', - SDLK_AT = '@', - /* - Skip uppercase letters - */ - SDLK_LEFTBRACKET = '[', - SDLK_BACKSLASH = '\\', - SDLK_RIGHTBRACKET = ']', - SDLK_CARET = '^', - SDLK_UNDERSCORE = '_', - SDLK_BACKQUOTE = '`', - SDLK_a = 'a', - SDLK_b = 'b', - SDLK_c = 'c', - SDLK_d = 'd', - SDLK_e = 'e', - SDLK_f = 'f', - SDLK_g = 'g', - SDLK_h = 'h', - SDLK_i = 'i', - SDLK_j = 'j', - SDLK_k = 'k', - SDLK_l = 'l', - SDLK_m = 'm', - SDLK_n = 'n', - SDLK_o = 'o', - SDLK_p = 'p', - SDLK_q = 'q', - SDLK_r = 'r', - SDLK_s = 's', - SDLK_t = 't', - SDLK_u = 'u', - SDLK_v = 'v', - SDLK_w = 'w', - SDLK_x = 'x', - SDLK_y = 'y', - SDLK_z = 'z', - - SDLK_CAPSLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CAPSLOCK), - - SDLK_F1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F1), - SDLK_F2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F2), - SDLK_F3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F3), - SDLK_F4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F4), - SDLK_F5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F5), - SDLK_F6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F6), - SDLK_F7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F7), - SDLK_F8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F8), - SDLK_F9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F9), - SDLK_F10 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F10), - SDLK_F11 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F11), - SDLK_F12 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F12), - - SDLK_PRINTSCREEN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRINTSCREEN), - SDLK_SCROLLLOCK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SCROLLLOCK), - SDLK_PAUSE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAUSE), - SDLK_INSERT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_INSERT), - SDLK_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HOME), - SDLK_PAGEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEUP), - SDLK_DELETE = '\177', - SDLK_END = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_END), - SDLK_PAGEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PAGEDOWN), - SDLK_RIGHT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RIGHT), - SDLK_LEFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LEFT), - SDLK_DOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DOWN), - SDLK_UP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UP), - - SDLK_NUMLOCKCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_NUMLOCKCLEAR), - SDLK_KP_DIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DIVIDE), - SDLK_KP_MULTIPLY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MULTIPLY), - SDLK_KP_MINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MINUS), - SDLK_KP_PLUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUS), - SDLK_KP_ENTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_ENTER), - SDLK_KP_1 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_1), - SDLK_KP_2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_2), - SDLK_KP_3 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_3), - SDLK_KP_4 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_4), - SDLK_KP_5 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_5), - SDLK_KP_6 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_6), - SDLK_KP_7 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_7), - SDLK_KP_8 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_8), - SDLK_KP_9 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_9), - SDLK_KP_0 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_0), - SDLK_KP_PERIOD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERIOD), - - SDLK_APPLICATION = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_APPLICATION), - SDLK_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_POWER), - SDLK_KP_EQUALS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALS), - SDLK_F13 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F13), - SDLK_F14 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F14), - SDLK_F15 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F15), - SDLK_F16 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F16), - SDLK_F17 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F17), - SDLK_F18 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F18), - SDLK_F19 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F19), - SDLK_F20 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F20), - SDLK_F21 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F21), - SDLK_F22 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F22), - SDLK_F23 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F23), - SDLK_F24 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_F24), - SDLK_EXECUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXECUTE), - SDLK_HELP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_HELP), - SDLK_MENU = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MENU), - SDLK_SELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SELECT), - SDLK_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_STOP), - SDLK_AGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AGAIN), - SDLK_UNDO = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_UNDO), - SDLK_CUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CUT), - SDLK_COPY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COPY), - SDLK_PASTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PASTE), - SDLK_FIND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_FIND), - SDLK_MUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MUTE), - SDLK_VOLUMEUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEUP), - SDLK_VOLUMEDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_VOLUMEDOWN), - SDLK_KP_COMMA = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COMMA), - SDLK_KP_EQUALSAS400 = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EQUALSAS400), - - SDLK_ALTERASE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_ALTERASE), - SDLK_SYSREQ = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SYSREQ), - SDLK_CANCEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CANCEL), - SDLK_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEAR), - SDLK_PRIOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_PRIOR), - SDLK_RETURN2 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RETURN2), - SDLK_SEPARATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SEPARATOR), - SDLK_OUT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OUT), - SDLK_OPER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_OPER), - SDLK_CLEARAGAIN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CLEARAGAIN), - SDLK_CRSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CRSEL), - SDLK_EXSEL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EXSEL), - - SDLK_KP_00 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_00), - SDLK_KP_000 = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_000), - SDLK_THOUSANDSSEPARATOR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_THOUSANDSSEPARATOR), - SDLK_DECIMALSEPARATOR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DECIMALSEPARATOR), - SDLK_CURRENCYUNIT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYUNIT), - SDLK_CURRENCYSUBUNIT = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CURRENCYSUBUNIT), - SDLK_KP_LEFTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTPAREN), - SDLK_KP_RIGHTPAREN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTPAREN), - SDLK_KP_LEFTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LEFTBRACE), - SDLK_KP_RIGHTBRACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_RIGHTBRACE), - SDLK_KP_TAB = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_TAB), - SDLK_KP_BACKSPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BACKSPACE), - SDLK_KP_A = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_A), - SDLK_KP_B = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_B), - SDLK_KP_C = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_C), - SDLK_KP_D = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_D), - SDLK_KP_E = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_E), - SDLK_KP_F = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_F), - SDLK_KP_XOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_XOR), - SDLK_KP_POWER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_POWER), - SDLK_KP_PERCENT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PERCENT), - SDLK_KP_LESS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_LESS), - SDLK_KP_GREATER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_GREATER), - SDLK_KP_AMPERSAND = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AMPERSAND), - SDLK_KP_DBLAMPERSAND = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLAMPERSAND), - SDLK_KP_VERTICALBAR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_VERTICALBAR), - SDLK_KP_DBLVERTICALBAR = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DBLVERTICALBAR), - SDLK_KP_COLON = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_COLON), - SDLK_KP_HASH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HASH), - SDLK_KP_SPACE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_SPACE), - SDLK_KP_AT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_AT), - SDLK_KP_EXCLAM = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_EXCLAM), - SDLK_KP_MEMSTORE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSTORE), - SDLK_KP_MEMRECALL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMRECALL), - SDLK_KP_MEMCLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMCLEAR), - SDLK_KP_MEMADD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMADD), - SDLK_KP_MEMSUBTRACT = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMSUBTRACT), - SDLK_KP_MEMMULTIPLY = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMMULTIPLY), - SDLK_KP_MEMDIVIDE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_MEMDIVIDE), - SDLK_KP_PLUSMINUS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_PLUSMINUS), - SDLK_KP_CLEAR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEAR), - SDLK_KP_CLEARENTRY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_CLEARENTRY), - SDLK_KP_BINARY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_BINARY), - SDLK_KP_OCTAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_OCTAL), - SDLK_KP_DECIMAL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_DECIMAL), - SDLK_KP_HEXADECIMAL = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KP_HEXADECIMAL), - - SDLK_LCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LCTRL), - SDLK_LSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LSHIFT), - SDLK_LALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LALT), - SDLK_LGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_LGUI), - SDLK_RCTRL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RCTRL), - SDLK_RSHIFT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RSHIFT), - SDLK_RALT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RALT), - SDLK_RGUI = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_RGUI), - - SDLK_MODE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MODE), - - SDLK_AUDIONEXT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIONEXT), - SDLK_AUDIOPREV = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPREV), - SDLK_AUDIOSTOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOSTOP), - SDLK_AUDIOPLAY = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOPLAY), - SDLK_AUDIOMUTE = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AUDIOMUTE), - SDLK_MEDIASELECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MEDIASELECT), - SDLK_WWW = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_WWW), - SDLK_MAIL = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_MAIL), - SDLK_CALCULATOR = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_CALCULATOR), - SDLK_COMPUTER = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_COMPUTER), - SDLK_AC_SEARCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_SEARCH), - SDLK_AC_HOME = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_HOME), - SDLK_AC_BACK = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BACK), - SDLK_AC_FORWARD = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_FORWARD), - SDLK_AC_STOP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_STOP), - SDLK_AC_REFRESH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_REFRESH), - SDLK_AC_BOOKMARKS = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_AC_BOOKMARKS), - - SDLK_BRIGHTNESSDOWN = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSDOWN), - SDLK_BRIGHTNESSUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_BRIGHTNESSUP), - SDLK_DISPLAYSWITCH = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_DISPLAYSWITCH), - SDLK_KBDILLUMTOGGLE = - SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMTOGGLE), - SDLK_KBDILLUMDOWN = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMDOWN), - SDLK_KBDILLUMUP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_KBDILLUMUP), - SDLK_EJECT = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_EJECT), - SDLK_SLEEP = SDL_SCANCODE_TO_KEYCODE(SDL_SCANCODE_SLEEP) -}; - -/** - * \brief Enumeration of valid key mods (possibly OR'd together). - */ -typedef enum -{ - KMOD_NONE = 0x0000, - KMOD_LSHIFT = 0x0001, - KMOD_RSHIFT = 0x0002, - KMOD_LCTRL = 0x0040, - KMOD_RCTRL = 0x0080, - KMOD_LALT = 0x0100, - KMOD_RALT = 0x0200, - KMOD_LGUI = 0x0400, - KMOD_RGUI = 0x0800, - KMOD_NUM = 0x1000, - KMOD_CAPS = 0x2000, - KMOD_MODE = 0x4000, - KMOD_RESERVED = 0x8000 -} SDL_Keymod; - -#define KMOD_CTRL (KMOD_LCTRL|KMOD_RCTRL) -#define KMOD_SHIFT (KMOD_LSHIFT|KMOD_RSHIFT) -#define KMOD_ALT (KMOD_LALT|KMOD_RALT) -#define KMOD_GUI (KMOD_LGUI|KMOD_RGUI) - -#endif /* _SDL_keycode_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_loadso.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_loadso.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_loadso.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_loadso.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_loadso.h - * - * System dependent library loading routines - * - * Some things to keep in mind: - * \li These functions only work on C function names. Other languages may - * have name mangling and intrinsic language support that varies from - * compiler to compiler. - * \li Make sure you declare your function pointers with the same calling - * convention as the actual library function. Your code will crash - * mysteriously if you do not do this. - * \li Avoid namespace collisions. If you load a symbol from the library, - * it is not defined whether or not it goes into the global symbol - * namespace for the application. If it does and it conflicts with - * symbols in your code or other shared libraries, you will not get - * the results you expect. :) - */ - -#ifndef _SDL_loadso_h -#define _SDL_loadso_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * This function dynamically loads a shared object and returns a pointer - * to the object handle (or NULL if there was an error). - * The 'sofile' parameter is a system dependent name of the object file. - */ -extern DECLSPEC void *SDLCALL SDL_LoadObject(const char *sofile); - -/** - * Given an object handle, this function looks up the address of the - * named function in the shared object and returns it. This address - * is no longer valid after calling SDL_UnloadObject(). - */ -extern DECLSPEC void *SDLCALL SDL_LoadFunction(void *handle, - const char *name); - -/** - * Unload a shared object from memory. - */ -extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_loadso_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_log.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_log.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_log.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_log.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_log.h - * - * Simple log messages with categories and priorities. - * - * By default logs are quiet, but if you're debugging SDL you might want: - * - * SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN); - * - * Here's where the messages go on different platforms: - * Windows: debug output stream - * Android: log output - * Others: standard error output (stderr) - */ - -#ifndef _SDL_log_h -#define _SDL_log_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - - -/** - * \brief The maximum size of a log message - * - * Messages longer than the maximum size will be truncated - */ -#define SDL_MAX_LOG_MESSAGE 4096 - -/** - * \brief The predefined log categories - * - * By default the application category is enabled at the INFO level, - * the assert category is enabled at the WARN level, test is enabled - * at the VERBOSE level and all other categories are enabled at the - * CRITICAL level. - */ -enum -{ - SDL_LOG_CATEGORY_APPLICATION, - SDL_LOG_CATEGORY_ERROR, - SDL_LOG_CATEGORY_ASSERT, - SDL_LOG_CATEGORY_SYSTEM, - SDL_LOG_CATEGORY_AUDIO, - SDL_LOG_CATEGORY_VIDEO, - SDL_LOG_CATEGORY_RENDER, - SDL_LOG_CATEGORY_INPUT, - SDL_LOG_CATEGORY_TEST, - - /* Reserved for future SDL library use */ - SDL_LOG_CATEGORY_RESERVED1, - SDL_LOG_CATEGORY_RESERVED2, - SDL_LOG_CATEGORY_RESERVED3, - SDL_LOG_CATEGORY_RESERVED4, - SDL_LOG_CATEGORY_RESERVED5, - SDL_LOG_CATEGORY_RESERVED6, - SDL_LOG_CATEGORY_RESERVED7, - SDL_LOG_CATEGORY_RESERVED8, - SDL_LOG_CATEGORY_RESERVED9, - SDL_LOG_CATEGORY_RESERVED10, - - /* Beyond this point is reserved for application use, e.g. - enum { - MYAPP_CATEGORY_AWESOME1 = SDL_LOG_CATEGORY_CUSTOM, - MYAPP_CATEGORY_AWESOME2, - MYAPP_CATEGORY_AWESOME3, - ... - }; - */ - SDL_LOG_CATEGORY_CUSTOM -}; - -/** - * \brief The predefined log priorities - */ -typedef enum -{ - SDL_LOG_PRIORITY_VERBOSE = 1, - SDL_LOG_PRIORITY_DEBUG, - SDL_LOG_PRIORITY_INFO, - SDL_LOG_PRIORITY_WARN, - SDL_LOG_PRIORITY_ERROR, - SDL_LOG_PRIORITY_CRITICAL, - SDL_NUM_LOG_PRIORITIES -} SDL_LogPriority; - - -/** - * \brief Set the priority of all log categories - */ -extern DECLSPEC void SDLCALL SDL_LogSetAllPriority(SDL_LogPriority priority); - -/** - * \brief Set the priority of a particular log category - */ -extern DECLSPEC void SDLCALL SDL_LogSetPriority(int category, - SDL_LogPriority priority); - -/** - * \brief Get the priority of a particular log category - */ -extern DECLSPEC SDL_LogPriority SDLCALL SDL_LogGetPriority(int category); - -/** - * \brief Reset all priorities to default. - * - * \note This is called in SDL_Quit(). - */ -extern DECLSPEC void SDLCALL SDL_LogResetPriorities(void); - -/** - * \brief Log a message with SDL_LOG_CATEGORY_APPLICATION and SDL_LOG_PRIORITY_INFO - */ -extern DECLSPEC void SDLCALL SDL_Log(const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_VERBOSE - */ -extern DECLSPEC void SDLCALL SDL_LogVerbose(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_DEBUG - */ -extern DECLSPEC void SDLCALL SDL_LogDebug(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_INFO - */ -extern DECLSPEC void SDLCALL SDL_LogInfo(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_WARN - */ -extern DECLSPEC void SDLCALL SDL_LogWarn(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_ERROR - */ -extern DECLSPEC void SDLCALL SDL_LogError(int category, const char *fmt, ...); - -/** - * \brief Log a message with SDL_LOG_PRIORITY_CRITICAL - */ -extern DECLSPEC void SDLCALL SDL_LogCritical(int category, const char *fmt, ...); - -/** - * \brief Log a message with the specified category and priority. - */ -extern DECLSPEC void SDLCALL SDL_LogMessage(int category, - SDL_LogPriority priority, - const char *fmt, ...); - -/** - * \brief Log a message with the specified category and priority. - */ -extern DECLSPEC void SDLCALL SDL_LogMessageV(int category, - SDL_LogPriority priority, - const char *fmt, va_list ap); - -/** - * \brief The prototype for the log output function - */ -typedef void (*SDL_LogOutputFunction)(void *userdata, int category, SDL_LogPriority priority, const char *message); - -/** - * \brief Get the current log output function. - */ -extern DECLSPEC void SDLCALL SDL_LogGetOutputFunction(SDL_LogOutputFunction *callback, void **userdata); - -/** - * \brief This function allows you to replace the default log output - * function with one of your own. - */ -extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction callback, void *userdata); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_log_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_main.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_main.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_main.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_main.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,155 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_main_h -#define _SDL_main_h - -#include "SDL_stdinc.h" - -/** - * \file SDL_main.h - * - * Redefine main() on some platforms so that it is called by SDL. - */ - -#ifndef SDL_MAIN_HANDLED -#if defined(__WIN32__) -/* On Windows SDL provides WinMain(), which parses the command line and passes - the arguments to your main function. - - If you provide your own WinMain(), you may define SDL_MAIN_HANDLED - */ -#define SDL_MAIN_AVAILABLE - -#elif defined(__WINRT__) -/* On WinRT, SDL provides a main function that initializes CoreApplication, - creating an instance of IFrameworkView in the process. - - Please note that #include'ing SDL_main.h is not enough to get a main() - function working. In non-XAML apps, the file, - src/main/winrt/SDL_WinRT_main_NonXAML.cpp, or a copy of it, must be compiled - into the app itself. In XAML apps, the function, SDL_WinRTRunApp must be - called, with a pointer to the Direct3D-hosted XAML control passed in. -*/ -#define SDL_MAIN_NEEDED - -#elif defined(__IPHONEOS__) -/* On iOS SDL provides a main function that creates an application delegate - and starts the iOS application run loop. - - See src/video/uikit/SDL_uikitappdelegate.m for more details. - */ -#define SDL_MAIN_NEEDED - -#elif defined(__ANDROID__) -/* On Android SDL provides a Java class in SDLActivity.java that is the - main activity entry point. - - See README-android.txt for more details on extending that class. - */ -#define SDL_MAIN_NEEDED - -#endif -#endif /* SDL_MAIN_HANDLED */ - -#ifdef __cplusplus -#define C_LINKAGE "C" -#else -#define C_LINKAGE -#endif /* __cplusplus */ - -/** - * \file SDL_main.h - * - * The application's main() function must be called with C linkage, - * and should be declared like this: - * \code - * #ifdef __cplusplus - * extern "C" - * #endif - * int main(int argc, char *argv[]) - * { - * } - * \endcode - */ - -#if defined(SDL_MAIN_NEEDED) || defined(SDL_MAIN_AVAILABLE) -#define main SDL_main -#endif - -/** - * The prototype for the application's main() function - */ -extern C_LINKAGE int SDL_main(int argc, char *argv[]); - - -#include "begin_code.h" -#ifdef __cplusplus -extern "C" { -#endif - -/** - * This is called by the real SDL main function to let the rest of the - * library know that initialization was done properly. - * - * Calling this yourself without knowing what you're doing can cause - * crashes and hard to diagnose problems with your application. - */ -extern DECLSPEC void SDLCALL SDL_SetMainReady(void); - -#ifdef __WIN32__ - -/** - * This can be called to set the application class at startup - */ -extern DECLSPEC int SDLCALL SDL_RegisterApp(char *name, Uint32 style, - void *hInst); -extern DECLSPEC void SDLCALL SDL_UnregisterApp(void); - -#endif /* __WIN32__ */ - - -#ifdef __WINRT__ - -/** - * \brief Initializes and launches an SDL/WinRT application. - * - * \param mainFunction The SDL app's C-style main(). - * \param xamlBackgroundPanel An optional, XAML-based, background panel. - * For Non-XAML apps, this value must be set to NULL. For XAML apps, - * pass in a pointer to a SwapChainBackgroundPanel, casted to an - * IInspectable (via reinterpret_cast). - * \ret 0 on success, -1 on failure. On failure, use SDL_GetError to retrieve more - * information on the failure. - */ -extern DECLSPEC int SDLCALL SDL_WinRTRunApp(int (*mainFunction)(int, char **), void * xamlBackgroundPanel); - -#endif /* __WINRT__ */ - - -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_main_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_messagebox.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_messagebox_h -#define _SDL_messagebox_h - -#include "SDL_stdinc.h" -#include "SDL_video.h" /* For SDL_Window */ - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief SDL_MessageBox flags. If supported will display warning icon, etc. - */ -typedef enum -{ - SDL_MESSAGEBOX_ERROR = 0x00000010, /**< error dialog */ - SDL_MESSAGEBOX_WARNING = 0x00000020, /**< warning dialog */ - SDL_MESSAGEBOX_INFORMATION = 0x00000040 /**< informational dialog */ -} SDL_MessageBoxFlags; - -/** - * \brief Flags for SDL_MessageBoxButtonData. - */ -typedef enum -{ - SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT = 0x00000001, /**< Marks the default button when return is hit */ - SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT = 0x00000002 /**< Marks the default button when escape is hit */ -} SDL_MessageBoxButtonFlags; - -/** - * \brief Individual button data. - */ -typedef struct -{ - Uint32 flags; /**< ::SDL_MessageBoxButtonFlags */ - int buttonid; /**< User defined button id (value returned via SDL_ShowMessageBox) */ - const char * text; /**< The UTF-8 button text */ -} SDL_MessageBoxButtonData; - -/** - * \brief RGB value used in a message box color scheme - */ -typedef struct -{ - Uint8 r, g, b; -} SDL_MessageBoxColor; - -typedef enum -{ - SDL_MESSAGEBOX_COLOR_BACKGROUND, - SDL_MESSAGEBOX_COLOR_TEXT, - SDL_MESSAGEBOX_COLOR_BUTTON_BORDER, - SDL_MESSAGEBOX_COLOR_BUTTON_BACKGROUND, - SDL_MESSAGEBOX_COLOR_BUTTON_SELECTED, - SDL_MESSAGEBOX_COLOR_MAX -} SDL_MessageBoxColorType; - -/** - * \brief A set of colors to use for message box dialogs - */ -typedef struct -{ - SDL_MessageBoxColor colors[SDL_MESSAGEBOX_COLOR_MAX]; -} SDL_MessageBoxColorScheme; - -/** - * \brief MessageBox structure containing title, text, window, etc. - */ -typedef struct -{ - Uint32 flags; /**< ::SDL_MessageBoxFlags */ - SDL_Window *window; /**< Parent window, can be NULL */ - const char *title; /**< UTF-8 title */ - const char *message; /**< UTF-8 message text */ - - int numbuttons; - const SDL_MessageBoxButtonData *buttons; - - const SDL_MessageBoxColorScheme *colorScheme; /**< ::SDL_MessageBoxColorScheme, can be NULL to use system settings */ -} SDL_MessageBoxData; - -/** - * \brief Create a modal message box. - * - * \param messageboxdata The SDL_MessageBoxData structure with title, text, etc. - * \param buttonid The pointer to which user id of hit button should be copied. - * - * \return -1 on error, otherwise 0 and buttonid contains user id of button - * hit or -1 if dialog was closed. - * - * \note This function should be called on the thread that created the parent - * window, or on the main thread if the messagebox has no parent. It will - * block execution of that thread until the user clicks a button or - * closes the messagebox. - */ -extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid); - -/** - * \brief Create a simple modal message box - * - * \param flags ::SDL_MessageBoxFlags - * \param title UTF-8 title text - * \param message UTF-8 message text - * \param window The parent window, or NULL for no parent - * - * \return 0 on success, -1 on error - * - * \sa SDL_ShowMessageBox - */ -extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *title, const char *message, SDL_Window *window); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_messagebox_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mouse.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mouse.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mouse.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mouse.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_mouse.h - * - * Include file for SDL mouse event handling. - */ - -#ifndef _SDL_mouse_h -#define _SDL_mouse_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct SDL_Cursor SDL_Cursor; /* Implementation dependent */ - -/** - * \brief Cursor types for SDL_CreateSystemCursor. - */ -typedef enum -{ - SDL_SYSTEM_CURSOR_ARROW, /**< Arrow */ - SDL_SYSTEM_CURSOR_IBEAM, /**< I-beam */ - SDL_SYSTEM_CURSOR_WAIT, /**< Wait */ - SDL_SYSTEM_CURSOR_CROSSHAIR, /**< Crosshair */ - SDL_SYSTEM_CURSOR_WAITARROW, /**< Small wait cursor (or Wait if not available) */ - SDL_SYSTEM_CURSOR_SIZENWSE, /**< Double arrow pointing northwest and southeast */ - SDL_SYSTEM_CURSOR_SIZENESW, /**< Double arrow pointing northeast and southwest */ - SDL_SYSTEM_CURSOR_SIZEWE, /**< Double arrow pointing west and east */ - SDL_SYSTEM_CURSOR_SIZENS, /**< Double arrow pointing north and south */ - SDL_SYSTEM_CURSOR_SIZEALL, /**< Four pointed arrow pointing north, south, east, and west */ - SDL_SYSTEM_CURSOR_NO, /**< Slashed circle or crossbones */ - SDL_SYSTEM_CURSOR_HAND, /**< Hand */ - SDL_NUM_SYSTEM_CURSORS -} SDL_SystemCursor; - -/* Function prototypes */ - -/** - * \brief Get the window which currently has mouse focus. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetMouseFocus(void); - -/** - * \brief Retrieve the current state of the mouse. - * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse cursor position relative to the focus window for the currently - * selected mouse. You can pass NULL for either x or y. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetMouseState(int *x, int *y); - -/** - * \brief Retrieve the relative state of the mouse. - * - * The current button state is returned as a button bitmask, which can - * be tested using the SDL_BUTTON(X) macros, and x and y are set to the - * mouse deltas since the last call to SDL_GetRelativeMouseState(). - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetRelativeMouseState(int *x, int *y); - -/** - * \brief Moves the mouse to the given position within the window. - * - * \param window The window to move the mouse into, or NULL for the current mouse focus - * \param x The x coordinate within the window - * \param y The y coordinate within the window - * - * \note This function generates a mouse motion event - */ -extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window, - int x, int y); - -/** - * \brief Set relative mouse mode. - * - * \param enabled Whether or not to enable relative mode - * - * \return 0 on success, or -1 if relative mode is not supported. - * - * While the mouse is in relative mode, the cursor is hidden, and the - * driver will try to report continuous motion in the current window. - * Only relative motion events will be delivered, the mouse position - * will not change. - * - * \note This function will flush any pending mouse motion. - * - * \sa SDL_GetRelativeMouseMode() - */ -extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled); - -/** - * \brief Query whether relative mouse mode is enabled. - * - * \sa SDL_SetRelativeMouseMode() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void); - -/** - * \brief Create a cursor, using the specified bitmap data and - * mask (in MSB format). - * - * The cursor width must be a multiple of 8 bits. - * - * The cursor is created in black and white according to the following: - * - * - * - * - * - * - *
data mask resulting pixel on screen
0 1 White
1 1 Black
0 0 Transparent
1 0 Inverted color if possible, black - * if not.
- * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data, - const Uint8 * mask, - int w, int h, int hot_x, - int hot_y); - -/** - * \brief Create a color cursor. - * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface, - int hot_x, - int hot_y); - -/** - * \brief Create a system cursor. - * - * \sa SDL_FreeCursor() - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateSystemCursor(SDL_SystemCursor id); - -/** - * \brief Set the active cursor. - */ -extern DECLSPEC void SDLCALL SDL_SetCursor(SDL_Cursor * cursor); - -/** - * \brief Return the active cursor. - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetCursor(void); - -/** - * \brief Return the default cursor. - */ -extern DECLSPEC SDL_Cursor *SDLCALL SDL_GetDefaultCursor(void); - -/** - * \brief Frees a cursor created with SDL_CreateCursor(). - * - * \sa SDL_CreateCursor() - */ -extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor); - -/** - * \brief Toggle whether or not the cursor is shown. - * - * \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current - * state. - * - * \return 1 if the cursor is shown, or 0 if the cursor is hidden. - */ -extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle); - -/** - * Used as a mask when testing buttons in buttonstate. - * - Button 1: Left mouse button - * - Button 2: Middle mouse button - * - Button 3: Right mouse button - */ -#define SDL_BUTTON(X) (1 << ((X)-1)) -#define SDL_BUTTON_LEFT 1 -#define SDL_BUTTON_MIDDLE 2 -#define SDL_BUTTON_RIGHT 3 -#define SDL_BUTTON_X1 4 -#define SDL_BUTTON_X2 5 -#define SDL_BUTTON_LMASK SDL_BUTTON(SDL_BUTTON_LEFT) -#define SDL_BUTTON_MMASK SDL_BUTTON(SDL_BUTTON_MIDDLE) -#define SDL_BUTTON_RMASK SDL_BUTTON(SDL_BUTTON_RIGHT) -#define SDL_BUTTON_X1MASK SDL_BUTTON(SDL_BUTTON_X1) -#define SDL_BUTTON_X2MASK SDL_BUTTON(SDL_BUTTON_X2) - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_mouse_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mutex.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mutex.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mutex.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_mutex.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,251 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_mutex_h -#define _SDL_mutex_h - -/** - * \file SDL_mutex.h - * - * Functions to provide thread synchronization primitives. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Synchronization functions which can time out return this value - * if they time out. - */ -#define SDL_MUTEX_TIMEDOUT 1 - -/** - * This is the timeout value which corresponds to never time out. - */ -#define SDL_MUTEX_MAXWAIT (~(Uint32)0) - - -/** - * \name Mutex functions - */ -/* @{ */ - -/* The SDL mutex structure, defined in SDL_sysmutex.c */ -struct SDL_mutex; -typedef struct SDL_mutex SDL_mutex; - -/** - * Create a mutex, initialized unlocked. - */ -extern DECLSPEC SDL_mutex *SDLCALL SDL_CreateMutex(void); - -/** - * Lock the mutex. - * - * \return 0, or -1 on error. - */ -#define SDL_mutexP(m) SDL_LockMutex(m) -extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex); - -/** - * Try to lock the mutex - * - * \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex); - -/** - * Unlock the mutex. - * - * \return 0, or -1 on error. - * - * \warning It is an error to unlock a mutex that has not been locked by - * the current thread, and doing so results in undefined behavior. - */ -#define SDL_mutexV(m) SDL_UnlockMutex(m) -extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex); - -/** - * Destroy a mutex. - */ -extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex); - -/* @} *//* Mutex functions */ - - -/** - * \name Semaphore functions - */ -/* @{ */ - -/* The SDL semaphore structure, defined in SDL_syssem.c */ -struct SDL_semaphore; -typedef struct SDL_semaphore SDL_sem; - -/** - * Create a semaphore, initialized with value, returns NULL on failure. - */ -extern DECLSPEC SDL_sem *SDLCALL SDL_CreateSemaphore(Uint32 initial_value); - -/** - * Destroy a semaphore. - */ -extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem); - -/** - * This function suspends the calling thread until the semaphore pointed - * to by \c sem has a positive count. It then atomically decreases the - * semaphore count. - */ -extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem); - -/** - * Non-blocking variant of SDL_SemWait(). - * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would - * block, and -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem); - -/** - * Variant of SDL_SemWait() with a timeout in milliseconds. - * - * \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not - * succeed in the allotted time, and -1 on error. - * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. - */ -extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms); - -/** - * Atomically increases the semaphore's count (not blocking). - * - * \return 0, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem); - -/** - * Returns the current count of the semaphore. - */ -extern DECLSPEC Uint32 SDLCALL SDL_SemValue(SDL_sem * sem); - -/* @} *//* Semaphore functions */ - - -/** - * \name Condition variable functions - */ -/* @{ */ - -/* The SDL condition variable structure, defined in SDL_syscond.c */ -struct SDL_cond; -typedef struct SDL_cond SDL_cond; - -/** - * Create a condition variable. - * - * Typical use of condition variables: - * - * Thread A: - * SDL_LockMutex(lock); - * while ( ! condition ) { - * SDL_CondWait(cond, lock); - * } - * SDL_UnlockMutex(lock); - * - * Thread B: - * SDL_LockMutex(lock); - * ... - * condition = true; - * ... - * SDL_CondSignal(cond); - * SDL_UnlockMutex(lock); - * - * There is some discussion whether to signal the condition variable - * with the mutex locked or not. There is some potential performance - * benefit to unlocking first on some platforms, but there are some - * potential race conditions depending on how your code is structured. - * - * In general it's safer to signal the condition variable while the - * mutex is locked. - */ -extern DECLSPEC SDL_cond *SDLCALL SDL_CreateCond(void); - -/** - * Destroy a condition variable. - */ -extern DECLSPEC void SDLCALL SDL_DestroyCond(SDL_cond * cond); - -/** - * Restart one of the threads that are waiting on the condition variable. - * - * \return 0 or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond); - -/** - * Restart all threads that are waiting on the condition variable. - * - * \return 0 or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondBroadcast(SDL_cond * cond); - -/** - * Wait on the condition variable, unlocking the provided mutex. - * - * \warning The mutex must be locked before entering this function! - * - * The mutex is re-locked once the condition variable is signaled. - * - * \return 0 when it is signaled, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex); - -/** - * Waits for at most \c ms milliseconds, and returns 0 if the condition - * variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not - * signaled in the allotted time, and -1 on error. - * - * \warning On some platforms this function is implemented by looping with a - * delay of 1 ms, and so should be avoided if possible. - */ -extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond, - SDL_mutex * mutex, Uint32 ms); - -/* @} *//* Condition variable functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_mutex_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_name.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_name.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_name.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_name.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDLname_h_ -#define _SDLname_h_ - -#if defined(__STDC__) || defined(__cplusplus) -#define NeedFunctionPrototypes 1 -#endif - -#define SDL_NAME(X) SDL_##X - -#endif /* _SDLname_h_ */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles2.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2790 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 2.0 API headers. - */ -#ifndef _MSC_VER -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#else /* _MSC_VER */ - -/* OpenGL ES2 headers for Visual Studio */ - -#ifndef __khrplatform_h_ -#define __khrplatform_h_ - -/* -** Copyright (c) 2008-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Khronos platform-specific types and definitions. -* -* $Revision: 23298 $ on $Date: 2013-09-30 17:07:13 -0700 (Mon, 30 Sep 2013) $ -* -* Adopters may modify this file to suit their platform. Adopters are -* encouraged to submit platform specific modifications to the Khronos -* group so that they can be included in future versions of this file. -* Please submit changes by sending them to the public Khronos Bugzilla -* (http://khronos.org/bugzilla) by filing a bug against product -* "Khronos (general)" component "Registry". -* -* A predefined template which fills in some of the bug fields can be -* reached using http://tinyurl.com/khrplatform-h-bugreport, but you -* must create a Bugzilla login first. -* -* -* See the Implementer's Guidelines for information about where this file -* should be located on your system and for more details of its use: -* http://www.khronos.org/registry/implementers_guide.pdf -* -* This file should be included as -* #include -* by Khronos client API header files that use its types and defines. -* -* The types in khrplatform.h should only be used to define API-specific types. -* -* Types defined in khrplatform.h: -* khronos_int8_t signed 8 bit -* khronos_uint8_t unsigned 8 bit -* khronos_int16_t signed 16 bit -* khronos_uint16_t unsigned 16 bit -* khronos_int32_t signed 32 bit -* khronos_uint32_t unsigned 32 bit -* khronos_int64_t signed 64 bit -* khronos_uint64_t unsigned 64 bit -* khronos_intptr_t signed same number of bits as a pointer -* khronos_uintptr_t unsigned same number of bits as a pointer -* khronos_ssize_t signed size -* khronos_usize_t unsigned size -* khronos_float_t signed 32 bit floating point -* khronos_time_ns_t unsigned 64 bit time in nanoseconds -* khronos_utime_nanoseconds_t unsigned time interval or absolute time in -* nanoseconds -* khronos_stime_nanoseconds_t signed time interval in nanoseconds -* khronos_boolean_enum_t enumerated boolean type. This should -* only be used as a base type when a client API's boolean type is -* an enum. Client APIs which use an integer or other type for -* booleans cannot use this as the base type for their boolean. -* -* Tokens defined in khrplatform.h: -* -* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values. -* -* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0. -* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0. -* -* Calling convention macros defined in this file: -* KHRONOS_APICALL -* KHRONOS_APIENTRY -* KHRONOS_APIATTRIBUTES -* -* These may be used in function prototypes as: -* -* KHRONOS_APICALL void KHRONOS_APIENTRY funcname( -* int arg1, -* int arg2) KHRONOS_APIATTRIBUTES; -*/ - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APICALL -*------------------------------------------------------------------------- -* This precedes the return type of the function in the function prototype. -*/ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) -# define KHRONOS_APICALL __declspec(dllimport) -#elif defined (__SYMBIAN32__) -# define KHRONOS_APICALL IMPORT_C -#else -# define KHRONOS_APICALL -#endif - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APIENTRY -*------------------------------------------------------------------------- -* This follows the return type of the function and precedes the function -* name in the function prototype. -*/ -#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) -/* Win32 but not WinCE */ -# define KHRONOS_APIENTRY __stdcall -#else -# define KHRONOS_APIENTRY -#endif - -/*------------------------------------------------------------------------- -* Definition of KHRONOS_APIATTRIBUTES -*------------------------------------------------------------------------- -* This follows the closing parenthesis of the function prototype arguments. -*/ -#if defined (__ARMCC_2__) -#define KHRONOS_APIATTRIBUTES __softfp -#else -#define KHRONOS_APIATTRIBUTES -#endif - -/*------------------------------------------------------------------------- -* basic type definitions -*-----------------------------------------------------------------------*/ -#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__) - - -/* -* Using -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__VMS ) || defined(__sgi) - -/* -* Using -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(_WIN32) && !defined(__SCITECH_SNAP__) - -/* -* Win32 -*/ -typedef __int32 khronos_int32_t; -typedef unsigned __int32 khronos_uint32_t; -typedef __int64 khronos_int64_t; -typedef unsigned __int64 khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif defined(__sun__) || defined(__digital__) - -/* -* Sun or Digital -*/ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#if defined(__arch64__) || defined(_LP64) -typedef long int khronos_int64_t; -typedef unsigned long int khronos_uint64_t; -#else -typedef long long int khronos_int64_t; -typedef unsigned long long int khronos_uint64_t; -#endif /* __arch64__ */ -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#elif 0 - -/* -* Hypothetical platform with no float or int64 support -*/ -typedef int khronos_int32_t; -typedef unsigned int khronos_uint32_t; -#define KHRONOS_SUPPORT_INT64 0 -#define KHRONOS_SUPPORT_FLOAT 0 - -#else - -/* -* Generic fallback -*/ -#include -typedef int32_t khronos_int32_t; -typedef uint32_t khronos_uint32_t; -typedef int64_t khronos_int64_t; -typedef uint64_t khronos_uint64_t; -#define KHRONOS_SUPPORT_INT64 1 -#define KHRONOS_SUPPORT_FLOAT 1 - -#endif - - -/* -* Types that are (so far) the same on all platforms -*/ -typedef signed char khronos_int8_t; -typedef unsigned char khronos_uint8_t; -typedef signed short int khronos_int16_t; -typedef unsigned short int khronos_uint16_t; - -/* -* Types that differ between LLP64 and LP64 architectures - in LLP64, -* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears -* to be the only LLP64 architecture in current use. -*/ -#ifdef _WIN64 -typedef signed long long int khronos_intptr_t; -typedef unsigned long long int khronos_uintptr_t; -typedef signed long long int khronos_ssize_t; -typedef unsigned long long int khronos_usize_t; -#else -typedef signed long int khronos_intptr_t; -typedef unsigned long int khronos_uintptr_t; -typedef signed long int khronos_ssize_t; -typedef unsigned long int khronos_usize_t; -#endif - -#if KHRONOS_SUPPORT_FLOAT -/* -* Float type -*/ -typedef float khronos_float_t; -#endif - -#if KHRONOS_SUPPORT_INT64 -/* Time types -* -* These types can be used to represent a time interval in nanoseconds or -* an absolute Unadjusted System Time. Unadjusted System Time is the number -* of nanoseconds since some arbitrary system event (e.g. since the last -* time the system booted). The Unadjusted System Time is an unsigned -* 64 bit value that wraps back to 0 every 584 years. Time intervals -* may be either signed or unsigned. -*/ -typedef khronos_uint64_t khronos_utime_nanoseconds_t; -typedef khronos_int64_t khronos_stime_nanoseconds_t; -#endif - -/* -* Dummy value used to pad enum types to 32 bits. -*/ -#ifndef KHRONOS_MAX_ENUM -#define KHRONOS_MAX_ENUM 0x7FFFFFFF -#endif - -/* -* Enumerated boolean type -* -* Values other than zero should be considered to be true. Therefore -* comparisons should not be made against KHRONOS_TRUE. -*/ -typedef enum { - KHRONOS_FALSE = 0, - KHRONOS_TRUE = 1, - KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM -} khronos_boolean_enum_t; - -#endif /* __khrplatform_h_ */ - - -#ifndef __gl2platform_h_ -#define __gl2platform_h_ - -/* $Revision: 10602 $ on $Date:: 2010-03-04 22:35:34 -0800 #$ */ - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/* Platform-specific types and definitions for OpenGL ES 2.X gl2.h - * - * Adopters may modify khrplatform.h and this file to suit their platform. - * You are encouraged to submit all modifications to the Khronos group so that - * they can be included in future versions of this file. Please submit changes - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) - * by filing a bug against product "OpenGL-ES" component "Registry". - */ - -/*#include */ - -#ifndef GL_APICALL -#define GL_APICALL KHRONOS_APICALL -#endif - -#ifndef GL_APIENTRY -#define GL_APIENTRY KHRONOS_APIENTRY -#endif - -#endif /* __gl2platform_h_ */ - -#ifndef __gl2_h_ -#define __gl2_h_ - -/* $Revision: 16803 $ on $Date:: 2012-02-02 09:49:18 -0800 #$ */ - -/*#include */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -/*------------------------------------------------------------------------- - * Data type definitions - *-----------------------------------------------------------------------*/ - -typedef void GLvoid; -typedef char GLchar; -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef khronos_int8_t GLbyte; -typedef short GLshort; -typedef int GLint; -typedef int GLsizei; -typedef khronos_uint8_t GLubyte; -typedef unsigned short GLushort; -typedef unsigned int GLuint; -typedef khronos_float_t GLfloat; -typedef khronos_float_t GLclampf; -typedef khronos_int32_t GLfixed; - -/* GL types for handling large vertex buffer objects */ -typedef khronos_intptr_t GLintptr; -typedef khronos_ssize_t GLsizeiptr; - -/* OpenGL ES core versions */ -#define GL_ES_VERSION_2_0 1 - -/* ClearBufferMask */ -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_COLOR_BUFFER_BIT 0x00004000 - -/* Boolean */ -#define GL_FALSE 0 -#define GL_TRUE 1 - -/* BeginMode */ -#define GL_POINTS 0x0000 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_LINE_STRIP 0x0003 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 - -/* AlphaFunction (not supported in ES20) */ -/* GL_NEVER */ -/* GL_LESS */ -/* GL_EQUAL */ -/* GL_LEQUAL */ -/* GL_GREATER */ -/* GL_NOTEQUAL */ -/* GL_GEQUAL */ -/* GL_ALWAYS */ - -/* BlendingFactorDest */ -#define GL_ZERO 0 -#define GL_ONE 1 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 - -/* BlendingFactorSrc */ -/* GL_ZERO */ -/* GL_ONE */ -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -/* GL_SRC_ALPHA */ -/* GL_ONE_MINUS_SRC_ALPHA */ -/* GL_DST_ALPHA */ -/* GL_ONE_MINUS_DST_ALPHA */ - -/* BlendEquationSeparate */ -#define GL_FUNC_ADD 0x8006 -#define GL_BLEND_EQUATION 0x8009 -#define GL_BLEND_EQUATION_RGB 0x8009 /* same as BLEND_EQUATION */ -#define GL_BLEND_EQUATION_ALPHA 0x883D - -/* BlendSubtract */ -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B - -/* Separate Blend Functions */ -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 - -/* Buffer Objects */ -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 - -#define GL_STREAM_DRAW 0x88E0 -#define GL_STATIC_DRAW 0x88E4 -#define GL_DYNAMIC_DRAW 0x88E8 - -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 - -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 - -/* CullFaceMode */ -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_FRONT_AND_BACK 0x0408 - -/* DepthFunction */ -/* GL_NEVER */ -/* GL_LESS */ -/* GL_EQUAL */ -/* GL_LEQUAL */ -/* GL_GREATER */ -/* GL_NOTEQUAL */ -/* GL_GEQUAL */ -/* GL_ALWAYS */ - -/* EnableCap */ -#define GL_TEXTURE_2D 0x0DE1 -#define GL_CULL_FACE 0x0B44 -#define GL_BLEND 0x0BE2 -#define GL_DITHER 0x0BD0 -#define GL_STENCIL_TEST 0x0B90 -#define GL_DEPTH_TEST 0x0B71 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_COVERAGE 0x80A0 - -/* ErrorCode */ -#define GL_NO_ERROR 0 -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_OUT_OF_MEMORY 0x0505 - -/* FrontFaceDirection */ -#define GL_CW 0x0900 -#define GL_CCW 0x0901 - -/* GetPName */ -#define GL_LINE_WIDTH 0x0B21 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#define GL_VIEWPORT 0x0BA2 -#define GL_SCISSOR_BOX 0x0C10 -/* GL_SCISSOR_TEST */ -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -/* GL_POLYGON_OFFSET_FILL */ -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB - -/* GetTextureParameter */ -/* GL_TEXTURE_MAG_FILTER */ -/* GL_TEXTURE_MIN_FILTER */ -/* GL_TEXTURE_WRAP_S */ -/* GL_TEXTURE_WRAP_T */ - -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 - -/* HintMode */ -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 - -/* HintTarget */ -#define GL_GENERATE_MIPMAP_HINT 0x8192 - -/* DataType */ -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_FIXED 0x140C - -/* PixelFormat */ -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A - -/* PixelType */ -/* GL_UNSIGNED_BYTE */ -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 - -/* Shaders */ -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#define GL_SHADER_TYPE 0x8B4F -#define GL_DELETE_STATUS 0x8B80 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D - -/* StencilFunction */ -#define GL_NEVER 0x0200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 - -/* StencilOp */ -/* GL_ZERO */ -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_INVERT 0x150A -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 - -/* StringName */ -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 - -/* TextureMagFilter */ -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 - -/* TextureMinFilter */ -/* GL_NEAREST */ -/* GL_LINEAR */ -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 - -/* TextureParameterName */ -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 - -/* TextureTarget */ -/* GL_TEXTURE_2D */ -#define GL_TEXTURE 0x1702 - -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C - -/* TextureUnit */ -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 - -/* TextureWrapMode */ -#define GL_REPEAT 0x2901 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_MIRRORED_REPEAT 0x8370 - -/* Uniform Types */ -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_CUBE 0x8B60 - -/* Vertex Arrays */ -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F - -/* Read Format */ -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B - -/* Shader Source */ -#define GL_COMPILE_STATUS 0x8B81 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_SHADER_COMPILER 0x8DFA - -/* Shader Binary */ -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 - -/* Shader Precision-Specified Types */ -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 - -/* Framebuffer Object. */ -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 - -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGB565 0x8D62 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_STENCIL_INDEX8 0x8D48 - -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 - -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 - -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 - -#define GL_NONE 0 - -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD - -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 - -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 - -/*------------------------------------------------------------------------- - * GL core functions. - *-----------------------------------------------------------------------*/ - -GL_APICALL void GL_APIENTRY glActiveTexture (GLenum texture); -GL_APICALL void GL_APIENTRY glAttachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar* name); -GL_APICALL void GL_APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GL_APICALL void GL_APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GL_APICALL void GL_APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glBindTexture (GLenum target, GLuint texture); -GL_APICALL void GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GL_APICALL void GL_APIENTRY glBlendEquation ( GLenum mode ); -GL_APICALL void GL_APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GL_APICALL void GL_APIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GL_APICALL void GL_APIENTRY glBlendFuncSeparate (GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GL_APICALL void GL_APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid* data, GLenum usage); -GL_APICALL void GL_APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid* data); -GL_APICALL GLenum GL_APIENTRY glCheckFramebufferStatus (GLenum target); -GL_APICALL void GL_APIENTRY glClear (GLbitfield mask); -GL_APICALL void GL_APIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GL_APICALL void GL_APIENTRY glClearDepthf (GLclampf depth); -GL_APICALL void GL_APIENTRY glClearStencil (GLint s); -GL_APICALL void GL_APIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GL_APICALL void GL_APIENTRY glCompileShader (GLuint shader); -GL_APICALL void GL_APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GL_APICALL void GL_APIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL GLuint GL_APIENTRY glCreateProgram (void); -GL_APICALL GLuint GL_APIENTRY glCreateShader (GLenum type); -GL_APICALL void GL_APIENTRY glCullFace (GLenum mode); -GL_APICALL void GL_APIENTRY glDeleteBuffers (GLsizei n, const GLuint* buffers); -GL_APICALL void GL_APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint* framebuffers); -GL_APICALL void GL_APIENTRY glDeleteProgram (GLuint program); -GL_APICALL void GL_APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint* renderbuffers); -GL_APICALL void GL_APIENTRY glDeleteShader (GLuint shader); -GL_APICALL void GL_APIENTRY glDeleteTextures (GLsizei n, const GLuint* textures); -GL_APICALL void GL_APIENTRY glDepthFunc (GLenum func); -GL_APICALL void GL_APIENTRY glDepthMask (GLboolean flag); -GL_APICALL void GL_APIENTRY glDepthRangef (GLclampf zNear, GLclampf zFar); -GL_APICALL void GL_APIENTRY glDetachShader (GLuint program, GLuint shader); -GL_APICALL void GL_APIENTRY glDisable (GLenum cap); -GL_APICALL void GL_APIENTRY glDisableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); -GL_APICALL void GL_APIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices); -GL_APICALL void GL_APIENTRY glEnable (GLenum cap); -GL_APICALL void GL_APIENTRY glEnableVertexAttribArray (GLuint index); -GL_APICALL void GL_APIENTRY glFinish (void); -GL_APICALL void GL_APIENTRY glFlush (void); -GL_APICALL void GL_APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GL_APICALL void GL_APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GL_APICALL void GL_APIENTRY glFrontFace (GLenum mode); -GL_APICALL void GL_APIENTRY glGenBuffers (GLsizei n, GLuint* buffers); -GL_APICALL void GL_APIENTRY glGenerateMipmap (GLenum target); -GL_APICALL void GL_APIENTRY glGenFramebuffers (GLsizei n, GLuint* framebuffers); -GL_APICALL void GL_APIENTRY glGenRenderbuffers (GLsizei n, GLuint* renderbuffers); -GL_APICALL void GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures); -GL_APICALL void GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -GL_APICALL void GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -GL_APICALL void GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders); -GL_APICALL int GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name); -GL_APICALL void GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params); -GL_APICALL void GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL GLenum GL_APIENTRY glGetError (void); -GL_APICALL void GL_APIENTRY glGetFloatv (GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetIntegerv (GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufsize, GLsizei* length, GLchar* infolog); -GL_APICALL void GL_APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* infolog); -GL_APICALL void GL_APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision); -GL_APICALL void GL_APIENTRY glGetShaderSource (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source); -GL_APICALL const GLubyte* GL_APIENTRY glGetString (GLenum name); -GL_APICALL void GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params); -GL_APICALL int GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name); -GL_APICALL void GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params); -GL_APICALL void GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params); -GL_APICALL void GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer); -GL_APICALL void GL_APIENTRY glHint (GLenum target, GLenum mode); -GL_APICALL GLboolean GL_APIENTRY glIsBuffer (GLuint buffer); -GL_APICALL GLboolean GL_APIENTRY glIsEnabled (GLenum cap); -GL_APICALL GLboolean GL_APIENTRY glIsFramebuffer (GLuint framebuffer); -GL_APICALL GLboolean GL_APIENTRY glIsProgram (GLuint program); -GL_APICALL GLboolean GL_APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GL_APICALL GLboolean GL_APIENTRY glIsShader (GLuint shader); -GL_APICALL GLboolean GL_APIENTRY glIsTexture (GLuint texture); -GL_APICALL void GL_APIENTRY glLineWidth (GLfloat width); -GL_APICALL void GL_APIENTRY glLinkProgram (GLuint program); -GL_APICALL void GL_APIENTRY glPixelStorei (GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glPolygonOffset (GLfloat factor, GLfloat units); -GL_APICALL void GL_APIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels); -GL_APICALL void GL_APIENTRY glReleaseShaderCompiler (void); -GL_APICALL void GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); -GL_APICALL void GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length); -GL_APICALL void GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length); -GL_APICALL void GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMask (GLuint mask); -GL_APICALL void GL_APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GL_APICALL void GL_APIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glStencilOpSeparate (GLenum face, GLenum fail, GLenum zfail, GLenum zpass); -GL_APICALL void GL_APIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GL_APICALL void GL_APIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat* params); -GL_APICALL void GL_APIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint* params); -GL_APICALL void GL_APIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glUniform1f (GLint location, GLfloat x); -GL_APICALL void GL_APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform1i (GLint location, GLint x); -GL_APICALL void GL_APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform2f (GLint location, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform2i (GLint location, GLint x, GLint y); -GL_APICALL void GL_APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform3f (GLint location, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform3i (GLint location, GLint x, GLint y, GLint z); -GL_APICALL void GL_APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniform4f (GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat* v); -GL_APICALL void GL_APIENTRY glUniform4i (GLint location, GLint x, GLint y, GLint z, GLint w); -GL_APICALL void GL_APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint* v); -GL_APICALL void GL_APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -GL_APICALL void GL_APIENTRY glUseProgram (GLuint program); -GL_APICALL void GL_APIENTRY glValidateProgram (GLuint program); -GL_APICALL void GL_APIENTRY glVertexAttrib1f (GLuint indx, GLfloat x); -GL_APICALL void GL_APIENTRY glVertexAttrib1fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib2f (GLuint indx, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glVertexAttrib2fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib3f (GLuint indx, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glVertexAttrib3fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttrib4f (GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values); -GL_APICALL void GL_APIENTRY glVertexAttribPointer (GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* ptr); -GL_APICALL void GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - -#ifdef __cplusplus -} -#endif - -#endif /* __gl2_h_ */ - - -#ifndef __gl2ext_h_ -#define __gl2ext_h_ - -/* $Revision: 19436 $ on $Date:: 2012-10-10 10:37:04 -0700 #$ */ - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * This document is licensed under the SGI Free Software B License Version - * 2.0. For details, see http://oss.sgi.com/projects/FreeB/ . - */ - -#ifndef GL_APIENTRYP -# define GL_APIENTRYP GL_APIENTRY* -#endif - -/*------------------------------------------------------------------------* - * OES extension tokens - *------------------------------------------------------------------------*/ - -/* GL_OES_compressed_ETC1_RGB8_texture */ -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_ETC1_RGB8_OES 0x8D64 -#endif - -/* GL_OES_compressed_paletted_texture */ -#ifndef GL_OES_compressed_paletted_texture -#define GL_PALETTE4_RGB8_OES 0x8B90 -#define GL_PALETTE4_RGBA8_OES 0x8B91 -#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 -#define GL_PALETTE4_RGBA4_OES 0x8B93 -#define GL_PALETTE4_RGB5_A1_OES 0x8B94 -#define GL_PALETTE8_RGB8_OES 0x8B95 -#define GL_PALETTE8_RGBA8_OES 0x8B96 -#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 -#define GL_PALETTE8_RGBA4_OES 0x8B98 -#define GL_PALETTE8_RGB5_A1_OES 0x8B99 -#endif - -/* GL_OES_depth24 */ -#ifndef GL_OES_depth24 -#define GL_DEPTH_COMPONENT24_OES 0x81A6 -#endif - -/* GL_OES_depth32 */ -#ifndef GL_OES_depth32 -#define GL_DEPTH_COMPONENT32_OES 0x81A7 -#endif - -/* GL_OES_depth_texture */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_EGL_image */ -#ifndef GL_OES_EGL_image -typedef void* GLeglImageOES; -#endif - -/* GL_OES_EGL_image_external */ -#ifndef GL_OES_EGL_image_external -/* GLeglImageOES defined in GL_OES_EGL_image already. */ -#define GL_TEXTURE_EXTERNAL_OES 0x8D65 -#define GL_SAMPLER_EXTERNAL_OES 0x8D66 -#define GL_TEXTURE_BINDING_EXTERNAL_OES 0x8D67 -#define GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES 0x8D68 -#endif - -/* GL_OES_element_index_uint */ -#ifndef GL_OES_element_index_uint -#define GL_UNSIGNED_INT 0x1405 -#endif - -/* GL_OES_get_program_binary */ -#ifndef GL_OES_get_program_binary -#define GL_PROGRAM_BINARY_LENGTH_OES 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS_OES 0x87FE -#define GL_PROGRAM_BINARY_FORMATS_OES 0x87FF -#endif - -/* GL_OES_mapbuffer */ -#ifndef GL_OES_mapbuffer -#define GL_WRITE_ONLY_OES 0x88B9 -#define GL_BUFFER_ACCESS_OES 0x88BB -#define GL_BUFFER_MAPPED_OES 0x88BC -#define GL_BUFFER_MAP_POINTER_OES 0x88BD -#endif - -/* GL_OES_packed_depth_stencil */ -#ifndef GL_OES_packed_depth_stencil -#define GL_DEPTH_STENCIL_OES 0x84F9 -#define GL_UNSIGNED_INT_24_8_OES 0x84FA -#define GL_DEPTH24_STENCIL8_OES 0x88F0 -#endif - -/* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat -#define GL_ALPHA8_OES 0x803C -#define GL_DEPTH_COMPONENT16_OES 0x81A5 -/* reuse GL_DEPTH_COMPONENT24_OES */ -/* reuse GL_DEPTH24_STENCIL8_OES */ -/* reuse GL_DEPTH_COMPONENT32_OES */ -#define GL_LUMINANCE4_ALPHA4_OES 0x8043 -#define GL_LUMINANCE8_ALPHA8_OES 0x8045 -#define GL_LUMINANCE8_OES 0x8040 -#define GL_RGBA4_OES 0x8056 -#define GL_RGB5_A1_OES 0x8057 -#define GL_RGB565_OES 0x8D62 -/* reuse GL_RGB8_OES */ -/* reuse GL_RGBA8_OES */ -/* reuse GL_RGB10_EXT */ -/* reuse GL_RGB10_A2_EXT */ -#endif - -/* GL_OES_rgb8_rgba8 */ -#ifndef GL_OES_rgb8_rgba8 -#define GL_RGB8_OES 0x8051 -#define GL_RGBA8_OES 0x8058 -#endif - -/* GL_OES_standard_derivatives */ -#ifndef GL_OES_standard_derivatives -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES 0x8B8B -#endif - -/* GL_OES_stencil1 */ -#ifndef GL_OES_stencil1 -#define GL_STENCIL_INDEX1_OES 0x8D46 -#endif - -/* GL_OES_stencil4 */ -#ifndef GL_OES_stencil4 -#define GL_STENCIL_INDEX4_OES 0x8D47 -#endif - -#ifndef GL_OES_surfaceless_context -#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 -#endif - -/* GL_OES_texture_3D */ -#ifndef GL_OES_texture_3D -#define GL_TEXTURE_WRAP_R_OES 0x8072 -#define GL_TEXTURE_3D_OES 0x806F -#define GL_TEXTURE_BINDING_3D_OES 0x806A -#define GL_MAX_3D_TEXTURE_SIZE_OES 0x8073 -#define GL_SAMPLER_3D_OES 0x8B5F -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES 0x8CD4 -#endif - -/* GL_OES_texture_float */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_float_linear */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_half_float */ -#ifndef GL_OES_texture_half_float -#define GL_HALF_FLOAT_OES 0x8D61 -#endif - -/* GL_OES_texture_half_float_linear */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_texture_npot */ -/* No new tokens introduced by this extension. */ - -/* GL_OES_vertex_array_object */ -#ifndef GL_OES_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_OES 0x85B5 -#endif - -/* GL_OES_vertex_half_float */ -/* GL_HALF_FLOAT_OES defined in GL_OES_texture_half_float already. */ - -/* GL_OES_vertex_type_10_10_10_2 */ -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_UNSIGNED_INT_10_10_10_2_OES 0x8DF6 -#define GL_INT_10_10_10_2_OES 0x8DF7 -#endif - -/*------------------------------------------------------------------------* - * KHR extension tokens - *------------------------------------------------------------------------*/ - -#ifndef GL_KHR_debug -typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_QUERY 0x82E3 -/* PROGRAM_PIPELINE only in GL */ -#define GL_SAMPLER 0x82E6 -/* DISPLAY_LIST only in GL */ -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#endif - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD -#endif - -/*------------------------------------------------------------------------* - * AMD extension tokens - *------------------------------------------------------------------------*/ - -/* GL_AMD_compressed_3DC_texture */ -#ifndef GL_AMD_compressed_3DC_texture -#define GL_3DC_X_AMD 0x87F9 -#define GL_3DC_XY_AMD 0x87FA -#endif - -/* GL_AMD_compressed_ATC_texture */ -#ifndef GL_AMD_compressed_ATC_texture -#define GL_ATC_RGB_AMD 0x8C92 -#define GL_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93 -#define GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE -#endif - -/* GL_AMD_performance_monitor */ -#ifndef GL_AMD_performance_monitor -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -#endif - -/* GL_AMD_program_binary_Z400 */ -#ifndef GL_AMD_program_binary_Z400 -#define GL_Z400_BINARY_AMD 0x8740 -#endif - -/*------------------------------------------------------------------------* - * ANGLE extension tokens - *------------------------------------------------------------------------*/ - -/* GL_ANGLE_framebuffer_blit */ -#ifndef GL_ANGLE_framebuffer_blit -#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA -#endif - -/* GL_ANGLE_framebuffer_multisample */ -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 -#define GL_MAX_SAMPLES_ANGLE 0x8D57 -#endif - -/* GL_ANGLE_instanced_arrays */ -#ifndef GL_ANGLE_instanced_arrays -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE -#endif - -/* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 -#endif - -/* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#endif - -/* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 -#endif - -/* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage -#define GL_TEXTURE_USAGE_ANGLE 0x93A2 -#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 -#endif - -/* GL_ANGLE_translated_shader_source */ -#ifndef GL_ANGLE_translated_shader_source -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 -#endif - -/*------------------------------------------------------------------------* - * APPLE extension tokens - *------------------------------------------------------------------------*/ - -/* GL_APPLE_copy_texture_levels */ -/* No new tokens introduced by this extension. */ - -/* GL_APPLE_framebuffer_multisample */ -#ifndef GL_APPLE_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_APPLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_APPLE 0x8D56 -#define GL_MAX_SAMPLES_APPLE 0x8D57 -#define GL_READ_FRAMEBUFFER_APPLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_APPLE 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_APPLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA -#endif - -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -/* GL_APPLE_sync */ -#ifndef GL_APPLE_sync - -#ifndef __gl3_h_ -/* These types are defined with reference to - * in the Apple extension spec, but here we use the Khronos - * portable types in khrplatform.h, and assume those types - * are always defined. - * If any other extensions using these types are defined, - * the typedefs must move out of this block and be shared. - */ -typedef khronos_int64_t GLint64; -typedef khronos_uint64_t GLuint64; -typedef struct __GLsync *GLsync; -#endif - -#define GL_SYNC_OBJECT_APPLE 0x8A53 -#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 -#define GL_OBJECT_TYPE_APPLE 0x9112 -#define GL_SYNC_CONDITION_APPLE 0x9113 -#define GL_SYNC_STATUS_APPLE 0x9114 -#define GL_SYNC_FLAGS_APPLE 0x9115 -#define GL_SYNC_FENCE_APPLE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 -#define GL_UNSIGNALED_APPLE 0x9118 -#define GL_SIGNALED_APPLE 0x9119 -#define GL_ALREADY_SIGNALED_APPLE 0x911A -#define GL_TIMEOUT_EXPIRED_APPLE 0x911B -#define GL_CONDITION_SATISFIED_APPLE 0x911C -#define GL_WAIT_FAILED_APPLE 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 -#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull -#endif - -/* GL_APPLE_texture_format_BGRA8888 */ -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_BGRA_EXT 0x80E1 -#endif - -/* GL_APPLE_texture_max_level */ -#ifndef GL_APPLE_texture_max_level -#define GL_TEXTURE_MAX_LEVEL_APPLE 0x813D -#endif - -/*------------------------------------------------------------------------* - * ARM extension tokens - *------------------------------------------------------------------------*/ - -/* GL_ARM_mali_program_binary */ -#ifndef GL_ARM_mali_program_binary -#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 -#endif - -/* GL_ARM_mali_shader_binary */ -#ifndef GL_ARM_mali_shader_binary -#define GL_MALI_SHADER_BINARY_ARM 0x8F60 -#endif - -/* GL_ARM_rgba8 */ -/* No new tokens introduced by this extension. */ - -/*------------------------------------------------------------------------* - * EXT extension tokens - *------------------------------------------------------------------------*/ - -/* GL_EXT_blend_minmax */ -#ifndef GL_EXT_blend_minmax -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#endif - -/* GL_EXT_color_buffer_half_float */ -#ifndef GL_EXT_color_buffer_half_float -#define GL_RGBA16F_EXT 0x881A -#define GL_RGB16F_EXT 0x881B -#define GL_RG16F_EXT 0x822F -#define GL_R16F_EXT 0x822D -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE_EXT 0x8211 -#define GL_UNSIGNED_NORMALIZED_EXT 0x8C17 -#endif - -/* GL_EXT_debug_label */ -#ifndef GL_EXT_debug_label -#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F -#define GL_PROGRAM_OBJECT_EXT 0x8B40 -#define GL_SHADER_OBJECT_EXT 0x8B48 -#define GL_BUFFER_OBJECT_EXT 0x9151 -#define GL_QUERY_OBJECT_EXT 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 -#endif - -/* GL_EXT_debug_marker */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_discard_framebuffer */ -#ifndef GL_EXT_discard_framebuffer -#define GL_COLOR_EXT 0x1800 -#define GL_DEPTH_EXT 0x1801 -#define GL_STENCIL_EXT 0x1802 -#endif - -/* GL_EXT_map_buffer_range */ -#ifndef GL_EXT_map_buffer_range -#define GL_MAP_READ_BIT_EXT 0x0001 -#define GL_MAP_WRITE_BIT_EXT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 -#endif - -/* GL_EXT_multisampled_render_to_texture */ -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -/* GL_EXT_multiview_draw_buffers */ -#ifndef GL_EXT_multiview_draw_buffers -#define GL_COLOR_ATTACHMENT_EXT 0x90F0 -#define GL_MULTIVIEW_EXT 0x90F1 -#define GL_DRAW_BUFFER_EXT 0x0C01 -#define GL_READ_BUFFER_EXT 0x0C02 -#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 -#endif - -/* GL_EXT_multi_draw_arrays */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_occlusion_query_boolean */ -#ifndef GL_EXT_occlusion_query_boolean -#define GL_ANY_SAMPLES_PASSED_EXT 0x8C2F -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT 0x8D6A -#define GL_CURRENT_QUERY_EXT 0x8865 -#define GL_QUERY_RESULT_EXT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_EXT 0x8867 -#endif - -/* GL_EXT_read_format_bgra */ -#ifndef GL_EXT_read_format_bgra -#define GL_BGRA_EXT 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT 0x8366 -#endif - -/* GL_EXT_robustness */ -#ifndef GL_EXT_robustness -/* reuse GL_NO_ERROR */ -#define GL_GUILTY_CONTEXT_RESET_EXT 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_EXT 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_EXT 0x8255 -#define GL_CONTEXT_ROBUST_ACCESS_EXT 0x90F3 -#define GL_RESET_NOTIFICATION_STRATEGY_EXT 0x8256 -#define GL_LOSE_CONTEXT_ON_RESET_EXT 0x8252 -#define GL_NO_RESET_NOTIFICATION_EXT 0x8261 -#endif - -/* GL_EXT_separate_shader_objects */ -#ifndef GL_EXT_separate_shader_objects -#define GL_VERTEX_SHADER_BIT_EXT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT_EXT 0x00000002 -#define GL_ALL_SHADER_BITS_EXT 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE_EXT 0x8258 -#define GL_ACTIVE_PROGRAM_EXT 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A -#endif - -/* GL_EXT_shader_framebuffer_fetch */ -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 -#endif - -/* GL_EXT_shader_texture_lod */ -/* No new tokens introduced by this extension. */ - -/* GL_EXT_shadow_samplers */ -#ifndef GL_EXT_shadow_samplers -#define GL_TEXTURE_COMPARE_MODE_EXT 0x884C -#define GL_TEXTURE_COMPARE_FUNC_EXT 0x884D -#define GL_COMPARE_REF_TO_TEXTURE_EXT 0x884E -#define GL_SAMPLER_2D_SHADOW_EXT 0x8B62 -#endif - -/* GL_EXT_sRGB */ -#ifndef GL_EXT_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING_EXT 0x8210 -#endif - -/* GL_EXT_texture_compression_dxt1 */ -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#endif - -/* GL_EXT_texture_filter_anisotropic */ -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -/* GL_EXT_texture_format_BGRA8888 */ -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_BGRA_EXT 0x80E1 -#endif - -/* GL_EXT_texture_rg */ -#ifndef GL_EXT_texture_rg -#define GL_RED_EXT 0x1903 -#define GL_RG_EXT 0x8227 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#endif - -/* GL_EXT_texture_storage */ -#ifndef GL_EXT_texture_storage -#define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F -#define GL_ALPHA8_EXT 0x803C -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_RGBA32F_EXT 0x8814 -#define GL_RGB32F_EXT 0x8815 -#define GL_ALPHA32F_EXT 0x8816 -#define GL_LUMINANCE32F_EXT 0x8818 -#define GL_LUMINANCE_ALPHA32F_EXT 0x8819 -/* reuse GL_RGBA16F_EXT */ -/* reuse GL_RGB16F_EXT */ -#define GL_ALPHA16F_EXT 0x881C -#define GL_LUMINANCE16F_EXT 0x881E -#define GL_LUMINANCE_ALPHA16F_EXT 0x881F -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGB10_EXT 0x8052 -#define GL_BGRA8_EXT 0x93A1 -#define GL_R8_EXT 0x8229 -#define GL_RG8_EXT 0x822B -#define GL_R32F_EXT 0x822E -#define GL_RG32F_EXT 0x8230 -#define GL_R16F_EXT 0x822D -#define GL_RG16F_EXT 0x822F -#endif - -/* GL_EXT_texture_type_2_10_10_10_REV */ -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_UNSIGNED_INT_2_10_10_10_REV_EXT 0x8368 -#endif - -/* GL_EXT_unpack_subimage */ -#ifndef GL_EXT_unpack_subimage -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 -#endif - -/*------------------------------------------------------------------------* - * DMP extension tokens - *------------------------------------------------------------------------*/ - -/* GL_DMP_shader_binary */ -#ifndef GL_DMP_shader_binary -#define GL_SHADER_BINARY_DMP 0x9250 -#endif - -/*------------------------------------------------------------------------* - * FJ extension tokens - *------------------------------------------------------------------------*/ - -/* GL_FJ_shader_binary_GCCSO */ -#ifndef GL_FJ_shader_binary_GCCSO -#define GCCSO_SHADER_BINARY_FJ 0x9260 -#endif - -/*------------------------------------------------------------------------* - * IMG extension tokens - *------------------------------------------------------------------------*/ - -/* GL_IMG_program_binary */ -#ifndef GL_IMG_program_binary -#define GL_SGX_PROGRAM_BINARY_IMG 0x9130 -#endif - -/* GL_IMG_read_format */ -#ifndef GL_IMG_read_format -#define GL_BGRA_IMG 0x80E1 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV_IMG 0x8365 -#endif - -/* GL_IMG_shader_binary */ -#ifndef GL_IMG_shader_binary -#define GL_SGX_BINARY_IMG 0x8C0A -#endif - -/* GL_IMG_texture_compression_pvrtc */ -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 -#define GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 -#define GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 -#define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 -#endif - -/* GL_IMG_multisampled_render_to_texture */ -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG 0x9134 -#define GL_MAX_SAMPLES_IMG 0x9135 -#define GL_TEXTURE_SAMPLES_IMG 0x9136 -#endif - -/*------------------------------------------------------------------------* - * NV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_NV_coverage_sample */ -#ifndef GL_NV_coverage_sample -#define GL_COVERAGE_COMPONENT_NV 0x8ED0 -#define GL_COVERAGE_COMPONENT4_NV 0x8ED1 -#define GL_COVERAGE_ATTACHMENT_NV 0x8ED2 -#define GL_COVERAGE_BUFFERS_NV 0x8ED3 -#define GL_COVERAGE_SAMPLES_NV 0x8ED4 -#define GL_COVERAGE_ALL_FRAGMENTS_NV 0x8ED5 -#define GL_COVERAGE_EDGE_FRAGMENTS_NV 0x8ED6 -#define GL_COVERAGE_AUTOMATIC_NV 0x8ED7 -#define GL_COVERAGE_BUFFER_BIT_NV 0x8000 -#endif - -/* GL_NV_depth_nonlinear */ -#ifndef GL_NV_depth_nonlinear -#define GL_DEPTH_COMPONENT16_NONLINEAR_NV 0x8E2C -#endif - -/* GL_NV_draw_buffers */ -#ifndef GL_NV_draw_buffers -#define GL_MAX_DRAW_BUFFERS_NV 0x8824 -#define GL_DRAW_BUFFER0_NV 0x8825 -#define GL_DRAW_BUFFER1_NV 0x8826 -#define GL_DRAW_BUFFER2_NV 0x8827 -#define GL_DRAW_BUFFER3_NV 0x8828 -#define GL_DRAW_BUFFER4_NV 0x8829 -#define GL_DRAW_BUFFER5_NV 0x882A -#define GL_DRAW_BUFFER6_NV 0x882B -#define GL_DRAW_BUFFER7_NV 0x882C -#define GL_DRAW_BUFFER8_NV 0x882D -#define GL_DRAW_BUFFER9_NV 0x882E -#define GL_DRAW_BUFFER10_NV 0x882F -#define GL_DRAW_BUFFER11_NV 0x8830 -#define GL_DRAW_BUFFER12_NV 0x8831 -#define GL_DRAW_BUFFER13_NV 0x8832 -#define GL_DRAW_BUFFER14_NV 0x8833 -#define GL_DRAW_BUFFER15_NV 0x8834 -#define GL_COLOR_ATTACHMENT0_NV 0x8CE0 -#define GL_COLOR_ATTACHMENT1_NV 0x8CE1 -#define GL_COLOR_ATTACHMENT2_NV 0x8CE2 -#define GL_COLOR_ATTACHMENT3_NV 0x8CE3 -#define GL_COLOR_ATTACHMENT4_NV 0x8CE4 -#define GL_COLOR_ATTACHMENT5_NV 0x8CE5 -#define GL_COLOR_ATTACHMENT6_NV 0x8CE6 -#define GL_COLOR_ATTACHMENT7_NV 0x8CE7 -#define GL_COLOR_ATTACHMENT8_NV 0x8CE8 -#define GL_COLOR_ATTACHMENT9_NV 0x8CE9 -#define GL_COLOR_ATTACHMENT10_NV 0x8CEA -#define GL_COLOR_ATTACHMENT11_NV 0x8CEB -#define GL_COLOR_ATTACHMENT12_NV 0x8CEC -#define GL_COLOR_ATTACHMENT13_NV 0x8CED -#define GL_COLOR_ATTACHMENT14_NV 0x8CEE -#define GL_COLOR_ATTACHMENT15_NV 0x8CEF -#endif - -/* GL_NV_fbo_color_attachments */ -#ifndef GL_NV_fbo_color_attachments -#define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF -/* GL_COLOR_ATTACHMENT{0-15}_NV defined in GL_NV_draw_buffers already. */ -#endif - -/* GL_NV_fence */ -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -/* GL_NV_read_buffer */ -#ifndef GL_NV_read_buffer -#define GL_READ_BUFFER_NV 0x0C02 -#endif - -/* GL_NV_read_buffer_front */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_depth */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_depth_stencil */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_read_stencil */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_texture_compression_s3tc_update */ -/* No new tokens introduced by this extension. */ - -/* GL_NV_texture_npot_2D_mipmap */ -/* No new tokens introduced by this extension. */ - -/*------------------------------------------------------------------------* - * QCOM extension tokens - *------------------------------------------------------------------------*/ - -/* GL_QCOM_alpha_test */ -#ifndef GL_QCOM_alpha_test -#define GL_ALPHA_TEST_QCOM 0x0BC0 -#define GL_ALPHA_TEST_FUNC_QCOM 0x0BC1 -#define GL_ALPHA_TEST_REF_QCOM 0x0BC2 -#endif - -/* GL_QCOM_binning_control */ -#ifndef GL_QCOM_binning_control -#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 -#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 -#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 -#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 -#endif - -/* GL_QCOM_driver_control */ -/* No new tokens introduced by this extension. */ - -/* GL_QCOM_extended_get */ -#ifndef GL_QCOM_extended_get -#define GL_TEXTURE_WIDTH_QCOM 0x8BD2 -#define GL_TEXTURE_HEIGHT_QCOM 0x8BD3 -#define GL_TEXTURE_DEPTH_QCOM 0x8BD4 -#define GL_TEXTURE_INTERNAL_FORMAT_QCOM 0x8BD5 -#define GL_TEXTURE_FORMAT_QCOM 0x8BD6 -#define GL_TEXTURE_TYPE_QCOM 0x8BD7 -#define GL_TEXTURE_IMAGE_VALID_QCOM 0x8BD8 -#define GL_TEXTURE_NUM_LEVELS_QCOM 0x8BD9 -#define GL_TEXTURE_TARGET_QCOM 0x8BDA -#define GL_TEXTURE_OBJECT_VALID_QCOM 0x8BDB -#define GL_STATE_RESTORE 0x8BDC -#endif - -/* GL_QCOM_extended_get2 */ -/* No new tokens introduced by this extension. */ - -/* GL_QCOM_perfmon_global_mode */ -#ifndef GL_QCOM_perfmon_global_mode -#define GL_PERFMON_GLOBAL_MODE_QCOM 0x8FA0 -#endif - -/* GL_QCOM_writeonly_rendering */ -#ifndef GL_QCOM_writeonly_rendering -#define GL_WRITEONLY_RENDERING_QCOM 0x8823 -#endif - -/* GL_QCOM_tiled_rendering */ -#ifndef GL_QCOM_tiled_rendering -#define GL_COLOR_BUFFER_BIT0_QCOM 0x00000001 -#define GL_COLOR_BUFFER_BIT1_QCOM 0x00000002 -#define GL_COLOR_BUFFER_BIT2_QCOM 0x00000004 -#define GL_COLOR_BUFFER_BIT3_QCOM 0x00000008 -#define GL_COLOR_BUFFER_BIT4_QCOM 0x00000010 -#define GL_COLOR_BUFFER_BIT5_QCOM 0x00000020 -#define GL_COLOR_BUFFER_BIT6_QCOM 0x00000040 -#define GL_COLOR_BUFFER_BIT7_QCOM 0x00000080 -#define GL_DEPTH_BUFFER_BIT0_QCOM 0x00000100 -#define GL_DEPTH_BUFFER_BIT1_QCOM 0x00000200 -#define GL_DEPTH_BUFFER_BIT2_QCOM 0x00000400 -#define GL_DEPTH_BUFFER_BIT3_QCOM 0x00000800 -#define GL_DEPTH_BUFFER_BIT4_QCOM 0x00001000 -#define GL_DEPTH_BUFFER_BIT5_QCOM 0x00002000 -#define GL_DEPTH_BUFFER_BIT6_QCOM 0x00004000 -#define GL_DEPTH_BUFFER_BIT7_QCOM 0x00008000 -#define GL_STENCIL_BUFFER_BIT0_QCOM 0x00010000 -#define GL_STENCIL_BUFFER_BIT1_QCOM 0x00020000 -#define GL_STENCIL_BUFFER_BIT2_QCOM 0x00040000 -#define GL_STENCIL_BUFFER_BIT3_QCOM 0x00080000 -#define GL_STENCIL_BUFFER_BIT4_QCOM 0x00100000 -#define GL_STENCIL_BUFFER_BIT5_QCOM 0x00200000 -#define GL_STENCIL_BUFFER_BIT6_QCOM 0x00400000 -#define GL_STENCIL_BUFFER_BIT7_QCOM 0x00800000 -#define GL_MULTISAMPLE_BUFFER_BIT0_QCOM 0x01000000 -#define GL_MULTISAMPLE_BUFFER_BIT1_QCOM 0x02000000 -#define GL_MULTISAMPLE_BUFFER_BIT2_QCOM 0x04000000 -#define GL_MULTISAMPLE_BUFFER_BIT3_QCOM 0x08000000 -#define GL_MULTISAMPLE_BUFFER_BIT4_QCOM 0x10000000 -#define GL_MULTISAMPLE_BUFFER_BIT5_QCOM 0x20000000 -#define GL_MULTISAMPLE_BUFFER_BIT6_QCOM 0x40000000 -#define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x80000000 -#endif - -/*------------------------------------------------------------------------* - * VIV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_VIV_shader_binary */ -#ifndef GL_VIV_shader_binary -#define GL_SHADER_BINARY_VIV 0x8FC4 -#endif - -/*------------------------------------------------------------------------* - * End of extension tokens, start of corresponding extension functions - *------------------------------------------------------------------------*/ - -/*------------------------------------------------------------------------* - * OES extension functions - *------------------------------------------------------------------------*/ - -/* GL_OES_compressed_ETC1_RGB8_texture */ -#ifndef GL_OES_compressed_ETC1_RGB8_texture -#define GL_OES_compressed_ETC1_RGB8_texture 1 -#endif - -/* GL_OES_compressed_paletted_texture */ -#ifndef GL_OES_compressed_paletted_texture -#define GL_OES_compressed_paletted_texture 1 -#endif - -/* GL_OES_depth24 */ -#ifndef GL_OES_depth24 -#define GL_OES_depth24 1 -#endif - -/* GL_OES_depth32 */ -#ifndef GL_OES_depth32 -#define GL_OES_depth32 1 -#endif - -/* GL_OES_depth_texture */ -#ifndef GL_OES_depth_texture -#define GL_OES_depth_texture 1 -#endif - -/* GL_OES_EGL_image */ -#ifndef GL_OES_EGL_image -#define GL_OES_EGL_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); -GL_APICALL void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); -#endif -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); -typedef void (GL_APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); -#endif - -/* GL_OES_EGL_image_external */ -#ifndef GL_OES_EGL_image_external -#define GL_OES_EGL_image_external 1 -/* glEGLImageTargetTexture2DOES defined in GL_OES_EGL_image already. */ -#endif - -/* GL_OES_element_index_uint */ -#ifndef GL_OES_element_index_uint -#define GL_OES_element_index_uint 1 -#endif - -/* GL_OES_fbo_render_mipmap */ -#ifndef GL_OES_fbo_render_mipmap -#define GL_OES_fbo_render_mipmap 1 -#endif - -/* GL_OES_fragment_precision_high */ -#ifndef GL_OES_fragment_precision_high -#define GL_OES_fragment_precision_high 1 -#endif - -/* GL_OES_get_program_binary */ -#ifndef GL_OES_get_program_binary -#define GL_OES_get_program_binary 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetProgramBinaryOES (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -GL_APICALL void GL_APIENTRY glProgramBinaryOES (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); -#endif -typedef void (GL_APIENTRYP PFNGLGETPROGRAMBINARYOESPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -typedef void (GL_APIENTRYP PFNGLPROGRAMBINARYOESPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLint length); -#endif - -/* GL_OES_mapbuffer */ -#ifndef GL_OES_mapbuffer -#define GL_OES_mapbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferOES (GLenum target, GLenum access); -GL_APICALL GLboolean GL_APIENTRY glUnmapBufferOES (GLenum target); -GL_APICALL void GL_APIENTRY glGetBufferPointervOES (GLenum target, GLenum pname, GLvoid** params); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFEROESPROC) (GLenum target, GLenum access); -typedef GLboolean (GL_APIENTRYP PFNGLUNMAPBUFFEROESPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum pname, GLvoid** params); -#endif - -/* GL_OES_packed_depth_stencil */ -#ifndef GL_OES_packed_depth_stencil -#define GL_OES_packed_depth_stencil 1 -#endif - -/* GL_OES_required_internalformat */ -#ifndef GL_OES_required_internalformat -#define GL_OES_required_internalformat 1 -#endif - -/* GL_OES_rgb8_rgba8 */ -#ifndef GL_OES_rgb8_rgba8 -#define GL_OES_rgb8_rgba8 1 -#endif - -/* GL_OES_standard_derivatives */ -#ifndef GL_OES_standard_derivatives -#define GL_OES_standard_derivatives 1 -#endif - -/* GL_OES_stencil1 */ -#ifndef GL_OES_stencil1 -#define GL_OES_stencil1 1 -#endif - -/* GL_OES_stencil4 */ -#ifndef GL_OES_stencil4 -#define GL_OES_stencil4 1 -#endif - -#ifndef GL_OES_surfaceless_context -#define GL_OES_surfaceless_context 1 -#endif - -/* GL_OES_texture_3D */ -#ifndef GL_OES_texture_3D -#define GL_OES_texture_3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); -GL_APICALL void GL_APIENTRY glCopyTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glCompressedTexImage3DOES (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glCompressedTexSubImage3DOES (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); -GL_APICALL void GL_APIENTRY glFramebufferTexture3DOES (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif -typedef void (GL_APIENTRYP PFNGLTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels); -typedef void (GL_APIENTRYP PFNGLTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels); -typedef void (GL_APIENTRYP PFNGLCOPYTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DOESPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data); -typedef void (GL_APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DOESPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DOES) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -#endif - -/* GL_OES_texture_float */ -#ifndef GL_OES_texture_float -#define GL_OES_texture_float 1 -#endif - -/* GL_OES_texture_float_linear */ -#ifndef GL_OES_texture_float_linear -#define GL_OES_texture_float_linear 1 -#endif - -/* GL_OES_texture_half_float */ -#ifndef GL_OES_texture_half_float -#define GL_OES_texture_half_float 1 -#endif - -/* GL_OES_texture_half_float_linear */ -#ifndef GL_OES_texture_half_float_linear -#define GL_OES_texture_half_float_linear 1 -#endif - -/* GL_OES_texture_npot */ -#ifndef GL_OES_texture_npot -#define GL_OES_texture_npot 1 -#endif - -/* GL_OES_vertex_array_object */ -#ifndef GL_OES_vertex_array_object -#define GL_OES_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBindVertexArrayOES (GLuint array); -GL_APICALL void GL_APIENTRY glDeleteVertexArraysOES (GLsizei n, const GLuint *arrays); -GL_APICALL void GL_APIENTRY glGenVertexArraysOES (GLsizei n, GLuint *arrays); -GL_APICALL GLboolean GL_APIENTRY glIsVertexArrayOES (GLuint array); -#endif -typedef void (GL_APIENTRYP PFNGLBINDVERTEXARRAYOESPROC) (GLuint array); -typedef void (GL_APIENTRYP PFNGLDELETEVERTEXARRAYSOESPROC) (GLsizei n, const GLuint *arrays); -typedef void (GL_APIENTRYP PFNGLGENVERTEXARRAYSOESPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); -#endif - -/* GL_OES_vertex_half_float */ -#ifndef GL_OES_vertex_half_float -#define GL_OES_vertex_half_float 1 -#endif - -/* GL_OES_vertex_type_10_10_10_2 */ -#ifndef GL_OES_vertex_type_10_10_10_2 -#define GL_OES_vertex_type_10_10_10_2 1 -#endif - -/*------------------------------------------------------------------------* - * KHR extension functions - *------------------------------------------------------------------------*/ - -#ifndef GL_KHR_debug -#define GL_KHR_debug 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); -GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); -GL_APICALL void GL_APIENTRY glPopDebugGroup (void); -GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); -#endif -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); -typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); -typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); -typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params); -#endif - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_KHR_texture_compression_astc_ldr 1 -#endif - - -/*------------------------------------------------------------------------* - * AMD extension functions - *------------------------------------------------------------------------*/ - -/* GL_AMD_compressed_3DC_texture */ -#ifndef GL_AMD_compressed_3DC_texture -#define GL_AMD_compressed_3DC_texture 1 -#endif - -/* GL_AMD_compressed_ATC_texture */ -#ifndef GL_AMD_compressed_ATC_texture -#define GL_AMD_compressed_ATC_texture 1 -#endif - -/* AMD_performance_monitor */ -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GL_APICALL void GL_APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -GL_APICALL void GL_APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GL_APICALL void GL_APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); -GL_APICALL void GL_APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GL_APICALL void GL_APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -typedef void (GL_APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (GL_APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *countersList); -typedef void (GL_APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif - -/* GL_AMD_program_binary_Z400 */ -#ifndef GL_AMD_program_binary_Z400 -#define GL_AMD_program_binary_Z400 1 -#endif - -/*------------------------------------------------------------------------* - * ANGLE extension functions - *------------------------------------------------------------------------*/ - -/* GL_ANGLE_framebuffer_blit */ -#ifndef GL_ANGLE_framebuffer_blit -#define GL_ANGLE_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glBlitFramebufferANGLE (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif -typedef void (GL_APIENTRYP PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -/* GL_ANGLE_framebuffer_multisample */ -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_ANGLE_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_ANGLE_instanced_arrays -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor); -#endif -typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); -#endif - -/* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_ANGLE_pack_reverse_row_order 1 -#endif - -/* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_ANGLE_texture_compression_dxt3 1 -#endif - -/* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_ANGLE_texture_compression_dxt5 1 -#endif - -/* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage -#define GL_ANGLE_texture_usage 1 -#endif - -#ifndef GL_ANGLE_translated_shader_source -#define GL_ANGLE_translated_shader_source 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif -typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); -#endif - -/*------------------------------------------------------------------------* - * APPLE extension functions - *------------------------------------------------------------------------*/ - -/* GL_APPLE_copy_texture_levels */ -#ifndef GL_APPLE_copy_texture_levels -#define GL_APPLE_copy_texture_levels 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif -typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); -#endif - -/* GL_APPLE_framebuffer_multisample */ -#ifndef GL_APPLE_framebuffer_multisample -#define GL_APPLE_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleAPPLE (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glResolveMultisampleFramebufferAPPLE (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); -#endif - -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#endif - -/* GL_APPLE_sync */ -#ifndef GL_APPLE_sync -#define GL_APPLE_sync 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); -GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); -GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); -GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); -GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); -GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif -typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); -typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); -typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); -typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif - -/* GL_APPLE_texture_format_BGRA8888 */ -#ifndef GL_APPLE_texture_format_BGRA8888 -#define GL_APPLE_texture_format_BGRA8888 1 -#endif - -/* GL_APPLE_texture_max_level */ -#ifndef GL_APPLE_texture_max_level -#define GL_APPLE_texture_max_level 1 -#endif - -/*------------------------------------------------------------------------* - * ARM extension functions - *------------------------------------------------------------------------*/ - -/* GL_ARM_mali_program_binary */ -#ifndef GL_ARM_mali_program_binary -#define GL_ARM_mali_program_binary 1 -#endif - -/* GL_ARM_mali_shader_binary */ -#ifndef GL_ARM_mali_shader_binary -#define GL_ARM_mali_shader_binary 1 -#endif - -/* GL_ARM_rgba8 */ -#ifndef GL_ARM_rgba8 -#define GL_ARM_rgba8 1 -#endif - -/*------------------------------------------------------------------------* - * EXT extension functions - *------------------------------------------------------------------------*/ - -/* GL_EXT_blend_minmax */ -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#endif - -/* GL_EXT_color_buffer_half_float */ -#ifndef GL_EXT_color_buffer_half_float -#define GL_EXT_color_buffer_half_float 1 -#endif - -/* GL_EXT_debug_label */ -#ifndef GL_EXT_debug_label -#define GL_EXT_debug_label 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glLabelObjectEXT (GLenum type, GLuint object, GLsizei length, const GLchar *label); -GL_APICALL void GL_APIENTRY glGetObjectLabelEXT (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif -typedef void (GL_APIENTRYP PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar *label); -typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei *length, GLchar *label); -#endif - -/* GL_EXT_debug_marker */ -#ifndef GL_EXT_debug_marker -#define GL_EXT_debug_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glInsertEventMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPushGroupMarkerEXT (GLsizei length, const GLchar *marker); -GL_APICALL void GL_APIENTRY glPopGroupMarkerEXT (void); -#endif -typedef void (GL_APIENTRYP PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar *marker); -typedef void (GL_APIENTRYP PFNGLPOPGROUPMARKEREXTPROC) (void); -#endif - -/* GL_EXT_discard_framebuffer */ -#ifndef GL_EXT_discard_framebuffer -#define GL_EXT_discard_framebuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif -typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); -#endif - -/* GL_EXT_map_buffer_range */ -#ifndef GL_EXT_map_buffer_range -#define GL_EXT_map_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); -#endif -typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#endif - -/* GL_EXT_multisampled_render_to_texture */ -#ifndef GL_EXT_multisampled_render_to_texture -#define GL_EXT_multisampled_render_to_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleEXT (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif - -/* GL_EXT_multiview_draw_buffers */ -#ifndef GL_EXT_multiview_draw_buffers -#define GL_EXT_multiview_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); -GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); -GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); -#endif -typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); -typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); -GL_APICALL void GL_APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (GL_APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -/* GL_EXT_occlusion_query_boolean */ -#ifndef GL_EXT_occlusion_query_boolean -#define GL_EXT_occlusion_query_boolean 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGenQueriesEXT (GLsizei n, GLuint *ids); -GL_APICALL void GL_APIENTRY glDeleteQueriesEXT (GLsizei n, const GLuint *ids); -GL_APICALL GLboolean GL_APIENTRY glIsQueryEXT (GLuint id); -GL_APICALL void GL_APIENTRY glBeginQueryEXT (GLenum target, GLuint id); -GL_APICALL void GL_APIENTRY glEndQueryEXT (GLenum target); -GL_APICALL void GL_APIENTRY glGetQueryivEXT (GLenum target, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glGetQueryObjectuivEXT (GLuint id, GLenum pname, GLuint *params); -#endif -typedef void (GL_APIENTRYP PFNGLGENQUERIESEXTPROC) (GLsizei n, GLuint *ids); -typedef void (GL_APIENTRYP PFNGLDELETEQUERIESEXTPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (GL_APIENTRYP PFNGLISQUERYEXTPROC) (GLuint id); -typedef void (GL_APIENTRYP PFNGLBEGINQUERYEXTPROC) (GLenum target, GLuint id); -typedef void (GL_APIENTRYP PFNGLENDQUERYEXTPROC) (GLenum target); -typedef void (GL_APIENTRYP PFNGLGETQUERYIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLGETQUERYOBJECTUIVEXTPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -/* GL_EXT_read_format_bgra */ -#ifndef GL_EXT_read_format_bgra -#define GL_EXT_read_format_bgra 1 -#endif - -/* GL_EXT_robustness */ -#ifndef GL_EXT_robustness -#define GL_EXT_robustness 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL GLenum GL_APIENTRY glGetGraphicsResetStatusEXT (void); -GL_APICALL void GL_APIENTRY glReadnPixelsEXT (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -GL_APICALL void GL_APIENTRY glGetnUniformfvEXT (GLuint program, GLint location, GLsizei bufSize, float *params); -GL_APICALL void GL_APIENTRY glGetnUniformivEXT (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif -typedef GLenum (GL_APIENTRYP PFNGLGETGRAPHICSRESETSTATUSEXTPROC) (void); -typedef void (GL_APIENTRYP PFNGLREADNPIXELSEXTPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMFVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, float *params); -typedef void (GL_APIENTRYP PFNGLGETNUNIFORMIVEXTPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -#endif - -/* GL_EXT_separate_shader_objects */ -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glUseProgramStagesEXT (GLuint pipeline, GLbitfield stages, GLuint program); -GL_APICALL void GL_APIENTRY glActiveShaderProgramEXT (GLuint pipeline, GLuint program); -GL_APICALL GLuint GL_APIENTRY glCreateShaderProgramvEXT (GLenum type, GLsizei count, const GLchar **strings); -GL_APICALL void GL_APIENTRY glBindProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glDeleteProgramPipelinesEXT (GLsizei n, const GLuint *pipelines); -GL_APICALL void GL_APIENTRY glGenProgramPipelinesEXT (GLsizei n, GLuint *pipelines); -GL_APICALL GLboolean GL_APIENTRY glIsProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -GL_APICALL void GL_APIENTRY glGetProgramPipelineivEXT (GLuint pipeline, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint x); -GL_APICALL void GL_APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint x, GLint y); -GL_APICALL void GL_APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z); -GL_APICALL void GL_APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -GL_APICALL void GL_APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat x); -GL_APICALL void GL_APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat x, GLfloat y); -GL_APICALL void GL_APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -GL_APICALL void GL_APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GL_APICALL void GL_APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GL_APICALL void GL_APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GL_APICALL void GL_APIENTRY glValidateProgramPipelineEXT (GLuint pipeline); -GL_APICALL void GL_APIENTRY glGetProgramPipelineInfoLogEXT (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif -typedef void (GL_APIENTRYP PFNGLUSEPROGRAMSTAGESEXTPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (GL_APIENTRYP PFNGLACTIVESHADERPROGRAMEXTPROC) (GLuint pipeline, GLuint program); -typedef GLuint (GL_APIENTRYP PFNGLCREATESHADERPROGRAMVEXTPROC) (GLenum type, GLsizei count, const GLchar **strings); -typedef void (GL_APIENTRYP PFNGLBINDPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLDELETEPROGRAMPIPELINESEXTPROC) (GLsizei n, const GLuint *pipelines); -typedef void (GL_APIENTRYP PFNGLGENPROGRAMPIPELINESEXTPROC) (GLsizei n, GLuint *pipelines); -typedef GLboolean (GL_APIENTRYP PFNGLISPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEIVEXTPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint x); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint x, GLint y); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat x); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline); -typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif - -/* GL_EXT_shader_framebuffer_fetch */ -#ifndef GL_EXT_shader_framebuffer_fetch -#define GL_EXT_shader_framebuffer_fetch 1 -#endif - -/* GL_EXT_shader_texture_lod */ -#ifndef GL_EXT_shader_texture_lod -#define GL_EXT_shader_texture_lod 1 -#endif - -/* GL_EXT_shadow_samplers */ -#ifndef GL_EXT_shadow_samplers -#define GL_EXT_shadow_samplers 1 -#endif - -/* GL_EXT_sRGB */ -#ifndef GL_EXT_sRGB -#define GL_EXT_sRGB 1 -#endif - -/* GL_EXT_texture_compression_dxt1 */ -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_EXT_texture_compression_dxt1 1 -#endif - -/* GL_EXT_texture_filter_anisotropic */ -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -/* GL_EXT_texture_format_BGRA8888 */ -#ifndef GL_EXT_texture_format_BGRA8888 -#define GL_EXT_texture_format_BGRA8888 1 -#endif - -/* GL_EXT_texture_rg */ -#ifndef GL_EXT_texture_rg -#define GL_EXT_texture_rg 1 -#endif - -/* GL_EXT_texture_storage */ -#ifndef GL_EXT_texture_storage -#define GL_EXT_texture_storage 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glTexStorage1DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTexStorage2DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTexStorage3DEXT (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -GL_APICALL void GL_APIENTRY glTextureStorage1DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -GL_APICALL void GL_APIENTRY glTextureStorage2DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -GL_APICALL void GL_APIENTRY glTextureStorage3DEXT (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE1DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE2DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXSTORAGE3DEXTPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -#endif - -/* GL_EXT_texture_type_2_10_10_10_REV */ -#ifndef GL_EXT_texture_type_2_10_10_10_REV -#define GL_EXT_texture_type_2_10_10_10_REV 1 -#endif - -/* GL_EXT_unpack_subimage */ -#ifndef GL_EXT_unpack_subimage -#define GL_EXT_unpack_subimage 1 -#endif - -/*------------------------------------------------------------------------* - * DMP extension functions - *------------------------------------------------------------------------*/ - -/* GL_DMP_shader_binary */ -#ifndef GL_DMP_shader_binary -#define GL_DMP_shader_binary 1 -#endif - -/*------------------------------------------------------------------------* - * FJ extension functions - *------------------------------------------------------------------------*/ - -/* GL_FJ_shader_binary_GCCSO */ -#ifndef GL_FJ_shader_binary_GCCSO -#define GL_FJ_shader_binary_GCCSO 1 -#endif - -/*------------------------------------------------------------------------* - * IMG extension functions - *------------------------------------------------------------------------*/ - -/* GL_IMG_program_binary */ -#ifndef GL_IMG_program_binary -#define GL_IMG_program_binary 1 -#endif - -/* GL_IMG_read_format */ -#ifndef GL_IMG_read_format -#define GL_IMG_read_format 1 -#endif - -/* GL_IMG_shader_binary */ -#ifndef GL_IMG_shader_binary -#define GL_IMG_shader_binary 1 -#endif - -/* GL_IMG_texture_compression_pvrtc */ -#ifndef GL_IMG_texture_compression_pvrtc -#define GL_IMG_texture_compression_pvrtc 1 -#endif - -/* GL_IMG_multisampled_render_to_texture */ -#ifndef GL_IMG_multisampled_render_to_texture -#define GL_IMG_multisampled_render_to_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleIMG (GLenum, GLsizei, GLenum, GLsizei, GLsizei); -GL_APICALL void GL_APIENTRY glFramebufferTexture2DMultisampleIMG (GLenum, GLenum, GLenum, GLuint, GLint, GLsizei); -#endif -typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEIMGPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEIMGPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); -#endif - -/*------------------------------------------------------------------------* - * NV extension functions - *------------------------------------------------------------------------*/ - -/* GL_NV_coverage_sample */ -#ifndef GL_NV_coverage_sample -#define GL_NV_coverage_sample 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glCoverageMaskNV (GLboolean mask); -GL_APICALL void GL_APIENTRY glCoverageOperationNV (GLenum operation); -#endif -typedef void (GL_APIENTRYP PFNGLCOVERAGEMASKNVPROC) (GLboolean mask); -typedef void (GL_APIENTRYP PFNGLCOVERAGEOPERATIONNVPROC) (GLenum operation); -#endif - -/* GL_NV_depth_nonlinear */ -#ifndef GL_NV_depth_nonlinear -#define GL_NV_depth_nonlinear 1 -#endif - -/* GL_NV_draw_buffers */ -#ifndef GL_NV_draw_buffers -#define GL_NV_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs); -#endif -typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs); -#endif - -/* GL_NV_fbo_color_attachments */ -#ifndef GL_NV_fbo_color_attachments -#define GL_NV_fbo_color_attachments 1 -#endif - -/* GL_NV_fence */ -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); -GL_APICALL void GL_APIENTRY glGenFencesNV (GLsizei, GLuint *); -GL_APICALL GLboolean GL_APIENTRY glIsFenceNV (GLuint); -GL_APICALL GLboolean GL_APIENTRY glTestFenceNV (GLuint); -GL_APICALL void GL_APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); -GL_APICALL void GL_APIENTRY glFinishFenceNV (GLuint); -GL_APICALL void GL_APIENTRY glSetFenceNV (GLuint, GLenum); -#endif -typedef void (GL_APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (GL_APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (GL_APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (GL_APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -/* GL_NV_read_buffer */ -#ifndef GL_NV_read_buffer -#define GL_NV_read_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glReadBufferNV (GLenum mode); -#endif -typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode); -#endif - -/* GL_NV_read_buffer_front */ -#ifndef GL_NV_read_buffer_front -#define GL_NV_read_buffer_front 1 -#endif - -/* GL_NV_read_depth */ -#ifndef GL_NV_read_depth -#define GL_NV_read_depth 1 -#endif - -/* GL_NV_read_depth_stencil */ -#ifndef GL_NV_read_depth_stencil -#define GL_NV_read_depth_stencil 1 -#endif - -/* GL_NV_read_stencil */ -#ifndef GL_NV_read_stencil -#define GL_NV_read_stencil 1 -#endif - -/* GL_NV_texture_compression_s3tc_update */ -#ifndef GL_NV_texture_compression_s3tc_update -#define GL_NV_texture_compression_s3tc_update 1 -#endif - -/* GL_NV_texture_npot_2D_mipmap */ -#ifndef GL_NV_texture_npot_2D_mipmap -#define GL_NV_texture_npot_2D_mipmap 1 -#endif - -/*------------------------------------------------------------------------* - * QCOM extension functions - *------------------------------------------------------------------------*/ - -/* GL_QCOM_alpha_test */ -#ifndef GL_QCOM_alpha_test -#define GL_QCOM_alpha_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); -#endif -typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); -#endif - -/* GL_QCOM_binning_control */ -#ifndef GL_QCOM_binning_control -#define GL_QCOM_binning_control 1 -#endif - -/* GL_QCOM_driver_control */ -#ifndef GL_QCOM_driver_control -#define GL_QCOM_driver_control 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glGetDriverControlsQCOM (GLint *num, GLsizei size, GLuint *driverControls); -GL_APICALL void GL_APIENTRY glGetDriverControlStringQCOM (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -GL_APICALL void GL_APIENTRY glEnableDriverControlQCOM (GLuint driverControl); -GL_APICALL void GL_APIENTRY glDisableDriverControlQCOM (GLuint driverControl); -#endif -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSQCOMPROC) (GLint *num, GLsizei size, GLuint *driverControls); -typedef void (GL_APIENTRYP PFNGLGETDRIVERCONTROLSTRINGQCOMPROC) (GLuint driverControl, GLsizei bufSize, GLsizei *length, GLchar *driverControlString); -typedef void (GL_APIENTRYP PFNGLENABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -typedef void (GL_APIENTRYP PFNGLDISABLEDRIVERCONTROLQCOMPROC) (GLuint driverControl); -#endif - -/* GL_QCOM_extended_get */ -#ifndef GL_QCOM_extended_get -#define GL_QCOM_extended_get 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetTexturesQCOM (GLuint *textures, GLint maxTextures, GLint *numTextures); -GL_APICALL void GL_APIENTRY glExtGetBuffersQCOM (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -GL_APICALL void GL_APIENTRY glExtGetRenderbuffersQCOM (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -GL_APICALL void GL_APIENTRY glExtGetFramebuffersQCOM (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -GL_APICALL void GL_APIENTRY glExtGetTexLevelParameterivQCOM (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -GL_APICALL void GL_APIENTRY glExtTexObjectStateOverrideiQCOM (GLenum target, GLenum pname, GLint param); -GL_APICALL void GL_APIENTRY glExtGetTexSubImageQCOM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); -GL_APICALL void GL_APIENTRY glExtGetBufferPointervQCOM (GLenum target, GLvoid **params); -#endif -typedef void (GL_APIENTRYP PFNGLEXTGETTEXTURESQCOMPROC) (GLuint *textures, GLint maxTextures, GLint *numTextures); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERSQCOMPROC) (GLuint *buffers, GLint maxBuffers, GLint *numBuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETRENDERBUFFERSQCOMPROC) (GLuint *renderbuffers, GLint maxRenderbuffers, GLint *numRenderbuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETFRAMEBUFFERSQCOMPROC) (GLuint *framebuffers, GLint maxFramebuffers, GLint *numFramebuffers); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXLEVELPARAMETERIVQCOMPROC) (GLuint texture, GLenum face, GLint level, GLenum pname, GLint *params); -typedef void (GL_APIENTRYP PFNGLEXTTEXOBJECTSTATEOVERRIDEIQCOMPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GL_APIENTRYP PFNGLEXTGETTEXSUBIMAGEQCOMPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLvoid *texels); -typedef void (GL_APIENTRYP PFNGLEXTGETBUFFERPOINTERVQCOMPROC) (GLenum target, GLvoid **params); -#endif - -/* GL_QCOM_extended_get2 */ -#ifndef GL_QCOM_extended_get2 -#define GL_QCOM_extended_get2 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glExtGetShadersQCOM (GLuint *shaders, GLint maxShaders, GLint *numShaders); -GL_APICALL void GL_APIENTRY glExtGetProgramsQCOM (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -GL_APICALL GLboolean GL_APIENTRY glExtIsProgramBinaryQCOM (GLuint program); -GL_APICALL void GL_APIENTRY glExtGetProgramBinarySourceQCOM (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif -typedef void (GL_APIENTRYP PFNGLEXTGETSHADERSQCOMPROC) (GLuint *shaders, GLint maxShaders, GLint *numShaders); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMSQCOMPROC) (GLuint *programs, GLint maxPrograms, GLint *numPrograms); -typedef GLboolean (GL_APIENTRYP PFNGLEXTISPROGRAMBINARYQCOMPROC) (GLuint program); -typedef void (GL_APIENTRYP PFNGLEXTGETPROGRAMBINARYSOURCEQCOMPROC) (GLuint program, GLenum shadertype, GLchar *source, GLint *length); -#endif - -/* GL_QCOM_perfmon_global_mode */ -#ifndef GL_QCOM_perfmon_global_mode -#define GL_QCOM_perfmon_global_mode 1 -#endif - -/* GL_QCOM_writeonly_rendering */ -#ifndef GL_QCOM_writeonly_rendering -#define GL_QCOM_writeonly_rendering 1 -#endif - -/* GL_QCOM_tiled_rendering */ -#ifndef GL_QCOM_tiled_rendering -#define GL_QCOM_tiled_rendering 1 -#ifdef GL_GLEXT_PROTOTYPES -GL_APICALL void GL_APIENTRY glStartTilingQCOM (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); -#endif -typedef void (GL_APIENTRYP PFNGLSTARTTILINGQCOMPROC) (GLuint x, GLuint y, GLuint width, GLuint height, GLbitfield preserveMask); -typedef void (GL_APIENTRYP PFNGLENDTILINGQCOMPROC) (GLbitfield preserveMask); -#endif - -/*------------------------------------------------------------------------* - * VIV extension tokens - *------------------------------------------------------------------------*/ - -/* GL_VIV_shader_binary */ -#ifndef GL_VIV_shader_binary -#define GL_VIV_shader_binary 1 -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __gl2ext_h_ */ - -#endif /* _MSC_VER */ - -#ifndef APIENTRY -#define APIENTRY GL_APIENTRY -#endif diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengles.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengles.h - * - * This is a simple file to encapsulate the OpenGL ES 1.X API headers. - */ - -#ifdef __IPHONEOS__ -#include -#include -#else -#include -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengl.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengl.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengl.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_opengl.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,11126 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_opengl.h - * - * This is a simple file to encapsulate the OpenGL API headers. - */ - -#ifndef _SDL_opengl_h -#define _SDL_opengl_h - -#include "SDL_config.h" - -#ifndef __IPHONEOS__ - -#ifdef __WIN32__ -#define WIN32_LEAN_AND_MEAN -#ifndef NOMINMAX -#define NOMINMAX /* Don't defined min() and max() */ -#endif -#include -#endif - -#ifdef __glext_h_ -/* Someone has already included glext.h */ -#define NO_SDL_GLEXT -#endif -#ifndef NO_SDL_GLEXT -#define __glext_h_ /* Don't let gl.h include glext.h */ -#endif -#if defined(__MACOSX__) -#include /* Header File For The OpenGL Library */ -#define __X_GL_H -#else -#include /* Header File For The OpenGL Library */ -#endif -#ifndef NO_SDL_GLEXT -#undef __glext_h_ -#endif - -/** - * \file SDL_opengl.h - * - * This file is included because glext.h is not available on some systems. - * If you don't want this version included, simply define ::NO_SDL_GLEXT. - * - * The latest version is available from: - * http://www.opengl.org/registry/ - */ - -/** - * \def NO_SDL_GLEXT - * - * Define this if you have your own version of glext.h and want to disable the - * version included in SDL_opengl.h. - */ - -#if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY) -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2007-2010 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated $Date: 2010-08-03 01:30:25 -0700 (Tue, 03 Aug 2010) $ */ -/* Current version at http://www.opengl.org/registry/ */ -#define GL_GLEXT_VERSION 64 -/* Function declaration macros - to move into glplatform.h */ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_RESCALE_NORMAL 0x803A -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#endif - -#ifndef GL_ARB_imaging_DEPRECATED -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#endif - -#ifndef GL_VERSION_1_5_DEPRECATED -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_FOG_COORD_SRC 0x8450 -#define GL_FOG_COORD 0x8451 -#define GL_CURRENT_FOG_COORD 0x8453 -#define GL_FOG_COORD_ARRAY_TYPE 0x8454 -#define GL_FOG_COORD_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORD_ARRAY_POINTER 0x8456 -#define GL_FOG_COORD_ARRAY 0x8457 -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING 0x889D -#define GL_SRC0_RGB 0x8580 -#define GL_SRC1_RGB 0x8581 -#define GL_SRC2_RGB 0x8582 -#define GL_SRC0_ALPHA 0x8588 -#define GL_SRC1_ALPHA 0x8589 -#define GL_SRC2_ALPHA 0x858A -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB 0x8009 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_VERSION_2_0_DEPRECATED -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_TEXTURE_COORDS 0x8871 -#endif - -#ifndef GL_VERSION_2_1 -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#endif - -#ifndef GL_VERSION_2_1_DEPRECATED -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B -#endif - -#ifndef GL_VERSION_3_0 -#define GL_COMPARE_REF_TO_TEXTURE 0x884E -#define GL_CLIP_DISTANCE0 0x3000 -#define GL_CLIP_DISTANCE1 0x3001 -#define GL_CLIP_DISTANCE2 0x3002 -#define GL_CLIP_DISTANCE3 0x3003 -#define GL_CLIP_DISTANCE4 0x3004 -#define GL_CLIP_DISTANCE5 0x3005 -#define GL_CLIP_DISTANCE6 0x3006 -#define GL_CLIP_DISTANCE7 0x3007 -#define GL_MAX_CLIP_DISTANCES 0x0D32 -#define GL_MAJOR_VERSION 0x821B -#define GL_MINOR_VERSION 0x821C -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_DEPTH_BUFFER 0x8223 -#define GL_STENCIL_BUFFER 0x8224 -#define GL_COMPRESSED_RED 0x8225 -#define GL_COMPRESSED_RG 0x8226 -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 -#define GL_RGBA32F 0x8814 -#define GL_RGB32F 0x8815 -#define GL_RGBA16F 0x881A -#define GL_RGB16F 0x881B -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD -#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF -#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 -#define GL_CLAMP_READ_COLOR 0x891C -#define GL_FIXED_ONLY 0x891D -#define GL_MAX_VARYING_COMPONENTS 0x8B4B -#define GL_TEXTURE_1D_ARRAY 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 -#define GL_TEXTURE_2D_ARRAY 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D -#define GL_R11F_G11F_B10F 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B -#define GL_RGB9_E5 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E -#define GL_TEXTURE_SHARED_SIZE 0x8C3F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 -#define GL_PRIMITIVES_GENERATED 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 -#define GL_RASTERIZER_DISCARD 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B -#define GL_INTERLEAVED_ATTRIBS 0x8C8C -#define GL_SEPARATE_ATTRIBS 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F -#define GL_RGBA32UI 0x8D70 -#define GL_RGB32UI 0x8D71 -#define GL_RGBA16UI 0x8D76 -#define GL_RGB16UI 0x8D77 -#define GL_RGBA8UI 0x8D7C -#define GL_RGB8UI 0x8D7D -#define GL_RGBA32I 0x8D82 -#define GL_RGB32I 0x8D83 -#define GL_RGBA16I 0x8D88 -#define GL_RGB16I 0x8D89 -#define GL_RGBA8I 0x8D8E -#define GL_RGB8I 0x8D8F -#define GL_RED_INTEGER 0x8D94 -#define GL_GREEN_INTEGER 0x8D95 -#define GL_BLUE_INTEGER 0x8D96 -#define GL_RGB_INTEGER 0x8D98 -#define GL_RGBA_INTEGER 0x8D99 -#define GL_BGR_INTEGER 0x8D9A -#define GL_BGRA_INTEGER 0x8D9B -#define GL_SAMPLER_1D_ARRAY 0x8DC0 -#define GL_SAMPLER_2D_ARRAY 0x8DC1 -#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 -#define GL_UNSIGNED_INT_VEC2 0x8DC6 -#define GL_UNSIGNED_INT_VEC3 0x8DC7 -#define GL_UNSIGNED_INT_VEC4 0x8DC8 -#define GL_INT_SAMPLER_1D 0x8DC9 -#define GL_INT_SAMPLER_2D 0x8DCA -#define GL_INT_SAMPLER_3D 0x8DCB -#define GL_INT_SAMPLER_CUBE 0x8DCC -#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF -#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 -#define GL_QUERY_WAIT 0x8E13 -#define GL_QUERY_NO_WAIT 0x8E14 -#define GL_QUERY_BY_REGION_WAIT 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 -#define GL_BUFFER_ACCESS_FLAGS 0x911F -#define GL_BUFFER_MAP_LENGTH 0x9120 -#define GL_BUFFER_MAP_OFFSET 0x9121 -/* Reuse tokens from ARB_depth_buffer_float */ -/* reuse GL_DEPTH_COMPONENT32F */ -/* reuse GL_DEPTH32F_STENCIL8 */ -/* reuse GL_FLOAT_32_UNSIGNED_INT_24_8_REV */ -/* Reuse tokens from ARB_framebuffer_object */ -/* reuse GL_INVALID_FRAMEBUFFER_OPERATION */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */ -/* reuse GL_FRAMEBUFFER_DEFAULT */ -/* reuse GL_FRAMEBUFFER_UNDEFINED */ -/* reuse GL_DEPTH_STENCIL_ATTACHMENT */ -/* reuse GL_INDEX */ -/* reuse GL_MAX_RENDERBUFFER_SIZE */ -/* reuse GL_DEPTH_STENCIL */ -/* reuse GL_UNSIGNED_INT_24_8 */ -/* reuse GL_DEPTH24_STENCIL8 */ -/* reuse GL_TEXTURE_STENCIL_SIZE */ -/* reuse GL_TEXTURE_RED_TYPE */ -/* reuse GL_TEXTURE_GREEN_TYPE */ -/* reuse GL_TEXTURE_BLUE_TYPE */ -/* reuse GL_TEXTURE_ALPHA_TYPE */ -/* reuse GL_TEXTURE_DEPTH_TYPE */ -/* reuse GL_UNSIGNED_NORMALIZED */ -/* reuse GL_FRAMEBUFFER_BINDING */ -/* reuse GL_DRAW_FRAMEBUFFER_BINDING */ -/* reuse GL_RENDERBUFFER_BINDING */ -/* reuse GL_READ_FRAMEBUFFER */ -/* reuse GL_DRAW_FRAMEBUFFER */ -/* reuse GL_READ_FRAMEBUFFER_BINDING */ -/* reuse GL_RENDERBUFFER_SAMPLES */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -/* reuse GL_FRAMEBUFFER_COMPLETE */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */ -/* reuse GL_FRAMEBUFFER_UNSUPPORTED */ -/* reuse GL_MAX_COLOR_ATTACHMENTS */ -/* reuse GL_COLOR_ATTACHMENT0 */ -/* reuse GL_COLOR_ATTACHMENT1 */ -/* reuse GL_COLOR_ATTACHMENT2 */ -/* reuse GL_COLOR_ATTACHMENT3 */ -/* reuse GL_COLOR_ATTACHMENT4 */ -/* reuse GL_COLOR_ATTACHMENT5 */ -/* reuse GL_COLOR_ATTACHMENT6 */ -/* reuse GL_COLOR_ATTACHMENT7 */ -/* reuse GL_COLOR_ATTACHMENT8 */ -/* reuse GL_COLOR_ATTACHMENT9 */ -/* reuse GL_COLOR_ATTACHMENT10 */ -/* reuse GL_COLOR_ATTACHMENT11 */ -/* reuse GL_COLOR_ATTACHMENT12 */ -/* reuse GL_COLOR_ATTACHMENT13 */ -/* reuse GL_COLOR_ATTACHMENT14 */ -/* reuse GL_COLOR_ATTACHMENT15 */ -/* reuse GL_DEPTH_ATTACHMENT */ -/* reuse GL_STENCIL_ATTACHMENT */ -/* reuse GL_FRAMEBUFFER */ -/* reuse GL_RENDERBUFFER */ -/* reuse GL_RENDERBUFFER_WIDTH */ -/* reuse GL_RENDERBUFFER_HEIGHT */ -/* reuse GL_RENDERBUFFER_INTERNAL_FORMAT */ -/* reuse GL_STENCIL_INDEX1 */ -/* reuse GL_STENCIL_INDEX4 */ -/* reuse GL_STENCIL_INDEX8 */ -/* reuse GL_STENCIL_INDEX16 */ -/* reuse GL_RENDERBUFFER_RED_SIZE */ -/* reuse GL_RENDERBUFFER_GREEN_SIZE */ -/* reuse GL_RENDERBUFFER_BLUE_SIZE */ -/* reuse GL_RENDERBUFFER_ALPHA_SIZE */ -/* reuse GL_RENDERBUFFER_DEPTH_SIZE */ -/* reuse GL_RENDERBUFFER_STENCIL_SIZE */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */ -/* reuse GL_MAX_SAMPLES */ -/* Reuse tokens from ARB_framebuffer_sRGB */ -/* reuse GL_FRAMEBUFFER_SRGB */ -/* Reuse tokens from ARB_half_float_vertex */ -/* reuse GL_HALF_FLOAT */ -/* Reuse tokens from ARB_map_buffer_range */ -/* reuse GL_MAP_READ_BIT */ -/* reuse GL_MAP_WRITE_BIT */ -/* reuse GL_MAP_INVALIDATE_RANGE_BIT */ -/* reuse GL_MAP_INVALIDATE_BUFFER_BIT */ -/* reuse GL_MAP_FLUSH_EXPLICIT_BIT */ -/* reuse GL_MAP_UNSYNCHRONIZED_BIT */ -/* Reuse tokens from ARB_texture_compression_rgtc */ -/* reuse GL_COMPRESSED_RED_RGTC1 */ -/* reuse GL_COMPRESSED_SIGNED_RED_RGTC1 */ -/* reuse GL_COMPRESSED_RG_RGTC2 */ -/* reuse GL_COMPRESSED_SIGNED_RG_RGTC2 */ -/* Reuse tokens from ARB_texture_rg */ -/* reuse GL_RG */ -/* reuse GL_RG_INTEGER */ -/* reuse GL_R8 */ -/* reuse GL_R16 */ -/* reuse GL_RG8 */ -/* reuse GL_RG16 */ -/* reuse GL_R16F */ -/* reuse GL_R32F */ -/* reuse GL_RG16F */ -/* reuse GL_RG32F */ -/* reuse GL_R8I */ -/* reuse GL_R8UI */ -/* reuse GL_R16I */ -/* reuse GL_R16UI */ -/* reuse GL_R32I */ -/* reuse GL_R32UI */ -/* reuse GL_RG8I */ -/* reuse GL_RG8UI */ -/* reuse GL_RG16I */ -/* reuse GL_RG16UI */ -/* reuse GL_RG32I */ -/* reuse GL_RG32UI */ -/* Reuse tokens from ARB_vertex_array_object */ -/* reuse GL_VERTEX_ARRAY_BINDING */ -#endif - -#ifndef GL_VERSION_3_0_DEPRECATED -#define GL_CLAMP_VERTEX_COLOR 0x891A -#define GL_CLAMP_FRAGMENT_COLOR 0x891B -#define GL_ALPHA_INTEGER 0x8D97 -/* Reuse tokens from ARB_framebuffer_object */ -/* reuse GL_TEXTURE_LUMINANCE_TYPE */ -/* reuse GL_TEXTURE_INTENSITY_TYPE */ -#endif - -#ifndef GL_VERSION_3_1 -#define GL_SAMPLER_2D_RECT 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 -#define GL_SAMPLER_BUFFER 0x8DC2 -#define GL_INT_SAMPLER_2D_RECT 0x8DCD -#define GL_INT_SAMPLER_BUFFER 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 -#define GL_TEXTURE_BUFFER 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E -#define GL_TEXTURE_RECTANGLE 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_PRIMITIVE_RESTART 0x8F9D -#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E -/* Reuse tokens from ARB_copy_buffer */ -/* reuse GL_COPY_READ_BUFFER */ -/* reuse GL_COPY_WRITE_BUFFER */ -/* Reuse tokens from ARB_draw_instanced (none) */ -/* Reuse tokens from ARB_uniform_buffer_object */ -/* reuse GL_UNIFORM_BUFFER */ -/* reuse GL_UNIFORM_BUFFER_BINDING */ -/* reuse GL_UNIFORM_BUFFER_START */ -/* reuse GL_UNIFORM_BUFFER_SIZE */ -/* reuse GL_MAX_VERTEX_UNIFORM_BLOCKS */ -/* reuse GL_MAX_FRAGMENT_UNIFORM_BLOCKS */ -/* reuse GL_MAX_COMBINED_UNIFORM_BLOCKS */ -/* reuse GL_MAX_UNIFORM_BUFFER_BINDINGS */ -/* reuse GL_MAX_UNIFORM_BLOCK_SIZE */ -/* reuse GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS */ -/* reuse GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT */ -/* reuse GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH */ -/* reuse GL_ACTIVE_UNIFORM_BLOCKS */ -/* reuse GL_UNIFORM_TYPE */ -/* reuse GL_UNIFORM_SIZE */ -/* reuse GL_UNIFORM_NAME_LENGTH */ -/* reuse GL_UNIFORM_BLOCK_INDEX */ -/* reuse GL_UNIFORM_OFFSET */ -/* reuse GL_UNIFORM_ARRAY_STRIDE */ -/* reuse GL_UNIFORM_MATRIX_STRIDE */ -/* reuse GL_UNIFORM_IS_ROW_MAJOR */ -/* reuse GL_UNIFORM_BLOCK_BINDING */ -/* reuse GL_UNIFORM_BLOCK_DATA_SIZE */ -/* reuse GL_UNIFORM_BLOCK_NAME_LENGTH */ -/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS */ -/* reuse GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER */ -/* reuse GL_INVALID_INDEX */ -#endif - -#ifndef GL_VERSION_3_2 -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_LINES_ADJACENCY 0x000A -#define GL_LINE_STRIP_ADJACENCY 0x000B -#define GL_TRIANGLES_ADJACENCY 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D -#define GL_PROGRAM_POINT_SIZE 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 -#define GL_GEOMETRY_SHADER 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT 0x8916 -#define GL_GEOMETRY_INPUT_TYPE 0x8917 -#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 -#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 -#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 -#define GL_CONTEXT_PROFILE_MASK 0x9126 -/* reuse GL_MAX_VARYING_COMPONENTS */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -/* Reuse tokens from ARB_depth_clamp */ -/* reuse GL_DEPTH_CLAMP */ -/* Reuse tokens from ARB_draw_elements_base_vertex (none) */ -/* Reuse tokens from ARB_fragment_coord_conventions (none) */ -/* Reuse tokens from ARB_provoking_vertex */ -/* reuse GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */ -/* reuse GL_FIRST_VERTEX_CONVENTION */ -/* reuse GL_LAST_VERTEX_CONVENTION */ -/* reuse GL_PROVOKING_VERTEX */ -/* Reuse tokens from ARB_seamless_cube_map */ -/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS */ -/* Reuse tokens from ARB_sync */ -/* reuse GL_MAX_SERVER_WAIT_TIMEOUT */ -/* reuse GL_OBJECT_TYPE */ -/* reuse GL_SYNC_CONDITION */ -/* reuse GL_SYNC_STATUS */ -/* reuse GL_SYNC_FLAGS */ -/* reuse GL_SYNC_FENCE */ -/* reuse GL_SYNC_GPU_COMMANDS_COMPLETE */ -/* reuse GL_UNSIGNALED */ -/* reuse GL_SIGNALED */ -/* reuse GL_ALREADY_SIGNALED */ -/* reuse GL_TIMEOUT_EXPIRED */ -/* reuse GL_CONDITION_SATISFIED */ -/* reuse GL_WAIT_FAILED */ -/* reuse GL_TIMEOUT_IGNORED */ -/* reuse GL_SYNC_FLUSH_COMMANDS_BIT */ -/* reuse GL_TIMEOUT_IGNORED */ -/* Reuse tokens from ARB_texture_multisample */ -/* reuse GL_SAMPLE_POSITION */ -/* reuse GL_SAMPLE_MASK */ -/* reuse GL_SAMPLE_MASK_VALUE */ -/* reuse GL_MAX_SAMPLE_MASK_WORDS */ -/* reuse GL_TEXTURE_2D_MULTISAMPLE */ -/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE */ -/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE */ -/* reuse GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_TEXTURE_SAMPLES */ -/* reuse GL_TEXTURE_FIXED_SAMPLE_LOCATIONS */ -/* reuse GL_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE */ -/* reuse GL_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY */ -/* reuse GL_MAX_COLOR_TEXTURE_SAMPLES */ -/* reuse GL_MAX_DEPTH_TEXTURE_SAMPLES */ -/* reuse GL_MAX_INTEGER_SAMPLES */ -/* Don't need to reuse tokens from ARB_vertex_array_bgra since they're already in 1.2 core */ -#endif - -#ifndef GL_VERSION_3_3 -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE -/* Reuse tokens from ARB_blend_func_extended */ -/* reuse GL_SRC1_COLOR */ -/* reuse GL_ONE_MINUS_SRC1_COLOR */ -/* reuse GL_ONE_MINUS_SRC1_ALPHA */ -/* reuse GL_MAX_DUAL_SOURCE_DRAW_BUFFERS */ -/* Reuse tokens from ARB_explicit_attrib_location (none) */ -/* Reuse tokens from ARB_occlusion_query2 */ -/* reuse GL_ANY_SAMPLES_PASSED */ -/* Reuse tokens from ARB_sampler_objects */ -/* reuse GL_SAMPLER_BINDING */ -/* Reuse tokens from ARB_shader_bit_encoding (none) */ -/* Reuse tokens from ARB_texture_rgb10_a2ui */ -/* reuse GL_RGB10_A2UI */ -/* Reuse tokens from ARB_texture_swizzle */ -/* reuse GL_TEXTURE_SWIZZLE_R */ -/* reuse GL_TEXTURE_SWIZZLE_G */ -/* reuse GL_TEXTURE_SWIZZLE_B */ -/* reuse GL_TEXTURE_SWIZZLE_A */ -/* reuse GL_TEXTURE_SWIZZLE_RGBA */ -/* Reuse tokens from ARB_timer_query */ -/* reuse GL_TIME_ELAPSED */ -/* reuse GL_TIMESTAMP */ -/* Reuse tokens from ARB_vertex_type_2_10_10_10_rev */ -/* reuse GL_INT_2_10_10_10_REV */ -#endif - -#ifndef GL_VERSION_4_0 -#define GL_SAMPLE_SHADING 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F -#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F -/* Reuse tokens from ARB_texture_query_lod (none) */ -/* Reuse tokens from ARB_draw_buffers_blend (none) */ -/* Reuse tokens from ARB_draw_indirect */ -/* reuse GL_DRAW_INDIRECT_BUFFER */ -/* reuse GL_DRAW_INDIRECT_BUFFER_BINDING */ -/* Reuse tokens from ARB_gpu_shader5 */ -/* reuse GL_GEOMETRY_SHADER_INVOCATIONS */ -/* reuse GL_MAX_GEOMETRY_SHADER_INVOCATIONS */ -/* reuse GL_MIN_FRAGMENT_INTERPOLATION_OFFSET */ -/* reuse GL_MAX_FRAGMENT_INTERPOLATION_OFFSET */ -/* reuse GL_FRAGMENT_INTERPOLATION_OFFSET_BITS */ -/* reuse GL_MAX_VERTEX_STREAMS */ -/* Reuse tokens from ARB_gpu_shader_fp64 */ -/* reuse GL_DOUBLE_VEC2 */ -/* reuse GL_DOUBLE_VEC3 */ -/* reuse GL_DOUBLE_VEC4 */ -/* reuse GL_DOUBLE_MAT2 */ -/* reuse GL_DOUBLE_MAT3 */ -/* reuse GL_DOUBLE_MAT4 */ -/* reuse GL_DOUBLE_MAT2x3 */ -/* reuse GL_DOUBLE_MAT2x4 */ -/* reuse GL_DOUBLE_MAT3x2 */ -/* reuse GL_DOUBLE_MAT3x4 */ -/* reuse GL_DOUBLE_MAT4x2 */ -/* reuse GL_DOUBLE_MAT4x3 */ -/* Reuse tokens from ARB_shader_subroutine */ -/* reuse GL_ACTIVE_SUBROUTINES */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORMS */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS */ -/* reuse GL_ACTIVE_SUBROUTINE_MAX_LENGTH */ -/* reuse GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH */ -/* reuse GL_MAX_SUBROUTINES */ -/* reuse GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS */ -/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */ -/* reuse GL_COMPATIBLE_SUBROUTINES */ -/* Reuse tokens from ARB_tessellation_shader */ -/* reuse GL_PATCHES */ -/* reuse GL_PATCH_VERTICES */ -/* reuse GL_PATCH_DEFAULT_INNER_LEVEL */ -/* reuse GL_PATCH_DEFAULT_OUTER_LEVEL */ -/* reuse GL_TESS_CONTROL_OUTPUT_VERTICES */ -/* reuse GL_TESS_GEN_MODE */ -/* reuse GL_TESS_GEN_SPACING */ -/* reuse GL_TESS_GEN_VERTEX_ORDER */ -/* reuse GL_TESS_GEN_POINT_MODE */ -/* reuse GL_ISOLINES */ -/* reuse GL_FRACTIONAL_ODD */ -/* reuse GL_FRACTIONAL_EVEN */ -/* reuse GL_MAX_PATCH_VERTICES */ -/* reuse GL_MAX_TESS_GEN_LEVEL */ -/* reuse GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS */ -/* reuse GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS */ -/* reuse GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_PATCH_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS */ -/* reuse GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS */ -/* reuse GL_MAX_TESS_CONTROL_INPUT_COMPONENTS */ -/* reuse GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS */ -/* reuse GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS */ -/* reuse GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER */ -/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER */ -/* reuse GL_TESS_EVALUATION_SHADER */ -/* reuse GL_TESS_CONTROL_SHADER */ -/* Reuse tokens from ARB_texture_buffer_object_rgb32 (none) */ -/* Reuse tokens from ARB_transform_feedback2 */ -/* reuse GL_TRANSFORM_FEEDBACK */ -/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */ -/* reuse GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */ -/* reuse GL_TRANSFORM_FEEDBACK_BINDING */ -/* Reuse tokens from ARB_transform_feedback3 */ -/* reuse GL_MAX_TRANSFORM_FEEDBACK_BUFFERS */ -/* reuse GL_MAX_VERTEX_STREAMS */ -#endif - -#ifndef GL_VERSION_4_1 -/* Reuse tokens from ARB_ES2_compatibility */ -/* reuse GL_FIXED */ -/* reuse GL_IMPLEMENTATION_COLOR_READ_TYPE */ -/* reuse GL_IMPLEMENTATION_COLOR_READ_FORMAT */ -/* reuse GL_LOW_FLOAT */ -/* reuse GL_MEDIUM_FLOAT */ -/* reuse GL_HIGH_FLOAT */ -/* reuse GL_LOW_INT */ -/* reuse GL_MEDIUM_INT */ -/* reuse GL_HIGH_INT */ -/* reuse GL_SHADER_COMPILER */ -/* reuse GL_NUM_SHADER_BINARY_FORMATS */ -/* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */ -/* reuse GL_MAX_VARYING_VECTORS */ -/* reuse GL_MAX_FRAGMENT_UNIFORM_VECTORS */ -/* Reuse tokens from ARB_get_program_binary */ -/* reuse GL_PROGRAM_BINARY_RETRIEVABLE_HINT */ -/* reuse GL_PROGRAM_BINARY_LENGTH */ -/* reuse GL_NUM_PROGRAM_BINARY_FORMATS */ -/* reuse GL_PROGRAM_BINARY_FORMATS */ -/* Reuse tokens from ARB_separate_shader_objects */ -/* reuse GL_VERTEX_SHADER_BIT */ -/* reuse GL_FRAGMENT_SHADER_BIT */ -/* reuse GL_GEOMETRY_SHADER_BIT */ -/* reuse GL_TESS_CONTROL_SHADER_BIT */ -/* reuse GL_TESS_EVALUATION_SHADER_BIT */ -/* reuse GL_ALL_SHADER_BITS */ -/* reuse GL_PROGRAM_SEPARABLE */ -/* reuse GL_ACTIVE_PROGRAM */ -/* reuse GL_PROGRAM_PIPELINE_BINDING */ -/* Reuse tokens from ARB_shader_precision (none) */ -/* Reuse tokens from ARB_vertex_attrib_64bit - all are in GL 3.0 and 4.0 already */ -/* Reuse tokens from ARB_viewport_array - some are in GL 1.1 and ARB_provoking_vertex already */ -/* reuse GL_MAX_VIEWPORTS */ -/* reuse GL_VIEWPORT_SUBPIXEL_BITS */ -/* reuse GL_VIEWPORT_BOUNDS_RANGE */ -/* reuse GL_LAYER_PROVOKING_VERTEX */ -/* reuse GL_VIEWPORT_INDEX_PROVOKING_VERTEX */ -/* reuse GL_UNDEFINED_VERTEX */ -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_ARB_depth_buffer_float -#define GL_DEPTH_COMPONENT32F 0x8CAC -#define GL_DEPTH32F_STENCIL8 0x8CAD -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD -#endif - -#ifndef GL_ARB_draw_instanced -#endif - -#ifndef GL_ARB_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 -#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 -#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 -#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 -#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 -#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 -#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 -#define GL_FRAMEBUFFER_DEFAULT 0x8218 -#define GL_FRAMEBUFFER_UNDEFINED 0x8219 -#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_DEPTH_STENCIL 0x84F9 -#define GL_UNSIGNED_INT_24_8 0x84FA -#define GL_DEPTH24_STENCIL8 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE 0x88F1 -#define GL_TEXTURE_RED_TYPE 0x8C10 -#define GL_TEXTURE_GREEN_TYPE 0x8C11 -#define GL_TEXTURE_BLUE_TYPE 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE 0x8C13 -#define GL_TEXTURE_DEPTH_TYPE 0x8C16 -#define GL_UNSIGNED_NORMALIZED 0x8C17 -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_READ_FRAMEBUFFER 0x8CA8 -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_COLOR_ATTACHMENT1 0x8CE1 -#define GL_COLOR_ATTACHMENT2 0x8CE2 -#define GL_COLOR_ATTACHMENT3 0x8CE3 -#define GL_COLOR_ATTACHMENT4 0x8CE4 -#define GL_COLOR_ATTACHMENT5 0x8CE5 -#define GL_COLOR_ATTACHMENT6 0x8CE6 -#define GL_COLOR_ATTACHMENT7 0x8CE7 -#define GL_COLOR_ATTACHMENT8 0x8CE8 -#define GL_COLOR_ATTACHMENT9 0x8CE9 -#define GL_COLOR_ATTACHMENT10 0x8CEA -#define GL_COLOR_ATTACHMENT11 0x8CEB -#define GL_COLOR_ATTACHMENT12 0x8CEC -#define GL_COLOR_ATTACHMENT13 0x8CED -#define GL_COLOR_ATTACHMENT14 0x8CEE -#define GL_COLOR_ATTACHMENT15 0x8CEF -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_STENCIL_INDEX1 0x8D46 -#define GL_STENCIL_INDEX4 0x8D47 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_STENCIL_INDEX16 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#define GL_MAX_SAMPLES 0x8D57 -#endif - -#ifndef GL_ARB_framebuffer_object_DEPRECATED -#define GL_INDEX 0x8222 -#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 -#endif - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB 0x8DB9 -#endif - -#ifndef GL_ARB_geometry_shader4 -#define GL_LINES_ADJACENCY_ARB 0x000A -#define GL_LINE_STRIP_ADJACENCY_ARB 0x000B -#define GL_TRIANGLES_ADJACENCY_ARB 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0x000D -#define GL_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 -#define GL_GEOMETRY_SHADER_ARB 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1 -/* reuse GL_MAX_VARYING_COMPONENTS */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */ -#endif - -#ifndef GL_ARB_half_float_vertex -#define GL_HALF_FLOAT 0x140B -#endif - -#ifndef GL_ARB_instanced_arrays -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE -#endif - -#ifndef GL_ARB_map_buffer_range -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 -#endif - -#ifndef GL_ARB_texture_buffer_object -#define GL_TEXTURE_BUFFER_ARB 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E -#endif - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC -#define GL_COMPRESSED_RG_RGTC2 0x8DBD -#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE -#endif - -#ifndef GL_ARB_texture_rg -#define GL_RG 0x8227 -#define GL_RG_INTEGER 0x8228 -#define GL_R8 0x8229 -#define GL_R16 0x822A -#define GL_RG8 0x822B -#define GL_RG16 0x822C -#define GL_R16F 0x822D -#define GL_R32F 0x822E -#define GL_RG16F 0x822F -#define GL_RG32F 0x8230 -#define GL_R8I 0x8231 -#define GL_R8UI 0x8232 -#define GL_R16I 0x8233 -#define GL_R16UI 0x8234 -#define GL_R32I 0x8235 -#define GL_R32UI 0x8236 -#define GL_RG8I 0x8237 -#define GL_RG8UI 0x8238 -#define GL_RG16I 0x8239 -#define GL_RG16UI 0x823A -#define GL_RG32I 0x823B -#define GL_RG32UI 0x823C -#endif - -#ifndef GL_ARB_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING 0x85B5 -#endif - -#ifndef GL_ARB_uniform_buffer_object -#define GL_UNIFORM_BUFFER 0x8A11 -#define GL_UNIFORM_BUFFER_BINDING 0x8A28 -#define GL_UNIFORM_BUFFER_START 0x8A29 -#define GL_UNIFORM_BUFFER_SIZE 0x8A2A -#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C -#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D -#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E -#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F -#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 -#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 -#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 -#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 -#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 -#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 -#define GL_UNIFORM_TYPE 0x8A37 -#define GL_UNIFORM_SIZE 0x8A38 -#define GL_UNIFORM_NAME_LENGTH 0x8A39 -#define GL_UNIFORM_BLOCK_INDEX 0x8A3A -#define GL_UNIFORM_OFFSET 0x8A3B -#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C -#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D -#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E -#define GL_UNIFORM_BLOCK_BINDING 0x8A3F -#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 -#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFFu -#endif - -#ifndef GL_ARB_compatibility -/* ARB_compatibility just defines tokens from core 3.0 */ -#endif - -#ifndef GL_ARB_copy_buffer -#define GL_COPY_READ_BUFFER 0x8F36 -#define GL_COPY_WRITE_BUFFER 0x8F37 -#endif - -#ifndef GL_ARB_shader_texture_lod -#endif - -#ifndef GL_ARB_depth_clamp -#define GL_DEPTH_CLAMP 0x864F -#endif - -#ifndef GL_ARB_draw_elements_base_vertex -#endif - -#ifndef GL_ARB_fragment_coord_conventions -#endif - -#ifndef GL_ARB_provoking_vertex -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F -#endif - -#ifndef GL_ARB_seamless_cube_map -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F -#endif - -#ifndef GL_ARB_sync -#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 -#define GL_OBJECT_TYPE 0x9112 -#define GL_SYNC_CONDITION 0x9113 -#define GL_SYNC_STATUS 0x9114 -#define GL_SYNC_FLAGS 0x9115 -#define GL_SYNC_FENCE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 -#define GL_UNSIGNALED 0x9118 -#define GL_SIGNALED 0x9119 -#define GL_ALREADY_SIGNALED 0x911A -#define GL_TIMEOUT_EXPIRED 0x911B -#define GL_CONDITION_SATISFIED 0x911C -#define GL_WAIT_FAILED 0x911D -#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull -#endif - -#ifndef GL_ARB_texture_multisample -#define GL_SAMPLE_POSITION 0x8E50 -#define GL_SAMPLE_MASK 0x8E51 -#define GL_SAMPLE_MASK_VALUE 0x8E52 -#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 -#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 -#define GL_TEXTURE_SAMPLES 0x9106 -#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 -#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 -#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D -#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E -#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F -#define GL_MAX_INTEGER_SAMPLES 0x9110 -#endif - -#ifndef GL_ARB_vertex_array_bgra -/* reuse GL_BGRA */ -#endif - -#ifndef GL_ARB_draw_buffers_blend -#endif - -#ifndef GL_ARB_sample_shading -#define GL_SAMPLE_SHADING_ARB 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 -#endif - -#ifndef GL_ARB_texture_cube_map_array -#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F -#endif - -#ifndef GL_ARB_texture_gather -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F -#endif - -#ifndef GL_ARB_texture_query_lod -#endif - -#ifndef GL_ARB_shading_language_include -#define GL_SHADER_INCLUDE_ARB 0x8DAE -#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9 -#define GL_NAMED_STRING_TYPE_ARB 0x8DEA -#endif - -#ifndef GL_ARB_texture_compression_bptc -#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F -#endif - -#ifndef GL_ARB_blend_func_extended -#define GL_SRC1_COLOR 0x88F9 -/* reuse GL_SRC1_ALPHA */ -#define GL_ONE_MINUS_SRC1_COLOR 0x88FA -#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB -#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC -#endif - -#ifndef GL_ARB_explicit_attrib_location -#endif - -#ifndef GL_ARB_occlusion_query2 -#define GL_ANY_SAMPLES_PASSED 0x8C2F -#endif - -#ifndef GL_ARB_sampler_objects -#define GL_SAMPLER_BINDING 0x8919 -#endif - -#ifndef GL_ARB_shader_bit_encoding -#endif - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_RGB10_A2UI 0x906F -#endif - -#ifndef GL_ARB_texture_swizzle -#define GL_TEXTURE_SWIZZLE_R 0x8E42 -#define GL_TEXTURE_SWIZZLE_G 0x8E43 -#define GL_TEXTURE_SWIZZLE_B 0x8E44 -#define GL_TEXTURE_SWIZZLE_A 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 -#endif - -#ifndef GL_ARB_timer_query -#define GL_TIME_ELAPSED 0x88BF -#define GL_TIMESTAMP 0x8E28 -#endif - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -/* reuse GL_UNSIGNED_INT_2_10_10_10_REV */ -#define GL_INT_2_10_10_10_REV 0x8D9F -#endif - -#ifndef GL_ARB_draw_indirect -#define GL_DRAW_INDIRECT_BUFFER 0x8F3F -#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 -#endif - -#ifndef GL_ARB_gpu_shader5 -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D -/* reuse GL_MAX_VERTEX_STREAMS */ -#endif - -#ifndef GL_ARB_gpu_shader_fp64 -/* reuse GL_DOUBLE */ -#define GL_DOUBLE_VEC2 0x8FFC -#define GL_DOUBLE_VEC3 0x8FFD -#define GL_DOUBLE_VEC4 0x8FFE -#define GL_DOUBLE_MAT2 0x8F46 -#define GL_DOUBLE_MAT3 0x8F47 -#define GL_DOUBLE_MAT4 0x8F48 -#define GL_DOUBLE_MAT2x3 0x8F49 -#define GL_DOUBLE_MAT2x4 0x8F4A -#define GL_DOUBLE_MAT3x2 0x8F4B -#define GL_DOUBLE_MAT3x4 0x8F4C -#define GL_DOUBLE_MAT4x2 0x8F4D -#define GL_DOUBLE_MAT4x3 0x8F4E -#endif - -#ifndef GL_ARB_shader_subroutine -#define GL_ACTIVE_SUBROUTINES 0x8DE5 -#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 -#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 -#define GL_MAX_SUBROUTINES 0x8DE7 -#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 -#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A -#define GL_COMPATIBLE_SUBROUTINES 0x8E4B -/* reuse GL_UNIFORM_SIZE */ -/* reuse GL_UNIFORM_NAME_LENGTH */ -#endif - -#ifndef GL_ARB_tessellation_shader -#define GL_PATCHES 0x000E -#define GL_PATCH_VERTICES 0x8E72 -#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 -#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 -#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 -#define GL_TESS_GEN_MODE 0x8E76 -#define GL_TESS_GEN_SPACING 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 -#define GL_TESS_GEN_POINT_MODE 0x8E79 -/* reuse GL_TRIANGLES */ -/* reuse GL_QUADS */ -#define GL_ISOLINES 0x8E7A -/* reuse GL_EQUAL */ -#define GL_FRACTIONAL_ODD 0x8E7B -#define GL_FRACTIONAL_EVEN 0x8E7C -/* reuse GL_CCW */ -/* reuse GL_CW */ -#define GL_MAX_PATCH_VERTICES 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 -#define GL_TESS_EVALUATION_SHADER 0x8E87 -#define GL_TESS_CONTROL_SHADER 0x8E88 -#endif - -#ifndef GL_ARB_texture_buffer_object_rgb32 -/* reuse GL_RGB32F */ -/* reuse GL_RGB32UI */ -/* reuse GL_RGB32I */ -#endif - -#ifndef GL_ARB_transform_feedback2 -#define GL_TRANSFORM_FEEDBACK 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 -#endif - -#ifndef GL_ARB_transform_feedback3 -#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 -#define GL_MAX_VERTEX_STREAMS 0x8E71 -#endif - -#ifndef GL_ARB_ES2_compatibility -#define GL_FIXED 0x140C -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD -#endif - -#ifndef GL_ARB_get_program_binary -#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF -#endif - -#ifndef GL_ARB_separate_shader_objects -#define GL_VERTEX_SHADER_BIT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT 0x00000002 -#define GL_GEOMETRY_SHADER_BIT 0x00000004 -#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 -#define GL_ALL_SHADER_BITS 0xFFFFFFFF -#define GL_PROGRAM_SEPARABLE 0x8258 -#define GL_ACTIVE_PROGRAM 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING 0x825A -#endif - -#ifndef GL_ARB_shader_precision -#endif - -#ifndef GL_ARB_vertex_attrib_64bit -/* reuse GL_RGB32I */ -/* reuse GL_DOUBLE_VEC2 */ -/* reuse GL_DOUBLE_VEC3 */ -/* reuse GL_DOUBLE_VEC4 */ -/* reuse GL_DOUBLE_MAT2 */ -/* reuse GL_DOUBLE_MAT3 */ -/* reuse GL_DOUBLE_MAT4 */ -/* reuse GL_DOUBLE_MAT2x3 */ -/* reuse GL_DOUBLE_MAT2x4 */ -/* reuse GL_DOUBLE_MAT3x2 */ -/* reuse GL_DOUBLE_MAT3x4 */ -/* reuse GL_DOUBLE_MAT4x2 */ -/* reuse GL_DOUBLE_MAT4x3 */ -#endif - -#ifndef GL_ARB_viewport_array -/* reuse GL_SCISSOR_BOX */ -/* reuse GL_VIEWPORT */ -/* reuse GL_DEPTH_RANGE */ -/* reuse GL_SCISSOR_TEST */ -#define GL_MAX_VIEWPORTS 0x825B -#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C -#define GL_VIEWPORT_BOUNDS_RANGE 0x825D -#define GL_LAYER_PROVOKING_VERTEX 0x825E -#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F -#define GL_UNDEFINED_VERTEX 0x8260 -/* reuse GL_FIRST_VERTEX_CONVENTION */ -/* reuse GL_LAST_VERTEX_CONVENTION */ -/* reuse GL_PROVOKING_VERTEX */ -#endif - -#ifndef GL_ARB_cl_event -#define GL_SYNC_CL_EVENT_ARB 0x8240 -#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241 -#endif - -#ifndef GL_ARB_debug_output -#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 -#define GL_DEBUG_SOURCE_API_ARB 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A -#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B -#define GL_DEBUG_TYPE_ERROR_ARB 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E -#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 -#define GL_DEBUG_TYPE_OTHER_ARB 0x8251 -#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 -#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 -#endif - -#ifndef GL_ARB_robustness -/* reuse GL_NO_ERROR */ -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define GL_NO_RESET_NOTIFICATION_ARB 0x8261 -#endif - -#ifndef GL_ARB_shader_stencil_export -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS 0x8118 -#define GL_DUAL_INTENSITY8_SGIS 0x8119 -#define GL_DUAL_INTENSITY12_SGIS 0x811A -#define GL_DUAL_INTENSITY16_SGIS 0x811B -#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C -#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D -#define GL_QUAD_ALPHA4_SGIS 0x811E -#define GL_QUAD_ALPHA8_SGIS 0x811F -#define GL_QUAD_LUMINANCE4_SGIS 0x8120 -#define GL_QUAD_LUMINANCE8_SGIS 0x8121 -#define GL_QUAD_INTENSITY4_SGIS 0x8122 -#define GL_QUAD_INTENSITY8_SGIS 0x8123 -#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 -#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SPRITE_SGIX 0x8148 -#define GL_SPRITE_MODE_SGIX 0x8149 -#define GL_SPRITE_AXIS_SGIX 0x814A -#define GL_SPRITE_TRANSLATION_SGIX 0x814B -#define GL_SPRITE_AXIAL_SGIX 0x814C -#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D -#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E -#endif - -#ifndef GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_POINT_SIZE_MIN_SGIS 0x8126 -#define GL_POINT_SIZE_MAX_SGIS 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 -#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 -#endif - -#ifndef GL_SGIX_instruments -#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 -#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C -#endif - -#ifndef GL_SGIX_framezoom -#define GL_FRAMEZOOM_SGIX 0x818B -#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C -#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#endif - -#ifndef GL_FfdMaskSGIX -#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 -#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 -#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 -#define GL_DEFORMATIONS_MASK_SGIX 0x8196 -#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_REFERENCE_PLANE_SGIX 0x817D -#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E -#endif - -#ifndef GL_SGIX_flush_raster -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_FUNC_POINTS_SGIS 0x812B -#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#endif - -#ifndef GL_HP_image_transform -#define GL_IMAGE_SCALE_X_HP 0x8155 -#define GL_IMAGE_SCALE_Y_HP 0x8156 -#define GL_IMAGE_TRANSLATE_X_HP 0x8157 -#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 -#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 -#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A -#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B -#define GL_IMAGE_MAG_FILTER_HP 0x815C -#define GL_IMAGE_MIN_FILTER_HP 0x815D -#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E -#define GL_CUBIC_HP 0x815F -#define GL_AVERAGE_HP 0x8160 -#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 -#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 -#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_IGNORE_BORDER_HP 0x8150 -#define GL_CONSTANT_BORDER_HP 0x8151 -#define GL_REPLICATE_BORDER_HP 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 -#endif - -#ifndef GL_INGR_palette_buffer -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE -#endif - -#ifndef GL_EXT_color_subtable -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_VERTEX_DATA_HINT_PGI 0x1A22A -#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B -#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C -#define GL_MAX_VERTEX_HINT_PGI 0x1A22D -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 -#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD -#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 -#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C -#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E -#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F -#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 -#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 -#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 -#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 -#define GL_CLIP_NEAR_HINT_PGI 0x1A220 -#define GL_CLIP_FAR_HINT_PGI 0x1A221 -#define GL_WIDE_LINE_HINT_PGI 0x1A222 -#define GL_BACK_NORMALS_HINT_PGI 0x1A223 -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_LIST_PRIORITY_SGIX 0x8182 -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_IR_INSTRUMENT1_SGIX 0x817F -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E -#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F -#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SHADOW_AMBIENT_SGIX 0x80BF -#endif - -#ifndef GL_EXT_index_texture -#endif - -#ifndef GL_EXT_index_material -#define GL_INDEX_MATERIAL_EXT 0x81B8 -#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 -#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA -#endif - -#ifndef GL_EXT_index_func -#define GL_INDEX_TEST_EXT 0x81B5 -#define GL_INDEX_TEST_FUNC_EXT 0x81B6 -#define GL_INDEX_TEST_REF_EXT 0x81B7 -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_IUI_V2F_EXT 0x81AD -#define GL_IUI_V3F_EXT 0x81AE -#define GL_IUI_N3F_V2F_EXT 0x81AF -#define GL_IUI_N3F_V3F_EXT 0x81B0 -#define GL_T2F_IUI_V2F_EXT 0x81B1 -#define GL_T2F_IUI_V3F_EXT 0x81B2 -#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 -#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_YCRCB_422_SGIX 0x81BB -#define GL_YCRCB_444_SGIX 0x81BC -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 -#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 -#define GL_LIGHT_ENV_MODE_SGIX 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B -#define GL_FRAGMENT_LIGHT0_SGIX 0x840C -#define GL_FRAGMENT_LIGHT1_SGIX 0x840D -#define GL_FRAGMENT_LIGHT2_SGIX 0x840E -#define GL_FRAGMENT_LIGHT3_SGIX 0x840F -#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 -#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 -#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 -#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 -#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 -#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 -#endif - -#ifndef GL_WIN_phong_shading -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB -#endif - -#ifndef GL_WIN_specular_fog -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC -#endif - -#ifndef GL_EXT_light_texture -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 -/* reuse GL_FRAGMENT_DEPTH_EXT */ -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 -#endif - -#ifndef GL_SGIX_impact_pixel_texture -#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 -#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 -#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 -#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 -#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 -#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 -#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A -#endif - -#ifndef GL_EXT_bgra -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 -#endif - -#ifndef GL_SGIX_async -#define GL_ASYNC_MARKER_SGIX 0x8329 -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D -#endif - -#ifndef GL_INTEL_texture_scissor -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 -#endif - -#ifndef GL_HP_occlusion_test -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA -#endif - -#ifndef GL_EXT_secondary_color -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF -#endif - -#ifndef GL_EXT_multi_draw_arrays -#endif - -#ifndef GL_EXT_fog_coord -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_TRANSFORM_HINT_APPLE 0x85B1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD -#endif - -#ifndef GL_SUNX_constant_data -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 -#endif - -#ifndef GL_SUN_global_alpha -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA -#endif - -#ifndef GL_SUN_triangle_list -#define GL_RESTART_SUN 0x0001 -#define GL_REPLACE_MIDDLE_SUN 0x0002 -#define GL_REPLACE_OLDEST_SUN 0x0003 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB -#endif - -#ifndef GL_SUN_vertex -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB -#endif - -#ifndef GL_INGR_color_clamp -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INTERLACE_READ_INGR 0x8568 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 -#endif - -#ifndef GL_EXT_texture_cube_map -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_WRAP_BORDER_SUN 0x81D4 -#endif - -#ifndef GL_EXT_texture_env_add -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 -#endif - -#ifndef GL_NV_register_combiners -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 -/* reuse GL_TEXTURE0_ARB */ -/* reuse GL_TEXTURE1_ARB */ -/* reuse GL_ZERO */ -/* reuse GL_NONE */ -/* reuse GL_FOG */ -#endif - -#ifndef GL_NV_fog_distance -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C -/* reuse GL_EYE_PLANE */ -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F -#endif - -#ifndef GL_NV_blend_square -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B -#endif - -#ifndef GL_MESA_resize_buffers -#endif - -#ifndef GL_MESA_window_pos -#endif - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_CULL_VERTEX_IBM 103050 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 -#endif - -#ifndef GL_SGIX_subsample -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 -#endif - -#ifndef GL_SGI_depth_pass_instrument -#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 -#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 -#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 -#endif - -#ifndef GL_3DFX_tbuffer -#endif - -#ifndef GL_EXT_multisample -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_CONVOLUTION_HINT_SGIX 0x8316 -#endif - -#ifndef GL_SGIX_resample -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -#endif - -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_IBM 0x8370 -#endif - -#ifndef GL_NV_evaluators -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 -#endif - -#ifndef GL_NV_texture_compression_vtc -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 -#endif - -#ifndef GL_NV_texture_shader -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 -#endif - -#ifndef GL_NV_vertex_program -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SCALEBIAS_HINT_SGIX 0x8322 -#endif - -#ifndef GL_OML_interlace -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 -#endif - -#ifndef GL_OML_subsample -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 -#endif - -#ifndef GL_OML_resample -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_REG_6_ATI 0x8927 -#define GL_REG_7_ATI 0x8928 -#define GL_REG_8_ATI 0x8929 -#define GL_REG_9_ATI 0x892A -#define GL_REG_10_ATI 0x892B -#define GL_REG_11_ATI 0x892C -#define GL_REG_12_ATI 0x892D -#define GL_REG_13_ATI 0x892E -#define GL_REG_14_ATI 0x892F -#define GL_REG_15_ATI 0x8930 -#define GL_REG_16_ATI 0x8931 -#define GL_REG_17_ATI 0x8932 -#define GL_REG_18_ATI 0x8933 -#define GL_REG_19_ATI 0x8934 -#define GL_REG_20_ATI 0x8935 -#define GL_REG_21_ATI 0x8936 -#define GL_REG_22_ATI 0x8937 -#define GL_REG_23_ATI 0x8938 -#define GL_REG_24_ATI 0x8939 -#define GL_REG_25_ATI 0x893A -#define GL_REG_26_ATI 0x893B -#define GL_REG_27_ATI 0x893C -#define GL_REG_28_ATI 0x893D -#define GL_REG_29_ATI 0x893E -#define GL_REG_30_ATI 0x893F -#define GL_REG_31_ATI 0x8940 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_CON_8_ATI 0x8949 -#define GL_CON_9_ATI 0x894A -#define GL_CON_10_ATI 0x894B -#define GL_CON_11_ATI 0x894C -#define GL_CON_12_ATI 0x894D -#define GL_CON_13_ATI 0x894E -#define GL_CON_14_ATI 0x894F -#define GL_CON_15_ATI 0x8950 -#define GL_CON_16_ATI 0x8951 -#define GL_CON_17_ATI 0x8952 -#define GL_CON_18_ATI 0x8953 -#define GL_CON_19_ATI 0x8954 -#define GL_CON_20_ATI 0x8955 -#define GL_CON_21_ATI 0x8956 -#define GL_CON_22_ATI 0x8957 -#define GL_CON_23_ATI 0x8958 -#define GL_CON_24_ATI 0x8959 -#define GL_CON_25_ATI 0x895A -#define GL_CON_26_ATI 0x895B -#define GL_CON_27_ATI 0x895C -#define GL_CON_28_ATI 0x895D -#define GL_CON_29_ATI 0x895E -#define GL_CON_30_ATI 0x895F -#define GL_CON_31_ATI 0x8960 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B -#define GL_RED_BIT_ATI 0x00000001 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_2X_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_STREAM0_ATI 0x876C -#define GL_VERTEX_STREAM1_ATI 0x876D -#define GL_VERTEX_STREAM2_ATI 0x876E -#define GL_VERTEX_STREAM3_ATI 0x876F -#define GL_VERTEX_STREAM4_ATI 0x8770 -#define GL_VERTEX_STREAM5_ATI 0x8771 -#define GL_VERTEX_STREAM6_ATI 0x8772 -#define GL_VERTEX_STREAM7_ATI 0x8773 -#define GL_VERTEX_SOURCE_ATI 0x8774 -#endif - -#ifndef GL_ATI_element_array -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A -#endif - -#ifndef GL_SUN_mesh_array -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SLICE_ACCUM_SUN 0x85CC -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_DEPTH_CLAMP_NV 0x864F -#endif - -#ifndef GL_NV_occlusion_query -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif - -#ifndef GL_NV_point_sprite -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 -#endif - -#ifndef GL_NV_vertex_program1_1 -#endif - -#ifndef GL_EXT_shadow_funcs -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 -#endif - -#ifndef GL_APPLE_element_array -#define GL_ELEMENT_ARRAY_APPLE 0x8A0C -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E -#endif - -#ifndef GL_APPLE_fence -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CLIENT_APPLE 0x85B4 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_YCBCR_422_APPLE 0x85B9 -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -#ifndef GL_S3_s3tc -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 -#endif - -#ifndef GL_ATI_texture_float -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F -#endif - -#ifndef GL_NV_float_buffer -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E -#endif - -#ifndef GL_NV_fragment_program -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 -#endif - -#ifndef GL_NV_half_float -#define GL_HALF_FLOAT_NV 0x140B -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D -#endif - -#ifndef GL_NV_primitive_restart -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F -#endif - -#ifndef GL_NV_vertex_program2 -#endif - -#ifndef GL_ATI_map_object_buffer -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#endif - -#ifndef GL_OES_read_format -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_BLEND_EQUATION_RGB_EXT 0x8009 -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D -#endif - -#ifndef GL_MESA_pack_invert -#define GL_PACK_INVERT_MESA 0x8758 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF -#endif - -#ifndef GL_NV_fragment_program_option -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 -#endif - -#ifndef GL_NV_vertex_program2_option -/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ -/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ -#endif - -#ifndef GL_NV_vertex_program3 -/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 -#endif - -#ifndef GL_GREMEDY_string_marker -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_STENCIL_TAG_BITS_EXT 0x88F2 -#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING_EXT -#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_TEXTURE_1D_STACK_MESAX 0x8759 -#define GL_TEXTURE_2D_STACK_MESAX 0x875A -#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B -#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C -#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D -#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E -#endif - -#ifndef GL_EXT_timer_query -#define GL_TIME_ELAPSED_EXT 0x88BF -#endif - -#ifndef GL_EXT_gpu_program_parameters -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 -#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 -#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 -#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 -#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 -#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 -#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_LINES_ADJACENCY_EXT 0x000A -#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B -#define GL_TRIANGLES_ADJACENCY_EXT 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D -#define GL_GEOMETRY_PROGRAM_NV 0x8C26 -#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 -#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 -#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */ -/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */ -/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */ -/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */ -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE -#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 -/* reuse GL_LINES_ADJACENCY_EXT */ -/* reuse GL_LINE_STRIP_ADJACENCY_EXT */ -/* reuse GL_TRIANGLES_ADJACENCY_EXT */ -/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -/* reuse GL_PROGRAM_POINT_SIZE_EXT */ -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 -#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 -#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 -#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 -#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 -#define GL_INT_SAMPLER_1D_EXT 0x8DC9 -#define GL_INT_SAMPLER_2D_EXT 0x8DCA -#define GL_INT_SAMPLER_3D_EXT 0x8DCB -#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC -#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD -#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 -#endif - -#ifndef GL_EXT_draw_instanced -#endif - -#ifndef GL_EXT_packed_float -#define GL_R11F_G11F_B10F_EXT 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B -#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C -#endif - -#ifndef GL_EXT_texture_array -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 -#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 -#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 -#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_RGB9_E5_EXT 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E -#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_DEPTH_COMPONENT32F_NV 0x8DAB -#define GL_DEPTH32F_STENCIL8_NV 0x8DAC -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD -#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF -#endif - -#ifndef GL_NV_fragment_program4 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA -#endif - -#ifndef GL_NV_geometry_shader4 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 -#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 -#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 -#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 -#endif - -#ifndef GL_EXT_draw_buffers2 -#endif - -#ifndef GL_NV_transform_feedback -#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 -#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 -#define GL_TEXTURE_COORD_NV 0x8C79 -#define GL_CLIP_DISTANCE_NV 0x8C7A -#define GL_VERTEX_ID_NV 0x8C7B -#define GL_PRIMITIVE_ID_NV 0x8C7C -#define GL_GENERIC_ATTRIB_NV 0x8C7D -#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 -#define GL_ACTIVE_VARYINGS_NV 0x8C81 -#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 -#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 -#define GL_PRIMITIVES_GENERATED_NV 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 -#define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C -#define GL_SEPARATE_ATTRIBS_NV 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F -#define GL_LAYER_NV 0x8DAA -#define GL_NEXT_BUFFER_NV -2 -#define GL_SKIP_COMPONENTS4_NV -3 -#define GL_SKIP_COMPONENTS3_NV -4 -#define GL_SKIP_COMPONENTS2_NV -5 -#define GL_SKIP_COMPONENTS1_NV -6 -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 -#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 -#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 -#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED -#define GL_UNIFORM_BUFFER_EXT 0x8DEE -#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF -#endif - -#ifndef GL_EXT_texture_integer -#define GL_RGBA32UI_EXT 0x8D70 -#define GL_RGB32UI_EXT 0x8D71 -#define GL_ALPHA32UI_EXT 0x8D72 -#define GL_INTENSITY32UI_EXT 0x8D73 -#define GL_LUMINANCE32UI_EXT 0x8D74 -#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -#define GL_RGBA16UI_EXT 0x8D76 -#define GL_RGB16UI_EXT 0x8D77 -#define GL_ALPHA16UI_EXT 0x8D78 -#define GL_INTENSITY16UI_EXT 0x8D79 -#define GL_LUMINANCE16UI_EXT 0x8D7A -#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -#define GL_RGBA8UI_EXT 0x8D7C -#define GL_RGB8UI_EXT 0x8D7D -#define GL_ALPHA8UI_EXT 0x8D7E -#define GL_INTENSITY8UI_EXT 0x8D7F -#define GL_LUMINANCE8UI_EXT 0x8D80 -#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -#define GL_RGBA32I_EXT 0x8D82 -#define GL_RGB32I_EXT 0x8D83 -#define GL_ALPHA32I_EXT 0x8D84 -#define GL_INTENSITY32I_EXT 0x8D85 -#define GL_LUMINANCE32I_EXT 0x8D86 -#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -#define GL_RGBA16I_EXT 0x8D88 -#define GL_RGB16I_EXT 0x8D89 -#define GL_ALPHA16I_EXT 0x8D8A -#define GL_INTENSITY16I_EXT 0x8D8B -#define GL_LUMINANCE16I_EXT 0x8D8C -#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -#define GL_RGBA8I_EXT 0x8D8E -#define GL_RGB8I_EXT 0x8D8F -#define GL_ALPHA8I_EXT 0x8D90 -#define GL_INTENSITY8I_EXT 0x8D91 -#define GL_LUMINANCE8I_EXT 0x8D92 -#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -#define GL_RED_INTEGER_EXT 0x8D94 -#define GL_GREEN_INTEGER_EXT 0x8D95 -#define GL_BLUE_INTEGER_EXT 0x8D96 -#define GL_ALPHA_INTEGER_EXT 0x8D97 -#define GL_RGB_INTEGER_EXT 0x8D98 -#define GL_RGBA_INTEGER_EXT 0x8D99 -#define GL_BGR_INTEGER_EXT 0x8D9A -#define GL_BGRA_INTEGER_EXT 0x8D9B -#define GL_LUMINANCE_INTEGER_EXT 0x8D9C -#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D -#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E -#endif - -#ifndef GL_GREMEDY_frame_terminator -#endif - -#ifndef GL_NV_conditional_render -#define GL_QUERY_WAIT_NV 0x8E13 -#define GL_QUERY_NO_WAIT_NV 0x8E14 -#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 -#endif - -#ifndef GL_NV_present_video -#define GL_FRAME_NV 0x8E26 -#define GL_FIELDS_NV 0x8E27 -#define GL_CURRENT_TIME_NV 0x8E28 -#define GL_NUM_FILL_STREAMS_NV 0x8E29 -#define GL_PRESENT_TIME_NV 0x8E2A -#define GL_PRESENT_DURATION_NV 0x8E2B -#endif - -#ifndef GL_EXT_transform_feedback -#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85 -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F -#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C -#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D -#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88 -#define GL_RASTERIZER_DISCARD_EXT 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76 -#endif - -#ifndef GL_EXT_direct_state_access -#define GL_PROGRAM_MATRIX_EXT 0x8E2D -#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E -#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F -#endif - -#ifndef GL_EXT_vertex_array_bgra -/* reuse GL_BGRA */ -#endif - -#ifndef GL_EXT_texture_swizzle -#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42 -#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43 -#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44 -#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46 -#endif - -#ifndef GL_NV_explicit_multisample -#define GL_SAMPLE_POSITION_NV 0x8E50 -#define GL_SAMPLE_MASK_NV 0x8E51 -#define GL_SAMPLE_MASK_VALUE_NV 0x8E52 -#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53 -#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54 -#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55 -#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 -#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57 -#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58 -#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 -#endif - -#ifndef GL_NV_transform_feedback2 -#define GL_TRANSFORM_FEEDBACK_NV 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 -#endif - -#ifndef GL_ATI_meminfo -#define GL_VBO_FREE_MEMORY_ATI 0x87FB -#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC -#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD -#endif - -#ifndef GL_AMD_performance_monitor -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 -#endif - -#ifndef GL_AMD_texture_texture4 -#endif - -#ifndef GL_AMD_vertex_shader_tesselator -#define GL_SAMPLER_BUFFER_AMD 0x9001 -#define GL_INT_SAMPLER_BUFFER_AMD 0x9002 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003 -#define GL_TESSELLATION_MODE_AMD 0x9004 -#define GL_TESSELLATION_FACTOR_AMD 0x9005 -#define GL_DISCRETE_AMD 0x9006 -#define GL_CONTINUOUS_AMD 0x9007 -#endif - -#ifndef GL_EXT_provoking_vertex -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D -#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E -#define GL_PROVOKING_VERTEX_EXT 0x8E4F -#endif - -#ifndef GL_EXT_texture_snorm -#define GL_ALPHA_SNORM 0x9010 -#define GL_LUMINANCE_SNORM 0x9011 -#define GL_LUMINANCE_ALPHA_SNORM 0x9012 -#define GL_INTENSITY_SNORM 0x9013 -#define GL_ALPHA8_SNORM 0x9014 -#define GL_LUMINANCE8_SNORM 0x9015 -#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 -#define GL_INTENSITY8_SNORM 0x9017 -#define GL_ALPHA16_SNORM 0x9018 -#define GL_LUMINANCE16_SNORM 0x9019 -#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A -#define GL_INTENSITY16_SNORM 0x901B -/* reuse GL_RED_SNORM */ -/* reuse GL_RG_SNORM */ -/* reuse GL_RGB_SNORM */ -/* reuse GL_RGBA_SNORM */ -/* reuse GL_R8_SNORM */ -/* reuse GL_RG8_SNORM */ -/* reuse GL_RGB8_SNORM */ -/* reuse GL_RGBA8_SNORM */ -/* reuse GL_R16_SNORM */ -/* reuse GL_RG16_SNORM */ -/* reuse GL_RGB16_SNORM */ -/* reuse GL_RGBA16_SNORM */ -/* reuse GL_SIGNED_NORMALIZED */ -#endif - -#ifndef GL_AMD_draw_buffers_blend -#endif - -#ifndef GL_APPLE_texture_range -#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7 -#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8 -#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC -#define GL_STORAGE_PRIVATE_APPLE 0x85BD -/* reuse GL_STORAGE_CACHED_APPLE */ -/* reuse GL_STORAGE_SHARED_APPLE */ -#endif - -#ifndef GL_APPLE_float_pixels -#define GL_HALF_APPLE 0x140B -#define GL_RGBA_FLOAT32_APPLE 0x8814 -#define GL_RGB_FLOAT32_APPLE 0x8815 -#define GL_ALPHA_FLOAT32_APPLE 0x8816 -#define GL_INTENSITY_FLOAT32_APPLE 0x8817 -#define GL_LUMINANCE_FLOAT32_APPLE 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819 -#define GL_RGBA_FLOAT16_APPLE 0x881A -#define GL_RGB_FLOAT16_APPLE 0x881B -#define GL_ALPHA_FLOAT16_APPLE 0x881C -#define GL_INTENSITY_FLOAT16_APPLE 0x881D -#define GL_LUMINANCE_FLOAT16_APPLE 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F -#define GL_COLOR_FLOAT_APPLE 0x8A0F -#endif - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00 -#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01 -#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02 -#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03 -#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04 -#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05 -#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06 -#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07 -#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08 -#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09 -#endif - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14 -#endif - -#ifndef GL_APPLE_object_purgeable -#define GL_BUFFER_OBJECT_APPLE 0x85B3 -#define GL_RELEASED_APPLE 0x8A19 -#define GL_VOLATILE_APPLE 0x8A1A -#define GL_RETAINED_APPLE 0x8A1B -#define GL_UNDEFINED_APPLE 0x8A1C -#define GL_PURGEABLE_APPLE 0x8A1D -#endif - -#ifndef GL_APPLE_row_bytes -#define GL_PACK_ROW_BYTES_APPLE 0x8A15 -#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 -#endif - -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -/* reuse GL_UNSIGNED_SHORT_8_8_APPLE */ -/* reuse GL_UNSIGNED_SHORT_8_8_REV_APPLE */ -#endif - -#ifndef GL_NV_video_capture -#define GL_VIDEO_BUFFER_NV 0x9020 -#define GL_VIDEO_BUFFER_BINDING_NV 0x9021 -#define GL_FIELD_UPPER_NV 0x9022 -#define GL_FIELD_LOWER_NV 0x9023 -#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 -#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 -#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026 -#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027 -#define GL_VIDEO_BUFFER_PITCH_NV 0x9028 -#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029 -#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A -#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B -#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C -#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D -#define GL_PARTIAL_SUCCESS_NV 0x902E -#define GL_SUCCESS_NV 0x902F -#define GL_FAILURE_NV 0x9030 -#define GL_YCBYCR8_422_NV 0x9031 -#define GL_YCBAYCR8A_4224_NV 0x9032 -#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033 -#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034 -#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035 -#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036 -#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037 -#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038 -#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039 -#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A -#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B -#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C -#endif - -#ifndef GL_NV_copy_image -#endif - -#ifndef GL_EXT_separate_shader_objects -#define GL_ACTIVE_PROGRAM_EXT 0x8B8D -#endif - -#ifndef GL_NV_parameter_buffer_object2 -#endif - -#ifndef GL_NV_shader_buffer_load -#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D -#define GL_GPU_ADDRESS_NV 0x8F34 -#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35 -#endif - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E -#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F -#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20 -#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 -#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22 -#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 -#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24 -#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25 -#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26 -#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 -#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28 -#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29 -#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A -#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B -#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C -#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D -#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E -#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F -#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30 -#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31 -#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32 -#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33 -#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40 -#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 -#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42 -#endif - -#ifndef GL_NV_texture_barrier -#endif - -#ifndef GL_AMD_shader_stencil_export -#endif - -#ifndef GL_AMD_seamless_cubemap_per_texture -/* reuse GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB */ -#endif - -#ifndef GL_AMD_conservative_depth -#endif - -#ifndef GL_EXT_shader_image_load_store -#define GL_MAX_IMAGE_UNITS_EXT 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 -#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A -#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B -#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C -#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D -#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E -#define GL_IMAGE_1D_EXT 0x904C -#define GL_IMAGE_2D_EXT 0x904D -#define GL_IMAGE_3D_EXT 0x904E -#define GL_IMAGE_2D_RECT_EXT 0x904F -#define GL_IMAGE_CUBE_EXT 0x9050 -#define GL_IMAGE_BUFFER_EXT 0x9051 -#define GL_IMAGE_1D_ARRAY_EXT 0x9052 -#define GL_IMAGE_2D_ARRAY_EXT 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056 -#define GL_INT_IMAGE_1D_EXT 0x9057 -#define GL_INT_IMAGE_2D_EXT 0x9058 -#define GL_INT_IMAGE_3D_EXT 0x9059 -#define GL_INT_IMAGE_2D_RECT_EXT 0x905A -#define GL_INT_IMAGE_CUBE_EXT 0x905B -#define GL_INT_IMAGE_BUFFER_EXT 0x905C -#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D -#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C -#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D -#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020 -#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000 -#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF -#endif - -#ifndef GL_EXT_vertex_attrib_64bit -/* reuse GL_DOUBLE */ -#define GL_DOUBLE_VEC2_EXT 0x8FFC -#define GL_DOUBLE_VEC3_EXT 0x8FFD -#define GL_DOUBLE_VEC4_EXT 0x8FFE -#define GL_DOUBLE_MAT2_EXT 0x8F46 -#define GL_DOUBLE_MAT3_EXT 0x8F47 -#define GL_DOUBLE_MAT4_EXT 0x8F48 -#define GL_DOUBLE_MAT2x3_EXT 0x8F49 -#define GL_DOUBLE_MAT2x4_EXT 0x8F4A -#define GL_DOUBLE_MAT3x2_EXT 0x8F4B -#define GL_DOUBLE_MAT3x4_EXT 0x8F4C -#define GL_DOUBLE_MAT4x2_EXT 0x8F4D -#define GL_DOUBLE_MAT4x3_EXT 0x8F4E -#endif - -#ifndef GL_NV_gpu_program5 -#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C -#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D -#define GL_MAX_PROGRAM_SUBROUTINE_PARAMETERS_NV 0x8F44 -#define GL_MAX_PROGRAM_SUBROUTINE_NUM_NV 0x8F45 -#endif - -#ifndef GL_NV_gpu_shader5 -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F -#define GL_INT8_NV 0x8FE0 -#define GL_INT8_VEC2_NV 0x8FE1 -#define GL_INT8_VEC3_NV 0x8FE2 -#define GL_INT8_VEC4_NV 0x8FE3 -#define GL_INT16_NV 0x8FE4 -#define GL_INT16_VEC2_NV 0x8FE5 -#define GL_INT16_VEC3_NV 0x8FE6 -#define GL_INT16_VEC4_NV 0x8FE7 -#define GL_INT64_VEC2_NV 0x8FE9 -#define GL_INT64_VEC3_NV 0x8FEA -#define GL_INT64_VEC4_NV 0x8FEB -#define GL_UNSIGNED_INT8_NV 0x8FEC -#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED -#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE -#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF -#define GL_UNSIGNED_INT16_NV 0x8FF0 -#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1 -#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 -#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 -#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 -#define GL_FLOAT16_NV 0x8FF8 -#define GL_FLOAT16_VEC2_NV 0x8FF9 -#define GL_FLOAT16_VEC3_NV 0x8FFA -#define GL_FLOAT16_VEC4_NV 0x8FFB -/* reuse GL_PATCHES */ -#endif - -#ifndef GL_NV_shader_buffer_store -#define GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV 0x00000010 -/* reuse GL_READ_WRITE */ -/* reuse GL_WRITE_ONLY */ -#endif - -#ifndef GL_NV_tessellation_program5 -#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 -#define GL_TESS_CONTROL_PROGRAM_NV 0x891E -#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F -#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74 -#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75 -#endif - -#ifndef GL_NV_vertex_attrib_integer_64bit -/* reuse GL_INT64_NV */ -/* reuse GL_UNSIGNED_INT64_NV */ -#endif - -#ifndef GL_NV_multisample_coverage -#define GL_COVERAGE_SAMPLES_NV 0x80A9 -#define GL_COLOR_SAMPLES_NV 0x8E20 -#endif - -#ifndef GL_AMD_name_gen_delete -#define GL_DATA_BUFFER_AMD 0x9151 -#define GL_PERFORMANCE_MONITOR_AMD 0x9152 -#define GL_QUERY_OBJECT_AMD 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154 -#define GL_SAMPLER_OBJECT_AMD 0x9155 -#endif - -#ifndef GL_AMD_debug_output -#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 -#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 -#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 -#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A -#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B -#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C -#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D -#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E -#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F -#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150 -#endif - -#ifndef GL_NV_vdpau_interop -#define GL_SURFACE_STATE_NV 0x86EB -#define GL_SURFACE_REGISTERED_NV 0x86FD -#define GL_SURFACE_MAPPED_NV 0x8700 -#define GL_WRITE_DISCARD_NV 0x88BE -#endif - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#endif - - -/*************************************************************/ - -#include -#ifndef GL_VERSION_2_0 -/* GL type for program/shader text */ -typedef char GLchar; -#endif - -#ifndef GL_VERSION_1_5 -/* GL types for handling large vertex buffer objects */ -#if defined(__APPLE__) -typedef long GLintptr; -typedef long GLsizeiptr; -#else -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -#if defined(__APPLE__) -typedef long GLintptrARB; -typedef long GLsizeiptrARB; -#else -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for program/shader text and shader object handles */ -typedef char GLcharARB; -#if defined(__APPLE__) -typedef void *GLhandleARB; -#else -typedef unsigned int GLhandleARB; -#endif -#endif - -/* GL type for "half" precision (s10e5) float data in host memory */ -#ifndef GL_ARB_half_float_pixel -typedef unsigned short GLhalfARB; -#endif - -#ifndef GL_NV_half_float -typedef unsigned short GLhalfNV; -#endif - -#ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glxext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include -#elif defined(__sun__) || defined(__digital__) -#include -#if defined(__STDC__) -#if defined(__arch64__) || defined(_LP64) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined( __VMS ) || defined(__sgi) -#include -#elif defined(__SCO__) || defined(__USLC__) -#include -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -/* Fallback if nothing above works */ -#include -#endif -#endif - -#ifndef GL_EXT_timer_query -typedef int64_t GLint64EXT; -typedef uint64_t GLuint64EXT; -#endif - -#ifndef GL_ARB_sync -typedef int64_t GLint64; -typedef uint64_t GLuint64; -typedef struct __GLsync *GLsync; -#endif - -#ifndef GL_ARB_cl_event -/* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */ -struct _cl_context; -struct _cl_event; -#endif - -#ifndef GL_ARB_debug_output -typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#endif - -#ifndef GL_AMD_debug_output -typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); -#endif - -#ifndef GL_NV_vdpau_interop -typedef GLintptr GLvdpauSurfaceNV; -#endif - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GLAPI void APIENTRY glBlendEquation (GLenum mode); -GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_VERSION_1_2_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyColorTable (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glGetColorTable (GLenum target, GLenum format, GLenum type, GLvoid *table); -GLAPI void APIENTRY glGetColorTableParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetColorTableParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glColorSubTable (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -GLAPI void APIENTRY glCopyColorSubTable (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glConvolutionFilter1D (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionParameterf (GLenum target, GLenum pname, GLfloat params); -GLAPI void APIENTRY glConvolutionParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glConvolutionParameteri (GLenum target, GLenum pname, GLint params); -GLAPI void APIENTRY glConvolutionParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetConvolutionFilter (GLenum target, GLenum format, GLenum type, GLvoid *image); -GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSeparableFilter (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glSeparableFilter2D (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -GLAPI void APIENTRY glGetHistogram (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetHistogramParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetHistogramParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMinmax (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glHistogram (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glResetHistogram (GLenum target); -GLAPI void APIENTRY glResetMinmax (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); -#endif - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTexture (GLenum texture); -GLAPI void APIENTRY glSampleCoverage (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glCompressedTexImage3D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage2D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage1D (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_VERSION_1_3_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClientActiveTexture (GLenum texture); -GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s); -GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord1f (GLenum target, GLfloat s); -GLAPI void APIENTRY glMultiTexCoord1fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord1i (GLenum target, GLint s); -GLAPI void APIENTRY glMultiTexCoord1iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord1s (GLenum target, GLshort s); -GLAPI void APIENTRY glMultiTexCoord1sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord2d (GLenum target, GLdouble s, GLdouble t); -GLAPI void APIENTRY glMultiTexCoord2dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord2f (GLenum target, GLfloat s, GLfloat t); -GLAPI void APIENTRY glMultiTexCoord2fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord2i (GLenum target, GLint s, GLint t); -GLAPI void APIENTRY glMultiTexCoord2iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord2s (GLenum target, GLshort s, GLshort t); -GLAPI void APIENTRY glMultiTexCoord2sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord3d (GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void APIENTRY glMultiTexCoord3dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord3f (GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void APIENTRY glMultiTexCoord3fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord3i (GLenum target, GLint s, GLint t, GLint r); -GLAPI void APIENTRY glMultiTexCoord3iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord3s (GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void APIENTRY glMultiTexCoord3sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord4d (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void APIENTRY glMultiTexCoord4dv (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord4f (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void APIENTRY glMultiTexCoord4fv (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord4i (GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void APIENTRY glMultiTexCoord4iv (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord4s (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void APIENTRY glMultiTexCoord4sv (GLenum target, const GLshort *v); -GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *m); -GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m); -GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m); -GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); -#endif - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param); -GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_VERSION_1_4_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordf (GLfloat coord); -GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord); -GLAPI void APIENTRY glFogCoordd (GLdouble coord); -GLAPI void APIENTRY glFogCoorddv (const GLdouble *coord); -GLAPI void APIENTRY glFogCoordPointer (GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glSecondaryColor3b (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *v); -GLAPI void APIENTRY glSecondaryColor3d (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *v); -GLAPI void APIENTRY glSecondaryColor3f (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *v); -GLAPI void APIENTRY glSecondaryColor3i (GLint red, GLint green, GLint blue); -GLAPI void APIENTRY glSecondaryColor3iv (const GLint *v); -GLAPI void APIENTRY glSecondaryColor3s (GLshort red, GLshort green, GLshort blue); -GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *v); -GLAPI void APIENTRY glSecondaryColor3ub (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *v); -GLAPI void APIENTRY glSecondaryColor3ui (GLuint red, GLuint green, GLuint blue); -GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *v); -GLAPI void APIENTRY glSecondaryColor3us (GLushort red, GLushort green, GLushort blue); -GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *v); -GLAPI void APIENTRY glSecondaryColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glWindowPos2d (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dv (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2f (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fv (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2i (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2iv (const GLint *v); -GLAPI void APIENTRY glWindowPos2s (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2sv (const GLshort *v); -GLAPI void APIENTRY glWindowPos3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dv (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fv (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3i (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3iv (const GLint *v); -GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3sv (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); -#endif - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueries (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteQueries (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsQuery (GLuint id); -GLAPI void APIENTRY glBeginQuery (GLenum target, GLuint id); -GLAPI void APIENTRY glEndQuery (GLenum target); -GLAPI void APIENTRY glGetQueryiv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectiv (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectuiv (GLuint id, GLenum pname, GLuint *params); -GLAPI void APIENTRY glBindBuffer (GLenum target, GLuint buffer); -GLAPI void APIENTRY glDeleteBuffers (GLsizei n, const GLuint *buffers); -GLAPI void APIENTRY glGenBuffers (GLsizei n, GLuint *buffers); -GLAPI GLboolean APIENTRY glIsBuffer (GLuint buffer); -GLAPI void APIENTRY glBufferData (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -GLAPI void APIENTRY glGetBufferSubData (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -GLAPI GLvoid* APIENTRY glMapBuffer (GLenum target, GLenum access); -GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum target); -GLAPI void APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetBufferPointerv (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparate (GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glDrawBuffers (GLsizei n, const GLenum *bufs); -GLAPI void APIENTRY glStencilOpSeparate (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI void APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask); -GLAPI void APIENTRY glStencilMaskSeparate (GLenum face, GLuint mask); -GLAPI void APIENTRY glAttachShader (GLuint program, GLuint shader); -GLAPI void APIENTRY glBindAttribLocation (GLuint program, GLuint index, const GLchar *name); -GLAPI void APIENTRY glCompileShader (GLuint shader); -GLAPI GLuint APIENTRY glCreateProgram (void); -GLAPI GLuint APIENTRY glCreateShader (GLenum type); -GLAPI void APIENTRY glDeleteProgram (GLuint program); -GLAPI void APIENTRY glDeleteShader (GLuint shader); -GLAPI void APIENTRY glDetachShader (GLuint program, GLuint shader); -GLAPI void APIENTRY glDisableVertexAttribArray (GLuint index); -GLAPI void APIENTRY glEnableVertexAttribArray (GLuint index); -GLAPI void APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -GLAPI GLint APIENTRY glGetAttribLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetProgramiv (GLuint program, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramInfoLog (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI void APIENTRY glGetShaderiv (GLuint shader, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetShaderInfoLog (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -GLAPI void APIENTRY glGetShaderSource (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -GLAPI GLint APIENTRY glGetUniformLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat *params); -GLAPI void APIENTRY glGetUniformiv (GLuint program, GLint location, GLint *params); -GLAPI void APIENTRY glGetVertexAttribdv (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgram (GLuint program); -GLAPI GLboolean APIENTRY glIsShader (GLuint shader); -GLAPI void APIENTRY glLinkProgram (GLuint program); -GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -GLAPI void APIENTRY glUseProgram (GLuint program); -GLAPI void APIENTRY glUniform1f (GLint location, GLfloat v0); -GLAPI void APIENTRY glUniform2f (GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glUniform3f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glUniform4f (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glUniform1i (GLint location, GLint v0); -GLAPI void APIENTRY glUniform2i (GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glUniform3i (GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glUniform4i (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glUniform1fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform2fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform3fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform4fv (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform1iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform2iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform3iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform4iv (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniformMatrix2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glValidateProgram (GLuint program); -GLAPI void APIENTRY glVertexAttrib1d (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1f (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1s (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2d (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2f (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2s (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3d (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3f (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3s (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4Niv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4Nub (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttrib4bv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4f (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4s (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4usv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribPointer (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum face, GLenum func, GLint ref, GLuint mask); -typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformMatrix2x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix2x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4x2fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3x4fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4x3fv (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif - -#ifndef GL_VERSION_3_0 -#define GL_VERSION_3_0 1 -/* OpenGL 3.0 also reuses entry points from these extensions: */ -/* ARB_framebuffer_object */ -/* ARB_map_buffer_range */ -/* ARB_vertex_array_object */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaski (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI void APIENTRY glGetBooleani_v (GLenum target, GLuint index, GLboolean *data); -GLAPI void APIENTRY glGetIntegeri_v (GLenum target, GLuint index, GLint *data); -GLAPI void APIENTRY glEnablei (GLenum target, GLuint index); -GLAPI void APIENTRY glDisablei (GLenum target, GLuint index); -GLAPI GLboolean APIENTRY glIsEnabledi (GLenum target, GLuint index); -GLAPI void APIENTRY glBeginTransformFeedback (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedback (void); -GLAPI void APIENTRY glBindBufferRange (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferBase (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryings (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -GLAPI void APIENTRY glGetTransformFeedbackVarying (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glClampColor (GLenum target, GLenum clamp); -GLAPI void APIENTRY glBeginConditionalRender (GLuint id, GLenum mode); -GLAPI void APIENTRY glEndConditionalRender (void); -GLAPI void APIENTRY glVertexAttribIPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribIiv (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribIuiv (GLuint index, GLenum pname, GLuint *params); -GLAPI void APIENTRY glVertexAttribI1i (GLuint index, GLint x); -GLAPI void APIENTRY glVertexAttribI2i (GLuint index, GLint x, GLint y); -GLAPI void APIENTRY glVertexAttribI3i (GLuint index, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexAttribI4i (GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexAttribI1ui (GLuint index, GLuint x); -GLAPI void APIENTRY glVertexAttribI2ui (GLuint index, GLuint x, GLuint y); -GLAPI void APIENTRY glVertexAttribI3ui (GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI void APIENTRY glVertexAttribI4ui (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glVertexAttribI1iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI2iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI3iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI4iv (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI1uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI2uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI3uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4uiv (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4bv (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttribI4sv (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttribI4ubv (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribI4usv (GLuint index, const GLushort *v); -GLAPI void APIENTRY glGetUniformuiv (GLuint program, GLint location, GLuint *params); -GLAPI void APIENTRY glBindFragDataLocation (GLuint program, GLuint color, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataLocation (GLuint program, const GLchar *name); -GLAPI void APIENTRY glUniform1ui (GLint location, GLuint v0); -GLAPI void APIENTRY glUniform2ui (GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glUniform3ui (GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glUniform4ui (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glUniform1uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform2uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform3uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform4uiv (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glTexParameterIiv (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexParameterIuiv (GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTexParameterIiv (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexParameterIuiv (GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glClearBufferiv (GLenum buffer, GLint drawbuffer, const GLint *value); -GLAPI void APIENTRY glClearBufferuiv (GLenum buffer, GLint drawbuffer, const GLuint *value); -GLAPI void APIENTRY glClearBufferfv (GLenum buffer, GLint drawbuffer, const GLfloat *value); -GLAPI void APIENTRY glClearBufferfi (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -GLAPI const GLubyte * APIENTRY glGetStringi (GLenum name, GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORMASKIPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (APIENTRYP PFNGLGETBOOLEANI_VPROC) (GLenum target, GLuint index, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint *data); -typedef void (APIENTRYP PFNGLENABLEIPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLDISABLEIPROC) (GLenum target, GLuint index); -typedef GLboolean (APIENTRYP PFNGLISENABLEDIPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp); -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode); -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint x, GLuint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawbuffer, const GLint *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawbuffer, const GLuint *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawbuffer, const GLfloat *value); -typedef void (APIENTRYP PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); -#endif - -#ifndef GL_VERSION_3_1 -#define GL_VERSION_3_1 1 -/* OpenGL 3.1 also reuses entry points from these extensions: */ -/* ARB_copy_buffer */ -/* ARB_uniform_buffer_object */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index); -#endif - -#ifndef GL_VERSION_3_2 -#define GL_VERSION_3_2 1 -/* OpenGL 3.2 also reuses entry points from these extensions: */ -/* ARB_draw_elements_base_vertex */ -/* ARB_provoking_vertex */ -/* ARB_sync */ -/* ARB_texture_multisample */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetInteger64i_v (GLenum target, GLuint index, GLint64 *data); -GLAPI void APIENTRY glGetBufferParameteri64v (GLenum target, GLenum pname, GLint64 *params); -GLAPI void APIENTRY glFramebufferTexture (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETINTEGER64I_VPROC) (GLenum target, GLuint index, GLint64 *data); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -#endif - -#ifndef GL_VERSION_3_3 -#define GL_VERSION_3_3 1 -/* OpenGL 3.3 also reuses entry points from these extensions: */ -/* ARB_blend_func_extended */ -/* ARB_sampler_objects */ -/* ARB_explicit_attrib_location, but it has none */ -/* ARB_occlusion_query2 (no entry points) */ -/* ARB_shader_bit_encoding (no entry points) */ -/* ARB_texture_rgb10_a2ui (no entry points) */ -/* ARB_texture_swizzle (no entry points) */ -/* ARB_timer_query */ -/* ARB_vertex_type_2_10_10_10_rev */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribDivisor (GLuint index, GLuint divisor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor); -#endif - -#ifndef GL_VERSION_4_0 -#define GL_VERSION_4_0 1 -/* OpenGL 4.0 also reuses entry points from these extensions: */ -/* ARB_texture_query_lod (no entry points) */ -/* ARB_draw_indirect */ -/* ARB_gpu_shader5 (no entry points) */ -/* ARB_gpu_shader_fp64 */ -/* ARB_shader_subroutine */ -/* ARB_tessellation_shader */ -/* ARB_texture_buffer_object_rgb32 (no entry points) */ -/* ARB_texture_cube_map_array (no entry points) */ -/* ARB_texture_gather (no entry points) */ -/* ARB_transform_feedback2 */ -/* ARB_transform_feedback3 */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMinSampleShading (GLclampf value); -GLAPI void APIENTRY glBlendEquationi (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparatei (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glBlendFunci (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparatei (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGPROC) (GLclampf value); -typedef void (APIENTRYP PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif - -#ifndef GL_VERSION_4_1 -#define GL_VERSION_4_1 1 -/* OpenGL 4.1 also reuses entry points from these extensions: */ -/* ARB_ES2_compatibility */ -/* ARB_get_program_binary */ -/* ARB_separate_shader_objects */ -/* ARB_shader_precision (no entry points) */ -/* ARB_vertex_attrib_64bit */ -/* ARB_viewport_array */ -#endif - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTextureARB (GLenum texture); -GLAPI void APIENTRY glClientActiveTextureARB (GLenum texture); -GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum target, GLdouble s); -GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum target, GLfloat s); -GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum target, GLint s); -GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum target, GLshort s); -GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum target, GLdouble s, GLdouble t); -GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum target, GLfloat s, GLfloat t); -GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum target, GLint s, GLint t); -GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum target, GLshort s, GLshort t); -GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r); -GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r); -GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum target, GLint s, GLint t, GLint r); -GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum target, GLshort s, GLshort t, GLshort r); -GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum target, const GLshort *v); -GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum target, const GLdouble *v); -GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum target, const GLfloat *v); -GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum target, GLint s, GLint t, GLint r, GLint q); -GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum target, const GLint *v); -GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum target, const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *m); -GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *m); -GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *m); -GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *m); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -#endif - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleCoverageARB (GLclampf value, GLboolean invert); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); -#endif - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 -#endif - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 -#endif - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfARB (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvARB (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWeightbvARB (GLint size, const GLbyte *weights); -GLAPI void APIENTRY glWeightsvARB (GLint size, const GLshort *weights); -GLAPI void APIENTRY glWeightivARB (GLint size, const GLint *weights); -GLAPI void APIENTRY glWeightfvARB (GLint size, const GLfloat *weights); -GLAPI void APIENTRY glWeightdvARB (GLint size, const GLdouble *weights); -GLAPI void APIENTRY glWeightubvARB (GLint size, const GLubyte *weights); -GLAPI void APIENTRY glWeightusvARB (GLint size, const GLushort *weights); -GLAPI void APIENTRY glWeightuivARB (GLint size, const GLuint *weights); -GLAPI void APIENTRY glWeightPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glVertexBlendARB (GLint count); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights); -typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights); -typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights); -typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights); -typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights); -typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights); -typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count); -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint index); -GLAPI void APIENTRY glMatrixIndexubvARB (GLint size, const GLubyte *indices); -GLAPI void APIENTRY glMatrixIndexusvARB (GLint size, const GLushort *indices); -GLAPI void APIENTRY glMatrixIndexuivARB (GLint size, const GLuint *indices); -GLAPI void APIENTRY glMatrixIndexPointerARB (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 -#endif - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 -#endif - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dARB (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2fARB (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2iARB (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2ivARB (const GLint *v); -GLAPI void APIENTRY glWindowPos2sARB (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2svARB (const GLshort *v); -GLAPI void APIENTRY glWindowPos3dARB (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3fARB (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3iARB (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3ivARB (const GLint *v); -GLAPI void APIENTRY glWindowPos3sARB (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3svARB (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v); -#endif - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttrib1dARB (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1fARB (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1sARB (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2dARB (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2fARB (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2sARB (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3sARB (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttrib4dARB (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4fARB (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttrib4sARB (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4svARB (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribPointerARB (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint index); -GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint index); -GLAPI void APIENTRY glProgramStringARB (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -GLAPI void APIENTRY glBindProgramARB (GLenum target, GLuint program); -GLAPI void APIENTRY glDeleteProgramsARB (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glGenProgramsARB (GLsizei n, GLuint *programs); -GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetProgramivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramStringARB (GLenum target, GLenum pname, GLvoid *string); -GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribivARB (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgramARB (GLuint program); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program); -#endif - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 -/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindBufferARB (GLenum target, GLuint buffer); -GLAPI void APIENTRY glDeleteBuffersARB (GLsizei n, const GLuint *buffers); -GLAPI void APIENTRY glGenBuffersARB (GLsizei n, GLuint *buffers); -GLAPI GLboolean APIENTRY glIsBufferARB (GLuint buffer); -GLAPI void APIENTRY glBufferDataARB (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -GLAPI void APIENTRY glGetBufferSubDataARB (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum target, GLenum access); -GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum target); -GLAPI void APIENTRY glGetBufferParameterivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetBufferPointervARB (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueriesARB (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteQueriesARB (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsQueryARB (GLuint id); -GLAPI void APIENTRY glBeginQueryARB (GLenum target, GLuint id); -GLAPI void APIENTRY glEndQueryARB (GLenum target); -GLAPI void APIENTRY glGetQueryivARB (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectivARB (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint id, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB obj); -GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum pname); -GLAPI void APIENTRY glDetachObjectARB (GLhandleARB containerObj, GLhandleARB attachedObj); -GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum shaderType); -GLAPI void APIENTRY glShaderSourceARB (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -GLAPI void APIENTRY glCompileShaderARB (GLhandleARB shaderObj); -GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void); -GLAPI void APIENTRY glAttachObjectARB (GLhandleARB containerObj, GLhandleARB obj); -GLAPI void APIENTRY glLinkProgramARB (GLhandleARB programObj); -GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB programObj); -GLAPI void APIENTRY glValidateProgramARB (GLhandleARB programObj); -GLAPI void APIENTRY glUniform1fARB (GLint location, GLfloat v0); -GLAPI void APIENTRY glUniform2fARB (GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glUniform3fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glUniform4fARB (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glUniform1iARB (GLint location, GLint v0); -GLAPI void APIENTRY glUniform2iARB (GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glUniform3iARB (GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glUniform4iARB (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glUniform1fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform2fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform3fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform4fvARB (GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glUniform1ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform2ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform3ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniform4ivARB (GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glUniformMatrix2fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix3fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glUniformMatrix4fvARB (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB obj, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB obj, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB programObj, const GLcharARB *name); -GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB programObj, GLint location, GLfloat *params); -GLAPI void APIENTRY glGetUniformivARB (GLhandleARB programObj, GLint location, GLint *params); -GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB programObj, GLuint index, const GLcharARB *name); -GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB programObj, const GLcharARB *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 -#endif - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersARB (GLsizei n, const GLenum *bufs); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClampColorARB (GLenum target, GLenum clamp); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 -#endif - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 -#endif - -#ifndef GL_ARB_depth_buffer_float -#define GL_ARB_depth_buffer_float 1 -#endif - -#ifndef GL_ARB_draw_instanced -#define GL_ARB_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedARB (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstancedARB (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_ARB_framebuffer_object -#define GL_ARB_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbuffer (GLuint renderbuffer); -GLAPI void APIENTRY glBindRenderbuffer (GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glDeleteRenderbuffers (GLsizei n, const GLuint *renderbuffers); -GLAPI void APIENTRY glGenRenderbuffers (GLsizei n, GLuint *renderbuffers); -GLAPI void APIENTRY glRenderbufferStorage (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetRenderbufferParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsFramebuffer (GLuint framebuffer); -GLAPI void APIENTRY glBindFramebuffer (GLenum target, GLuint framebuffer); -GLAPI void APIENTRY glDeleteFramebuffers (GLsizei n, const GLuint *framebuffers); -GLAPI void APIENTRY glGenFramebuffers (GLsizei n, GLuint *framebuffers); -GLAPI GLenum APIENTRY glCheckFramebufferStatus (GLenum target); -GLAPI void APIENTRY glFramebufferTexture1D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture2D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture3D (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glFramebufferRenderbuffer (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetFramebufferAttachmentParameteriv (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateMipmap (GLenum target); -GLAPI void APIENTRY glBlitFramebuffer (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -GLAPI void APIENTRY glRenderbufferStorageMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glFramebufferTextureLayer (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPPROC) (GLenum target); -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -#endif - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_ARB_framebuffer_sRGB 1 -#endif - -#ifndef GL_ARB_geometry_shader4 -#define GL_ARB_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriARB (GLuint program, GLenum pname, GLint value); -GLAPI void APIENTRY glFramebufferTextureARB (GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTextureLayerARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glFramebufferTextureFaceARB (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_ARB_half_float_vertex -#define GL_ARB_half_float_vertex 1 -#endif - -#ifndef GL_ARB_instanced_arrays -#define GL_ARB_instanced_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribDivisorARB (GLuint index, GLuint divisor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); -#endif - -#ifndef GL_ARB_map_buffer_range -#define GL_ARB_map_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapBufferRange (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI void APIENTRY glFlushMappedBufferRange (GLenum target, GLintptr offset, GLsizeiptr length); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -#endif - -#ifndef GL_ARB_texture_buffer_object -#define GL_ARB_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferARB (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_ARB_texture_compression_rgtc 1 -#endif - -#ifndef GL_ARB_texture_rg -#define GL_ARB_texture_rg 1 -#endif - -#ifndef GL_ARB_vertex_array_object -#define GL_ARB_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArray (GLuint array); -GLAPI void APIENTRY glDeleteVertexArrays (GLsizei n, const GLuint *arrays); -GLAPI void APIENTRY glGenVertexArrays (GLsizei n, GLuint *arrays); -GLAPI GLboolean APIENTRY glIsVertexArray (GLuint array); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYPROC) (GLuint array); -#endif - -#ifndef GL_ARB_uniform_buffer_object -#define GL_ARB_uniform_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformIndices (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices); -GLAPI void APIENTRY glGetActiveUniformsiv (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetActiveUniformName (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -GLAPI GLuint APIENTRY glGetUniformBlockIndex (GLuint program, const GLchar *uniformBlockName); -GLAPI void APIENTRY glGetActiveUniformBlockiv (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetActiveUniformBlockName (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -GLAPI void APIENTRY glUniformBlockBinding (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* *uniformNames, GLuint *uniformIndices); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint *uniformIndices, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformName); -typedef GLuint (APIENTRYP PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar *uniformBlockName); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei *length, GLchar *uniformBlockName); -typedef void (APIENTRYP PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); -#endif - -#ifndef GL_ARB_compatibility -#define GL_ARB_compatibility 1 -#endif - -#ifndef GL_ARB_copy_buffer -#define GL_ARB_copy_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyBufferSubData (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -#endif - -#ifndef GL_ARB_shader_texture_lod -#define GL_ARB_shader_texture_lod 1 -#endif - -#ifndef GL_ARB_depth_clamp -#define GL_ARB_depth_clamp 1 -#endif - -#ifndef GL_ARB_draw_elements_base_vertex -#define GL_ARB_draw_elements_base_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount, const GLint *basevertex); -#endif - -#ifndef GL_ARB_fragment_coord_conventions -#define GL_ARB_fragment_coord_conventions 1 -#endif - -#ifndef GL_ARB_provoking_vertex -#define GL_ARB_provoking_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProvokingVertex (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXPROC) (GLenum mode); -#endif - -#ifndef GL_ARB_seamless_cube_map -#define GL_ARB_seamless_cube_map 1 -#endif - -#ifndef GL_ARB_sync -#define GL_ARB_sync 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLsync APIENTRY glFenceSync (GLenum condition, GLbitfield flags); -GLAPI GLboolean APIENTRY glIsSync (GLsync sync); -GLAPI void APIENTRY glDeleteSync (GLsync sync); -GLAPI GLenum APIENTRY glClientWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI void APIENTRY glWaitSync (GLsync sync, GLbitfield flags, GLuint64 timeout); -GLAPI void APIENTRY glGetInteger64v (GLenum pname, GLint64 *params); -GLAPI void APIENTRY glGetSynciv (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLsync (APIENTRYP PFNGLFENCESYNCPROC) (GLenum condition, GLbitfield flags); -typedef GLboolean (APIENTRYP PFNGLISSYNCPROC) (GLsync sync); -typedef void (APIENTRYP PFNGLDELETESYNCPROC) (GLsync sync); -typedef GLenum (APIENTRYP PFNGLCLIENTWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (APIENTRYP PFNGLWAITSYNCPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); -typedef void (APIENTRYP PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLGETSYNCIVPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -#endif - -#ifndef GL_ARB_texture_multisample -#define GL_ARB_texture_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage2DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -GLAPI void APIENTRY glTexImage3DMultisample (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -GLAPI void APIENTRY glGetMultisamplefv (GLenum pname, GLuint index, GLfloat *val); -GLAPI void APIENTRY glSampleMaski (GLuint index, GLbitfield mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (APIENTRYP PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat *val); -typedef void (APIENTRYP PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask); -#endif - -#ifndef GL_ARB_vertex_array_bgra -#define GL_ARB_vertex_array_bgra 1 -#endif - -#ifndef GL_ARB_draw_buffers_blend -#define GL_ARB_draw_buffers_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationiARB (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparateiARB (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -GLAPI void APIENTRY glBlendFunciARB (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparateiARB (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -#endif - -#ifndef GL_ARB_sample_shading -#define GL_ARB_sample_shading 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMinSampleShadingARB (GLclampf value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value); -#endif - -#ifndef GL_ARB_texture_cube_map_array -#define GL_ARB_texture_cube_map_array 1 -#endif - -#ifndef GL_ARB_texture_gather -#define GL_ARB_texture_gather 1 -#endif - -#ifndef GL_ARB_texture_query_lod -#define GL_ARB_texture_query_lod 1 -#endif - -#ifndef GL_ARB_shading_language_include -#define GL_ARB_shading_language_include 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glNamedStringARB (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string); -GLAPI void APIENTRY glDeleteNamedStringARB (GLint namelen, const GLchar *name); -GLAPI void APIENTRY glCompileShaderIncludeARB (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length); -GLAPI GLboolean APIENTRY glIsNamedStringARB (GLint namelen, const GLchar *name); -GLAPI void APIENTRY glGetNamedStringARB (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string); -GLAPI void APIENTRY glGetNamedStringivARB (GLint namelen, const GLchar *name, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar *name, GLint stringlen, const GLchar *string); -typedef void (APIENTRYP PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* *path, const GLint *length); -typedef GLboolean (APIENTRYP PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name); -typedef void (APIENTRYP PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar *name, GLsizei bufSize, GLint *stringlen, GLchar *string); -typedef void (APIENTRYP PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar *name, GLenum pname, GLint *params); -#endif - -#ifndef GL_ARB_texture_compression_bptc -#define GL_ARB_texture_compression_bptc 1 -#endif - -#ifndef GL_ARB_blend_func_extended -#define GL_ARB_blend_func_extended 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindFragDataLocationIndexed (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataIndex (GLuint program, const GLchar *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar *name); -#endif - -#ifndef GL_ARB_explicit_attrib_location -#define GL_ARB_explicit_attrib_location 1 -#endif - -#ifndef GL_ARB_occlusion_query2 -#define GL_ARB_occlusion_query2 1 -#endif - -#ifndef GL_ARB_sampler_objects -#define GL_ARB_sampler_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenSamplers (GLsizei count, GLuint *samplers); -GLAPI void APIENTRY glDeleteSamplers (GLsizei count, const GLuint *samplers); -GLAPI GLboolean APIENTRY glIsSampler (GLuint sampler); -GLAPI void APIENTRY glBindSampler (GLuint unit, GLuint sampler); -GLAPI void APIENTRY glSamplerParameteri (GLuint sampler, GLenum pname, GLint param); -GLAPI void APIENTRY glSamplerParameteriv (GLuint sampler, GLenum pname, const GLint *param); -GLAPI void APIENTRY glSamplerParameterf (GLuint sampler, GLenum pname, GLfloat param); -GLAPI void APIENTRY glSamplerParameterfv (GLuint sampler, GLenum pname, const GLfloat *param); -GLAPI void APIENTRY glSamplerParameterIiv (GLuint sampler, GLenum pname, const GLint *param); -GLAPI void APIENTRY glSamplerParameterIuiv (GLuint sampler, GLenum pname, const GLuint *param); -GLAPI void APIENTRY glGetSamplerParameteriv (GLuint sampler, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSamplerParameterIiv (GLuint sampler, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSamplerParameterfv (GLuint sampler, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetSamplerParameterIuiv (GLuint sampler, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint *samplers); -typedef void (APIENTRYP PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint *samplers); -typedef GLboolean (APIENTRYP PFNGLISSAMPLERPROC) (GLuint sampler); -typedef void (APIENTRYP PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint *param); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_ARB_texture_rgb10_a2ui 1 -#endif - -#ifndef GL_ARB_texture_swizzle -#define GL_ARB_texture_swizzle 1 -#endif - -#ifndef GL_ARB_timer_query -#define GL_ARB_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glQueryCounter (GLuint id, GLenum target); -GLAPI void APIENTRY glGetQueryObjecti64v (GLuint id, GLenum pname, GLint64 *params); -GLAPI void APIENTRY glGetQueryObjectui64v (GLuint id, GLenum pname, GLuint64 *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64 *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64 *params); -#endif - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -#define GL_ARB_vertex_type_2_10_10_10_rev 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexP2ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP2uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glVertexP3ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP3uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glVertexP4ui (GLenum type, GLuint value); -GLAPI void APIENTRY glVertexP4uiv (GLenum type, const GLuint *value); -GLAPI void APIENTRY glTexCoordP1ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP1uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP2ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP2uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP3ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP3uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glTexCoordP4ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glTexCoordP4uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP1ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP1uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP2ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP2uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP3ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP3uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glMultiTexCoordP4ui (GLenum texture, GLenum type, GLuint coords); -GLAPI void APIENTRY glMultiTexCoordP4uiv (GLenum texture, GLenum type, const GLuint *coords); -GLAPI void APIENTRY glNormalP3ui (GLenum type, GLuint coords); -GLAPI void APIENTRY glNormalP3uiv (GLenum type, const GLuint *coords); -GLAPI void APIENTRY glColorP3ui (GLenum type, GLuint color); -GLAPI void APIENTRY glColorP3uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glColorP4ui (GLenum type, GLuint color); -GLAPI void APIENTRY glColorP4uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glSecondaryColorP3ui (GLenum type, GLuint color); -GLAPI void APIENTRY glSecondaryColorP3uiv (GLenum type, const GLuint *color); -GLAPI void APIENTRY glVertexAttribP1ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP1uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP2ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP2uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP3ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP3uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -GLAPI void APIENTRY glVertexAttribP4ui (GLuint index, GLenum type, GLboolean normalized, GLuint value); -GLAPI void APIENTRY glVertexAttribP4uiv (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint *value); -typedef void (APIENTRYP PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords); -typedef void (APIENTRYP PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint *coords); -typedef void (APIENTRYP PFNGLCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLCOLORP4UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (APIENTRYP PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint *color); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (APIENTRYP PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint *value); -#endif - -#ifndef GL_ARB_draw_indirect -#define GL_ARB_draw_indirect 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysIndirect (GLenum mode, const GLvoid *indirect); -GLAPI void APIENTRY glDrawElementsIndirect (GLenum mode, GLenum type, const GLvoid *indirect); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const GLvoid *indirect); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const GLvoid *indirect); -#endif - -#ifndef GL_ARB_gpu_shader5 -#define GL_ARB_gpu_shader5 1 -#endif - -#ifndef GL_ARB_gpu_shader_fp64 -#define GL_ARB_gpu_shader_fp64 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniform1d (GLint location, GLdouble x); -GLAPI void APIENTRY glUniform2d (GLint location, GLdouble x, GLdouble y); -GLAPI void APIENTRY glUniform3d (GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glUniform4d (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glUniform1dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform2dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform3dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniform4dv (GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix2x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix3x4dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4x2dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glUniformMatrix4x3dv (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glGetUniformdv (GLuint program, GLint location, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORM1DPROC) (GLint location, GLdouble x); -typedef void (APIENTRYP PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble *params); -#endif - -#ifndef GL_ARB_shader_subroutine -#define GL_ARB_shader_subroutine 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetSubroutineUniformLocation (GLuint program, GLenum shadertype, const GLchar *name); -GLAPI GLuint APIENTRY glGetSubroutineIndex (GLuint program, GLenum shadertype, const GLchar *name); -GLAPI void APIENTRY glGetActiveSubroutineUniformiv (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -GLAPI void APIENTRY glGetActiveSubroutineUniformName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -GLAPI void APIENTRY glGetActiveSubroutineName (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -GLAPI void APIENTRY glUniformSubroutinesuiv (GLenum shadertype, GLsizei count, const GLuint *indices); -GLAPI void APIENTRY glGetUniformSubroutineuiv (GLenum shadertype, GLint location, GLuint *params); -GLAPI void APIENTRY glGetProgramStageiv (GLuint program, GLenum shadertype, GLenum pname, GLint *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar *name); -typedef GLuint (APIENTRYP PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint *values); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei *length, GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint *indices); -typedef void (APIENTRYP PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint *values); -#endif - -#ifndef GL_ARB_tessellation_shader -#define GL_ARB_tessellation_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPatchParameteri (GLenum pname, GLint value); -GLAPI void APIENTRY glPatchParameterfv (GLenum pname, const GLfloat *values); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value); -typedef void (APIENTRYP PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat *values); -#endif - -#ifndef GL_ARB_texture_buffer_object_rgb32 -#define GL_ARB_texture_buffer_object_rgb32 1 -#endif - -#ifndef GL_ARB_transform_feedback2 -#define GL_ARB_transform_feedback2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindTransformFeedback (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteTransformFeedbacks (GLsizei n, const GLuint *ids); -GLAPI void APIENTRY glGenTransformFeedbacks (GLsizei n, GLuint *ids); -GLAPI GLboolean APIENTRY glIsTransformFeedback (GLuint id); -GLAPI void APIENTRY glPauseTransformFeedback (void); -GLAPI void APIENTRY glResumeTransformFeedback (void); -GLAPI void APIENTRY glDrawTransformFeedback (GLenum mode, GLuint id); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint *ids); -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id); -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKPROC) (void); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id); -#endif - -#ifndef GL_ARB_transform_feedback3 -#define GL_ARB_transform_feedback3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawTransformFeedbackStream (GLenum mode, GLuint id, GLuint stream); -GLAPI void APIENTRY glBeginQueryIndexed (GLenum target, GLuint index, GLuint id); -GLAPI void APIENTRY glEndQueryIndexed (GLenum target, GLuint index); -GLAPI void APIENTRY glGetQueryIndexediv (GLenum target, GLuint index, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream); -typedef void (APIENTRYP PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_ARB_ES2_compatibility -#define GL_ARB_ES2_compatibility 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReleaseShaderCompiler (void); -GLAPI void APIENTRY glShaderBinary (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); -GLAPI void APIENTRY glGetShaderPrecisionFormat (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -GLAPI void APIENTRY glDepthRangef (GLclampf n, GLclampf f); -GLAPI void APIENTRY glClearDepthf (GLclampf d); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRELEASESHADERCOMPILERPROC) (void); -typedef void (APIENTRYP PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length); -typedef void (APIENTRYP PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision); -typedef void (APIENTRYP PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f); -typedef void (APIENTRYP PFNGLCLEARDEPTHFPROC) (GLclampf d); -#endif - -#ifndef GL_ARB_get_program_binary -#define GL_ARB_get_program_binary 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetProgramBinary (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -GLAPI void APIENTRY glProgramBinary (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); -GLAPI void APIENTRY glProgramParameteri (GLuint program, GLenum pname, GLint value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary); -typedef void (APIENTRYP PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_ARB_separate_shader_objects -#define GL_ARB_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUseProgramStages (GLuint pipeline, GLbitfield stages, GLuint program); -GLAPI void APIENTRY glActiveShaderProgram (GLuint pipeline, GLuint program); -GLAPI GLuint APIENTRY glCreateShaderProgramv (GLenum type, GLsizei count, const GLchar* *strings); -GLAPI void APIENTRY glBindProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glDeleteProgramPipelines (GLsizei n, const GLuint *pipelines); -GLAPI void APIENTRY glGenProgramPipelines (GLsizei n, GLuint *pipelines); -GLAPI GLboolean APIENTRY glIsProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glGetProgramPipelineiv (GLuint pipeline, GLenum pname, GLint *params); -GLAPI void APIENTRY glProgramUniform1i (GLuint program, GLint location, GLint v0); -GLAPI void APIENTRY glProgramUniform1iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform1f (GLuint program, GLint location, GLfloat v0); -GLAPI void APIENTRY glProgramUniform1fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1d (GLuint program, GLint location, GLdouble v0); -GLAPI void APIENTRY glProgramUniform1dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform1ui (GLuint program, GLint location, GLuint v0); -GLAPI void APIENTRY glProgramUniform1uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform2i (GLuint program, GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glProgramUniform2iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform2f (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glProgramUniform2fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform2d (GLuint program, GLint location, GLdouble v0, GLdouble v1); -GLAPI void APIENTRY glProgramUniform2dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform2ui (GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glProgramUniform2uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform3i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glProgramUniform3iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform3f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glProgramUniform3fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform3d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -GLAPI void APIENTRY glProgramUniform3dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform3ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glProgramUniform3uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform4i (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glProgramUniform4iv (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform4f (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glProgramUniform4fv (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform4d (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -GLAPI void APIENTRY glProgramUniform4dv (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform4ui (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glProgramUniform4uiv (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniformMatrix2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3fv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3dv (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glValidateProgramPipeline (GLuint pipeline); -GLAPI void APIENTRY glGetProgramPipelineInfoLog (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (APIENTRYP PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar* *strings); -typedef void (APIENTRYP PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint *pipelines); -typedef void (APIENTRYP PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint *pipelines); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble v0, GLdouble v1, GLdouble v2, GLdouble v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -#endif - -#ifndef GL_ARB_vertex_attrib_64bit -#define GL_ARB_vertex_attrib_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1d (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttribL2d (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttribL3d (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttribL4d (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttribL1dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL2dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL3dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL4dv (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribLPointer (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribLdv (GLuint index, GLenum pname, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble *params); -#endif - -#ifndef GL_ARB_viewport_array -#define GL_ARB_viewport_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glViewportArrayv (GLuint first, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glViewportIndexedf (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -GLAPI void APIENTRY glViewportIndexedfv (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glScissorArrayv (GLuint first, GLsizei count, const GLint *v); -GLAPI void APIENTRY glScissorIndexed (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -GLAPI void APIENTRY glScissorIndexedv (GLuint index, const GLint *v); -GLAPI void APIENTRY glDepthRangeArrayv (GLuint first, GLsizei count, const GLclampd *v); -GLAPI void APIENTRY glDepthRangeIndexed (GLuint index, GLclampd n, GLclampd f); -GLAPI void APIENTRY glGetFloati_v (GLenum target, GLuint index, GLfloat *data); -GLAPI void APIENTRY glGetDoublei_v (GLenum target, GLuint index, GLdouble *data); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -typedef void (APIENTRYP PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint *v); -typedef void (APIENTRYP PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd *v); -typedef void (APIENTRYP PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f); -typedef void (APIENTRYP PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat *data); -typedef void (APIENTRYP PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble *data); -#endif - -#ifndef GL_ARB_cl_event -#define GL_ARB_cl_event 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLsync APIENTRY glCreateSyncFromCLeventARB (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context * context, struct _cl_event * event, GLbitfield flags); -#endif - -#ifndef GL_ARB_debug_output -#define GL_ARB_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); -#endif - -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLenum APIENTRY glGetGraphicsResetStatusARB (void); -GLAPI void APIENTRY glGetnMapdvARB (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -GLAPI void APIENTRY glGetnMapfvARB (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -GLAPI void APIENTRY glGetnMapivARB (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -GLAPI void APIENTRY glGetnPixelMapfvARB (GLenum map, GLsizei bufSize, GLfloat *values); -GLAPI void APIENTRY glGetnPixelMapuivARB (GLenum map, GLsizei bufSize, GLuint *values); -GLAPI void APIENTRY glGetnPixelMapusvARB (GLenum map, GLsizei bufSize, GLushort *values); -GLAPI void APIENTRY glGetnPolygonStippleARB (GLsizei bufSize, GLubyte *pattern); -GLAPI void APIENTRY glGetnColorTableARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -GLAPI void APIENTRY glGetnConvolutionFilterARB (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -GLAPI void APIENTRY glGetnSeparableFilterARB (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glGetnHistogramARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnMinmaxARB (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -GLAPI void APIENTRY glGetnTexImageARB (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); -GLAPI void APIENTRY glReadnPixelsARB (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); -GLAPI void APIENTRY glGetnCompressedTexImageARB (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); -GLAPI void APIENTRY glGetnUniformfvARB (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -GLAPI void APIENTRY glGetnUniformivARB (GLuint program, GLint location, GLsizei bufSize, GLint *params); -GLAPI void APIENTRY glGetnUniformuivARB (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -GLAPI void APIENTRY glGetnUniformdvARB (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLenum (APIENTRYP PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void); -typedef void (APIENTRYP PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble *v); -typedef void (APIENTRYP PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat *v); -typedef void (APIENTRYP PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint *v); -typedef void (APIENTRYP PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint *values); -typedef void (APIENTRYP PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort *values); -typedef void (APIENTRYP PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte *pattern); -typedef void (APIENTRYP PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table); -typedef void (APIENTRYP PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image); -typedef void (APIENTRYP PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values); -typedef void (APIENTRYP PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img); -typedef void (APIENTRYP PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data); -typedef void (APIENTRYP PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *img); -typedef void (APIENTRYP PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint *params); -typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); -#endif - -#ifndef GL_ARB_shader_stencil_export -#define GL_ARB_shader_stencil_export 1 -#endif - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 -#endif - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColorEXT (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat factor, GLfloat bias); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); -#endif - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 -#endif - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage3DEXT (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum target, GLenum filter, GLfloat *weights); -GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights); -typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetHistogramEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMinmaxEXT (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glHistogramEXT (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glMinmaxEXT (GLenum target, GLenum internalformat, GLboolean sink); -GLAPI void APIENTRY glResetHistogramEXT (GLenum target); -GLAPI void APIENTRY glResetMinmaxEXT (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target); -#endif - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum target, GLenum pname, GLfloat params); -GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum target, GLenum pname, GLint params); -GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *image); -GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif - -#ifndef GL_SGI_color_matrix -#define GL_SGI_color_matrix 1 -#endif - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableSGI (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glColorTableParameterivSGI (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glCopyColorTableSGI (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glGetColorTableSGI (GLenum target, GLenum format, GLenum type, GLvoid *table); -GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum target, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params); -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenSGIX (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum pname, GLint param); -GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum pname, const GLint *params); -GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum pname, GLint *params); -GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage4DSGIS (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 -#endif - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 -#endif - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei n, const GLuint *textures, GLboolean *residences); -GLAPI void APIENTRY glBindTextureEXT (GLenum target, GLuint texture); -GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei n, const GLuint *textures); -GLAPI void APIENTRY glGenTexturesEXT (GLsizei n, GLuint *textures); -GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint texture); -GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures); -typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures); -typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum target, GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum target, GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum target, GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 -#endif - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskSGIS (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glSamplePatternSGIS (GLenum pattern); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 -#endif - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glArrayElementEXT (GLint i); -GLAPI void APIENTRY glColorPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glDrawArraysEXT (GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei stride, GLsizei count, const GLboolean *pointer); -GLAPI void APIENTRY glGetPointervEXT (GLenum pname, GLvoid* *params); -GLAPI void APIENTRY glIndexPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glNormalPointerEXT (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glTexCoordPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -GLAPI void APIENTRY glVertexPointerEXT (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer); -typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 -#endif - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 -#endif - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 -#endif - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_SGIX_pixel_tiles 1 -#endif - -#ifndef GL_SGIX_texture_select -#define GL_SGIX_texture_select 1 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum pname, GLfloat param); -GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum pname, GLint param); -GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 -#endif - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfEXT (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvEXT (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_SGIS_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfSGIS (GLenum pname, GLfloat param); -GLAPI void APIENTRY glPointParameterfvSGIS (GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIX_instruments -#define GL_SGIX_instruments 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetInstrumentsSGIX (void); -GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei size, GLint *buffer); -GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *marker_p); -GLAPI void APIENTRY glReadInstrumentsSGIX (GLint marker); -GLAPI void APIENTRY glStartInstrumentsSGIX (void); -GLAPI void APIENTRY glStopInstrumentsSGIX (GLint marker); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer); -typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p); -typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker); -typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker); -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 -#endif - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameZoomSGIX (GLint factor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor); -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTagSampleBufferSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_SGIX_polynomial_ffd 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -GLAPI void APIENTRY glDeformSGIX (GLbitfield mask); -GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask); -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *equation); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation); -#endif - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushRasterSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogFuncSGIS (GLsizei n, const GLfloat *points); -GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points); -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 -#endif - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glImageTransformParameteriHP (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glImageTransformParameterfHP (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glImageTransformParameterivHP (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum target, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 -#endif - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorSubTableEXT (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glHintPGI (GLenum target, GLint mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode); -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableEXT (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -GLAPI void APIENTRY glGetColorTableEXT (GLenum target, GLenum format, GLenum type, GLvoid *data); -GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint list, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetListParameterivSGIX (GLuint list, GLenum pname, GLint *params); -GLAPI void APIENTRY glListParameterfSGIX (GLuint list, GLenum pname, GLfloat param); -GLAPI void APIENTRY glListParameterfvSGIX (GLuint list, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glListParameteriSGIX (GLuint list, GLenum pname, GLint param); -GLAPI void APIENTRY glListParameterivSGIX (GLuint list, GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_SGIX_calligraphic_fragment 1 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 -#endif - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 -#endif - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexMaterialEXT (GLenum face, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexFuncEXT (GLenum func, GLclampf ref); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref); -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLockArraysEXT (GLint first, GLsizei count); -GLAPI void APIENTRY glUnlockArraysEXT (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void); -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullParameterdvEXT (GLenum pname, GLdouble *params); -GLAPI void APIENTRY glCullParameterfvEXT (GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_SGIX_fragment_lighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum face, GLenum mode); -GLAPI void APIENTRY glFragmentLightfSGIX (GLenum light, GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum light, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentLightiSGIX (GLenum light, GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentLightivSGIX (GLenum light, GLenum pname, const GLint *params); -GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum pname, const GLint *params); -GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum face, GLenum pname, GLfloat param); -GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum face, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum face, GLenum pname, GLint param); -GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum face, GLenum pname, const GLint *params); -GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum light, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum light, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum face, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum face, GLenum pname, GLint *params); -GLAPI void APIENTRY glLightEnviSGIX (GLenum pname, GLint param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 -#endif - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 -#endif - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glApplyTextureEXT (GLenum mode); -GLAPI void APIENTRY glTextureLightEXT (GLenum pname); -GLAPI void APIENTRY glTextureMaterialEXT (GLenum face, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 -#endif - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 -#endif - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint marker); -GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *markerp); -GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *markerp); -GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei range); -GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint marker, GLsizei range); -GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint marker); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp); -typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp); -typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glNormalPointervINTEL (GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glColorPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -GLAPI void APIENTRY glTexCoordPointervINTEL (GLint size, GLenum type, const GLvoid* *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -#endif - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 -#endif - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glSecondaryColor3iEXT (GLint red, GLint green, GLint blue); -GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *v); -GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort red, GLshort green, GLshort blue); -GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *v); -GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *v); -GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint red, GLuint green, GLuint blue); -GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *v); -GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort red, GLushort green, GLushort blue); -GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *v); -GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureNormalEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordfEXT (GLfloat coord); -GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *coord); -GLAPI void APIENTRY glFogCoorddEXT (GLdouble coord); -GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *coord); -GLAPI void APIENTRY glFogCoordPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTangent3bEXT (GLbyte tx, GLbyte ty, GLbyte tz); -GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glTangent3dEXT (GLdouble tx, GLdouble ty, GLdouble tz); -GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glTangent3fEXT (GLfloat tx, GLfloat ty, GLfloat tz); -GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glTangent3iEXT (GLint tx, GLint ty, GLint tz); -GLAPI void APIENTRY glTangent3ivEXT (const GLint *v); -GLAPI void APIENTRY glTangent3sEXT (GLshort tx, GLshort ty, GLshort tz); -GLAPI void APIENTRY glTangent3svEXT (const GLshort *v); -GLAPI void APIENTRY glBinormal3bEXT (GLbyte bx, GLbyte by, GLbyte bz); -GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *v); -GLAPI void APIENTRY glBinormal3dEXT (GLdouble bx, GLdouble by, GLdouble bz); -GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *v); -GLAPI void APIENTRY glBinormal3fEXT (GLfloat bx, GLfloat by, GLfloat bz); -GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *v); -GLAPI void APIENTRY glBinormal3iEXT (GLint bx, GLint by, GLint bz); -GLAPI void APIENTRY glBinormal3ivEXT (const GLint *v); -GLAPI void APIENTRY glBinormal3sEXT (GLshort bx, GLshort by, GLshort bz); -GLAPI void APIENTRY glBinormal3svEXT (const GLshort *v); -GLAPI void APIENTRY glTangentPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glBinormalPointerEXT (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz); -typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz); -typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz); -typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz); -typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz); -typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz); -typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz); -typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz); -typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz); -typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz); -typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_SGIX_fog_scale 1 -#endif - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFinishTextureSUNX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void); -#endif - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte factor); -GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort factor); -GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint factor); -GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat factor); -GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble factor); -GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte factor); -GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort factor); -GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint factor); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -#endif - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint code); -GLAPI void APIENTRY glReplacementCodeusSUN (GLushort code); -GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte code); -GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *code); -GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *code); -GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *code); -GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *rc, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *rc, const GLubyte *c, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_blend_func_separate -#define GL_INGR_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 -#endif - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight); -GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight); -GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushVertexArrayRangeNV (void); -GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei length, const GLvoid *pointer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer); -#endif - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerParameterfvNV (GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glCombinerParameterfNV (GLenum pname, GLfloat param); -GLAPI void APIENTRY glCombinerParameterivNV (GLenum pname, const GLint *params); -GLAPI void APIENTRY glCombinerParameteriNV (GLenum pname, GLint param); -GLAPI void APIENTRY glCombinerInputNV (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -GLAPI void APIENTRY glCombinerOutputNV (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -GLAPI void APIENTRY glFinalCombinerInputNV (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum stage, GLenum portion, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum variable, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum variable, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params); -#endif - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 -#endif - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 -#endif - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glResizeBuffersMESA (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); -#endif - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dMESA (GLdouble x, GLdouble y); -GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos2fMESA (GLfloat x, GLfloat y); -GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos2iMESA (GLint x, GLint y); -GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos2sMESA (GLshort x, GLshort y); -GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *v); -GLAPI void APIENTRY glWindowPos3dMESA (GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos3fMESA (GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos3iMESA (GLint x, GLint y, GLint z); -GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos3sMESA (GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *v); -GLAPI void APIENTRY glWindowPos4dMESA (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *v); -GLAPI void APIENTRY glWindowPos4fMESA (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *v); -GLAPI void APIENTRY glWindowPos4iMESA (GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *v); -GLAPI void APIENTRY glWindowPos4sMESA (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v); -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint stride, const GLboolean* *pointer, GLint ptrstride); -GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glIndexPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glNormalPointerListIBM (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glTexCoordPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -GLAPI void APIENTRY glVertexPointerListIBM (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif - -#ifndef GL_SGIX_subsample -#define GL_SGIX_subsample 1 -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_SGIX_ycrcba 1 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#define GL_SGIX_ycrcb_subsample 1 -#endif - -#ifndef GL_SGIX_depth_pass_instrument -#define GL_SGIX_depth_pass_instrument 1 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 -#endif - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTbufferMask3DFX (GLuint mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); -#endif - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskEXT (GLclampf value, GLboolean invert); -GLAPI void APIENTRY glSamplePatternEXT (GLenum pattern); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 -#endif - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_SGIS_texture_color_mask 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif - -#ifndef GL_SGIX_igloo_interface -#define GL_SGIX_igloo_interface 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum pname, const GLvoid *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params); -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 -#endif - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteFencesNV (GLsizei n, const GLuint *fences); -GLAPI void APIENTRY glGenFencesNV (GLsizei n, GLuint *fences); -GLAPI GLboolean APIENTRY glIsFenceNV (GLuint fence); -GLAPI GLboolean APIENTRY glTestFenceNV (GLuint fence); -GLAPI void APIENTRY glGetFenceivNV (GLuint fence, GLenum pname, GLint *params); -GLAPI void APIENTRY glFinishFenceNV (GLuint fence); -GLAPI void APIENTRY glSetFenceNV (GLuint fence, GLenum condition); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -GLAPI void APIENTRY glMapParameterivNV (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMapParameterfvNV (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetMapControlPointsNV (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -GLAPI void APIENTRY glGetMapParameterivNV (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMapParameterfvNV (GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum target, GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glEvalMapsNV (GLenum target, GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum stage, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum stage, GLenum pname, GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 -#endif - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 -#endif - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei n, const GLuint *programs, GLboolean *residences); -GLAPI void APIENTRY glBindProgramNV (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteProgramsNV (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glExecuteProgramNV (GLenum target, GLuint id, const GLfloat *params); -GLAPI void APIENTRY glGenProgramsNV (GLsizei n, GLuint *programs); -GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum target, GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum target, GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetProgramivNV (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetProgramStringNV (GLuint id, GLenum pname, GLubyte *program); -GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum target, GLuint address, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribivNV (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint index, GLenum pname, GLvoid* *pointer); -GLAPI GLboolean APIENTRY glIsProgramNV (GLuint id); -GLAPI void APIENTRY glLoadProgramNV (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -GLAPI void APIENTRY glProgramParameter4dNV (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramParameter4dvNV (GLenum target, GLuint index, const GLdouble *v); -GLAPI void APIENTRY glProgramParameter4fNV (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramParameter4fvNV (GLenum target, GLuint index, const GLfloat *v); -GLAPI void APIENTRY glProgramParameters4dvNV (GLenum target, GLuint index, GLuint count, const GLdouble *v); -GLAPI void APIENTRY glProgramParameters4fvNV (GLenum target, GLuint index, GLuint count, const GLfloat *v); -GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei n, const GLuint *programs); -GLAPI void APIENTRY glTrackMatrixNV (GLenum target, GLuint address, GLenum matrix, GLenum transform); -GLAPI void APIENTRY glVertexAttribPointerNV (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glVertexAttrib1dNV (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib1fNV (GLuint index, GLfloat x); -GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib1sNV (GLuint index, GLshort x); -GLAPI void APIENTRY glVertexAttrib1svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib2dNV (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib2fNV (GLuint index, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib2sNV (GLuint index, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexAttrib2svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib3dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib3fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib3sNV (GLuint index, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexAttrib3svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4dNV (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttrib4fNV (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint index, const GLfloat *v); -GLAPI void APIENTRY glVertexAttrib4sNV (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexAttrib4svNV (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs1svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs2svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs3svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint index, GLsizei count, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint index, GLsizei count, const GLfloat *v); -GLAPI void APIENTRY glVertexAttribs4svNV (GLuint index, GLsizei count, const GLshort *v); -GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint index, GLsizei count, const GLubyte *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v); -typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SGIX_scalebias_hint 1 -#endif - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 -#endif - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 -#endif - -#ifndef GL_OML_resample -#define GL_OML_resample 1 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBumpParameterivATI (GLenum pname, const GLint *param); -GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum pname, const GLfloat *param); -GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum pname, GLint *param); -GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum pname, GLfloat *param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint range); -GLAPI void APIENTRY glBindFragmentShaderATI (GLuint id); -GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint id); -GLAPI void APIENTRY glBeginFragmentShaderATI (void); -GLAPI void APIENTRY glEndFragmentShaderATI (void); -GLAPI void APIENTRY glPassTexCoordATI (GLuint dst, GLuint coord, GLenum swizzle); -GLAPI void APIENTRY glSampleMapATI (GLuint dst, GLuint interp, GLenum swizzle); -GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint dst, const GLfloat *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value); -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPNTrianglesiATI (GLenum pname, GLint param); -GLAPI void APIENTRY glPNTrianglesfATI (GLenum pname, GLfloat param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei size, const GLvoid *pointer, GLenum usage); -GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint buffer, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetObjectBufferivATI (GLuint buffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glFreeObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glArrayObjectATI (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum array, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetArrayObjectivATI (GLenum array, GLenum pname, GLint *params); -GLAPI void APIENTRY glVariantArrayObjectATI (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint id, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint id, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); -typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params); -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVertexShaderEXT (void); -GLAPI void APIENTRY glEndVertexShaderEXT (void); -GLAPI void APIENTRY glBindVertexShaderEXT (GLuint id); -GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint range); -GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint id); -GLAPI void APIENTRY glShaderOp1EXT (GLenum op, GLuint res, GLuint arg1); -GLAPI void APIENTRY glShaderOp2EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -GLAPI void APIENTRY glShaderOp3EXT (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -GLAPI void APIENTRY glSwizzleEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -GLAPI void APIENTRY glWriteMaskEXT (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -GLAPI void APIENTRY glInsertComponentEXT (GLuint res, GLuint src, GLuint num); -GLAPI void APIENTRY glExtractComponentEXT (GLuint res, GLuint src, GLuint num); -GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -GLAPI void APIENTRY glSetInvariantEXT (GLuint id, GLenum type, const GLvoid *addr); -GLAPI void APIENTRY glSetLocalConstantEXT (GLuint id, GLenum type, const GLvoid *addr); -GLAPI void APIENTRY glVariantbvEXT (GLuint id, const GLbyte *addr); -GLAPI void APIENTRY glVariantsvEXT (GLuint id, const GLshort *addr); -GLAPI void APIENTRY glVariantivEXT (GLuint id, const GLint *addr); -GLAPI void APIENTRY glVariantfvEXT (GLuint id, const GLfloat *addr); -GLAPI void APIENTRY glVariantdvEXT (GLuint id, const GLdouble *addr); -GLAPI void APIENTRY glVariantubvEXT (GLuint id, const GLubyte *addr); -GLAPI void APIENTRY glVariantusvEXT (GLuint id, const GLushort *addr); -GLAPI void APIENTRY glVariantuivEXT (GLuint id, const GLuint *addr); -GLAPI void APIENTRY glVariantPointerEXT (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint id); -GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint id); -GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum light, GLenum value); -GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum face, GLenum value); -GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum unit, GLenum coord, GLenum value); -GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum unit, GLenum value); -GLAPI GLuint APIENTRY glBindParameterEXT (GLenum value); -GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint id, GLenum cap); -GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -GLAPI void APIENTRY glGetVariantPointervEXT (GLuint id, GLenum value, GLvoid* *data); -GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint id, GLenum value, GLboolean *data); -GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint id, GLenum value, GLint *data); -GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint id, GLenum value, GLfloat *data); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr); -typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr); -typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr); -typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr); -typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr); -typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr); -typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr); -typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr); -typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data); -typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexStream1sATI (GLenum stream, GLshort x); -GLAPI void APIENTRY glVertexStream1svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream1iATI (GLenum stream, GLint x); -GLAPI void APIENTRY glVertexStream1ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream1fATI (GLenum stream, GLfloat x); -GLAPI void APIENTRY glVertexStream1fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream1dATI (GLenum stream, GLdouble x); -GLAPI void APIENTRY glVertexStream1dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream2sATI (GLenum stream, GLshort x, GLshort y); -GLAPI void APIENTRY glVertexStream2svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream2iATI (GLenum stream, GLint x, GLint y); -GLAPI void APIENTRY glVertexStream2ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream2fATI (GLenum stream, GLfloat x, GLfloat y); -GLAPI void APIENTRY glVertexStream2fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream2dATI (GLenum stream, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexStream2dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream3sATI (GLenum stream, GLshort x, GLshort y, GLshort z); -GLAPI void APIENTRY glVertexStream3svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream3iATI (GLenum stream, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexStream3ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream3fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glVertexStream3fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream3dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexStream3dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glVertexStream4sATI (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void APIENTRY glVertexStream4svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glVertexStream4iATI (GLenum stream, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexStream4ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glVertexStream4fATI (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glVertexStream4fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glVertexStream4dATI (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexStream4dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glNormalStream3bATI (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -GLAPI void APIENTRY glNormalStream3bvATI (GLenum stream, const GLbyte *coords); -GLAPI void APIENTRY glNormalStream3sATI (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -GLAPI void APIENTRY glNormalStream3svATI (GLenum stream, const GLshort *coords); -GLAPI void APIENTRY glNormalStream3iATI (GLenum stream, GLint nx, GLint ny, GLint nz); -GLAPI void APIENTRY glNormalStream3ivATI (GLenum stream, const GLint *coords); -GLAPI void APIENTRY glNormalStream3fATI (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -GLAPI void APIENTRY glNormalStream3fvATI (GLenum stream, const GLfloat *coords); -GLAPI void APIENTRY glNormalStream3dATI (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -GLAPI void APIENTRY glNormalStream3dvATI (GLenum stream, const GLdouble *coords); -GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum stream); -GLAPI void APIENTRY glVertexBlendEnviATI (GLenum pname, GLint param); -GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum pname, GLfloat param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerATI (GLenum type, const GLvoid *pointer); -GLAPI void APIENTRY glDrawElementArrayATI (GLenum mode, GLsizei count); -GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 -#endif - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei n, GLuint *ids); -GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei n, const GLuint *ids); -GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint id); -GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint id); -GLAPI void APIENTRY glEndOcclusionQueryNV (void); -GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint id, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint id, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameteriNV (GLenum pname, GLint param); -GLAPI void APIENTRY glPointParameterivNV (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 -#endif - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 -#endif - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 -#endif - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerAPPLE (GLenum type, const GLvoid *pointer); -GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum mode, GLint first, GLsizei count); -GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenFencesAPPLE (GLsizei n, GLuint *fences); -GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei n, const GLuint *fences); -GLAPI void APIENTRY glSetFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint fence); -GLAPI void APIENTRY glFinishFenceAPPLE (GLuint fence); -GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum object, GLuint name); -GLAPI void APIENTRY glFinishObjectAPPLE (GLenum object, GLint name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences); -typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); -typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint array); -GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei n, const GLuint *arrays); -GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei n, GLuint *arrays); -GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint array); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum pname, GLint param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 -#endif - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersATI (GLsizei n, const GLenum *bufs); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_ATI_pixel_format_float 1 -/* This is really a WGL extension, but defines some associated GL enums. - * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. - */ -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 -#endif - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 -#endif - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 -#endif - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 -/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertex2hNV (GLhalfNV x, GLhalfNV y); -GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertex3hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z); -GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertex4hNV (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glNormal3hNV (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glColor4hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV s); -GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV s, GLhalfNV t); -GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r); -GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum target, GLhalfNV s); -GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum target, GLhalfNV s, GLhalfNV t); -GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum target, const GLhalfNV *v); -GLAPI void APIENTRY glFogCoordhNV (GLhalfNV fog); -GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *fog); -GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *v); -GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV weight); -GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *weight); -GLAPI void APIENTRY glVertexAttrib1hNV (GLuint index, GLhalfNV x); -GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib2hNV (GLuint index, GLhalfNV x, GLhalfNV y); -GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib3hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttrib4hNV (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint index, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint index, GLsizei n, const GLhalfNV *v); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s); -typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); -typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer); -GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -#endif - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPrimitiveRestartNV (void); -GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 -#endif - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 -#endif - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint buffer); -GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilOpSeparateATI (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint index, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint index, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthBoundsEXT (GLclampd zmin, GLclampd zmax); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum modeRGB, GLenum modeAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 -#endif - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 -#endif - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 -#endif - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint renderbuffer); -GLAPI void APIENTRY glBindRenderbufferEXT (GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei n, const GLuint *renderbuffers); -GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei n, GLuint *renderbuffers); -GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint framebuffer); -GLAPI void APIENTRY glBindFramebufferEXT (GLenum target, GLuint framebuffer); -GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei n, const GLuint *framebuffers); -GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei n, GLuint *framebuffers); -GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum target); -GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum target, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateMipmapEXT (GLenum target); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -#endif - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei len, const GLvoid *string); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string); -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_EXT_packed_depth_stencil 1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_EXT_stencil_clear_tag 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilClearTagEXT (GLsizei stencilTagBits, GLuint stencilClearTag); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC) (GLsizei stencilTagBits, GLuint stencilClearTag); -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_EXT_texture_sRGB 1 -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlitFramebufferEXT (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_MESAX_texture_stack 1 -#endif - -#ifndef GL_EXT_timer_query -#define GL_EXT_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetQueryObjecti64vEXT (GLuint id, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetQueryObjectui64vEXT (GLuint id, GLenum pname, GLuint64EXT *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_gpu_program_parameters -#define GL_EXT_gpu_program_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramEnvParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramLocalParameters4fvEXT (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_APPLE_flush_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferParameteriAPPLE (GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE (GLenum target, GLintptr offset, GLsizeiptr size); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size); -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_NV_gpu_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramLocalParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glProgramLocalParameterI4ivNV (GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glProgramLocalParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramLocalParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glProgramLocalParameterI4uivNV (GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glProgramLocalParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glProgramEnvParameterI4iNV (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glProgramEnvParameterI4ivNV (GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glProgramEnvParametersI4ivNV (GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramEnvParameterI4uiNV (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glProgramEnvParameterI4uivNV (GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glProgramEnvParametersI4uivNV (GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetProgramLocalParameterIivNV (GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetProgramLocalParameterIuivNV (GLenum target, GLuint index, GLuint *params); -GLAPI void APIENTRY glGetProgramEnvParameterIivNV (GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetProgramEnvParameterIuivNV (GLenum target, GLuint index, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC) (GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC) (GLenum target, GLuint index, GLuint *params); -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_NV_geometry_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramVertexLimitNV (GLenum target, GLint limit); -GLAPI void APIENTRY glFramebufferTextureEXT (GLenum target, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glFramebufferTextureLayerEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glFramebufferTextureFaceEXT (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_EXT_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriEXT (GLuint program, GLenum pname, GLint value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_NV_vertex_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribI1iEXT (GLuint index, GLint x); -GLAPI void APIENTRY glVertexAttribI2iEXT (GLuint index, GLint x, GLint y); -GLAPI void APIENTRY glVertexAttribI3iEXT (GLuint index, GLint x, GLint y, GLint z); -GLAPI void APIENTRY glVertexAttribI4iEXT (GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glVertexAttribI1uiEXT (GLuint index, GLuint x); -GLAPI void APIENTRY glVertexAttribI2uiEXT (GLuint index, GLuint x, GLuint y); -GLAPI void APIENTRY glVertexAttribI3uiEXT (GLuint index, GLuint x, GLuint y, GLuint z); -GLAPI void APIENTRY glVertexAttribI4uiEXT (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glVertexAttribI1ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI2ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI3ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI4ivEXT (GLuint index, const GLint *v); -GLAPI void APIENTRY glVertexAttribI1uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI2uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI3uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4uivEXT (GLuint index, const GLuint *v); -GLAPI void APIENTRY glVertexAttribI4bvEXT (GLuint index, const GLbyte *v); -GLAPI void APIENTRY glVertexAttribI4svEXT (GLuint index, const GLshort *v); -GLAPI void APIENTRY glVertexAttribI4ubvEXT (GLuint index, const GLubyte *v); -GLAPI void APIENTRY glVertexAttribI4usvEXT (GLuint index, const GLushort *v); -GLAPI void APIENTRY glVertexAttribIPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname, GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params); -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_EXT_gpu_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformuivEXT (GLuint program, GLint location, GLuint *params); -GLAPI void APIENTRY glBindFragDataLocationEXT (GLuint program, GLuint color, const GLchar *name); -GLAPI GLint APIENTRY glGetFragDataLocationEXT (GLuint program, const GLchar *name); -GLAPI void APIENTRY glUniform1uiEXT (GLint location, GLuint v0); -GLAPI void APIENTRY glUniform2uiEXT (GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glUniform3uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glUniform4uiEXT (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glUniform1uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform2uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform3uivEXT (GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glUniform4uivEXT (GLint location, GLsizei count, const GLuint *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params); -typedef void (APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -#endif - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedEXT (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstancedEXT (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_packed_float -#define GL_EXT_packed_float 1 -#endif - -#ifndef GL_EXT_texture_array -#define GL_EXT_texture_array 1 -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_EXT_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferEXT (GLenum target, GLenum internalformat, GLuint buffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_EXT_texture_compression_latc 1 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_EXT_texture_shared_exponent 1 -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_NV_depth_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthRangedNV (GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glClearDepthdNV (GLdouble depth); -GLAPI void APIENTRY glDepthBoundsdNV (GLdouble zmin, GLdouble zmax); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLCLEARDEPTHDNVPROC) (GLdouble depth); -typedef void (APIENTRYP PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax); -#endif - -#ifndef GL_NV_fragment_program4 -#define GL_NV_fragment_program4 1 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_NV_framebuffer_multisample_coverage 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_EXT_framebuffer_sRGB 1 -#endif - -#ifndef GL_NV_geometry_shader4 -#define GL_NV_geometry_shader4 1 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_NV_parameter_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif - -#ifndef GL_EXT_draw_buffers2 -#define GL_EXT_draw_buffers2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaskIndexedEXT (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -GLAPI void APIENTRY glGetBooleanIndexedvEXT (GLenum target, GLuint index, GLboolean *data); -GLAPI void APIENTRY glGetIntegerIndexedvEXT (GLenum target, GLuint index, GLint *data); -GLAPI void APIENTRY glEnableIndexedEXT (GLenum target, GLuint index); -GLAPI void APIENTRY glDisableIndexedEXT (GLenum target, GLuint index); -GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT (GLenum target, GLuint index); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum target, GLuint index, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLint *data); -typedef void (APIENTRYP PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (APIENTRYP PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef GLboolean (APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); -#endif - -#ifndef GL_NV_transform_feedback -#define GL_NV_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackNV (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedbackNV (void); -GLAPI void APIENTRY glTransformFeedbackAttribsNV (GLuint count, const GLint *attribs, GLenum bufferMode); -GLAPI void APIENTRY glBindBufferRangeNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferOffsetNV (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -GLAPI void APIENTRY glBindBufferBaseNV (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryingsNV (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -GLAPI void APIENTRY glActiveVaryingNV (GLuint program, const GLchar *name); -GLAPI GLint APIENTRY glGetVaryingLocationNV (GLuint program, const GLchar *name); -GLAPI void APIENTRY glGetActiveVaryingNV (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -GLAPI void APIENTRY glGetTransformFeedbackVaryingNV (GLuint program, GLuint index, GLint *location); -GLAPI void APIENTRY glTransformFeedbackStreamAttribsNV (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (APIENTRYP PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -typedef void (APIENTRYP PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name); -typedef GLint (APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKSTREAMATTRIBSNVPROC) (GLsizei count, const GLint *attribs, GLsizei nbuffers, const GLint *bufstreams, GLenum bufferMode); -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_EXT_bindable_uniform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformBufferEXT (GLuint program, GLint location, GLuint buffer); -GLAPI GLint APIENTRY glGetUniformBufferSizeEXT (GLuint program, GLint location); -GLAPI GLintptr APIENTRY glGetUniformOffsetEXT (GLuint program, GLint location); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer); -typedef GLint (APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location); -typedef GLintptr (APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location); -#endif - -#ifndef GL_EXT_texture_integer -#define GL_EXT_texture_integer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexParameterIivEXT (GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTexParameterIuivEXT (GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTexParameterIivEXT (GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTexParameterIuivEXT (GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glClearColorIiEXT (GLint red, GLint green, GLint blue, GLint alpha); -GLAPI void APIENTRY glClearColorIuiEXT (GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha); -typedef void (APIENTRYP PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif - -#ifndef GL_GREMEDY_frame_terminator -#define GL_GREMEDY_frame_terminator 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameTerminatorGREMEDY (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMETERMINATORGREMEDYPROC) (void); -#endif - -#ifndef GL_NV_conditional_render -#define GL_NV_conditional_render 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginConditionalRenderNV (GLuint id, GLenum mode); -GLAPI void APIENTRY glEndConditionalRenderNV (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode); -typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVPROC) (void); -#endif - -#ifndef GL_NV_present_video -#define GL_NV_present_video 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPresentFrameKeyedNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); -GLAPI void APIENTRY glPresentFrameDualFillNV (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -GLAPI void APIENTRY glGetVideoivNV (GLuint video_slot, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideouivNV (GLuint video_slot, GLenum pname, GLuint *params); -GLAPI void APIENTRY glGetVideoi64vNV (GLuint video_slot, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetVideoui64vNV (GLuint video_slot, GLenum pname, GLuint64EXT *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); -typedef void (APIENTRYP PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -typedef void (APIENTRYP PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_transform_feedback -#define GL_EXT_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackEXT (GLenum primitiveMode); -GLAPI void APIENTRY glEndTransformFeedbackEXT (void); -GLAPI void APIENTRY glBindBufferRangeEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -GLAPI void APIENTRY glBindBufferOffsetEXT (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -GLAPI void APIENTRY glBindBufferBaseEXT (GLenum target, GLuint index, GLuint buffer); -GLAPI void APIENTRY glTransformFeedbackVaryingsEXT (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -GLAPI void APIENTRY glGetTransformFeedbackVaryingEXT (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode); -typedef void (APIENTRYP PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (APIENTRYP PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode); -typedef void (APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -#endif - -#ifndef GL_EXT_direct_state_access -#define GL_EXT_direct_state_access 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClientAttribDefaultEXT (GLbitfield mask); -GLAPI void APIENTRY glPushClientAttribDefaultEXT (GLbitfield mask); -GLAPI void APIENTRY glMatrixLoadfEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixLoaddEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixMultfEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixMultdEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixLoadIdentityEXT (GLenum mode); -GLAPI void APIENTRY glMatrixRotatefEXT (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixRotatedEXT (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixScalefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixScaledEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixTranslatefEXT (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -GLAPI void APIENTRY glMatrixTranslatedEXT (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glMatrixFrustumEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glMatrixOrthoEXT (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void APIENTRY glMatrixPopEXT (GLenum mode); -GLAPI void APIENTRY glMatrixPushEXT (GLenum mode); -GLAPI void APIENTRY glMatrixLoadTransposefEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixLoadTransposedEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glMatrixMultTransposefEXT (GLenum mode, const GLfloat *m); -GLAPI void APIENTRY glMatrixMultTransposedEXT (GLenum mode, const GLdouble *m); -GLAPI void APIENTRY glTextureParameterfEXT (GLuint texture, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glTextureParameteriEXT (GLuint texture, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetTextureImageEXT (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glGetTextureParameterfvEXT (GLuint texture, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTextureParameterivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTextureLevelParameterfvEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetTextureLevelParameterivEXT (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void APIENTRY glTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glMultiTexParameterfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexParameteriEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void APIENTRY glCopyMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void APIENTRY glCopyMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void APIENTRY glCopyMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetMultiTexImageEXT (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -GLAPI void APIENTRY glGetMultiTexParameterfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexParameterivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexLevelParameterfvEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexLevelParameterivEXT (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void APIENTRY glMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -GLAPI void APIENTRY glCopyMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void APIENTRY glBindMultiTextureEXT (GLenum texunit, GLenum target, GLuint texture); -GLAPI void APIENTRY glEnableClientStateIndexedEXT (GLenum array, GLuint index); -GLAPI void APIENTRY glDisableClientStateIndexedEXT (GLenum array, GLuint index); -GLAPI void APIENTRY glMultiTexCoordPointerEXT (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glMultiTexEnvfEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexEnviEXT (GLenum texunit, GLenum target, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexGendEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -GLAPI void APIENTRY glMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); -GLAPI void APIENTRY glMultiTexGenfEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -GLAPI void APIENTRY glMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glMultiTexGeniEXT (GLenum texunit, GLenum coord, GLenum pname, GLint param); -GLAPI void APIENTRY glMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); -GLAPI void APIENTRY glGetMultiTexEnvfvEXT (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexEnvivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexGendvEXT (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glGetMultiTexGenfvEXT (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetMultiTexGenivEXT (GLenum texunit, GLenum coord, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetFloatIndexedvEXT (GLenum target, GLuint index, GLfloat *data); -GLAPI void APIENTRY glGetDoubleIndexedvEXT (GLenum target, GLuint index, GLdouble *data); -GLAPI void APIENTRY glGetPointerIndexedvEXT (GLenum target, GLuint index, GLvoid* *data); -GLAPI void APIENTRY glCompressedTextureImage3DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureImage2DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureImage1DEXT (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage3DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage2DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedTextureSubImage1DEXT (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glGetCompressedTextureImageEXT (GLuint texture, GLenum target, GLint lod, GLvoid *img); -GLAPI void APIENTRY glCompressedMultiTexImage3DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexImage2DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexImage1DEXT (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage3DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage2DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glCompressedMultiTexSubImage1DEXT (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -GLAPI void APIENTRY glGetCompressedMultiTexImageEXT (GLenum texunit, GLenum target, GLint lod, GLvoid *img); -GLAPI void APIENTRY glNamedProgramStringEXT (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string); -GLAPI void APIENTRY glNamedProgramLocalParameter4dEXT (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glNamedProgramLocalParameter4dvEXT (GLuint program, GLenum target, GLuint index, const GLdouble *params); -GLAPI void APIENTRY glNamedProgramLocalParameter4fEXT (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glNamedProgramLocalParameter4fvEXT (GLuint program, GLenum target, GLuint index, const GLfloat *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterdvEXT (GLuint program, GLenum target, GLuint index, GLdouble *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterfvEXT (GLuint program, GLenum target, GLuint index, GLfloat *params); -GLAPI void APIENTRY glGetNamedProgramivEXT (GLuint program, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetNamedProgramStringEXT (GLuint program, GLenum target, GLenum pname, GLvoid *string); -GLAPI void APIENTRY glNamedProgramLocalParameters4fvEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glNamedProgramLocalParameterI4iEXT (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -GLAPI void APIENTRY glNamedProgramLocalParameterI4ivEXT (GLuint program, GLenum target, GLuint index, const GLint *params); -GLAPI void APIENTRY glNamedProgramLocalParametersI4ivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glNamedProgramLocalParameterI4uiEXT (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -GLAPI void APIENTRY glNamedProgramLocalParameterI4uivEXT (GLuint program, GLenum target, GLuint index, const GLuint *params); -GLAPI void APIENTRY glNamedProgramLocalParametersI4uivEXT (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterIivEXT (GLuint program, GLenum target, GLuint index, GLint *params); -GLAPI void APIENTRY glGetNamedProgramLocalParameterIuivEXT (GLuint program, GLenum target, GLuint index, GLuint *params); -GLAPI void APIENTRY glTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetTextureParameterIivEXT (GLuint texture, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetTextureParameterIuivEXT (GLuint texture, GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -GLAPI void APIENTRY glMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); -GLAPI void APIENTRY glGetMultiTexParameterIivEXT (GLenum texunit, GLenum target, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetMultiTexParameterIuivEXT (GLenum texunit, GLenum target, GLenum pname, GLuint *params); -GLAPI void APIENTRY glProgramUniform1fEXT (GLuint program, GLint location, GLfloat v0); -GLAPI void APIENTRY glProgramUniform2fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1); -GLAPI void APIENTRY glProgramUniform3fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -GLAPI void APIENTRY glProgramUniform4fEXT (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -GLAPI void APIENTRY glProgramUniform1iEXT (GLuint program, GLint location, GLint v0); -GLAPI void APIENTRY glProgramUniform2iEXT (GLuint program, GLint location, GLint v0, GLint v1); -GLAPI void APIENTRY glProgramUniform3iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -GLAPI void APIENTRY glProgramUniform4iEXT (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -GLAPI void APIENTRY glProgramUniform1fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform2fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform3fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform4fvEXT (GLuint program, GLint location, GLsizei count, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform2ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform3ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniform4ivEXT (GLuint program, GLint location, GLsizei count, const GLint *value); -GLAPI void APIENTRY glProgramUniformMatrix2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3fvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -GLAPI void APIENTRY glProgramUniform1uiEXT (GLuint program, GLint location, GLuint v0); -GLAPI void APIENTRY glProgramUniform2uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1); -GLAPI void APIENTRY glProgramUniform3uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -GLAPI void APIENTRY glProgramUniform4uiEXT (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -GLAPI void APIENTRY glProgramUniform1uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform2uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform3uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glProgramUniform4uivEXT (GLuint program, GLint location, GLsizei count, const GLuint *value); -GLAPI void APIENTRY glNamedBufferDataEXT (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage); -GLAPI void APIENTRY glNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data); -GLAPI GLvoid* APIENTRY glMapNamedBufferEXT (GLuint buffer, GLenum access); -GLAPI GLboolean APIENTRY glUnmapNamedBufferEXT (GLuint buffer); -GLAPI GLvoid* APIENTRY glMapNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -GLAPI void APIENTRY glFlushMappedNamedBufferRangeEXT (GLuint buffer, GLintptr offset, GLsizeiptr length); -GLAPI void APIENTRY glNamedCopyBufferSubDataEXT (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -GLAPI void APIENTRY glGetNamedBufferParameterivEXT (GLuint buffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetNamedBufferPointervEXT (GLuint buffer, GLenum pname, GLvoid* *params); -GLAPI void APIENTRY glGetNamedBufferSubDataEXT (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data); -GLAPI void APIENTRY glTextureBufferEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glMultiTexBufferEXT (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -GLAPI void APIENTRY glNamedRenderbufferStorageEXT (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glGetNamedRenderbufferParameterivEXT (GLuint renderbuffer, GLenum pname, GLint *params); -GLAPI GLenum APIENTRY glCheckNamedFramebufferStatusEXT (GLuint framebuffer, GLenum target); -GLAPI void APIENTRY glNamedFramebufferTexture1DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTexture2DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTexture3DEXT (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -GLAPI void APIENTRY glNamedFramebufferRenderbufferEXT (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -GLAPI void APIENTRY glGetNamedFramebufferAttachmentParameterivEXT (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); -GLAPI void APIENTRY glGenerateTextureMipmapEXT (GLuint texture, GLenum target); -GLAPI void APIENTRY glGenerateMultiTexMipmapEXT (GLenum texunit, GLenum target); -GLAPI void APIENTRY glFramebufferDrawBufferEXT (GLuint framebuffer, GLenum mode); -GLAPI void APIENTRY glFramebufferDrawBuffersEXT (GLuint framebuffer, GLsizei n, const GLenum *bufs); -GLAPI void APIENTRY glFramebufferReadBufferEXT (GLuint framebuffer, GLenum mode); -GLAPI void APIENTRY glGetFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params); -GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleEXT (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glNamedRenderbufferStorageMultisampleCoverageEXT (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -GLAPI void APIENTRY glNamedFramebufferTextureEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -GLAPI void APIENTRY glNamedFramebufferTextureLayerEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -GLAPI void APIENTRY glNamedFramebufferTextureFaceEXT (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -GLAPI void APIENTRY glTextureRenderbufferEXT (GLuint texture, GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glMultiTexRenderbufferEXT (GLenum texunit, GLenum target, GLuint renderbuffer); -GLAPI void APIENTRY glProgramUniform1dEXT (GLuint program, GLint location, GLdouble x); -GLAPI void APIENTRY glProgramUniform2dEXT (GLuint program, GLint location, GLdouble x, GLdouble y); -GLAPI void APIENTRY glProgramUniform3dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glProgramUniform4dEXT (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glProgramUniform1dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform2dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform3dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniform4dvEXT (GLuint program, GLint location, GLsizei count, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix2x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix3x4dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x2dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -GLAPI void APIENTRY glProgramUniformMatrix4x3dvEXT (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLMATRIXLOADFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXLOADDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXMULTFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXMULTDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXROTATEFEXTPROC) (GLenum mode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXROTATEDEXTPROC) (GLenum mode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXSCALEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXSCALEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum mode, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum mode, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLMATRIXFRUSTUMEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLMATRIXORTHOEXTPROC) (GLenum mode, GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -typedef void (APIENTRYP PFNGLMATRIXPOPEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXPUSHEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum mode, const GLfloat *m); -typedef void (APIENTRYP PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum mode, const GLdouble *m); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (APIENTRYP PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (APIENTRYP PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -typedef void (APIENTRYP PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble *params); -typedef void (APIENTRYP PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat *data); -typedef void (APIENTRYP PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble *data); -typedef void (APIENTRYP PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, GLvoid* *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint lod, GLvoid *img); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint lod, GLvoid *img); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint *params); -typedef void (APIENTRYP PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint *value); -typedef void (APIENTRYP PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer); -typedef GLvoid* (APIENTRYP PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (APIENTRYP PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (APIENTRYP PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef void (APIENTRYP PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint *params); -typedef GLenum (APIENTRYP PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target); -typedef void (APIENTRYP PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (APIENTRYP PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (APIENTRYP PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DEXTPROC) (GLuint program, GLint location, GLdouble x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DEXTPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4DVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX2X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX3X4DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X2DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMMATRIX4X3DVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble *value); -#endif - -#ifndef GL_EXT_vertex_array_bgra -#define GL_EXT_vertex_array_bgra 1 -#endif - -#ifndef GL_EXT_texture_swizzle -#define GL_EXT_texture_swizzle 1 -#endif - -#ifndef GL_NV_explicit_multisample -#define GL_NV_explicit_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetMultisamplefvNV (GLenum pname, GLuint index, GLfloat *val); -GLAPI void APIENTRY glSampleMaskIndexedNV (GLuint index, GLbitfield mask); -GLAPI void APIENTRY glTexRenderbufferNV (GLenum target, GLuint renderbuffer); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat *val); -typedef void (APIENTRYP PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask); -typedef void (APIENTRYP PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer); -#endif - -#ifndef GL_NV_transform_feedback2 -#define GL_NV_transform_feedback2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindTransformFeedbackNV (GLenum target, GLuint id); -GLAPI void APIENTRY glDeleteTransformFeedbacksNV (GLsizei n, const GLuint *ids); -GLAPI void APIENTRY glGenTransformFeedbacksNV (GLsizei n, GLuint *ids); -GLAPI GLboolean APIENTRY glIsTransformFeedbackNV (GLuint id); -GLAPI void APIENTRY glPauseTransformFeedbackNV (void); -GLAPI void APIENTRY glResumeTransformFeedbackNV (void); -GLAPI void APIENTRY glDrawTransformFeedbackNV (GLenum mode, GLuint id); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint *ids); -typedef void (APIENTRYP PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id); -#endif - -#ifndef GL_ATI_meminfo -#define GL_ATI_meminfo 1 -#endif - -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetPerfMonitorGroupsAMD (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -GLAPI void APIENTRY glGetPerfMonitorCountersAMD (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -GLAPI void APIENTRY glGetPerfMonitorGroupStringAMD (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -GLAPI void APIENTRY glGetPerfMonitorCounterStringAMD (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -GLAPI void APIENTRY glGetPerfMonitorCounterInfoAMD (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -GLAPI void APIENTRY glGenPerfMonitorsAMD (GLsizei n, GLuint *monitors); -GLAPI void APIENTRY glDeletePerfMonitorsAMD (GLsizei n, GLuint *monitors); -GLAPI void APIENTRY glSelectPerfMonitorCountersAMD (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -GLAPI void APIENTRY glBeginPerfMonitorAMD (GLuint monitor); -GLAPI void APIENTRY glEndPerfMonitorAMD (GLuint monitor); -GLAPI void APIENTRY glGetPerfMonitorCounterDataAMD (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint *numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint *numCounters, GLint *maxActiveCounters, GLsizei counterSize, GLuint *counters); -typedef void (APIENTRYP PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei *length, GLchar *groupString); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei *length, GLchar *counterString); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, GLvoid *data); -typedef void (APIENTRYP PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (APIENTRYP PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint *monitors); -typedef void (APIENTRYP PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint *counterList); -typedef void (APIENTRYP PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (APIENTRYP PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint *data, GLint *bytesWritten); -#endif - -#ifndef GL_AMD_texture_texture4 -#define GL_AMD_texture_texture4 1 -#endif - -#ifndef GL_AMD_vertex_shader_tesselator -#define GL_AMD_vertex_shader_tesselator 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTessellationFactorAMD (GLfloat factor); -GLAPI void APIENTRY glTessellationModeAMD (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_provoking_vertex -#define GL_EXT_provoking_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProvokingVertexEXT (GLenum mode); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_texture_snorm -#define GL_EXT_texture_snorm 1 -#endif - -#ifndef GL_AMD_draw_buffers_blend -#define GL_AMD_draw_buffers_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncIndexedAMD (GLuint buf, GLenum src, GLenum dst); -GLAPI void APIENTRY glBlendFuncSeparateIndexedAMD (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -GLAPI void APIENTRY glBlendEquationIndexedAMD (GLuint buf, GLenum mode); -GLAPI void APIENTRY glBlendEquationSeparateIndexedAMD (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode); -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_APPLE_texture_range -#define GL_APPLE_texture_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureRangeAPPLE (GLenum target, GLsizei length, const GLvoid *pointer); -GLAPI void APIENTRY glGetTexParameterPointervAPPLE (GLenum target, GLenum pname, GLvoid* *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_APPLE_float_pixels -#define GL_APPLE_float_pixels 1 -#endif - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_APPLE_vertex_program_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glEnableVertexAttribAPPLE (GLuint index, GLenum pname); -GLAPI void APIENTRY glDisableVertexAttribAPPLE (GLuint index, GLenum pname); -GLAPI GLboolean APIENTRY glIsVertexAttribEnabledAPPLE (GLuint index, GLenum pname); -GLAPI void APIENTRY glMapVertexAttrib1dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -GLAPI void APIENTRY glMapVertexAttrib1fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -GLAPI void APIENTRY glMapVertexAttrib2dAPPLE (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -GLAPI void APIENTRY glMapVertexAttrib2fAPPLE (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef GLboolean (APIENTRYP PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -typedef void (APIENTRYP PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -#endif - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_APPLE_aux_depth_stencil 1 -#endif - -#ifndef GL_APPLE_object_purgeable -#define GL_APPLE_object_purgeable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLenum APIENTRY glObjectPurgeableAPPLE (GLenum objectType, GLuint name, GLenum option); -GLAPI GLenum APIENTRY glObjectUnpurgeableAPPLE (GLenum objectType, GLuint name, GLenum option); -GLAPI void APIENTRY glGetObjectParameterivAPPLE (GLenum objectType, GLuint name, GLenum pname, GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLenum (APIENTRYP PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef GLenum (APIENTRYP PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint *params); -#endif - -#ifndef GL_APPLE_row_bytes -#define GL_APPLE_row_bytes 1 -#endif - -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 -#endif - -#ifndef GL_NV_video_capture -#define GL_NV_video_capture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVideoCaptureNV (GLuint video_capture_slot); -GLAPI void APIENTRY glBindVideoCaptureStreamBufferNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -GLAPI void APIENTRY glBindVideoCaptureStreamTextureNV (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -GLAPI void APIENTRY glEndVideoCaptureNV (GLuint video_capture_slot); -GLAPI void APIENTRY glGetVideoCaptureivNV (GLuint video_capture_slot, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideoCaptureStreamivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params); -GLAPI void APIENTRY glGetVideoCaptureStreamfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params); -GLAPI void APIENTRY glGetVideoCaptureStreamdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params); -GLAPI GLenum APIENTRY glVideoCaptureNV (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time); -GLAPI void APIENTRY glVideoCaptureStreamParameterivNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params); -GLAPI void APIENTRY glVideoCaptureStreamParameterfvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params); -GLAPI void APIENTRY glVideoCaptureStreamParameterdvNV (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -typedef void (APIENTRYP PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble *params); -typedef GLenum (APIENTRYP PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint *sequence_num, GLuint64EXT *capture_time); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble *params); -#endif - -#ifndef GL_NV_copy_image -#define GL_NV_copy_image 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyImageSubDataNV (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif - -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUseShaderProgramEXT (GLenum type, GLuint program); -GLAPI void APIENTRY glActiveProgramEXT (GLuint program); -GLAPI GLuint APIENTRY glCreateShaderProgramEXT (GLenum type, const GLchar *string); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program); -typedef void (APIENTRYP PFNGLACTIVEPROGRAMEXTPROC) (GLuint program); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar *string); -#endif - -#ifndef GL_NV_parameter_buffer_object2 -#define GL_NV_parameter_buffer_object2 1 -#endif - -#ifndef GL_NV_shader_buffer_load -#define GL_NV_shader_buffer_load 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMakeBufferResidentNV (GLenum target, GLenum access); -GLAPI void APIENTRY glMakeBufferNonResidentNV (GLenum target); -GLAPI GLboolean APIENTRY glIsBufferResidentNV (GLenum target); -GLAPI void APIENTRY glMakeNamedBufferResidentNV (GLuint buffer, GLenum access); -GLAPI void APIENTRY glMakeNamedBufferNonResidentNV (GLuint buffer); -GLAPI GLboolean APIENTRY glIsNamedBufferResidentNV (GLuint buffer); -GLAPI void APIENTRY glGetBufferParameterui64vNV (GLenum target, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glGetNamedBufferParameterui64vNV (GLuint buffer, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glGetIntegerui64vNV (GLenum value, GLuint64EXT *result); -GLAPI void APIENTRY glUniformui64NV (GLint location, GLuint64EXT value); -GLAPI void APIENTRY glUniformui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glGetUniformui64vNV (GLuint program, GLint location, GLuint64EXT *params); -GLAPI void APIENTRY glProgramUniformui64NV (GLuint program, GLint location, GLuint64EXT value); -GLAPI void APIENTRY glProgramUniformui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access); -typedef void (APIENTRYP PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target); -typedef GLboolean (APIENTRYP PFNGLISBUFFERRESIDENTNVPROC) (GLenum target); -typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access); -typedef void (APIENTRYP PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer); -typedef GLboolean (APIENTRYP PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT *result); -typedef void (APIENTRYP PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); -typedef void (APIENTRYP PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_NV_vertex_buffer_unified_memory 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferAddressRangeNV (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -GLAPI void APIENTRY glVertexFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glNormalFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glColorFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glIndexFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glTexCoordFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glEdgeFlagFormatNV (GLsizei stride); -GLAPI void APIENTRY glSecondaryColorFormatNV (GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glFogCoordFormatNV (GLenum type, GLsizei stride); -GLAPI void APIENTRY glVertexAttribFormatNV (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -GLAPI void APIENTRY glVertexAttribIFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); -GLAPI void APIENTRY glGetIntegerui64i_vNV (GLenum value, GLuint index, GLuint64EXT *result); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -typedef void (APIENTRYP PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -typedef void (APIENTRYP PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT *result); -#endif - -#ifndef GL_NV_texture_barrier -#define GL_NV_texture_barrier 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureBarrierNV (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTUREBARRIERNVPROC) (void); -#endif - -#ifndef GL_AMD_shader_stencil_export -#define GL_AMD_shader_stencil_export 1 -#endif - -#ifndef GL_AMD_seamless_cubemap_per_texture -#define GL_AMD_seamless_cubemap_per_texture 1 -#endif - -#ifndef GL_AMD_conservative_depth -#define GL_AMD_conservative_depth 1 -#endif - -#ifndef GL_EXT_shader_image_load_store -#define GL_EXT_shader_image_load_store 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindImageTextureEXT (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -GLAPI void APIENTRY glMemoryBarrierEXT (GLbitfield barriers); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -typedef void (APIENTRYP PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers); -#endif - -#ifndef GL_EXT_vertex_attrib_64bit -#define GL_EXT_vertex_attrib_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1dEXT (GLuint index, GLdouble x); -GLAPI void APIENTRY glVertexAttribL2dEXT (GLuint index, GLdouble x, GLdouble y); -GLAPI void APIENTRY glVertexAttribL3dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z); -GLAPI void APIENTRY glVertexAttribL4dEXT (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void APIENTRY glVertexAttribL1dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL2dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL3dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribL4dvEXT (GLuint index, const GLdouble *v); -GLAPI void APIENTRY glVertexAttribLPointerEXT (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -GLAPI void APIENTRY glGetVertexAttribLdvEXT (GLuint index, GLenum pname, GLdouble *params); -GLAPI void APIENTRY glVertexArrayVertexAttribLOffsetEXT (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -#endif - -#ifndef GL_NV_gpu_program5 -#define GL_NV_gpu_program5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramSubroutineParametersuivNV (GLenum target, GLsizei count, const GLuint *params); -GLAPI void APIENTRY glGetProgramSubroutineParameteruivNV (GLenum target, GLuint index, GLuint *param); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMSUBROUTINEPARAMETERSUIVNVPROC) (GLenum target, GLsizei count, const GLuint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSUBROUTINEPARAMETERUIVNVPROC) (GLenum target, GLuint index, GLuint *param); -#endif - -#ifndef GL_NV_gpu_shader5 -#define GL_NV_gpu_shader5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniform1i64NV (GLint location, GLint64EXT x); -GLAPI void APIENTRY glUniform2i64NV (GLint location, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glUniform3i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glUniform4i64NV (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glUniform1i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform2i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform3i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform4i64vNV (GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glUniform1ui64NV (GLint location, GLuint64EXT x); -GLAPI void APIENTRY glUniform2ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glUniform3ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glUniform4ui64NV (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glUniform1ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform2ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform3ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glUniform4ui64vNV (GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glGetUniformi64vNV (GLuint program, GLint location, GLint64EXT *params); -GLAPI void APIENTRY glProgramUniform1i64NV (GLuint program, GLint location, GLint64EXT x); -GLAPI void APIENTRY glProgramUniform2i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glProgramUniform3i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glProgramUniform4i64NV (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glProgramUniform1i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform2i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform3i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform4i64vNV (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -GLAPI void APIENTRY glProgramUniform1ui64NV (GLuint program, GLint location, GLuint64EXT x); -GLAPI void APIENTRY glProgramUniform2ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glProgramUniform3ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glProgramUniform4ui64NV (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glProgramUniform1ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform2ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform3ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -GLAPI void APIENTRY glProgramUniform4ui64vNV (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); -typedef void (APIENTRYP PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x); -typedef void (APIENTRYP PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT *params); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -typedef void (APIENTRYP PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT *value); -#endif - -#ifndef GL_NV_shader_buffer_store -#define GL_NV_shader_buffer_store 1 -#endif - -#ifndef GL_NV_tessellation_program5 -#define GL_NV_tessellation_program5 1 -#endif - -#ifndef GL_NV_vertex_attrib_integer_64bit -#define GL_NV_vertex_attrib_integer_64bit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribL1i64NV (GLuint index, GLint64EXT x); -GLAPI void APIENTRY glVertexAttribL2i64NV (GLuint index, GLint64EXT x, GLint64EXT y); -GLAPI void APIENTRY glVertexAttribL3i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -GLAPI void APIENTRY glVertexAttribL4i64NV (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -GLAPI void APIENTRY glVertexAttribL1i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL2i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL3i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL4i64vNV (GLuint index, const GLint64EXT *v); -GLAPI void APIENTRY glVertexAttribL1ui64NV (GLuint index, GLuint64EXT x); -GLAPI void APIENTRY glVertexAttribL2ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y); -GLAPI void APIENTRY glVertexAttribL3ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -GLAPI void APIENTRY glVertexAttribL4ui64NV (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -GLAPI void APIENTRY glVertexAttribL1ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL2ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL3ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glVertexAttribL4ui64vNV (GLuint index, const GLuint64EXT *v); -GLAPI void APIENTRY glGetVertexAttribLi64vNV (GLuint index, GLenum pname, GLint64EXT *params); -GLAPI void APIENTRY glGetVertexAttribLui64vNV (GLuint index, GLenum pname, GLuint64EXT *params); -GLAPI void APIENTRY glVertexAttribLFormatNV (GLuint index, GLint size, GLenum type, GLsizei stride); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT *v); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT *params); -typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -#endif - -#ifndef GL_NV_multisample_coverage -#define GL_NV_multisample_coverage 1 -#endif - -#ifndef GL_AMD_name_gen_delete -#define GL_AMD_name_gen_delete 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenNamesAMD (GLenum identifier, GLuint num, GLuint *names); -GLAPI void APIENTRY glDeleteNamesAMD (GLenum identifier, GLuint num, const GLuint *names); -GLAPI GLboolean APIENTRY glIsNameAMD (GLenum identifier, GLuint name); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint *names); -typedef void (APIENTRYP PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint *names); -typedef GLboolean (APIENTRYP PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name); -#endif - -#ifndef GL_AMD_debug_output -#define GL_AMD_debug_output 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDebugMessageEnableAMD (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -GLAPI void APIENTRY glDebugMessageInsertAMD (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); -GLAPI void APIENTRY glDebugMessageCallbackAMD (GLDEBUGPROCAMD callback, GLvoid *userParam); -GLAPI GLuint APIENTRY glGetDebugMessageLogAMD (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); -typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar *buf); -typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, GLvoid *userParam); -typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum *categories, GLuint *severities, GLuint *ids, GLsizei *lengths, GLchar *message); -#endif - -#ifndef GL_NV_vdpau_interop -#define GL_NV_vdpau_interop 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVDPAUInitNV (const GLvoid *vdpDevice, const GLvoid *getProcAddress); -GLAPI void APIENTRY glVDPAUFiniNV (void); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface); -GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface); -GLAPI void APIENTRY glVDPAUGetSurfaceivNV (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -GLAPI void APIENTRY glVDPAUSurfaceAccessNV (GLvdpauSurfaceNV surface, GLenum access); -GLAPI void APIENTRY glVDPAUMapSurfacesNV (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); -GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const GLvoid *vdpDevice, const GLvoid *getProcAddress); -typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (APIENTRYP PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); -typedef void (APIENTRYP PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access); -typedef void (APIENTRYP PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV *surfaces); -typedef void (APIENTRYP PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV *surfaces); -#endif - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#define GL_AMD_transform_feedback3_lines_triangles 1 -#endif - - -#ifdef __cplusplus -} -#endif - -#endif -#endif /* NO_SDL_GLEXT */ - -#endif /* !__IPHONEOS__ */ - -#endif /* _SDL_opengl_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_pixels.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_pixels.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_pixels.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_pixels.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,429 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_pixels.h - * - * Header for the enumerated pixel format definitions. - */ - -#ifndef _SDL_pixels_h -#define _SDL_pixels_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name Transparency definitions - * - * These define alpha as the opacity of a surface. - */ -/* @{ */ -#define SDL_ALPHA_OPAQUE 255 -#define SDL_ALPHA_TRANSPARENT 0 -/* @} */ - -/** Pixel type. */ -enum -{ - SDL_PIXELTYPE_UNKNOWN, - SDL_PIXELTYPE_INDEX1, - SDL_PIXELTYPE_INDEX4, - SDL_PIXELTYPE_INDEX8, - SDL_PIXELTYPE_PACKED8, - SDL_PIXELTYPE_PACKED16, - SDL_PIXELTYPE_PACKED32, - SDL_PIXELTYPE_ARRAYU8, - SDL_PIXELTYPE_ARRAYU16, - SDL_PIXELTYPE_ARRAYU32, - SDL_PIXELTYPE_ARRAYF16, - SDL_PIXELTYPE_ARRAYF32 -}; - -/** Bitmap pixel order, high bit -> low bit. */ -enum -{ - SDL_BITMAPORDER_NONE, - SDL_BITMAPORDER_4321, - SDL_BITMAPORDER_1234 -}; - -/** Packed component order, high bit -> low bit. */ -enum -{ - SDL_PACKEDORDER_NONE, - SDL_PACKEDORDER_XRGB, - SDL_PACKEDORDER_RGBX, - SDL_PACKEDORDER_ARGB, - SDL_PACKEDORDER_RGBA, - SDL_PACKEDORDER_XBGR, - SDL_PACKEDORDER_BGRX, - SDL_PACKEDORDER_ABGR, - SDL_PACKEDORDER_BGRA -}; - -/** Array component order, low byte -> high byte. */ -enum -{ - SDL_ARRAYORDER_NONE, - SDL_ARRAYORDER_RGB, - SDL_ARRAYORDER_RGBA, - SDL_ARRAYORDER_ARGB, - SDL_ARRAYORDER_BGR, - SDL_ARRAYORDER_BGRA, - SDL_ARRAYORDER_ABGR -}; - -/** Packed component layout. */ -enum -{ - SDL_PACKEDLAYOUT_NONE, - SDL_PACKEDLAYOUT_332, - SDL_PACKEDLAYOUT_4444, - SDL_PACKEDLAYOUT_1555, - SDL_PACKEDLAYOUT_5551, - SDL_PACKEDLAYOUT_565, - SDL_PACKEDLAYOUT_8888, - SDL_PACKEDLAYOUT_2101010, - SDL_PACKEDLAYOUT_1010102 -}; - -#define SDL_DEFINE_PIXELFOURCC(A, B, C, D) SDL_FOURCC(A, B, C, D) - -#define SDL_DEFINE_PIXELFORMAT(type, order, layout, bits, bytes) \ - ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \ - ((bits) << 8) | ((bytes) << 0)) - -#define SDL_PIXELFLAG(X) (((X) >> 28) & 0x0F) -#define SDL_PIXELTYPE(X) (((X) >> 24) & 0x0F) -#define SDL_PIXELORDER(X) (((X) >> 20) & 0x0F) -#define SDL_PIXELLAYOUT(X) (((X) >> 16) & 0x0F) -#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF) -#define SDL_BYTESPERPIXEL(X) \ - (SDL_ISPIXELFORMAT_FOURCC(X) ? \ - ((((X) == SDL_PIXELFORMAT_YUY2) || \ - ((X) == SDL_PIXELFORMAT_UYVY) || \ - ((X) == SDL_PIXELFORMAT_YVYU)) ? 2 : 1) : (((X) >> 0) & 0xFF)) - -#define SDL_ISPIXELFORMAT_INDEXED(format) \ - (!SDL_ISPIXELFORMAT_FOURCC(format) && \ - ((SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX1) || \ - (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX4) || \ - (SDL_PIXELTYPE(format) == SDL_PIXELTYPE_INDEX8))) - -#define SDL_ISPIXELFORMAT_ALPHA(format) \ - (!SDL_ISPIXELFORMAT_FOURCC(format) && \ - ((SDL_PIXELORDER(format) == SDL_PACKEDORDER_ARGB) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_RGBA) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_ABGR) || \ - (SDL_PIXELORDER(format) == SDL_PACKEDORDER_BGRA))) - -/* The flag is set to 1 because 0x1? is not in the printable ASCII range */ -#define SDL_ISPIXELFORMAT_FOURCC(format) \ - ((format) && (SDL_PIXELFLAG(format) != 1)) - -/* Note: If you modify this list, update SDL_GetPixelFormatName() */ -enum -{ - SDL_PIXELFORMAT_UNKNOWN, - SDL_PIXELFORMAT_INDEX1LSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_4321, 0, - 1, 0), - SDL_PIXELFORMAT_INDEX1MSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX1, SDL_BITMAPORDER_1234, 0, - 1, 0), - SDL_PIXELFORMAT_INDEX4LSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_4321, 0, - 4, 0), - SDL_PIXELFORMAT_INDEX4MSB = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX4, SDL_BITMAPORDER_1234, 0, - 4, 0), - SDL_PIXELFORMAT_INDEX8 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_INDEX8, 0, 0, 8, 1), - SDL_PIXELFORMAT_RGB332 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED8, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_332, 8, 1), - SDL_PIXELFORMAT_RGB444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_4444, 12, 2), - SDL_PIXELFORMAT_RGB555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_BGR555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_1555, 15, 2), - SDL_PIXELFORMAT_ARGB4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_RGBA4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_ABGR4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_BGRA4444 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_4444, 16, 2), - SDL_PIXELFORMAT_ARGB1555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_1555, 16, 2), - SDL_PIXELFORMAT_RGBA5551 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_5551, 16, 2), - SDL_PIXELFORMAT_ABGR1555 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_1555, 16, 2), - SDL_PIXELFORMAT_BGRA5551 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_5551, 16, 2), - SDL_PIXELFORMAT_RGB565 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_565, 16, 2), - SDL_PIXELFORMAT_BGR565 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED16, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_565, 16, 2), - SDL_PIXELFORMAT_RGB24 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_RGB, 0, - 24, 3), - SDL_PIXELFORMAT_BGR24 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_ARRAYU8, SDL_ARRAYORDER_BGR, 0, - 24, 3), - SDL_PIXELFORMAT_RGB888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XRGB, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_RGBX8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBX, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGR888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_XBGR, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_BGRX8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRX, - SDL_PACKEDLAYOUT_8888, 24, 4), - SDL_PIXELFORMAT_ARGB8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_RGBA8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_RGBA, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_ABGR8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ABGR, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_BGRA8888 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_BGRA, - SDL_PACKEDLAYOUT_8888, 32, 4), - SDL_PIXELFORMAT_ARGB2101010 = - SDL_DEFINE_PIXELFORMAT(SDL_PIXELTYPE_PACKED32, SDL_PACKEDORDER_ARGB, - SDL_PACKEDLAYOUT_2101010, 32, 4), - - SDL_PIXELFORMAT_YV12 = /**< Planar mode: Y + V + U (3 planes) */ - SDL_DEFINE_PIXELFOURCC('Y', 'V', '1', '2'), - SDL_PIXELFORMAT_IYUV = /**< Planar mode: Y + U + V (3 planes) */ - SDL_DEFINE_PIXELFOURCC('I', 'Y', 'U', 'V'), - SDL_PIXELFORMAT_YUY2 = /**< Packed mode: Y0+U0+Y1+V0 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', '2'), - SDL_PIXELFORMAT_UYVY = /**< Packed mode: U0+Y0+V0+Y1 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('U', 'Y', 'V', 'Y'), - SDL_PIXELFORMAT_YVYU = /**< Packed mode: Y0+V0+Y1+U0 (1 plane) */ - SDL_DEFINE_PIXELFOURCC('Y', 'V', 'Y', 'U') -}; - -typedef struct SDL_Color -{ - Uint8 r; - Uint8 g; - Uint8 b; - Uint8 a; -} SDL_Color; -#define SDL_Colour SDL_Color - -typedef struct SDL_Palette -{ - int ncolors; - SDL_Color *colors; - Uint32 version; - int refcount; -} SDL_Palette; - -/** - * \note Everything in the pixel format structure is read-only. - */ -typedef struct SDL_PixelFormat -{ - Uint32 format; - SDL_Palette *palette; - Uint8 BitsPerPixel; - Uint8 BytesPerPixel; - Uint8 padding[2]; - Uint32 Rmask; - Uint32 Gmask; - Uint32 Bmask; - Uint32 Amask; - Uint8 Rloss; - Uint8 Gloss; - Uint8 Bloss; - Uint8 Aloss; - Uint8 Rshift; - Uint8 Gshift; - Uint8 Bshift; - Uint8 Ashift; - int refcount; - struct SDL_PixelFormat *next; -} SDL_PixelFormat; - -/** - * \brief Get the human readable name of a pixel format - */ -extern DECLSPEC const char* SDLCALL SDL_GetPixelFormatName(Uint32 format); - -/** - * \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks. - * - * \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible. - * - * \sa SDL_MasksToPixelFormatEnum() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format, - int *bpp, - Uint32 * Rmask, - Uint32 * Gmask, - Uint32 * Bmask, - Uint32 * Amask); - -/** - * \brief Convert a bpp and RGBA masks to an enumerated pixel format. - * - * \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion - * wasn't possible. - * - * \sa SDL_PixelFormatEnumToMasks() - */ -extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp, - Uint32 Rmask, - Uint32 Gmask, - Uint32 Bmask, - Uint32 Amask); - -/** - * \brief Create an SDL_PixelFormat structure from a pixel format enum. - */ -extern DECLSPEC SDL_PixelFormat * SDLCALL SDL_AllocFormat(Uint32 pixel_format); - -/** - * \brief Free an SDL_PixelFormat structure. - */ -extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format); - -/** - * \brief Create a palette structure with the specified number of color - * entries. - * - * \return A new palette, or NULL if there wasn't enough memory. - * - * \note The palette entries are initialized to white. - * - * \sa SDL_FreePalette() - */ -extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors); - -/** - * \brief Set the palette for a pixel format structure. - */ -extern DECLSPEC int SDLCALL SDL_SetPixelFormatPalette(SDL_PixelFormat * format, - SDL_Palette *palette); - -/** - * \brief Set a range of colors in a palette. - * - * \param palette The palette to modify. - * \param colors An array of colors to copy into the palette. - * \param firstcolor The index of the first palette entry to modify. - * \param ncolors The number of entries to modify. - * - * \return 0 on success, or -1 if not all of the colors could be set. - */ -extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette, - const SDL_Color * colors, - int firstcolor, int ncolors); - -/** - * \brief Free a palette created with SDL_AllocPalette(). - * - * \sa SDL_AllocPalette() - */ -extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette); - -/** - * \brief Maps an RGB triple to an opaque pixel value for a given pixel format. - * - * \sa SDL_MapRGBA - */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format, - Uint8 r, Uint8 g, Uint8 b); - -/** - * \brief Maps an RGBA quadruple to a pixel value for a given pixel format. - * - * \sa SDL_MapRGB - */ -extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the RGB components from a pixel of the specified format. - * - * \sa SDL_GetRGBA - */ -extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel, - const SDL_PixelFormat * format, - Uint8 * r, Uint8 * g, Uint8 * b); - -/** - * \brief Get the RGBA components from a pixel of the specified format. - * - * \sa SDL_GetRGB - */ -extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel, - const SDL_PixelFormat * format, - Uint8 * r, Uint8 * g, Uint8 * b, - Uint8 * a); - -/** - * \brief Calculate a 256 entry gamma ramp for a gamma value. - */ -extern DECLSPEC void SDLCALL SDL_CalculateGammaRamp(float gamma, Uint16 * ramp); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_pixels_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_platform.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_platform.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_platform.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_platform.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,164 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_platform.h - * - * Try to get a standard set of platform defines. - */ - -#ifndef _SDL_platform_h -#define _SDL_platform_h - -#if defined(_AIX) -#undef __AIX__ -#define __AIX__ 1 -#endif -#if defined(__HAIKU__) -#undef __HAIKU__ -#define __HAIKU__ 1 -#endif -#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__) -#undef __BSDI__ -#define __BSDI__ 1 -#endif -#if defined(_arch_dreamcast) -#undef __DREAMCAST__ -#define __DREAMCAST__ 1 -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -#undef __FREEBSD__ -#define __FREEBSD__ 1 -#endif -#if defined(hpux) || defined(__hpux) || defined(__hpux__) -#undef __HPUX__ -#define __HPUX__ 1 -#endif -#if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE) -#undef __IRIX__ -#define __IRIX__ 1 -#endif -#if defined(linux) || defined(__linux) || defined(__linux__) -#undef __LINUX__ -#define __LINUX__ 1 -#endif -#if defined(ANDROID) || defined(__ANDROID__) -#undef __ANDROID__ -#undef __LINUX__ /* do we need to do this? */ -#define __ANDROID__ 1 -#endif - -#if defined(__APPLE__) -/* lets us know what version of Mac OS X we're compiling on */ -#include "AvailabilityMacros.h" -#include "TargetConditionals.h" -#if TARGET_OS_IPHONE -/* if compiling for iPhone */ -#undef __IPHONEOS__ -#define __IPHONEOS__ 1 -#undef __MACOSX__ -#else -/* if not compiling for iPhone */ -#undef __MACOSX__ -#define __MACOSX__ 1 -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 -# error SDL for Mac OS X only supports deploying on 10.5 and above. -#endif /* MAC_OS_X_VERSION_MIN_REQUIRED < 1050 */ -#endif /* TARGET_OS_IPHONE */ -#endif /* defined(__APPLE__) */ - -#if defined(__NetBSD__) -#undef __NETBSD__ -#define __NETBSD__ 1 -#endif -#if defined(__OpenBSD__) -#undef __OPENBSD__ -#define __OPENBSD__ 1 -#endif -#if defined(__OS2__) -#undef __OS2__ -#define __OS2__ 1 -#endif -#if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE) -#undef __OSF__ -#define __OSF__ 1 -#endif -#if defined(__QNXNTO__) -#undef __QNXNTO__ -#define __QNXNTO__ 1 -#endif -#if defined(riscos) || defined(__riscos) || defined(__riscos__) -#undef __RISCOS__ -#define __RISCOS__ 1 -#endif -#if defined(__SVR4) -#undef __SOLARIS__ -#define __SOLARIS__ 1 -#endif - -#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -/* Try to find out if we're compiling for WinRT or non-WinRT */ -/* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */ -#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_) /* _MSC_VER==1700 for MSVC 2012 */ -#include -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) -#undef __WINDOWS__ -#define __WINDOWS__ 1 -/* See if we're compiling for WinRT: */ -#elif WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) -#undef __WINRT__ -#define __WINRT__ 1 -#endif -#else -#undef __WINDOWS__ -#define __WINDOWS__ 1 -#endif /* _MSC_VER < 1700 */ -#endif /* defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) */ - -#if defined(__WINDOWS__) -#undef __WIN32__ -#define __WIN32__ 1 -#endif -#if defined(__PSP__) -#undef __PSP__ -#define __PSP__ 1 -#endif - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Gets the name of the platform. - */ -extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_platform_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_power.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_power.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_power.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_power.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,75 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_power_h -#define _SDL_power_h - -/** - * \file SDL_power.h - * - * Header for the SDL power management routines. - */ - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The basic state for the system's power supply. - */ -typedef enum -{ - SDL_POWERSTATE_UNKNOWN, /**< cannot determine power status */ - SDL_POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */ - SDL_POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */ - SDL_POWERSTATE_CHARGING, /**< Plugged in, charging battery */ - SDL_POWERSTATE_CHARGED /**< Plugged in, battery charged */ -} SDL_PowerState; - - -/** - * \brief Get the current power supply details. - * - * \param secs Seconds of battery life left. You can pass a NULL here if - * you don't care. Will return -1 if we can't determine a - * value, or we're not running on a battery. - * - * \param pct Percentage of battery life left, between 0 and 100. You can - * pass a NULL here if you don't care. Will return -1 if we - * can't determine a value, or we're not running on a battery. - * - * \return The state of the battery (if any). - */ -extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_power_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_quit.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_quit.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_quit.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_quit.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_quit.h - * - * Include file for SDL quit event handling. - */ - -#ifndef _SDL_quit_h -#define _SDL_quit_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -/** - * \file SDL_quit.h - * - * An ::SDL_QUIT event is generated when the user tries to close the application - * window. If it is ignored or filtered out, the window will remain open. - * If it is not ignored or filtered, it is queued normally and the window - * is allowed to close. When the window is closed, screen updates will - * complete, but have no effect. - * - * SDL_Init() installs signal handlers for SIGINT (keyboard interrupt) - * and SIGTERM (system termination request), if handlers do not already - * exist, that generate ::SDL_QUIT events as well. There is no way - * to determine the cause of an ::SDL_QUIT event, but setting a signal - * handler in your application will override the default generation of - * quit events for that signal. - * - * \sa SDL_Quit() - */ - -/* There are no functions directly affecting the quit event */ - -#define SDL_QuitRequested() \ - (SDL_PumpEvents(), (SDL_PeepEvents(NULL,0,SDL_PEEKEVENT,SDL_QUIT,SDL_QUIT) > 0)) - -#endif /* _SDL_quit_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rect.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rect.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rect.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rect.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,138 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_rect.h - * - * Header file for SDL_rect definition and management functions. - */ - -#ifndef _SDL_rect_h -#define _SDL_rect_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_pixels.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The structure that defines a point - * - * \sa SDL_EnclosePoints - */ -typedef struct SDL_Point -{ - int x; - int y; -} SDL_Point; - -/** - * \brief A rectangle, with the origin at the upper left. - * - * \sa SDL_RectEmpty - * \sa SDL_RectEquals - * \sa SDL_HasIntersection - * \sa SDL_IntersectRect - * \sa SDL_UnionRect - * \sa SDL_EnclosePoints - */ -typedef struct SDL_Rect -{ - int x, y; - int w, h; -} SDL_Rect; - -/** - * \brief Returns true if the rectangle has no area. - */ -SDL_FORCE_INLINE SDL_bool SDL_RectEmpty(const SDL_Rect *r) -{ - return ((!r) || (r->w <= 0) || (r->h <= 0)) ? SDL_TRUE : SDL_FALSE; -} - -/** - * \brief Returns true if the two rectangles are equal. - */ -SDL_FORCE_INLINE SDL_bool SDL_RectEquals(const SDL_Rect *a, const SDL_Rect *b) -{ - return (a && b && (a->x == b->x) && (a->y == b->y) && - (a->w == b->w) && (a->h == b->h)) ? SDL_TRUE : SDL_FALSE; -} - -/** - * \brief Determine whether two rectangles intersect. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_HasIntersection(const SDL_Rect * A, - const SDL_Rect * B); - -/** - * \brief Calculate the intersection of two rectangles. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRect(const SDL_Rect * A, - const SDL_Rect * B, - SDL_Rect * result); - -/** - * \brief Calculate the union of two rectangles. - */ -extern DECLSPEC void SDLCALL SDL_UnionRect(const SDL_Rect * A, - const SDL_Rect * B, - SDL_Rect * result); - -/** - * \brief Calculate a minimal rectangle enclosing a set of points - * - * \return SDL_TRUE if any points were within the clipping rect - */ -extern DECLSPEC SDL_bool SDLCALL SDL_EnclosePoints(const SDL_Point * points, - int count, - const SDL_Rect * clip, - SDL_Rect * result); - -/** - * \brief Calculate the intersection of a rectangle and line segment. - * - * \return SDL_TRUE if there is an intersection, SDL_FALSE otherwise. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IntersectRectAndLine(const SDL_Rect * - rect, int *X1, - int *Y1, int *X2, - int *Y2); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_rect_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_render.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_render.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_render.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_render.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,870 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_render.h - * - * Header file for SDL 2D rendering functions. - * - * This API supports the following features: - * * single pixel points - * * single pixel lines - * * filled rectangles - * * texture images - * - * The primitives may be drawn in opaque, blended, or additive modes. - * - * The texture images may be drawn in opaque, blended, or additive modes. - * They can have an additional color tint or alpha modulation applied to - * them, and may also be stretched with linear interpolation. - * - * This API is designed to accelerate simple 2D operations. You may - * want more functionality such as polygons and particle effects and - * in that case you should use SDL's OpenGL/Direct3D support or one - * of the many good 3D engines. - * - * These functions must be called from the main thread. - * See this bug for details: http://bugzilla.libsdl.org/show_bug.cgi?id=1995 - */ - -#ifndef _SDL_render_h -#define _SDL_render_h - -#include "SDL_stdinc.h" -#include "SDL_rect.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Flags used when creating a rendering context - */ -typedef enum -{ - SDL_RENDERER_SOFTWARE = 0x00000001, /**< The renderer is a software fallback */ - SDL_RENDERER_ACCELERATED = 0x00000002, /**< The renderer uses hardware - acceleration */ - SDL_RENDERER_PRESENTVSYNC = 0x00000004, /**< Present is synchronized - with the refresh rate */ - SDL_RENDERER_TARGETTEXTURE = 0x00000008 /**< The renderer supports - rendering to texture */ -} SDL_RendererFlags; - -/** - * \brief Information on the capabilities of a render driver or context. - */ -typedef struct SDL_RendererInfo -{ - const char *name; /**< The name of the renderer */ - Uint32 flags; /**< Supported ::SDL_RendererFlags */ - Uint32 num_texture_formats; /**< The number of available texture formats */ - Uint32 texture_formats[16]; /**< The available texture formats */ - int max_texture_width; /**< The maximimum texture width */ - int max_texture_height; /**< The maximimum texture height */ -} SDL_RendererInfo; - -/** - * \brief The access pattern allowed for a texture. - */ -typedef enum -{ - SDL_TEXTUREACCESS_STATIC, /**< Changes rarely, not lockable */ - SDL_TEXTUREACCESS_STREAMING, /**< Changes frequently, lockable */ - SDL_TEXTUREACCESS_TARGET /**< Texture can be used as a render target */ -} SDL_TextureAccess; - -/** - * \brief The texture channel modulation used in SDL_RenderCopy(). - */ -typedef enum -{ - SDL_TEXTUREMODULATE_NONE = 0x00000000, /**< No modulation */ - SDL_TEXTUREMODULATE_COLOR = 0x00000001, /**< srcC = srcC * color */ - SDL_TEXTUREMODULATE_ALPHA = 0x00000002 /**< srcA = srcA * alpha */ -} SDL_TextureModulate; - -/** - * \brief Flip constants for SDL_RenderCopyEx - */ -typedef enum -{ - SDL_FLIP_NONE = 0x00000000, /**< Do not flip */ - SDL_FLIP_HORIZONTAL = 0x00000001, /**< flip horizontally */ - SDL_FLIP_VERTICAL = 0x00000002 /**< flip vertically */ -} SDL_RendererFlip; - -/** - * \brief A structure representing rendering state - */ -struct SDL_Renderer; -typedef struct SDL_Renderer SDL_Renderer; - -/** - * \brief An efficient driver-specific representation of pixel data - */ -struct SDL_Texture; -typedef struct SDL_Texture SDL_Texture; - - -/* Function prototypes */ - -/** - * \brief Get the number of 2D rendering drivers available for the current - * display. - * - * A render driver is a set of code that handles rendering and texture - * management on a particular display. Normally there is only one, but - * some drivers may have several available with different capabilities. - * - * \sa SDL_GetRenderDriverInfo() - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC int SDLCALL SDL_GetNumRenderDrivers(void); - -/** - * \brief Get information about a specific 2D rendering driver for the current - * display. - * - * \param index The index of the driver to query information about. - * \param info A pointer to an SDL_RendererInfo struct to be filled with - * information on the rendering driver. - * - * \return 0 on success, -1 if the index was out of range. - * - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDriverInfo(int index, - SDL_RendererInfo * info); - -/** - * \brief Create a window and default renderer - * - * \param width The width of the window - * \param height The height of the window - * \param window_flags The flags used to create the window - * \param window A pointer filled with the window, or NULL on error - * \param renderer A pointer filled with the renderer, or NULL on error - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_CreateWindowAndRenderer( - int width, int height, Uint32 window_flags, - SDL_Window **window, SDL_Renderer **renderer); - - -/** - * \brief Create a 2D rendering context for a window. - * - * \param window The window where rendering is displayed. - * \param index The index of the rendering driver to initialize, or -1 to - * initialize the first one supporting the requested flags. - * \param flags ::SDL_RendererFlags. - * - * \return A valid rendering context or NULL if there was an error. - * - * \sa SDL_CreateSoftwareRenderer() - * \sa SDL_GetRendererInfo() - * \sa SDL_DestroyRenderer() - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateRenderer(SDL_Window * window, - int index, Uint32 flags); - -/** - * \brief Create a 2D software rendering context for a surface. - * - * \param surface The surface where rendering is done. - * - * \return A valid rendering context or NULL if there was an error. - * - * \sa SDL_CreateRenderer() - * \sa SDL_DestroyRenderer() - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_CreateSoftwareRenderer(SDL_Surface * surface); - -/** - * \brief Get the renderer associated with a window. - */ -extern DECLSPEC SDL_Renderer * SDLCALL SDL_GetRenderer(SDL_Window * window); - -/** - * \brief Get information about a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererInfo(SDL_Renderer * renderer, - SDL_RendererInfo * info); - -/** - * \brief Get the output size of a rendering context. - */ -extern DECLSPEC int SDLCALL SDL_GetRendererOutputSize(SDL_Renderer * renderer, - int *w, int *h); - -/** - * \brief Create a texture for a rendering context. - * - * \param renderer The renderer. - * \param format The format of the texture. - * \param access One of the enumerated values in ::SDL_TextureAccess. - * \param w The width of the texture in pixels. - * \param h The height of the texture in pixels. - * - * \return The created texture is returned, or 0 if no rendering context was - * active, the format was unsupported, or the width or height were out - * of range. - * - * \sa SDL_QueryTexture() - * \sa SDL_UpdateTexture() - * \sa SDL_DestroyTexture() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTexture(SDL_Renderer * renderer, - Uint32 format, - int access, int w, - int h); - -/** - * \brief Create a texture from an existing surface. - * - * \param renderer The renderer. - * \param surface The surface containing pixel data used to fill the texture. - * - * \return The created texture is returned, or 0 on error. - * - * \note The surface is not modified or freed by this function. - * - * \sa SDL_QueryTexture() - * \sa SDL_DestroyTexture() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_CreateTextureFromSurface(SDL_Renderer * renderer, SDL_Surface * surface); - -/** - * \brief Query the attributes of a texture - * - * \param texture A texture to be queried. - * \param format A pointer filled in with the raw format of the texture. The - * actual format may differ, but pixel transfers will use this - * format. - * \param access A pointer filled in with the actual access to the texture. - * \param w A pointer filled in with the width of the texture in pixels. - * \param h A pointer filled in with the height of the texture in pixels. - * - * \return 0 on success, or -1 if the texture is not valid. - */ -extern DECLSPEC int SDLCALL SDL_QueryTexture(SDL_Texture * texture, - Uint32 * format, int *access, - int *w, int *h); - -/** - * \brief Set an additional color value used in render copy operations. - * - * \param texture The texture to update. - * \param r The red color value multiplied into copy operations. - * \param g The green color value multiplied into copy operations. - * \param b The blue color value multiplied into copy operations. - * - * \return 0 on success, or -1 if the texture is not valid or color modulation - * is not supported. - * - * \sa SDL_GetTextureColorMod() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureColorMod(SDL_Texture * texture, - Uint8 r, Uint8 g, Uint8 b); - - -/** - * \brief Get the additional color value used in render copy operations. - * - * \param texture The texture to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureColorMod() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureColorMod(SDL_Texture * texture, - Uint8 * r, Uint8 * g, - Uint8 * b); - -/** - * \brief Set an additional alpha value used in render copy operations. - * - * \param texture The texture to update. - * \param alpha The alpha value multiplied into copy operations. - * - * \return 0 on success, or -1 if the texture is not valid or alpha modulation - * is not supported. - * - * \sa SDL_GetTextureAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureAlphaMod(SDL_Texture * texture, - Uint8 alpha); - -/** - * \brief Get the additional alpha value used in render copy operations. - * - * \param texture The texture to query. - * \param alpha A pointer filled in with the current alpha value. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureAlphaMod(SDL_Texture * texture, - Uint8 * alpha); - -/** - * \brief Set the blend mode used for texture copy operations. - * - * \param texture The texture to update. - * \param blendMode ::SDL_BlendMode to use for texture blending. - * - * \return 0 on success, or -1 if the texture is not valid or the blend mode is - * not supported. - * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. - * - * \sa SDL_GetTextureBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetTextureBlendMode(SDL_Texture * texture, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for texture copy operations. - * - * \param texture The texture to query. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \sa SDL_SetTextureBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetTextureBlendMode(SDL_Texture * texture, - SDL_BlendMode *blendMode); - -/** - * \brief Update the given texture rectangle with new pixel data. - * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param pixels The raw pixel data. - * \param pitch The number of bytes between rows of pixel data. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \note This is a fairly slow function. - */ -extern DECLSPEC int SDLCALL SDL_UpdateTexture(SDL_Texture * texture, - const SDL_Rect * rect, - const void *pixels, int pitch); - -/** - * \brief Update a rectangle within a planar YV12 or IYUV texture with new pixel data. - * - * \param texture The texture to update - * \param rect A pointer to the rectangle of pixels to update, or NULL to - * update the entire texture. - * \param Yplane The raw pixel data for the Y plane. - * \param Ypitch The number of bytes between rows of pixel data for the Y plane. - * \param Uplane The raw pixel data for the U plane. - * \param Upitch The number of bytes between rows of pixel data for the U plane. - * \param Vplane The raw pixel data for the V plane. - * \param Vpitch The number of bytes between rows of pixel data for the V plane. - * - * \return 0 on success, or -1 if the texture is not valid. - * - * \note You can use SDL_UpdateTexture() as long as your pixel data is - * a contiguous block of Y and U/V planes in the proper order, but - * this function is available if your pixel data is not contiguous. - */ -extern DECLSPEC int SDLCALL SDL_UpdateYUVTexture(SDL_Texture * texture, - const SDL_Rect * rect, - const Uint8 *Yplane, int Ypitch, - const Uint8 *Uplane, int Upitch, - const Uint8 *Vplane, int Vpitch); - -/** - * \brief Lock a portion of the texture for write-only pixel access. - * - * \param texture The texture to lock for access, which was created with - * ::SDL_TEXTUREACCESS_STREAMING. - * \param rect A pointer to the rectangle to lock for access. If the rect - * is NULL, the entire texture will be locked. - * \param pixels This is filled in with a pointer to the locked pixels, - * appropriately offset by the locked area. - * \param pitch This is filled in with the pitch of the locked pixels. - * - * \return 0 on success, or -1 if the texture is not valid or was not created with ::SDL_TEXTUREACCESS_STREAMING. - * - * \sa SDL_UnlockTexture() - */ -extern DECLSPEC int SDLCALL SDL_LockTexture(SDL_Texture * texture, - const SDL_Rect * rect, - void **pixels, int *pitch); - -/** - * \brief Unlock a texture, uploading the changes to video memory, if needed. - * - * \sa SDL_LockTexture() - */ -extern DECLSPEC void SDLCALL SDL_UnlockTexture(SDL_Texture * texture); - -/** - * \brief Determines whether a window supports the use of render targets - * - * \param renderer The renderer that will be checked - * - * \return SDL_TRUE if supported, SDL_FALSE if not. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_RenderTargetSupported(SDL_Renderer *renderer); - -/** - * \brief Set a texture as the current rendering target. - * - * \param renderer The renderer. - * \param texture The targeted texture, which must be created with the SDL_TEXTUREACCESS_TARGET flag, or NULL for the default render target - * - * \return 0 on success, or -1 on error - * - * \sa SDL_GetRenderTarget() - */ -extern DECLSPEC int SDLCALL SDL_SetRenderTarget(SDL_Renderer *renderer, - SDL_Texture *texture); - -/** - * \brief Get the current render target or NULL for the default render target. - * - * \return The current render target - * - * \sa SDL_SetRenderTarget() - */ -extern DECLSPEC SDL_Texture * SDLCALL SDL_GetRenderTarget(SDL_Renderer *renderer); - -/** - * \brief Set device independent resolution for rendering - * - * \param renderer The renderer for which resolution should be set. - * \param w The width of the logical resolution - * \param h The height of the logical resolution - * - * This function uses the viewport and scaling functionality to allow a fixed logical - * resolution for rendering, regardless of the actual output resolution. If the actual - * output resolution doesn't have the same aspect ratio the output rendering will be - * centered within the output display. - * - * If the output display is a window, mouse events in the window will be filtered - * and scaled so they seem to arrive within the logical resolution. - * - * \note If this function results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. - * - * \sa SDL_RenderGetLogicalSize() - * \sa SDL_RenderSetScale() - * \sa SDL_RenderSetViewport() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetLogicalSize(SDL_Renderer * renderer, int w, int h); - -/** - * \brief Get device independent resolution for rendering - * - * \param renderer The renderer from which resolution should be queried. - * \param w A pointer filled with the width of the logical resolution - * \param h A pointer filled with the height of the logical resolution - * - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetLogicalSize(SDL_Renderer * renderer, int *w, int *h); - -/** - * \brief Set the drawing area for rendering on the current target. - * - * \param renderer The renderer for which the drawing area should be set. - * \param rect The rectangle representing the drawing area, or NULL to set the viewport to the entire target. - * - * The x,y of the viewport rect represents the origin for rendering. - * - * \return 0 on success, or -1 on error - * - * \note If the window associated with the renderer is resized, the viewport is automatically reset. - * - * \sa SDL_RenderGetViewport() - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetViewport(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the drawing area for the current target. - * - * \sa SDL_RenderSetViewport() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetViewport(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the clip rectangle for the current target. - * - * \param renderer The renderer for which clip rectangle should be set. - * \param rect A pointer to the rectangle to set as the clip rectangle, or - * NULL to disable clipping. - * - * \return 0 on success, or -1 on error - * - * \sa SDL_RenderGetClipRect() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetClipRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Get the clip rectangle for the current target. - * - * \param renderer The renderer from which clip rectangle should be queried. - * \param rect A pointer filled in with the current clip rectangle, or - * an empty rectangle if clipping is disabled. - * - * \sa SDL_RenderSetClipRect() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetClipRect(SDL_Renderer * renderer, - SDL_Rect * rect); - -/** - * \brief Set the drawing scale for rendering on the current target. - * - * \param renderer The renderer for which the drawing scale should be set. - * \param scaleX The horizontal scaling factor - * \param scaleY The vertical scaling factor - * - * The drawing coordinates are scaled by the x/y scaling factors - * before they are used by the renderer. This allows resolution - * independent drawing with a single coordinate system. - * - * \note If this results in scaling or subpixel drawing by the - * rendering backend, it will be handled using the appropriate - * quality hints. For best results use integer scaling factors. - * - * \sa SDL_RenderGetScale() - * \sa SDL_RenderSetLogicalSize() - */ -extern DECLSPEC int SDLCALL SDL_RenderSetScale(SDL_Renderer * renderer, - float scaleX, float scaleY); - -/** - * \brief Get the drawing scale for the current target. - * - * \param renderer The renderer from which drawing scale should be queried. - * \param scaleX A pointer filled in with the horizontal scaling factor - * \param scaleY A pointer filled in with the vertical scaling factor - * - * \sa SDL_RenderSetScale() - */ -extern DECLSPEC void SDLCALL SDL_RenderGetScale(SDL_Renderer * renderer, - float *scaleX, float *scaleY); - -/** - * \brief Set the color used for drawing operations (Rect, Line and Clear). - * - * \param renderer The renderer for which drawing color should be set. - * \param r The red value used to draw on the rendering target. - * \param g The green value used to draw on the rendering target. - * \param b The blue value used to draw on the rendering target. - * \param a The alpha value used to draw on the rendering target, usually - * ::SDL_ALPHA_OPAQUE (255). - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_SetRenderDrawColor(SDL_Renderer * renderer, - Uint8 r, Uint8 g, Uint8 b, - Uint8 a); - -/** - * \brief Get the color used for drawing operations (Rect, Line and Clear). - * - * \param renderer The renderer from which drawing color should be queried. - * \param r A pointer to the red value used to draw on the rendering target. - * \param g A pointer to the green value used to draw on the rendering target. - * \param b A pointer to the blue value used to draw on the rendering target. - * \param a A pointer to the alpha value used to draw on the rendering target, - * usually ::SDL_ALPHA_OPAQUE (255). - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDrawColor(SDL_Renderer * renderer, - Uint8 * r, Uint8 * g, Uint8 * b, - Uint8 * a); - -/** - * \brief Set the blend mode used for drawing operations (Fill and Line). - * - * \param renderer The renderer for which blend mode should be set. - * \param blendMode ::SDL_BlendMode to use for blending. - * - * \return 0 on success, or -1 on error - * - * \note If the blend mode is not supported, the closest supported mode is - * chosen. - * - * \sa SDL_GetRenderDrawBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetRenderDrawBlendMode(SDL_Renderer * renderer, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for drawing operations. - * - * \param renderer The renderer from which blend mode should be queried. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 on error - * - * \sa SDL_SetRenderDrawBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetRenderDrawBlendMode(SDL_Renderer * renderer, - SDL_BlendMode *blendMode); - -/** - * \brief Clear the current rendering target with the drawing color - * - * This function clears the entire rendering target, ignoring the viewport. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderClear(SDL_Renderer * renderer); - -/** - * \brief Draw a point on the current rendering target. - * - * \param renderer The renderer which should draw a point. - * \param x The x coordinate of the point. - * \param y The y coordinate of the point. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawPoint(SDL_Renderer * renderer, - int x, int y); - -/** - * \brief Draw multiple points on the current rendering target. - * - * \param renderer The renderer which should draw multiple points. - * \param points The points to draw - * \param count The number of points to draw - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawPoints(SDL_Renderer * renderer, - const SDL_Point * points, - int count); - -/** - * \brief Draw a line on the current rendering target. - * - * \param renderer The renderer which should draw a line. - * \param x1 The x coordinate of the start point. - * \param y1 The y coordinate of the start point. - * \param x2 The x coordinate of the end point. - * \param y2 The y coordinate of the end point. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawLine(SDL_Renderer * renderer, - int x1, int y1, int x2, int y2); - -/** - * \brief Draw a series of connected lines on the current rendering target. - * - * \param renderer The renderer which should draw multiple lines. - * \param points The points along the lines - * \param count The number of points, drawing count-1 lines - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawLines(SDL_Renderer * renderer, - const SDL_Point * points, - int count); - -/** - * \brief Draw a rectangle on the current rendering target. - * - * \param renderer The renderer which should draw a rectangle. - * \param rect A pointer to the destination rectangle, or NULL to outline the entire rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Draw some number of rectangles on the current rendering target. - * - * \param renderer The renderer which should draw multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawRects(SDL_Renderer * renderer, - const SDL_Rect * rects, - int count); - -/** - * \brief Fill a rectangle on the current rendering target with the drawing color. - * - * \param renderer The renderer which should fill a rectangle. - * \param rect A pointer to the destination rectangle, or NULL for the entire - * rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderFillRect(SDL_Renderer * renderer, - const SDL_Rect * rect); - -/** - * \brief Fill some number of rectangles on the current rendering target with the drawing color. - * - * \param renderer The renderer which should fill multiple rectangles. - * \param rects A pointer to an array of destination rectangles. - * \param count The number of rectangles. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderFillRects(SDL_Renderer * renderer, - const SDL_Rect * rects, - int count); - -/** - * \brief Copy a portion of the texture to the current rendering target. - * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderCopy(SDL_Renderer * renderer, - SDL_Texture * texture, - const SDL_Rect * srcrect, - const SDL_Rect * dstrect); - -/** - * \brief Copy a portion of the source texture to the current rendering target, rotating it by angle around the given center - * - * \param renderer The renderer which should copy parts of a texture. - * \param texture The source texture. - * \param srcrect A pointer to the source rectangle, or NULL for the entire - * texture. - * \param dstrect A pointer to the destination rectangle, or NULL for the - * entire rendering target. - * \param angle An angle in degrees that indicates the rotation that will be applied to dstrect - * \param center A pointer to a point indicating the point around which dstrect will be rotated (if NULL, rotation will be done aroud dstrect.w/2, dstrect.h/2) - * \param flip An SDL_RendererFlip value stating which flipping actions should be performed on the texture - * - * \return 0 on success, or -1 on error - */ -extern DECLSPEC int SDLCALL SDL_RenderCopyEx(SDL_Renderer * renderer, - SDL_Texture * texture, - const SDL_Rect * srcrect, - const SDL_Rect * dstrect, - const double angle, - const SDL_Point *center, - const SDL_RendererFlip flip); - -/** - * \brief Read pixels from the current rendering target. - * - * \param renderer The renderer from which pixels should be read. - * \param rect A pointer to the rectangle to read, or NULL for the entire - * render target. - * \param format The desired format of the pixel data, or 0 to use the format - * of the rendering target - * \param pixels A pointer to be filled in with the pixel data - * \param pitch The pitch of the pixels parameter. - * - * \return 0 on success, or -1 if pixel reading is not supported. - * - * \warning This is a very slow operation, and should not be used frequently. - */ -extern DECLSPEC int SDLCALL SDL_RenderReadPixels(SDL_Renderer * renderer, - const SDL_Rect * rect, - Uint32 format, - void *pixels, int pitch); - -/** - * \brief Update the screen with rendering performed. - */ -extern DECLSPEC void SDLCALL SDL_RenderPresent(SDL_Renderer * renderer); - -/** - * \brief Destroy the specified texture. - * - * \sa SDL_CreateTexture() - * \sa SDL_CreateTextureFromSurface() - */ -extern DECLSPEC void SDLCALL SDL_DestroyTexture(SDL_Texture * texture); - -/** - * \brief Destroy the rendering context for a window and free associated - * textures. - * - * \sa SDL_CreateRenderer() - */ -extern DECLSPEC void SDLCALL SDL_DestroyRenderer(SDL_Renderer * renderer); - - -/** - * \brief Bind the texture to the current OpenGL/ES/ES2 context for use with - * OpenGL instructions. - * - * \param texture The SDL texture to bind - * \param texw A pointer to a float that will be filled with the texture width - * \param texh A pointer to a float that will be filled with the texture height - * - * \return 0 on success, or -1 if the operation is not supported - */ -extern DECLSPEC int SDLCALL SDL_GL_BindTexture(SDL_Texture *texture, float *texw, float *texh); - -/** - * \brief Unbind a texture from the current OpenGL/ES/ES2 context. - * - * \param texture The SDL texture to unbind - * - * \return 0 on success, or -1 if the operation is not supported - */ -extern DECLSPEC int SDLCALL SDL_GL_UnbindTexture(SDL_Texture *texture); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_render_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_revision.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_revision.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_revision.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_revision.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -#define SDL_REVISION "hg-8628:b558f99d48f0" -#define SDL_REVISION_NUMBER 8628 diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rwops.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rwops.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rwops.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_rwops.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,232 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_rwops.h - * - * This file provides a general interface for SDL to read and write - * data streams. It can easily be extended to files, memory, etc. - */ - -#ifndef _SDL_rwops_h -#define _SDL_rwops_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* RWops Types */ -#define SDL_RWOPS_UNKNOWN 0 /* Unknown stream type */ -#define SDL_RWOPS_WINFILE 1 /* Win32 file */ -#define SDL_RWOPS_STDFILE 2 /* Stdio file */ -#define SDL_RWOPS_JNIFILE 3 /* Android asset */ -#define SDL_RWOPS_MEMORY 4 /* Memory stream */ -#define SDL_RWOPS_MEMORY_RO 5 /* Read-Only memory stream */ - -/** - * This is the read/write operation structure -- very basic. - */ -typedef struct SDL_RWops -{ - /** - * Return the size of the file in this rwops, or -1 if unknown - */ - Sint64 (SDLCALL * size) (struct SDL_RWops * context); - - /** - * Seek to \c offset relative to \c whence, one of stdio's whence values: - * RW_SEEK_SET, RW_SEEK_CUR, RW_SEEK_END - * - * \return the final offset in the data stream, or -1 on error. - */ - Sint64 (SDLCALL * seek) (struct SDL_RWops * context, Sint64 offset, - int whence); - - /** - * Read up to \c maxnum objects each of size \c size from the data - * stream to the area pointed at by \c ptr. - * - * \return the number of objects read, or 0 at error or end of file. - */ - size_t (SDLCALL * read) (struct SDL_RWops * context, void *ptr, - size_t size, size_t maxnum); - - /** - * Write exactly \c num objects each of size \c size from the area - * pointed at by \c ptr to data stream. - * - * \return the number of objects written, or 0 at error or end of file. - */ - size_t (SDLCALL * write) (struct SDL_RWops * context, const void *ptr, - size_t size, size_t num); - - /** - * Close and free an allocated SDL_RWops structure. - * - * \return 0 if successful or -1 on write error when flushing data. - */ - int (SDLCALL * close) (struct SDL_RWops * context); - - Uint32 type; - union - { -#if defined(ANDROID) - struct - { - void *fileNameRef; - void *inputStreamRef; - void *readableByteChannelRef; - void *readMethod; - void *assetFileDescriptorRef; - long position; - long size; - long offset; - int fd; - } androidio; -#elif defined(__WIN32__) - struct - { - SDL_bool append; - void *h; - struct - { - void *data; - size_t size; - size_t left; - } buffer; - } windowsio; -#endif - -#ifdef HAVE_STDIO_H - struct - { - SDL_bool autoclose; - FILE *fp; - } stdio; -#endif - struct - { - Uint8 *base; - Uint8 *here; - Uint8 *stop; - } mem; - struct - { - void *data1; - void *data2; - } unknown; - } hidden; - -} SDL_RWops; - - -/** - * \name RWFrom functions - * - * Functions to create SDL_RWops structures from various data streams. - */ -/* @{ */ - -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFile(const char *file, - const char *mode); - -#ifdef HAVE_STDIO_H -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(FILE * fp, - SDL_bool autoclose); -#else -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromFP(void * fp, - SDL_bool autoclose); -#endif - -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromMem(void *mem, int size); -extern DECLSPEC SDL_RWops *SDLCALL SDL_RWFromConstMem(const void *mem, - int size); - -/* @} *//* RWFrom functions */ - - -extern DECLSPEC SDL_RWops *SDLCALL SDL_AllocRW(void); -extern DECLSPEC void SDLCALL SDL_FreeRW(SDL_RWops * area); - -#define RW_SEEK_SET 0 /**< Seek from the beginning of data */ -#define RW_SEEK_CUR 1 /**< Seek relative to current read point */ -#define RW_SEEK_END 2 /**< Seek relative to the end of data */ - -/** - * \name Read/write macros - * - * Macros to easily read and write from an SDL_RWops structure. - */ -/* @{ */ -#define SDL_RWsize(ctx) (ctx)->size(ctx) -#define SDL_RWseek(ctx, offset, whence) (ctx)->seek(ctx, offset, whence) -#define SDL_RWtell(ctx) (ctx)->seek(ctx, 0, RW_SEEK_CUR) -#define SDL_RWread(ctx, ptr, size, n) (ctx)->read(ctx, ptr, size, n) -#define SDL_RWwrite(ctx, ptr, size, n) (ctx)->write(ctx, ptr, size, n) -#define SDL_RWclose(ctx) (ctx)->close(ctx) -/* @} *//* Read/write macros */ - - -/** - * \name Read endian functions - * - * Read an item of the specified endianness and return in native format. - */ -/* @{ */ -extern DECLSPEC Uint8 SDLCALL SDL_ReadU8(SDL_RWops * src); -extern DECLSPEC Uint16 SDLCALL SDL_ReadLE16(SDL_RWops * src); -extern DECLSPEC Uint16 SDLCALL SDL_ReadBE16(SDL_RWops * src); -extern DECLSPEC Uint32 SDLCALL SDL_ReadLE32(SDL_RWops * src); -extern DECLSPEC Uint32 SDLCALL SDL_ReadBE32(SDL_RWops * src); -extern DECLSPEC Uint64 SDLCALL SDL_ReadLE64(SDL_RWops * src); -extern DECLSPEC Uint64 SDLCALL SDL_ReadBE64(SDL_RWops * src); -/* @} *//* Read endian functions */ - -/** - * \name Write endian functions - * - * Write an item of native format to the specified endianness. - */ -/* @{ */ -extern DECLSPEC size_t SDLCALL SDL_WriteU8(SDL_RWops * dst, Uint8 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE16(SDL_RWops * dst, Uint16 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE16(SDL_RWops * dst, Uint16 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE32(SDL_RWops * dst, Uint32 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE32(SDL_RWops * dst, Uint32 value); -extern DECLSPEC size_t SDLCALL SDL_WriteLE64(SDL_RWops * dst, Uint64 value); -extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value); -/* @} *//* Write endian functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_rwops_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_scancode.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_scancode.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_scancode.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_scancode.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,401 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_scancode.h - * - * Defines keyboard scancodes. - */ - -#ifndef _SDL_scancode_h -#define _SDL_scancode_h - -#include "SDL_stdinc.h" - -/** - * \brief The SDL keyboard scancode representation. - * - * Values of this type are used to represent keyboard keys, among other places - * in the \link SDL_Keysym::scancode key.keysym.scancode \endlink field of the - * SDL_Event structure. - * - * The values in this enumeration are based on the USB usage page standard: - * http://www.usb.org/developers/devclass_docs/Hut1_12v2.pdf - */ -typedef enum -{ - SDL_SCANCODE_UNKNOWN = 0, - - /** - * \name Usage page 0x07 - * - * These values are from usage page 0x07 (USB keyboard page). - */ - /* @{ */ - - SDL_SCANCODE_A = 4, - SDL_SCANCODE_B = 5, - SDL_SCANCODE_C = 6, - SDL_SCANCODE_D = 7, - SDL_SCANCODE_E = 8, - SDL_SCANCODE_F = 9, - SDL_SCANCODE_G = 10, - SDL_SCANCODE_H = 11, - SDL_SCANCODE_I = 12, - SDL_SCANCODE_J = 13, - SDL_SCANCODE_K = 14, - SDL_SCANCODE_L = 15, - SDL_SCANCODE_M = 16, - SDL_SCANCODE_N = 17, - SDL_SCANCODE_O = 18, - SDL_SCANCODE_P = 19, - SDL_SCANCODE_Q = 20, - SDL_SCANCODE_R = 21, - SDL_SCANCODE_S = 22, - SDL_SCANCODE_T = 23, - SDL_SCANCODE_U = 24, - SDL_SCANCODE_V = 25, - SDL_SCANCODE_W = 26, - SDL_SCANCODE_X = 27, - SDL_SCANCODE_Y = 28, - SDL_SCANCODE_Z = 29, - - SDL_SCANCODE_1 = 30, - SDL_SCANCODE_2 = 31, - SDL_SCANCODE_3 = 32, - SDL_SCANCODE_4 = 33, - SDL_SCANCODE_5 = 34, - SDL_SCANCODE_6 = 35, - SDL_SCANCODE_7 = 36, - SDL_SCANCODE_8 = 37, - SDL_SCANCODE_9 = 38, - SDL_SCANCODE_0 = 39, - - SDL_SCANCODE_RETURN = 40, - SDL_SCANCODE_ESCAPE = 41, - SDL_SCANCODE_BACKSPACE = 42, - SDL_SCANCODE_TAB = 43, - SDL_SCANCODE_SPACE = 44, - - SDL_SCANCODE_MINUS = 45, - SDL_SCANCODE_EQUALS = 46, - SDL_SCANCODE_LEFTBRACKET = 47, - SDL_SCANCODE_RIGHTBRACKET = 48, - SDL_SCANCODE_BACKSLASH = 49, /**< Located at the lower left of the return - * key on ISO keyboards and at the right end - * of the QWERTY row on ANSI keyboards. - * Produces REVERSE SOLIDUS (backslash) and - * VERTICAL LINE in a US layout, REVERSE - * SOLIDUS and VERTICAL LINE in a UK Mac - * layout, NUMBER SIGN and TILDE in a UK - * Windows layout, DOLLAR SIGN and POUND SIGN - * in a Swiss German layout, NUMBER SIGN and - * APOSTROPHE in a German layout, GRAVE - * ACCENT and POUND SIGN in a French Mac - * layout, and ASTERISK and MICRO SIGN in a - * French Windows layout. - */ - SDL_SCANCODE_NONUSHASH = 50, /**< ISO USB keyboards actually use this code - * instead of 49 for the same key, but all - * OSes I've seen treat the two codes - * identically. So, as an implementor, unless - * your keyboard generates both of those - * codes and your OS treats them differently, - * you should generate SDL_SCANCODE_BACKSLASH - * instead of this code. As a user, you - * should not rely on this code because SDL - * will never generate it with most (all?) - * keyboards. - */ - SDL_SCANCODE_SEMICOLON = 51, - SDL_SCANCODE_APOSTROPHE = 52, - SDL_SCANCODE_GRAVE = 53, /**< Located in the top left corner (on both ANSI - * and ISO keyboards). Produces GRAVE ACCENT and - * TILDE in a US Windows layout and in US and UK - * Mac layouts on ANSI keyboards, GRAVE ACCENT - * and NOT SIGN in a UK Windows layout, SECTION - * SIGN and PLUS-MINUS SIGN in US and UK Mac - * layouts on ISO keyboards, SECTION SIGN and - * DEGREE SIGN in a Swiss German layout (Mac: - * only on ISO keyboards), CIRCUMFLEX ACCENT and - * DEGREE SIGN in a German layout (Mac: only on - * ISO keyboards), SUPERSCRIPT TWO and TILDE in a - * French Windows layout, COMMERCIAL AT and - * NUMBER SIGN in a French Mac layout on ISO - * keyboards, and LESS-THAN SIGN and GREATER-THAN - * SIGN in a Swiss German, German, or French Mac - * layout on ANSI keyboards. - */ - SDL_SCANCODE_COMMA = 54, - SDL_SCANCODE_PERIOD = 55, - SDL_SCANCODE_SLASH = 56, - - SDL_SCANCODE_CAPSLOCK = 57, - - SDL_SCANCODE_F1 = 58, - SDL_SCANCODE_F2 = 59, - SDL_SCANCODE_F3 = 60, - SDL_SCANCODE_F4 = 61, - SDL_SCANCODE_F5 = 62, - SDL_SCANCODE_F6 = 63, - SDL_SCANCODE_F7 = 64, - SDL_SCANCODE_F8 = 65, - SDL_SCANCODE_F9 = 66, - SDL_SCANCODE_F10 = 67, - SDL_SCANCODE_F11 = 68, - SDL_SCANCODE_F12 = 69, - - SDL_SCANCODE_PRINTSCREEN = 70, - SDL_SCANCODE_SCROLLLOCK = 71, - SDL_SCANCODE_PAUSE = 72, - SDL_SCANCODE_INSERT = 73, /**< insert on PC, help on some Mac keyboards (but - does send code 73, not 117) */ - SDL_SCANCODE_HOME = 74, - SDL_SCANCODE_PAGEUP = 75, - SDL_SCANCODE_DELETE = 76, - SDL_SCANCODE_END = 77, - SDL_SCANCODE_PAGEDOWN = 78, - SDL_SCANCODE_RIGHT = 79, - SDL_SCANCODE_LEFT = 80, - SDL_SCANCODE_DOWN = 81, - SDL_SCANCODE_UP = 82, - - SDL_SCANCODE_NUMLOCKCLEAR = 83, /**< num lock on PC, clear on Mac keyboards - */ - SDL_SCANCODE_KP_DIVIDE = 84, - SDL_SCANCODE_KP_MULTIPLY = 85, - SDL_SCANCODE_KP_MINUS = 86, - SDL_SCANCODE_KP_PLUS = 87, - SDL_SCANCODE_KP_ENTER = 88, - SDL_SCANCODE_KP_1 = 89, - SDL_SCANCODE_KP_2 = 90, - SDL_SCANCODE_KP_3 = 91, - SDL_SCANCODE_KP_4 = 92, - SDL_SCANCODE_KP_5 = 93, - SDL_SCANCODE_KP_6 = 94, - SDL_SCANCODE_KP_7 = 95, - SDL_SCANCODE_KP_8 = 96, - SDL_SCANCODE_KP_9 = 97, - SDL_SCANCODE_KP_0 = 98, - SDL_SCANCODE_KP_PERIOD = 99, - - SDL_SCANCODE_NONUSBACKSLASH = 100, /**< This is the additional key that ISO - * keyboards have over ANSI ones, - * located between left shift and Y. - * Produces GRAVE ACCENT and TILDE in a - * US or UK Mac layout, REVERSE SOLIDUS - * (backslash) and VERTICAL LINE in a - * US or UK Windows layout, and - * LESS-THAN SIGN and GREATER-THAN SIGN - * in a Swiss German, German, or French - * layout. */ - SDL_SCANCODE_APPLICATION = 101, /**< windows contextual menu, compose */ - SDL_SCANCODE_POWER = 102, /**< The USB document says this is a status flag, - * not a physical key - but some Mac keyboards - * do have a power key. */ - SDL_SCANCODE_KP_EQUALS = 103, - SDL_SCANCODE_F13 = 104, - SDL_SCANCODE_F14 = 105, - SDL_SCANCODE_F15 = 106, - SDL_SCANCODE_F16 = 107, - SDL_SCANCODE_F17 = 108, - SDL_SCANCODE_F18 = 109, - SDL_SCANCODE_F19 = 110, - SDL_SCANCODE_F20 = 111, - SDL_SCANCODE_F21 = 112, - SDL_SCANCODE_F22 = 113, - SDL_SCANCODE_F23 = 114, - SDL_SCANCODE_F24 = 115, - SDL_SCANCODE_EXECUTE = 116, - SDL_SCANCODE_HELP = 117, - SDL_SCANCODE_MENU = 118, - SDL_SCANCODE_SELECT = 119, - SDL_SCANCODE_STOP = 120, - SDL_SCANCODE_AGAIN = 121, /**< redo */ - SDL_SCANCODE_UNDO = 122, - SDL_SCANCODE_CUT = 123, - SDL_SCANCODE_COPY = 124, - SDL_SCANCODE_PASTE = 125, - SDL_SCANCODE_FIND = 126, - SDL_SCANCODE_MUTE = 127, - SDL_SCANCODE_VOLUMEUP = 128, - SDL_SCANCODE_VOLUMEDOWN = 129, -/* not sure whether there's a reason to enable these */ -/* SDL_SCANCODE_LOCKINGCAPSLOCK = 130, */ -/* SDL_SCANCODE_LOCKINGNUMLOCK = 131, */ -/* SDL_SCANCODE_LOCKINGSCROLLLOCK = 132, */ - SDL_SCANCODE_KP_COMMA = 133, - SDL_SCANCODE_KP_EQUALSAS400 = 134, - - SDL_SCANCODE_INTERNATIONAL1 = 135, /**< used on Asian keyboards, see - footnotes in USB doc */ - SDL_SCANCODE_INTERNATIONAL2 = 136, - SDL_SCANCODE_INTERNATIONAL3 = 137, /**< Yen */ - SDL_SCANCODE_INTERNATIONAL4 = 138, - SDL_SCANCODE_INTERNATIONAL5 = 139, - SDL_SCANCODE_INTERNATIONAL6 = 140, - SDL_SCANCODE_INTERNATIONAL7 = 141, - SDL_SCANCODE_INTERNATIONAL8 = 142, - SDL_SCANCODE_INTERNATIONAL9 = 143, - SDL_SCANCODE_LANG1 = 144, /**< Hangul/English toggle */ - SDL_SCANCODE_LANG2 = 145, /**< Hanja conversion */ - SDL_SCANCODE_LANG3 = 146, /**< Katakana */ - SDL_SCANCODE_LANG4 = 147, /**< Hiragana */ - SDL_SCANCODE_LANG5 = 148, /**< Zenkaku/Hankaku */ - SDL_SCANCODE_LANG6 = 149, /**< reserved */ - SDL_SCANCODE_LANG7 = 150, /**< reserved */ - SDL_SCANCODE_LANG8 = 151, /**< reserved */ - SDL_SCANCODE_LANG9 = 152, /**< reserved */ - - SDL_SCANCODE_ALTERASE = 153, /**< Erase-Eaze */ - SDL_SCANCODE_SYSREQ = 154, - SDL_SCANCODE_CANCEL = 155, - SDL_SCANCODE_CLEAR = 156, - SDL_SCANCODE_PRIOR = 157, - SDL_SCANCODE_RETURN2 = 158, - SDL_SCANCODE_SEPARATOR = 159, - SDL_SCANCODE_OUT = 160, - SDL_SCANCODE_OPER = 161, - SDL_SCANCODE_CLEARAGAIN = 162, - SDL_SCANCODE_CRSEL = 163, - SDL_SCANCODE_EXSEL = 164, - - SDL_SCANCODE_KP_00 = 176, - SDL_SCANCODE_KP_000 = 177, - SDL_SCANCODE_THOUSANDSSEPARATOR = 178, - SDL_SCANCODE_DECIMALSEPARATOR = 179, - SDL_SCANCODE_CURRENCYUNIT = 180, - SDL_SCANCODE_CURRENCYSUBUNIT = 181, - SDL_SCANCODE_KP_LEFTPAREN = 182, - SDL_SCANCODE_KP_RIGHTPAREN = 183, - SDL_SCANCODE_KP_LEFTBRACE = 184, - SDL_SCANCODE_KP_RIGHTBRACE = 185, - SDL_SCANCODE_KP_TAB = 186, - SDL_SCANCODE_KP_BACKSPACE = 187, - SDL_SCANCODE_KP_A = 188, - SDL_SCANCODE_KP_B = 189, - SDL_SCANCODE_KP_C = 190, - SDL_SCANCODE_KP_D = 191, - SDL_SCANCODE_KP_E = 192, - SDL_SCANCODE_KP_F = 193, - SDL_SCANCODE_KP_XOR = 194, - SDL_SCANCODE_KP_POWER = 195, - SDL_SCANCODE_KP_PERCENT = 196, - SDL_SCANCODE_KP_LESS = 197, - SDL_SCANCODE_KP_GREATER = 198, - SDL_SCANCODE_KP_AMPERSAND = 199, - SDL_SCANCODE_KP_DBLAMPERSAND = 200, - SDL_SCANCODE_KP_VERTICALBAR = 201, - SDL_SCANCODE_KP_DBLVERTICALBAR = 202, - SDL_SCANCODE_KP_COLON = 203, - SDL_SCANCODE_KP_HASH = 204, - SDL_SCANCODE_KP_SPACE = 205, - SDL_SCANCODE_KP_AT = 206, - SDL_SCANCODE_KP_EXCLAM = 207, - SDL_SCANCODE_KP_MEMSTORE = 208, - SDL_SCANCODE_KP_MEMRECALL = 209, - SDL_SCANCODE_KP_MEMCLEAR = 210, - SDL_SCANCODE_KP_MEMADD = 211, - SDL_SCANCODE_KP_MEMSUBTRACT = 212, - SDL_SCANCODE_KP_MEMMULTIPLY = 213, - SDL_SCANCODE_KP_MEMDIVIDE = 214, - SDL_SCANCODE_KP_PLUSMINUS = 215, - SDL_SCANCODE_KP_CLEAR = 216, - SDL_SCANCODE_KP_CLEARENTRY = 217, - SDL_SCANCODE_KP_BINARY = 218, - SDL_SCANCODE_KP_OCTAL = 219, - SDL_SCANCODE_KP_DECIMAL = 220, - SDL_SCANCODE_KP_HEXADECIMAL = 221, - - SDL_SCANCODE_LCTRL = 224, - SDL_SCANCODE_LSHIFT = 225, - SDL_SCANCODE_LALT = 226, /**< alt, option */ - SDL_SCANCODE_LGUI = 227, /**< windows, command (apple), meta */ - SDL_SCANCODE_RCTRL = 228, - SDL_SCANCODE_RSHIFT = 229, - SDL_SCANCODE_RALT = 230, /**< alt gr, option */ - SDL_SCANCODE_RGUI = 231, /**< windows, command (apple), meta */ - - SDL_SCANCODE_MODE = 257, /**< I'm not sure if this is really not covered - * by any of the above, but since there's a - * special KMOD_MODE for it I'm adding it here - */ - - /* @} *//* Usage page 0x07 */ - - /** - * \name Usage page 0x0C - * - * These values are mapped from usage page 0x0C (USB consumer page). - */ - /* @{ */ - - SDL_SCANCODE_AUDIONEXT = 258, - SDL_SCANCODE_AUDIOPREV = 259, - SDL_SCANCODE_AUDIOSTOP = 260, - SDL_SCANCODE_AUDIOPLAY = 261, - SDL_SCANCODE_AUDIOMUTE = 262, - SDL_SCANCODE_MEDIASELECT = 263, - SDL_SCANCODE_WWW = 264, - SDL_SCANCODE_MAIL = 265, - SDL_SCANCODE_CALCULATOR = 266, - SDL_SCANCODE_COMPUTER = 267, - SDL_SCANCODE_AC_SEARCH = 268, - SDL_SCANCODE_AC_HOME = 269, - SDL_SCANCODE_AC_BACK = 270, - SDL_SCANCODE_AC_FORWARD = 271, - SDL_SCANCODE_AC_STOP = 272, - SDL_SCANCODE_AC_REFRESH = 273, - SDL_SCANCODE_AC_BOOKMARKS = 274, - - /* @} *//* Usage page 0x0C */ - - /** - * \name Walther keys - * - * These are values that Christian Walther added (for mac keyboard?). - */ - /* @{ */ - - SDL_SCANCODE_BRIGHTNESSDOWN = 275, - SDL_SCANCODE_BRIGHTNESSUP = 276, - SDL_SCANCODE_DISPLAYSWITCH = 277, /**< display mirroring/dual display - switch, video mode switch */ - SDL_SCANCODE_KBDILLUMTOGGLE = 278, - SDL_SCANCODE_KBDILLUMDOWN = 279, - SDL_SCANCODE_KBDILLUMUP = 280, - SDL_SCANCODE_EJECT = 281, - SDL_SCANCODE_SLEEP = 282, - - SDL_SCANCODE_APP1 = 283, - SDL_SCANCODE_APP2 = 284, - - /* @} *//* Walther keys */ - - /* Add any other keys here. */ - - SDL_NUM_SCANCODES = 512 /**< not a key, just marks the number of scancodes - for array bounds */ -} SDL_Scancode; - -#endif /* _SDL_scancode_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_shape.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_shape.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_shape.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_shape.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,143 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_shape_h -#define _SDL_shape_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_surface.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** \file SDL_shape.h - * - * Header file for the shaped window API. - */ - -#define SDL_NONSHAPEABLE_WINDOW -1 -#define SDL_INVALID_SHAPE_ARGUMENT -2 -#define SDL_WINDOW_LACKS_SHAPE -3 - -/** - * \brief Create a window that can be shaped with the specified position, dimensions, and flags. - * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of SDL_WINDOW_BORDERLESS with any of the following: - * ::SDL_WINDOW_OPENGL, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_RESIZABLE, - * ::SDL_WINDOW_MAXIMIZED, ::SDL_WINDOW_MINIMIZED, - * ::SDL_WINDOW_BORDERLESS is always set, and ::SDL_WINDOW_FULLSCREEN is always unset. - * - * \return The window created, or NULL if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags); - -/** - * \brief Return whether the given window is a shaped window. - * - * \param window The window to query for being shaped. - * - * \return SDL_TRUE if the window is a window that can be shaped, SDL_FALSE if the window is unshaped or NULL. - * \sa SDL_CreateShapedWindow - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsShapedWindow(const SDL_Window *window); - -/** \brief An enum denoting the specific type of contents present in an SDL_WindowShapeParams union. */ -typedef enum { - /** \brief The default mode, a binarized alpha cutoff of 1. */ - ShapeModeDefault, - /** \brief A binarized alpha cutoff with a given integer value. */ - ShapeModeBinarizeAlpha, - /** \brief A binarized alpha cutoff with a given integer value, but with the opposite comparison. */ - ShapeModeReverseBinarizeAlpha, - /** \brief A color key is applied. */ - ShapeModeColorKey -} WindowShapeMode; - -#define SDL_SHAPEMODEALPHA(mode) (mode == ShapeModeDefault || mode == ShapeModeBinarizeAlpha || mode == ShapeModeReverseBinarizeAlpha) - -/** \brief A union containing parameters for shaped windows. */ -typedef union { - /** \brief a cutoff alpha value for binarization of the window shape's alpha channel. */ - Uint8 binarizationCutoff; - SDL_Color colorKey; -} SDL_WindowShapeParams; - -/** \brief A struct that tags the SDL_WindowShapeParams union with an enum describing the type of its contents. */ -typedef struct SDL_WindowShapeMode { - /** \brief The mode of these window-shape parameters. */ - WindowShapeMode mode; - /** \brief Window-shape parameters. */ - SDL_WindowShapeParams parameters; -} SDL_WindowShapeMode; - -/** - * \brief Set the shape and parameters of a shaped window. - * - * \param window The shaped window whose parameters should be set. - * \param shape A surface encoding the desired shape for the window. - * \param shape_mode The parameters to set for the shaped window. - * - * \return 0 on success, SDL_INVALID_SHAPE_ARGUMENT on invalid an invalid shape argument, or SDL_NONSHAPEABLE_WINDOW - * if the SDL_Window* given does not reference a valid shaped window. - * - * \sa SDL_WindowShapeMode - * \sa SDL_GetShapedWindowMode. - */ -extern DECLSPEC int SDLCALL SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); - -/** - * \brief Get the shape parameters of a shaped window. - * - * \param window The shaped window whose parameters should be retrieved. - * \param shape_mode An empty shape-mode structure to fill, or NULL to check whether the window has a shape. - * - * \return 0 if the window has a shape and, provided shape_mode was not NULL, shape_mode has been filled with the mode - * data, SDL_NONSHAPEABLE_WINDOW if the SDL_Window given is not a shaped window, or SDL_WINDOW_LACKS_SHAPE if - * the SDL_Window* given is a shapeable window currently lacking a shape. - * - * \sa SDL_WindowShapeMode - * \sa SDL_SetWindowShape - */ -extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shape_mode); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_shape_h */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_stdinc.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,405 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_stdinc.h - * - * This is a general header that includes C language support. - */ - -#ifndef _SDL_stdinc_h -#define _SDL_stdinc_h - -#include "SDL_config.h" - -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#ifdef HAVE_STDIO_H -#include -#endif -#if defined(STDC_HEADERS) -# include -# include -# include -#else -# if defined(HAVE_STDLIB_H) -# include -# elif defined(HAVE_MALLOC_H) -# include -# endif -# if defined(HAVE_STDDEF_H) -# include -# endif -# if defined(HAVE_STDARG_H) -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H) -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#if defined(HAVE_INTTYPES_H) -# include -#elif defined(HAVE_STDINT_H) -# include -#endif -#ifdef HAVE_CTYPE_H -# include -#endif -#ifdef HAVE_MATH_H -# if defined(__WINRT__) -/* Defining _USE_MATH_DEFINES is required to get M_PI to be defined on - WinRT. See http://msdn.microsoft.com/en-us/library/4hwaceh6.aspx - for more information. -*/ -# define _USE_MATH_DEFINES -# endif -# include -#endif -#ifdef HAVE_FLOAT_H -# include -#endif -#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H) -# include -#endif - -/** - * The number of elements in an array. - */ -#define SDL_arraysize(array) (sizeof(array)/sizeof(array[0])) -#define SDL_TABLESIZE(table) SDL_arraysize(table) - -/** - * \name Cast operators - * - * Use proper C++ casts when compiled as C++ to be compatible with the option - * -Wold-style-cast of GCC (and -Werror=old-style-cast in GCC 4.2 and above). - */ -/* @{ */ -#ifdef __cplusplus -#define SDL_reinterpret_cast(type, expression) reinterpret_cast(expression) -#define SDL_static_cast(type, expression) static_cast(expression) -#define SDL_const_cast(type, expression) const_cast(expression) -#else -#define SDL_reinterpret_cast(type, expression) ((type)(expression)) -#define SDL_static_cast(type, expression) ((type)(expression)) -#define SDL_const_cast(type, expression) ((type)(expression)) -#endif -/* @} *//* Cast operators */ - -/* Define a four character code as a Uint32 */ -#define SDL_FOURCC(A, B, C, D) \ - ((SDL_static_cast(Uint32, SDL_static_cast(Uint8, (A))) << 0) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (B))) << 8) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (C))) << 16) | \ - (SDL_static_cast(Uint32, SDL_static_cast(Uint8, (D))) << 24)) - -/** - * \name Basic data types - */ -/* @{ */ - -typedef enum -{ - SDL_FALSE = 0, - SDL_TRUE = 1 -} SDL_bool; - -/** - * \brief A signed 8-bit integer type. - */ -typedef int8_t Sint8; -/** - * \brief An unsigned 8-bit integer type. - */ -typedef uint8_t Uint8; -/** - * \brief A signed 16-bit integer type. - */ -typedef int16_t Sint16; -/** - * \brief An unsigned 16-bit integer type. - */ -typedef uint16_t Uint16; -/** - * \brief A signed 32-bit integer type. - */ -typedef int32_t Sint32; -/** - * \brief An unsigned 32-bit integer type. - */ -typedef uint32_t Uint32; - -/** - * \brief A signed 64-bit integer type. - */ -typedef int64_t Sint64; -/** - * \brief An unsigned 64-bit integer type. - */ -typedef uint64_t Uint64; - -/* @} *//* Basic data types */ - - -#define SDL_COMPILE_TIME_ASSERT(name, x) \ - typedef int SDL_dummy_ ## name[(x) * 2 - 1] -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -SDL_COMPILE_TIME_ASSERT(uint8, sizeof(Uint8) == 1); -SDL_COMPILE_TIME_ASSERT(sint8, sizeof(Sint8) == 1); -SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2); -SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); -SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); -SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); -SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); -SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ -/** \endcond */ - -/* Check to make sure enums are the size of ints, for structure packing. - For both Watcom C/C++ and Borland C/C++ the compiler option that makes - enums having the size of an int must be enabled. - This is "-b" for Borland C/C++ and "-ei" for Watcom C/C++ (v11). -*/ - -/** \cond */ -#ifndef DOXYGEN_SHOULD_IGNORE_THIS -#if !defined(__ANDROID__) - /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */ -typedef enum -{ - DUMMY_ENUM_VALUE -} SDL_DUMMY_ENUM; - -SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int)); -#endif -#endif /* DOXYGEN_SHOULD_IGNORE_THIS */ -/** \endcond */ - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(HAVE_ALLOCA) && !defined(alloca) -# if defined(HAVE_ALLOCA_H) -# include -# elif defined(__GNUC__) -# define alloca __builtin_alloca -# elif defined(_MSC_VER) -# include -# define alloca _alloca -# elif defined(__WATCOMC__) -# include -# elif defined(__BORLANDC__) -# include -# elif defined(__DMC__) -# include -# elif defined(__AIX__) -#pragma alloca -# elif defined(__MRC__) -void *alloca(unsigned); -# else -char *alloca(); -# endif -#endif -#ifdef HAVE_ALLOCA -#define SDL_stack_alloc(type, count) (type*)alloca(sizeof(type)*(count)) -#define SDL_stack_free(data) -#else -#define SDL_stack_alloc(type, count) (type*)SDL_malloc(sizeof(type)*(count)) -#define SDL_stack_free(data) SDL_free(data) -#endif - -extern DECLSPEC void *SDLCALL SDL_malloc(size_t size); -extern DECLSPEC void *SDLCALL SDL_calloc(size_t nmemb, size_t size); -extern DECLSPEC void *SDLCALL SDL_realloc(void *mem, size_t size); -extern DECLSPEC void SDLCALL SDL_free(void *mem); - -extern DECLSPEC char *SDLCALL SDL_getenv(const char *name); -extern DECLSPEC int SDLCALL SDL_setenv(const char *name, const char *value, int overwrite); - -extern DECLSPEC void SDLCALL SDL_qsort(void *base, size_t nmemb, size_t size, int (*compare) (const void *, const void *)); - -extern DECLSPEC int SDLCALL SDL_abs(int x); - -/* !!! FIXME: these have side effects. You probably shouldn't use them. */ -/* !!! FIXME: Maybe we do forceinline functions of SDL_mini, SDL_minf, etc? */ -#define SDL_min(x, y) (((x) < (y)) ? (x) : (y)) -#define SDL_max(x, y) (((x) > (y)) ? (x) : (y)) - -extern DECLSPEC int SDLCALL SDL_isdigit(int x); -extern DECLSPEC int SDLCALL SDL_isspace(int x); -extern DECLSPEC int SDLCALL SDL_toupper(int x); -extern DECLSPEC int SDLCALL SDL_tolower(int x); - -extern DECLSPEC void *SDLCALL SDL_memset(void *dst, int c, size_t len); - -#define SDL_zero(x) SDL_memset(&(x), 0, sizeof((x))) -#define SDL_zerop(x) SDL_memset((x), 0, sizeof(*(x))) - -/* Note that memset() is a byte assignment and this is a 32-bit assignment, so they're not directly equivalent. */ -SDL_FORCE_INLINE void SDL_memset4(void *dst, Uint32 val, size_t dwords) -{ -#if defined(__GNUC__) && defined(i386) - int u0, u1, u2; - __asm__ __volatile__ ( - "cld \n\t" - "rep ; stosl \n\t" - : "=&D" (u0), "=&a" (u1), "=&c" (u2) - : "0" (dst), "1" (val), "2" (SDL_static_cast(Uint32, dwords)) - : "memory" - ); -#else - size_t _n = (dwords + 3) / 4; - Uint32 *_p = SDL_static_cast(Uint32 *, dst); - Uint32 _val = (val); - if (dwords == 0) - return; - switch (dwords % 4) - { - case 0: do { *_p++ = _val; - case 3: *_p++ = _val; - case 2: *_p++ = _val; - case 1: *_p++ = _val; - } while ( --_n ); - } -#endif -} - - -extern DECLSPEC void *SDLCALL SDL_memcpy(void *dst, const void *src, size_t len); - -SDL_FORCE_INLINE void *SDL_memcpy4(void *dst, const void *src, size_t dwords) -{ - return SDL_memcpy(dst, src, dwords * 4); -} - -extern DECLSPEC void *SDLCALL SDL_memmove(void *dst, const void *src, size_t len); -extern DECLSPEC int SDLCALL SDL_memcmp(const void *s1, const void *s2, size_t len); - -extern DECLSPEC size_t SDLCALL SDL_wcslen(const wchar_t *wstr); -extern DECLSPEC size_t SDLCALL SDL_wcslcpy(wchar_t *dst, const wchar_t *src, size_t maxlen); -extern DECLSPEC size_t SDLCALL SDL_wcslcat(wchar_t *dst, const wchar_t *src, size_t maxlen); - -extern DECLSPEC size_t SDLCALL SDL_strlen(const char *str); -extern DECLSPEC size_t SDLCALL SDL_strlcpy(char *dst, const char *src, size_t maxlen); -extern DECLSPEC size_t SDLCALL SDL_utf8strlcpy(char *dst, const char *src, size_t dst_bytes); -extern DECLSPEC size_t SDLCALL SDL_strlcat(char *dst, const char *src, size_t maxlen); -extern DECLSPEC char *SDLCALL SDL_strdup(const char *str); -extern DECLSPEC char *SDLCALL SDL_strrev(char *str); -extern DECLSPEC char *SDLCALL SDL_strupr(char *str); -extern DECLSPEC char *SDLCALL SDL_strlwr(char *str); -extern DECLSPEC char *SDLCALL SDL_strchr(const char *str, int c); -extern DECLSPEC char *SDLCALL SDL_strrchr(const char *str, int c); -extern DECLSPEC char *SDLCALL SDL_strstr(const char *haystack, const char *needle); - -extern DECLSPEC char *SDLCALL SDL_itoa(int value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_uitoa(unsigned int value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ltoa(long value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ultoa(unsigned long value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_lltoa(Sint64 value, char *str, int radix); -extern DECLSPEC char *SDLCALL SDL_ulltoa(Uint64 value, char *str, int radix); - -extern DECLSPEC int SDLCALL SDL_atoi(const char *str); -extern DECLSPEC double SDLCALL SDL_atof(const char *str); -extern DECLSPEC long SDLCALL SDL_strtol(const char *str, char **endp, int base); -extern DECLSPEC unsigned long SDLCALL SDL_strtoul(const char *str, char **endp, int base); -extern DECLSPEC Sint64 SDLCALL SDL_strtoll(const char *str, char **endp, int base); -extern DECLSPEC Uint64 SDLCALL SDL_strtoull(const char *str, char **endp, int base); -extern DECLSPEC double SDLCALL SDL_strtod(const char *str, char **endp); - -extern DECLSPEC int SDLCALL SDL_strcmp(const char *str1, const char *str2); -extern DECLSPEC int SDLCALL SDL_strncmp(const char *str1, const char *str2, size_t maxlen); -extern DECLSPEC int SDLCALL SDL_strcasecmp(const char *str1, const char *str2); -extern DECLSPEC int SDLCALL SDL_strncasecmp(const char *str1, const char *str2, size_t len); - -extern DECLSPEC int SDLCALL SDL_sscanf(const char *text, const char *fmt, ...); -extern DECLSPEC int SDLCALL SDL_vsscanf(const char *text, const char *fmt, va_list ap); -extern DECLSPEC int SDLCALL SDL_snprintf(char *text, size_t maxlen, const char *fmt, ...); -extern DECLSPEC int SDLCALL SDL_vsnprintf(char *text, size_t maxlen, const char *fmt, va_list ap); - -#ifndef HAVE_M_PI -#ifndef M_PI -#define M_PI 3.14159265358979323846264338327950288 /* pi */ -#endif -#endif - -extern DECLSPEC double SDLCALL SDL_acos(double x); -extern DECLSPEC double SDLCALL SDL_asin(double x); -extern DECLSPEC double SDLCALL SDL_atan(double x); -extern DECLSPEC double SDLCALL SDL_atan2(double x, double y); -extern DECLSPEC double SDLCALL SDL_ceil(double x); -extern DECLSPEC double SDLCALL SDL_copysign(double x, double y); -extern DECLSPEC double SDLCALL SDL_cos(double x); -extern DECLSPEC float SDLCALL SDL_cosf(float x); -extern DECLSPEC double SDLCALL SDL_fabs(double x); -extern DECLSPEC double SDLCALL SDL_floor(double x); -extern DECLSPEC double SDLCALL SDL_log(double x); -extern DECLSPEC double SDLCALL SDL_pow(double x, double y); -extern DECLSPEC double SDLCALL SDL_scalbn(double x, int n); -extern DECLSPEC double SDLCALL SDL_sin(double x); -extern DECLSPEC float SDLCALL SDL_sinf(float x); -extern DECLSPEC double SDLCALL SDL_sqrt(double x); - -/* The SDL implementation of iconv() returns these error codes */ -#define SDL_ICONV_ERROR (size_t)-1 -#define SDL_ICONV_E2BIG (size_t)-2 -#define SDL_ICONV_EILSEQ (size_t)-3 -#define SDL_ICONV_EINVAL (size_t)-4 - -/* SDL_iconv_* are now always real symbols/types, not macros or inlined. */ -typedef struct _SDL_iconv_t *SDL_iconv_t; -extern DECLSPEC SDL_iconv_t SDLCALL SDL_iconv_open(const char *tocode, - const char *fromcode); -extern DECLSPEC int SDLCALL SDL_iconv_close(SDL_iconv_t cd); -extern DECLSPEC size_t SDLCALL SDL_iconv(SDL_iconv_t cd, const char **inbuf, - size_t * inbytesleft, char **outbuf, - size_t * outbytesleft); -/** - * This function converts a string between encodings in one pass, returning a - * string that must be freed with SDL_free() or NULL on error. - */ -extern DECLSPEC char *SDLCALL SDL_iconv_string(const char *tocode, - const char *fromcode, - const char *inbuf, - size_t inbytesleft); -#define SDL_iconv_utf8_locale(S) SDL_iconv_string("", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs2(S) (Uint16 *)SDL_iconv_string("UCS-2-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) -#define SDL_iconv_utf8_ucs4(S) (Uint32 *)SDL_iconv_string("UCS-4-INTERNAL", "UTF-8", S, SDL_strlen(S)+1) - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_stdinc_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_surface.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_surface.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_surface.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_surface.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,503 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_surface.h - * - * Header file for ::SDL_Surface definition and management functions. - */ - -#ifndef _SDL_surface_h -#define _SDL_surface_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_blendmode.h" -#include "SDL_rwops.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \name Surface flags - * - * These are the currently supported flags for the ::SDL_Surface. - * - * \internal - * Used internally (read-only). - */ -/* @{ */ -#define SDL_SWSURFACE 0 /**< Just here for compatibility */ -#define SDL_PREALLOC 0x00000001 /**< Surface uses preallocated memory */ -#define SDL_RLEACCEL 0x00000002 /**< Surface is RLE encoded */ -#define SDL_DONTFREE 0x00000004 /**< Surface is referenced internally */ -/* @} *//* Surface flags */ - -/** - * Evaluates to true if the surface needs to be locked before access. - */ -#define SDL_MUSTLOCK(S) (((S)->flags & SDL_RLEACCEL) != 0) - -/** - * \brief A collection of pixels used in software blitting. - * - * \note This structure should be treated as read-only, except for \c pixels, - * which, if not NULL, contains the raw pixel data for the surface. - */ -typedef struct SDL_Surface -{ - Uint32 flags; /**< Read-only */ - SDL_PixelFormat *format; /**< Read-only */ - int w, h; /**< Read-only */ - int pitch; /**< Read-only */ - void *pixels; /**< Read-write */ - - /** Application data associated with the surface */ - void *userdata; /**< Read-write */ - - /** information needed for surfaces requiring locks */ - int locked; /**< Read-only */ - void *lock_data; /**< Read-only */ - - /** clipping information */ - SDL_Rect clip_rect; /**< Read-only */ - - /** info for fast blit mapping to other surfaces */ - struct SDL_BlitMap *map; /**< Private */ - - /** Reference count -- used when freeing surface */ - int refcount; /**< Read-mostly */ -} SDL_Surface; - -/** - * \brief The type of function used for surface blitting functions. - */ -typedef int (*SDL_blit) (struct SDL_Surface * src, SDL_Rect * srcrect, - struct SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * Allocate and free an RGB surface. - * - * If the depth is 4 or 8 bits, an empty palette is allocated for the surface. - * If the depth is greater than 8 bits, the pixel format is set using the - * flags '[RGB]mask'. - * - * If the function runs out of memory, it will return NULL. - * - * \param flags The \c flags are obsolete and should be set to 0. - * \param width The width in pixels of the surface to create. - * \param height The height in pixels of the surface to create. - * \param depth The depth in bits of the surface to create. - * \param Rmask The red mask of the surface to create. - * \param Gmask The green mask of the surface to create. - * \param Bmask The blue mask of the surface to create. - * \param Amask The alpha mask of the surface to create. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurface - (Uint32 flags, int width, int height, int depth, - Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); -extern DECLSPEC SDL_Surface *SDLCALL SDL_CreateRGBSurfaceFrom(void *pixels, - int width, - int height, - int depth, - int pitch, - Uint32 Rmask, - Uint32 Gmask, - Uint32 Bmask, - Uint32 Amask); -extern DECLSPEC void SDLCALL SDL_FreeSurface(SDL_Surface * surface); - -/** - * \brief Set the palette used by a surface. - * - * \return 0, or -1 if the surface format doesn't use a palette. - * - * \note A single palette can be shared with many surfaces. - */ -extern DECLSPEC int SDLCALL SDL_SetSurfacePalette(SDL_Surface * surface, - SDL_Palette * palette); - -/** - * \brief Sets up a surface for directly accessing the pixels. - * - * Between calls to SDL_LockSurface() / SDL_UnlockSurface(), you can write - * to and read from \c surface->pixels, using the pixel format stored in - * \c surface->format. Once you are done accessing the surface, you should - * use SDL_UnlockSurface() to release it. - * - * Not all surfaces require locking. If SDL_MUSTLOCK(surface) evaluates - * to 0, then you can read and write to the surface at any time, and the - * pixel format of the surface will not change. - * - * No operating system or library calls should be made between lock/unlock - * pairs, as critical system locks may be held during this time. - * - * SDL_LockSurface() returns 0, or -1 if the surface couldn't be locked. - * - * \sa SDL_UnlockSurface() - */ -extern DECLSPEC int SDLCALL SDL_LockSurface(SDL_Surface * surface); -/** \sa SDL_LockSurface() */ -extern DECLSPEC void SDLCALL SDL_UnlockSurface(SDL_Surface * surface); - -/** - * Load a surface from a seekable SDL data stream (memory or file). - * - * If \c freesrc is non-zero, the stream will be closed after being read. - * - * The new surface should be freed with SDL_FreeSurface(). - * - * \return the new surface, or NULL if there was an error. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_LoadBMP_RW(SDL_RWops * src, - int freesrc); - -/** - * Load a surface from a file. - * - * Convenience macro. - */ -#define SDL_LoadBMP(file) SDL_LoadBMP_RW(SDL_RWFromFile(file, "rb"), 1) - -/** - * Save a surface to a seekable SDL data stream (memory or file). - * - * If \c freedst is non-zero, the stream will be closed after being written. - * - * \return 0 if successful or -1 if there was an error. - */ -extern DECLSPEC int SDLCALL SDL_SaveBMP_RW - (SDL_Surface * surface, SDL_RWops * dst, int freedst); - -/** - * Save a surface to a file. - * - * Convenience macro. - */ -#define SDL_SaveBMP(surface, file) \ - SDL_SaveBMP_RW(surface, SDL_RWFromFile(file, "wb"), 1) - -/** - * \brief Sets the RLE acceleration hint for a surface. - * - * \return 0 on success, or -1 if the surface is not valid - * - * \note If RLE is enabled, colorkey and alpha blending blits are much faster, - * but the surface must be locked before directly accessing the pixels. - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceRLE(SDL_Surface * surface, - int flag); - -/** - * \brief Sets the color key (transparent pixel) in a blittable surface. - * - * \param surface The surface to update - * \param flag Non-zero to enable colorkey and 0 to disable colorkey - * \param key The transparent pixel in the native surface format - * - * \return 0 on success, or -1 if the surface is not valid - * - * You can pass SDL_RLEACCEL to enable RLE accelerated blits. - */ -extern DECLSPEC int SDLCALL SDL_SetColorKey(SDL_Surface * surface, - int flag, Uint32 key); - -/** - * \brief Gets the color key (transparent pixel) in a blittable surface. - * - * \param surface The surface to update - * \param key A pointer filled in with the transparent pixel in the native - * surface format - * - * \return 0 on success, or -1 if the surface is not valid or colorkey is not - * enabled. - */ -extern DECLSPEC int SDLCALL SDL_GetColorKey(SDL_Surface * surface, - Uint32 * key); - -/** - * \brief Set an additional color value used in blit operations. - * - * \param surface The surface to update. - * \param r The red color value multiplied into blit operations. - * \param g The green color value multiplied into blit operations. - * \param b The blue color value multiplied into blit operations. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_GetSurfaceColorMod() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceColorMod(SDL_Surface * surface, - Uint8 r, Uint8 g, Uint8 b); - - -/** - * \brief Get the additional color value used in blit operations. - * - * \param surface The surface to query. - * \param r A pointer filled in with the current red color value. - * \param g A pointer filled in with the current green color value. - * \param b A pointer filled in with the current blue color value. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceColorMod() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceColorMod(SDL_Surface * surface, - Uint8 * r, Uint8 * g, - Uint8 * b); - -/** - * \brief Set an additional alpha value used in blit operations. - * - * \param surface The surface to update. - * \param alpha The alpha value multiplied into blit operations. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_GetSurfaceAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceAlphaMod(SDL_Surface * surface, - Uint8 alpha); - -/** - * \brief Get the additional alpha value used in blit operations. - * - * \param surface The surface to query. - * \param alpha A pointer filled in with the current alpha value. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceAlphaMod() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceAlphaMod(SDL_Surface * surface, - Uint8 * alpha); - -/** - * \brief Set the blend mode used for blit operations. - * - * \param surface The surface to update. - * \param blendMode ::SDL_BlendMode to use for blit blending. - * - * \return 0 on success, or -1 if the parameters are not valid. - * - * \sa SDL_GetSurfaceBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_SetSurfaceBlendMode(SDL_Surface * surface, - SDL_BlendMode blendMode); - -/** - * \brief Get the blend mode used for blit operations. - * - * \param surface The surface to query. - * \param blendMode A pointer filled in with the current blend mode. - * - * \return 0 on success, or -1 if the surface is not valid. - * - * \sa SDL_SetSurfaceBlendMode() - */ -extern DECLSPEC int SDLCALL SDL_GetSurfaceBlendMode(SDL_Surface * surface, - SDL_BlendMode *blendMode); - -/** - * Sets the clipping rectangle for the destination surface in a blit. - * - * If the clip rectangle is NULL, clipping will be disabled. - * - * If the clip rectangle doesn't intersect the surface, the function will - * return SDL_FALSE and blits will be completely clipped. Otherwise the - * function returns SDL_TRUE and blits to the surface will be clipped to - * the intersection of the surface area and the clipping rectangle. - * - * Note that blits are automatically clipped to the edges of the source - * and destination surfaces. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_SetClipRect(SDL_Surface * surface, - const SDL_Rect * rect); - -/** - * Gets the clipping rectangle for the destination surface in a blit. - * - * \c rect must be a pointer to a valid rectangle which will be filled - * with the correct values. - */ -extern DECLSPEC void SDLCALL SDL_GetClipRect(SDL_Surface * surface, - SDL_Rect * rect); - -/** - * Creates a new surface of the specified format, and then copies and maps - * the given surface to it so the blit of the converted surface will be as - * fast as possible. If this function fails, it returns NULL. - * - * The \c flags parameter is passed to SDL_CreateRGBSurface() and has those - * semantics. You can also pass ::SDL_RLEACCEL in the flags parameter and - * SDL will try to RLE accelerate colorkey and alpha blits in the resulting - * surface. - */ -extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurface - (SDL_Surface * src, const SDL_PixelFormat * fmt, Uint32 flags); -extern DECLSPEC SDL_Surface *SDLCALL SDL_ConvertSurfaceFormat - (SDL_Surface * src, Uint32 pixel_format, Uint32 flags); - -/** - * \brief Copy a block of pixels of one format to another format - * - * \return 0 on success, or -1 if there was an error - */ -extern DECLSPEC int SDLCALL SDL_ConvertPixels(int width, int height, - Uint32 src_format, - const void * src, int src_pitch, - Uint32 dst_format, - void * dst, int dst_pitch); - -/** - * Performs a fast fill of the given rectangle with \c color. - * - * If \c rect is NULL, the whole surface will be filled with \c color. - * - * The color should be a pixel of the format used by the surface, and - * can be generated by the SDL_MapRGB() function. - * - * \return 0 on success, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_FillRect - (SDL_Surface * dst, const SDL_Rect * rect, Uint32 color); -extern DECLSPEC int SDLCALL SDL_FillRects - (SDL_Surface * dst, const SDL_Rect * rects, int count, Uint32 color); - -/** - * Performs a fast blit from the source surface to the destination surface. - * - * This assumes that the source and destination rectangles are - * the same size. If either \c srcrect or \c dstrect are NULL, the entire - * surface (\c src or \c dst) is copied. The final blit rectangles are saved - * in \c srcrect and \c dstrect after all clipping is performed. - * - * \return If the blit is successful, it returns 0, otherwise it returns -1. - * - * The blit function should not be called on a locked surface. - * - * The blit semantics for surfaces with and without blending and colorkey - * are defined as follows: - * \verbatim - RGBA->RGB: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source alpha-channel and per-surface alpha) - SDL_SRCCOLORKEY ignored. - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source color key, ignoring alpha in the - comparison. - - RGB->RGBA: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source per-surface alpha) - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB, set destination alpha to source per-surface alpha value. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source color key. - - RGBA->RGBA: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source alpha-channel and per-surface alpha) - SDL_SRCCOLORKEY ignored. - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy all of RGBA to the destination. - if SDL_SRCCOLORKEY set, only copy the pixels matching the - RGB values of the source color key, ignoring alpha in the - comparison. - - RGB->RGB: - Source surface blend mode set to SDL_BLENDMODE_BLEND: - alpha-blend (using the source per-surface alpha) - Source surface blend mode set to SDL_BLENDMODE_NONE: - copy RGB. - both: - if SDL_SRCCOLORKEY set, only copy the pixels matching the - source color key. - \endverbatim - * - * You should call SDL_BlitSurface() unless you know exactly how SDL - * blitting works internally and how to use the other blit functions. - */ -#define SDL_BlitSurface SDL_UpperBlit - -/** - * This is the public blit function, SDL_BlitSurface(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlit() - */ -extern DECLSPEC int SDLCALL SDL_UpperBlit - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * This is a semi-private blit function and it performs low-level surface - * blitting only. - */ -extern DECLSPEC int SDLCALL SDL_LowerBlit - (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * \brief Perform a fast, low quality, stretch blit between two surfaces of the - * same pixel format. - * - * \note This function uses a static buffer, and is not thread-safe. - */ -extern DECLSPEC int SDLCALL SDL_SoftStretch(SDL_Surface * src, - const SDL_Rect * srcrect, - SDL_Surface * dst, - const SDL_Rect * dstrect); - -#define SDL_BlitScaled SDL_UpperBlitScaled - -/** - * This is the public scaled blit function, SDL_BlitScaled(), and it performs - * rectangle validation and clipping before passing it to SDL_LowerBlitScaled() - */ -extern DECLSPEC int SDLCALL SDL_UpperBlitScaled - (SDL_Surface * src, const SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - -/** - * This is a semi-private blit function and it performs low-level surface - * scaled blitting only. - */ -extern DECLSPEC int SDLCALL SDL_LowerBlitScaled - (SDL_Surface * src, SDL_Rect * srcrect, - SDL_Surface * dst, SDL_Rect * dstrect); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_surface_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_system.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_system.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_system.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_system.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,191 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_system.h - * - * Include file for platform specific SDL API functions - */ - -#ifndef _SDL_system_h -#define _SDL_system_h - -#include "SDL_stdinc.h" -#include "SDL_keyboard.h" -#include "SDL_render.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - - -/* Platform specific functions for Windows */ -#ifdef __WIN32__ - -/* Returns the D3D9 adapter index that matches the specified display index. - This adapter index can be passed to IDirect3D9::CreateDevice and controls - on which monitor a full screen application will appear. -*/ -extern DECLSPEC int SDLCALL SDL_Direct3D9GetAdapterIndex( int displayIndex ); - -/* Returns the D3D device associated with a renderer, or NULL if it's not a D3D renderer. - Once you are done using the device, you should release it to avoid a resource leak. - */ -typedef struct IDirect3DDevice9 IDirect3DDevice9; -extern DECLSPEC IDirect3DDevice9* SDLCALL SDL_RenderGetD3D9Device(SDL_Renderer * renderer); - -/* Returns the DXGI Adapter and Output indices for the specified display index. - These can be passed to EnumAdapters and EnumOutputs respectively to get the objects - required to create a DX10 or DX11 device and swap chain. - */ -extern DECLSPEC void SDLCALL SDL_DXGIGetOutputInfo( int displayIndex, int *adapterIndex, int *outputIndex ); - -#endif /* __WIN32__ */ - - -/* Platform specific functions for iOS */ -#if defined(__IPHONEOS__) && __IPHONEOS__ - -extern DECLSPEC int SDLCALL SDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam); -extern DECLSPEC void SDLCALL SDL_iPhoneSetEventPump(SDL_bool enabled); - -#endif /* __IPHONEOS__ */ - - -/* Platform specific functions for Android */ -#if defined(__ANDROID__) && __ANDROID__ - -/* Get the JNI environment for the current thread - This returns JNIEnv*, but the prototype is void* so we don't need jni.h - */ -extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv(); - -/* Get the SDL Activity object for the application - This returns jobject, but the prototype is void* so we don't need jni.h - The jobject returned by SDL_AndroidGetActivity is a local reference. - It is the caller's responsibility to properly release it - (using env->Push/PopLocalFrame or manually with env->DeleteLocalRef) - */ -extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(); - -/* See the official Android developer guide for more information: - http://developer.android.com/guide/topics/data/data-storage.html -*/ -#define SDL_ANDROID_EXTERNAL_STORAGE_READ 0x01 -#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE 0x02 - -/* Get the path used for internal storage for this application. - This path is unique to your application and cannot be written to - by other applications. - */ -extern DECLSPEC const char * SDLCALL SDL_AndroidGetInternalStoragePath(); - -/* Get the current state of external storage, a bitmask of these values: - SDL_ANDROID_EXTERNAL_STORAGE_READ - SDL_ANDROID_EXTERNAL_STORAGE_WRITE - If external storage is currently unavailable, this will return 0. -*/ -extern DECLSPEC int SDLCALL SDL_AndroidGetExternalStorageState(); - -/* Get the path used for external storage for this application. - This path is unique to your application, but is public and can be - written to by other applications. - */ -extern DECLSPEC const char * SDLCALL SDL_AndroidGetExternalStoragePath(); - -#endif /* __ANDROID__ */ - -/* Platform specific functions for WinRT */ -#if defined(__WINRT__) && __WINRT__ - -/** - * \brief WinRT / Windows Phone path types - */ -typedef enum -{ - /** \brief The installed app's root directory. - Files here are likely to be read-only. */ - SDL_WINRT_PATH_INSTALLED_LOCATION, - - /** \brief The app's local data store. Files may be written here */ - SDL_WINRT_PATH_LOCAL_FOLDER, - - /** \brief The app's roaming data store. Unsupported on Windows Phone. - Files written here may be copied to other machines via a network - connection. - */ - SDL_WINRT_PATH_ROAMING_FOLDER, - - /** \brief The app's temporary data store. Unsupported on Windows Phone. - Files written here may be deleted at any time. */ - SDL_WINRT_PATH_TEMP_FOLDER -} SDL_WinRT_Path; - - -/** - * \brief Retrieves a WinRT defined path on the local file system - * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx - * - * \param pathType The type of path to retrieve. - * \ret A UCS-2 string (16-bit, wide-char) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. - */ -extern DECLSPEC const wchar_t * SDLCALL SDL_WinRTGetFSPathUNICODE(SDL_WinRT_Path pathType); - -/** - * \brief Retrieves a WinRT defined path on the local file system - * - * \note Documentation on most app-specific path types on WinRT - * can be found on MSDN, at the URL: - * http://msdn.microsoft.com/en-us/library/windows/apps/hh464917.aspx - * - * \param pathType The type of path to retrieve. - * \ret A UTF-8 string (8-bit, multi-byte) containing the path, or NULL - * if the path is not available for any reason. Not all paths are - * available on all versions of Windows. This is especially true on - * Windows Phone. Check the documentation for the given - * SDL_WinRT_Path for more information on which path types are - * supported where. - */ -extern DECLSPEC const char * SDLCALL SDL_WinRTGetFSPathUTF8(SDL_WinRT_Path pathType); - -#endif /* __WINRT__ */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_system_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_syswm.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_syswm.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_syswm.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_syswm.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,272 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_syswm.h - * - * Include file for SDL custom system window manager hooks. - */ - -#ifndef _SDL_syswm_h -#define _SDL_syswm_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" -#include "SDL_version.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \file SDL_syswm.h - * - * Your application has access to a special type of event ::SDL_SYSWMEVENT, - * which contains window-manager specific information and arrives whenever - * an unhandled window event occurs. This event is ignored by default, but - * you can enable it with SDL_EventState(). - */ -#ifdef SDL_PROTOTYPES_ONLY -struct SDL_SysWMinfo; -#else - -#if defined(SDL_VIDEO_DRIVER_WINDOWS) -#define WIN32_LEAN_AND_MEAN -#include -#endif - -#if defined(SDL_VIDEO_DRIVER_WINRT) -#include -#endif - -/* This is the structure for custom window manager events */ -#if defined(SDL_VIDEO_DRIVER_X11) -#if defined(__APPLE__) && defined(__MACH__) -/* conflicts with Quickdraw.h */ -#define Cursor X11Cursor -#endif - -#include -#include - -#if defined(__APPLE__) && defined(__MACH__) -/* matches the re-define above */ -#undef Cursor -#endif - -#endif /* defined(SDL_VIDEO_DRIVER_X11) */ - -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) -#include -#endif - -#if defined(SDL_VIDEO_DRIVER_COCOA) -#ifdef __OBJC__ -#include -#else -typedef struct _NSWindow NSWindow; -#endif -#endif - -#if defined(SDL_VIDEO_DRIVER_UIKIT) -#ifdef __OBJC__ -#include -#else -typedef struct _UIWindow UIWindow; -typedef struct _UIViewController UIViewController; -#endif -#endif - -#if defined(SDL_VIDEO_DRIVER_MIR) -#include -#endif - - -/** - * These are the various supported windowing subsystems - */ -typedef enum -{ - SDL_SYSWM_UNKNOWN, - SDL_SYSWM_WINDOWS, - SDL_SYSWM_X11, - SDL_SYSWM_DIRECTFB, - SDL_SYSWM_COCOA, - SDL_SYSWM_UIKIT, - SDL_SYSWM_WAYLAND, - SDL_SYSWM_MIR, - SDL_SYSWM_WINRT, -} SDL_SYSWM_TYPE; - -/** - * The custom event structure. - */ -struct SDL_SysWMmsg -{ - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union - { -#if defined(SDL_VIDEO_DRIVER_WINDOWS) - struct { - HWND hwnd; /**< The window for the message */ - UINT msg; /**< The type of message */ - WPARAM wParam; /**< WORD message parameter */ - LPARAM lParam; /**< LONG message parameter */ - } win; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) - struct { - XEvent event; - } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) - struct { - DFBEvent event; - } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) - struct - { - /* No Cocoa window events yet */ - } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) - struct - { - /* No UIKit window events yet */ - } uikit; -#endif - /* Can't have an empty union */ - int dummy; - } msg; -}; - -/** - * The custom window manager information structure. - * - * When this structure is returned, it holds information about which - * low level system it is using, and will be one of SDL_SYSWM_TYPE. - */ -struct SDL_SysWMinfo -{ - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union - { -#if defined(SDL_VIDEO_DRIVER_WINDOWS) - struct - { - HWND window; /**< The window handle */ - } win; -#endif -#if defined(SDL_VIDEO_DRIVER_WINRT) - struct - { - IInspectable * window; /**< The WinRT CoreWindow */ - } winrt; -#endif -#if defined(SDL_VIDEO_DRIVER_X11) - struct - { - Display *display; /**< The X11 display */ - Window window; /**< The X11 window */ - } x11; -#endif -#if defined(SDL_VIDEO_DRIVER_DIRECTFB) - struct - { - IDirectFB *dfb; /**< The directfb main interface */ - IDirectFBWindow *window; /**< The directfb window handle */ - IDirectFBSurface *surface; /**< The directfb client surface */ - } dfb; -#endif -#if defined(SDL_VIDEO_DRIVER_COCOA) - struct - { - NSWindow *window; /* The Cocoa window */ - } cocoa; -#endif -#if defined(SDL_VIDEO_DRIVER_UIKIT) - struct - { - UIWindow *window; /* The UIKit window */ - } uikit; -#endif -#if defined(SDL_VIDEO_DRIVER_WAYLAND) - struct - { - struct wl_display *display; /**< Wayland display */ - struct wl_surface *surface; /**< Wayland surface */ - struct wl_shell_surface *shell_surface; /**< Wayland shell_surface (window manager handle) */ - } wl; -#endif -#if defined(SDL_VIDEO_DRIVER_MIR) - struct - { - MirConnection *connection; /**< Mir display server connection */ - MirSurface *surface; /**< Mir surface */ - } mir; -#endif - - /* Can't have an empty union */ - int dummy; - } info; -}; - -#endif /* SDL_PROTOTYPES_ONLY */ - -typedef struct SDL_SysWMinfo SDL_SysWMinfo; - -/* Function prototypes */ -/** - * \brief This function allows access to driver-dependent window information. - * - * \param window The window about which information is being requested - * \param info This structure must be initialized with the SDL version, and is - * then filled in with information about the given window. - * - * \return SDL_TRUE if the function is implemented and the version member of - * the \c info struct is valid, SDL_FALSE otherwise. - * - * You typically use this function like this: - * \code - * SDL_SysWMinfo info; - * SDL_VERSION(&info.version); - * if ( SDL_GetWindowWMInfo(window, &info) ) { ... } - * \endcode - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowWMInfo(SDL_Window * window, - SDL_SysWMinfo * info); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_syswm_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_thread.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_thread.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_thread.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_thread.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_thread_h -#define _SDL_thread_h - -/** - * \file SDL_thread.h - * - * Header for the SDL thread management routines. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -/* Thread synchronization primitives */ -#include "SDL_atomic.h" -#include "SDL_mutex.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/* The SDL thread structure, defined in SDL_thread.c */ -struct SDL_Thread; -typedef struct SDL_Thread SDL_Thread; - -/* The SDL thread ID */ -typedef unsigned long SDL_threadID; - -/* Thread local storage ID, 0 is the invalid ID */ -typedef unsigned int SDL_TLSID; - -/** - * The SDL thread priority. - * - * \note On many systems you require special privileges to set high priority. - */ -typedef enum { - SDL_THREAD_PRIORITY_LOW, - SDL_THREAD_PRIORITY_NORMAL, - SDL_THREAD_PRIORITY_HIGH -} SDL_ThreadPriority; - -/** - * The function passed to SDL_CreateThread(). - * It is passed a void* user context parameter and returns an int. - */ -typedef int (SDLCALL * SDL_ThreadFunction) (void *data); - -#if defined(__WIN32__) && !defined(HAVE_LIBC) -/** - * \file SDL_thread.h - * - * We compile SDL into a DLL. This means, that it's the DLL which - * creates a new thread for the calling process with the SDL_CreateThread() - * API. There is a problem with this, that only the RTL of the SDL.DLL will - * be initialized for those threads, and not the RTL of the calling - * application! - * - * To solve this, we make a little hack here. - * - * We'll always use the caller's _beginthread() and _endthread() APIs to - * start a new thread. This way, if it's the SDL.DLL which uses this API, - * then the RTL of SDL.DLL will be used to create the new thread, and if it's - * the application, then the RTL of the application will be used. - * - * So, in short: - * Always use the _beginthread() and _endthread() of the calling runtime - * library! - */ -#define SDL_PASSED_BEGINTHREAD_ENDTHREAD -#include /* This has _beginthread() and _endthread() defined! */ - -typedef uintptr_t(__cdecl * pfnSDL_CurrentBeginThread) (void *, unsigned, - unsigned (__stdcall * - func) (void - *), - void *arg, unsigned, - unsigned *threadID); -typedef void (__cdecl * pfnSDL_CurrentEndThread) (unsigned code); - -/** - * Create a thread. - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data, - pfnSDL_CurrentBeginThread pfnBeginThread, - pfnSDL_CurrentEndThread pfnEndThread); - -/** - * Create a thread. - */ -#if defined(SDL_CreateThread) && SDL_DYNAMIC_API -#undef SDL_CreateThread -#define SDL_CreateThread(fn, name, data) SDL_CreateThread_REAL(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#else -#define SDL_CreateThread(fn, name, data) SDL_CreateThread(fn, name, data, (pfnSDL_CurrentBeginThread)_beginthreadex, (pfnSDL_CurrentEndThread)_endthreadex) -#endif - -#else - -/** - * Create a thread. - * - * Thread naming is a little complicated: Most systems have very small - * limits for the string length (Haiku has 32 bytes, Linux currently has 16, - * Visual C++ 6.0 has nine!), and possibly other arbitrary rules. You'll - * have to see what happens with your system's debugger. The name should be - * UTF-8 (but using the naming limits of C identifiers is a better bet). - * There are no requirements for thread naming conventions, so long as the - * string is null-terminated UTF-8, but these guidelines are helpful in - * choosing a name: - * - * http://stackoverflow.com/questions/149932/naming-conventions-for-threads - * - * If a system imposes requirements, SDL will try to munge the string for - * it (truncate, etc), but the original string contents will be available - * from SDL_GetThreadName(). - */ -extern DECLSPEC SDL_Thread *SDLCALL -SDL_CreateThread(SDL_ThreadFunction fn, const char *name, void *data); - -#endif - -/** - * Get the thread name, as it was specified in SDL_CreateThread(). - * This function returns a pointer to a UTF-8 string that names the - * specified thread, or NULL if it doesn't have a name. This is internal - * memory, not to be free()'d by the caller, and remains valid until the - * specified thread is cleaned up by SDL_WaitThread(). - */ -extern DECLSPEC const char *SDLCALL SDL_GetThreadName(SDL_Thread *thread); - -/** - * Get the thread identifier for the current thread. - */ -extern DECLSPEC SDL_threadID SDLCALL SDL_ThreadID(void); - -/** - * Get the thread identifier for the specified thread. - * - * Equivalent to SDL_ThreadID() if the specified thread is NULL. - */ -extern DECLSPEC SDL_threadID SDLCALL SDL_GetThreadID(SDL_Thread * thread); - -/** - * Set the priority for the current thread - */ -extern DECLSPEC int SDLCALL SDL_SetThreadPriority(SDL_ThreadPriority priority); - -/** - * Wait for a thread to finish. Threads that haven't been detached will - * remain (as a "zombie") until this function cleans them up. Not doing so - * is a resource leak. - * - * Once a thread has been cleaned up through this function, the SDL_Thread - * that references it becomes invalid and should not be referenced again. - * As such, only one thread may call SDL_WaitThread() on another. - * - * The return code for the thread function is placed in the area - * pointed to by \c status, if \c status is not NULL. - * - * You may not wait on a thread that has been used in a call to - * SDL_DetachThread(). Use either that function or this one, but not - * both, or behavior is undefined. - * - * It is safe to pass NULL to this function; it is a no-op. - */ -extern DECLSPEC void SDLCALL SDL_WaitThread(SDL_Thread * thread, int *status); - -/** - * A thread may be "detached" to signify that it should not remain until - * another thread has called SDL_WaitThread() on it. Detaching a thread - * is useful for long-running threads that nothing needs to synchronize - * with or further manage. When a detached thread is done, it simply - * goes away. - * - * There is no way to recover the return code of a detached thread. If you - * need this, don't detach the thread and instead use SDL_WaitThread(). - * - * Once a thread is detached, you should usually assume the SDL_Thread isn't - * safe to reference again, as it will become invalid immediately upon - * the detached thread's exit, instead of remaining until someone has called - * SDL_WaitThread() to finally clean it up. As such, don't detach the same - * thread more than once. - * - * If a thread has already exited when passed to SDL_DetachThread(), it will - * stop waiting for a call to SDL_WaitThread() and clean up immediately. - * It is not safe to detach a thread that might be used with SDL_WaitThread(). - * - * You may not call SDL_WaitThread() on a thread that has been detached. - * Use either that function or this one, but not both, or behavior is - * undefined. - * - * It is safe to pass NULL to this function; it is a no-op. - */ -extern DECLSPEC void SDLCALL SDL_DetachThread(SDL_Thread * thread); - -/** - * \brief Create an identifier that is globally visible to all threads but refers to data that is thread-specific. - * - * \return The newly created thread local storage identifier, or 0 on error - * - * \code - * static SDL_SpinLock tls_lock; - * static SDL_TLSID thread_local_storage; - * - * void SetMyThreadData(void *value) - * { - * if (!thread_local_storage) { - * SDL_AtomicLock(&tls_lock); - * if (!thread_local_storage) { - * thread_local_storage = SDL_TLSCreate(); - * } - * SDL_AtomicUnLock(&tls_lock); - * } - * SDL_TLSSet(thread_local_storage, value); - * } - * - * void *GetMyThreadData(void) - * { - * return SDL_TLSGet(thread_local_storage); - * } - * \endcode - * - * \sa SDL_TLSGet() - * \sa SDL_TLSSet() - */ -extern DECLSPEC SDL_TLSID SDLCALL SDL_TLSCreate(void); - -/** - * \brief Get the value associated with a thread local storage ID for the current thread. - * - * \param id The thread local storage ID - * - * \return The value associated with the ID for the current thread, or NULL if no value has been set. - * - * \sa SDL_TLSCreate() - * \sa SDL_TLSSet() - */ -extern DECLSPEC void * SDLCALL SDL_TLSGet(SDL_TLSID id); - -/** - * \brief Set the value associated with a thread local storage ID for the current thread. - * - * \param id The thread local storage ID - * \param value The value to associate with the ID for the current thread - * \param destructor A function called when the thread exits, to free the value. - * - * \return 0 on success, -1 on error - * - * \sa SDL_TLSCreate() - * \sa SDL_TLSGet() - */ -extern DECLSPEC int SDLCALL SDL_TLSSet(SDL_TLSID id, const void *value, void (*destructor)(void*)); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_thread_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_timer.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_timer.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_timer.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_timer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -#ifndef _SDL_timer_h -#define _SDL_timer_h - -/** - * \file SDL_timer.h - * - * Header for the SDL time management routines. - */ - -#include "SDL_stdinc.h" -#include "SDL_error.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Get the number of milliseconds since the SDL library initialization. - * - * \note This value wraps if the program runs for more than ~49 days. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetTicks(void); - -/** - * \brief Compare SDL ticks values, and return true if A has passed B - * - * e.g. if you want to wait 100 ms, you could do this: - * Uint32 timeout = SDL_GetTicks() + 100; - * while (!SDL_TICKS_PASSED(SDL_GetTicks(), timeout)) { - * ... do work until timeout has elapsed - * } - */ -#define SDL_TICKS_PASSED(A, B) ((Sint32)((B) - (A)) <= 0) - -/** - * \brief Get the current value of the high resolution counter - */ -extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceCounter(void); - -/** - * \brief Get the count per second of the high resolution counter - */ -extern DECLSPEC Uint64 SDLCALL SDL_GetPerformanceFrequency(void); - -/** - * \brief Wait a specified number of milliseconds before returning. - */ -extern DECLSPEC void SDLCALL SDL_Delay(Uint32 ms); - -/** - * Function prototype for the timer callback function. - * - * The callback function is passed the current timer interval and returns - * the next timer interval. If the returned value is the same as the one - * passed in, the periodic alarm continues, otherwise a new alarm is - * scheduled. If the callback returns 0, the periodic alarm is cancelled. - */ -typedef Uint32 (SDLCALL * SDL_TimerCallback) (Uint32 interval, void *param); - -/** - * Definition of the timer ID type. - */ -typedef int SDL_TimerID; - -/** - * \brief Add a new timer to the pool of timers already running. - * - * \return A timer ID, or NULL when an error occurs. - */ -extern DECLSPEC SDL_TimerID SDLCALL SDL_AddTimer(Uint32 interval, - SDL_TimerCallback callback, - void *param); - -/** - * \brief Remove a timer knowing its ID. - * - * \return A boolean value indicating success or failure. - * - * \warning It is not safe to remove a timer multiple times. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_timer_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_touch.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_touch.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_touch.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_touch.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,86 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_touch.h - * - * Include file for SDL touch event handling. - */ - -#ifndef _SDL_touch_h -#define _SDL_touch_h - -#include "SDL_stdinc.h" -#include "SDL_error.h" -#include "SDL_video.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -typedef Sint64 SDL_TouchID; -typedef Sint64 SDL_FingerID; - -typedef struct SDL_Finger -{ - SDL_FingerID id; - float x; - float y; - float pressure; -} SDL_Finger; - -/* Used as the device ID for mouse events simulated with touch input */ -#define SDL_TOUCH_MOUSEID ((Uint32)-1) - - -/* Function prototypes */ - -/** - * \brief Get the number of registered touch devices. - */ -extern DECLSPEC int SDLCALL SDL_GetNumTouchDevices(void); - -/** - * \brief Get the touch ID with the given index, or 0 if the index is invalid. - */ -extern DECLSPEC SDL_TouchID SDLCALL SDL_GetTouchDevice(int index); - -/** - * \brief Get the number of active fingers for a given touch device. - */ -extern DECLSPEC int SDLCALL SDL_GetNumTouchFingers(SDL_TouchID touchID); - -/** - * \brief Get the finger object of the given touch, with the given index. - */ -extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int index); - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_touch_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_types.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_types.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_types.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_types.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_types.h - * - * \deprecated - */ - -/* DEPRECATED */ -#include "SDL_stdinc.h" diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_version.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_version.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_version.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_version.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_version.h - * - * This header defines the current SDL version. - */ - -#ifndef _SDL_version_h -#define _SDL_version_h - -#include "SDL_stdinc.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief Information the version of SDL in use. - * - * Represents the library's version as three levels: major revision - * (increments with massive changes, additions, and enhancements), - * minor revision (increments with backwards-compatible changes to the - * major revision), and patchlevel (increments with fixes to the minor - * revision). - * - * \sa SDL_VERSION - * \sa SDL_GetVersion - */ -typedef struct SDL_version -{ - Uint8 major; /**< major version */ - Uint8 minor; /**< minor version */ - Uint8 patch; /**< update version */ -} SDL_version; - -/* Printable format: "%d.%d.%d", MAJOR, MINOR, PATCHLEVEL -*/ -#define SDL_MAJOR_VERSION 2 -#define SDL_MINOR_VERSION 0 -#define SDL_PATCHLEVEL 3 - -/** - * \brief Macro to determine SDL version program was compiled against. - * - * This macro fills in a SDL_version structure with the version of the - * library you compiled against. This is determined by what header the - * compiler uses. Note that if you dynamically linked the library, you might - * have a slightly newer or older version at runtime. That version can be - * determined with SDL_GetVersion(), which, unlike SDL_VERSION(), - * is not a macro. - * - * \param x A pointer to a SDL_version struct to initialize. - * - * \sa SDL_version - * \sa SDL_GetVersion - */ -#define SDL_VERSION(x) \ -{ \ - (x)->major = SDL_MAJOR_VERSION; \ - (x)->minor = SDL_MINOR_VERSION; \ - (x)->patch = SDL_PATCHLEVEL; \ -} - -/** - * This macro turns the version numbers into a numeric value: - * \verbatim - (1,2,3) -> (1203) - \endverbatim - * - * This assumes that there will never be more than 100 patchlevels. - */ -#define SDL_VERSIONNUM(X, Y, Z) \ - ((X)*1000 + (Y)*100 + (Z)) - -/** - * This is the version number macro for the current SDL version. - */ -#define SDL_COMPILEDVERSION \ - SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL) - -/** - * This macro will evaluate to true if compiled with SDL at least X.Y.Z. - */ -#define SDL_VERSION_ATLEAST(X, Y, Z) \ - (SDL_COMPILEDVERSION >= SDL_VERSIONNUM(X, Y, Z)) - -/** - * \brief Get the version of SDL that is linked against your program. - * - * If you are linking to SDL dynamically, then it is possible that the - * current version will be different than the version you compiled against. - * This function returns the current version, while SDL_VERSION() is a - * macro that tells you what version you compiled with. - * - * \code - * SDL_version compiled; - * SDL_version linked; - * - * SDL_VERSION(&compiled); - * SDL_GetVersion(&linked); - * printf("We compiled against SDL version %d.%d.%d ...\n", - * compiled.major, compiled.minor, compiled.patch); - * printf("But we linked against SDL version %d.%d.%d.\n", - * linked.major, linked.minor, linked.patch); - * \endcode - * - * This function may be called safely at any time, even before SDL_Init(). - * - * \sa SDL_VERSION - */ -extern DECLSPEC void SDLCALL SDL_GetVersion(SDL_version * ver); - -/** - * \brief Get the code revision of SDL that is linked against your program. - * - * Returns an arbitrary string (a hash value) uniquely identifying the - * exact revision of the SDL library in use, and is only useful in comparing - * against other revisions. It is NOT an incrementing number. - */ -extern DECLSPEC const char *SDLCALL SDL_GetRevision(void); - -/** - * \brief Get the revision number of SDL that is linked against your program. - * - * Returns a number uniquely identifying the exact revision of the SDL - * library in use. It is an incrementing number based on commits to - * hg.libsdl.org. - */ -extern DECLSPEC int SDLCALL SDL_GetRevisionNumber(void); - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_version_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_video.h projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_video.h --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_video.h 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Headers/SDL_video.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,979 +0,0 @@ -/* - Simple DirectMedia Layer - Copyright (C) 1997-2014 Sam Lantinga - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. -*/ - -/** - * \file SDL_video.h - * - * Header file for SDL video functions. - */ - -#ifndef _SDL_video_h -#define _SDL_video_h - -#include "SDL_stdinc.h" -#include "SDL_pixels.h" -#include "SDL_rect.h" -#include "SDL_surface.h" - -#include "begin_code.h" -/* Set up for C function definitions, even when using C++ */ -#ifdef __cplusplus -extern "C" { -#endif - -/** - * \brief The structure that defines a display mode - * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() - * \sa SDL_GetDesktopDisplayMode() - * \sa SDL_GetCurrentDisplayMode() - * \sa SDL_GetClosestDisplayMode() - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() - */ -typedef struct -{ - Uint32 format; /**< pixel format */ - int w; /**< width */ - int h; /**< height */ - int refresh_rate; /**< refresh rate (or zero for unspecified) */ - void *driverdata; /**< driver-specific data, initialize to 0 */ -} SDL_DisplayMode; - -/** - * \brief The type used to identify a window - * - * \sa SDL_CreateWindow() - * \sa SDL_CreateWindowFrom() - * \sa SDL_DestroyWindow() - * \sa SDL_GetWindowData() - * \sa SDL_GetWindowFlags() - * \sa SDL_GetWindowGrab() - * \sa SDL_GetWindowPosition() - * \sa SDL_GetWindowSize() - * \sa SDL_GetWindowTitle() - * \sa SDL_HideWindow() - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() - * \sa SDL_RaiseWindow() - * \sa SDL_RestoreWindow() - * \sa SDL_SetWindowData() - * \sa SDL_SetWindowFullscreen() - * \sa SDL_SetWindowGrab() - * \sa SDL_SetWindowIcon() - * \sa SDL_SetWindowPosition() - * \sa SDL_SetWindowSize() - * \sa SDL_SetWindowBordered() - * \sa SDL_SetWindowTitle() - * \sa SDL_ShowWindow() - */ -typedef struct SDL_Window SDL_Window; - -/** - * \brief The flags on a window - * - * \sa SDL_GetWindowFlags() - */ -typedef enum -{ - SDL_WINDOW_FULLSCREEN = 0x00000001, /**< fullscreen window */ - SDL_WINDOW_OPENGL = 0x00000002, /**< window usable with OpenGL context */ - SDL_WINDOW_SHOWN = 0x00000004, /**< window is visible */ - SDL_WINDOW_HIDDEN = 0x00000008, /**< window is not visible */ - SDL_WINDOW_BORDERLESS = 0x00000010, /**< no window decoration */ - SDL_WINDOW_RESIZABLE = 0x00000020, /**< window can be resized */ - SDL_WINDOW_MINIMIZED = 0x00000040, /**< window is minimized */ - SDL_WINDOW_MAXIMIZED = 0x00000080, /**< window is maximized */ - SDL_WINDOW_INPUT_GRABBED = 0x00000100, /**< window has grabbed input focus */ - SDL_WINDOW_INPUT_FOCUS = 0x00000200, /**< window has input focus */ - SDL_WINDOW_MOUSE_FOCUS = 0x00000400, /**< window has mouse focus */ - SDL_WINDOW_FULLSCREEN_DESKTOP = ( SDL_WINDOW_FULLSCREEN | 0x00001000 ), - SDL_WINDOW_FOREIGN = 0x00000800, /**< window not created by SDL */ - SDL_WINDOW_ALLOW_HIGHDPI = 0x00002000 /**< window should be created in high-DPI mode if supported */ -} SDL_WindowFlags; - -/** - * \brief Used to indicate that you don't care what the window position is. - */ -#define SDL_WINDOWPOS_UNDEFINED_MASK 0x1FFF0000 -#define SDL_WINDOWPOS_UNDEFINED_DISPLAY(X) (SDL_WINDOWPOS_UNDEFINED_MASK|(X)) -#define SDL_WINDOWPOS_UNDEFINED SDL_WINDOWPOS_UNDEFINED_DISPLAY(0) -#define SDL_WINDOWPOS_ISUNDEFINED(X) \ - (((X)&0xFFFF0000) == SDL_WINDOWPOS_UNDEFINED_MASK) - -/** - * \brief Used to indicate that the window position should be centered. - */ -#define SDL_WINDOWPOS_CENTERED_MASK 0x2FFF0000 -#define SDL_WINDOWPOS_CENTERED_DISPLAY(X) (SDL_WINDOWPOS_CENTERED_MASK|(X)) -#define SDL_WINDOWPOS_CENTERED SDL_WINDOWPOS_CENTERED_DISPLAY(0) -#define SDL_WINDOWPOS_ISCENTERED(X) \ - (((X)&0xFFFF0000) == SDL_WINDOWPOS_CENTERED_MASK) - -/** - * \brief Event subtype for window events - */ -typedef enum -{ - SDL_WINDOWEVENT_NONE, /**< Never used */ - SDL_WINDOWEVENT_SHOWN, /**< Window has been shown */ - SDL_WINDOWEVENT_HIDDEN, /**< Window has been hidden */ - SDL_WINDOWEVENT_EXPOSED, /**< Window has been exposed and should be - redrawn */ - SDL_WINDOWEVENT_MOVED, /**< Window has been moved to data1, data2 - */ - SDL_WINDOWEVENT_RESIZED, /**< Window has been resized to data1xdata2 */ - SDL_WINDOWEVENT_SIZE_CHANGED, /**< The window size has changed, either as a result of an API call or through the system or user changing the window size. */ - SDL_WINDOWEVENT_MINIMIZED, /**< Window has been minimized */ - SDL_WINDOWEVENT_MAXIMIZED, /**< Window has been maximized */ - SDL_WINDOWEVENT_RESTORED, /**< Window has been restored to normal size - and position */ - SDL_WINDOWEVENT_ENTER, /**< Window has gained mouse focus */ - SDL_WINDOWEVENT_LEAVE, /**< Window has lost mouse focus */ - SDL_WINDOWEVENT_FOCUS_GAINED, /**< Window has gained keyboard focus */ - SDL_WINDOWEVENT_FOCUS_LOST, /**< Window has lost keyboard focus */ - SDL_WINDOWEVENT_CLOSE /**< The window manager requests that the - window be closed */ -} SDL_WindowEventID; - -/** - * \brief An opaque handle to an OpenGL context. - */ -typedef void *SDL_GLContext; - -/** - * \brief OpenGL configuration attributes - */ -typedef enum -{ - SDL_GL_RED_SIZE, - SDL_GL_GREEN_SIZE, - SDL_GL_BLUE_SIZE, - SDL_GL_ALPHA_SIZE, - SDL_GL_BUFFER_SIZE, - SDL_GL_DOUBLEBUFFER, - SDL_GL_DEPTH_SIZE, - SDL_GL_STENCIL_SIZE, - SDL_GL_ACCUM_RED_SIZE, - SDL_GL_ACCUM_GREEN_SIZE, - SDL_GL_ACCUM_BLUE_SIZE, - SDL_GL_ACCUM_ALPHA_SIZE, - SDL_GL_STEREO, - SDL_GL_MULTISAMPLEBUFFERS, - SDL_GL_MULTISAMPLESAMPLES, - SDL_GL_ACCELERATED_VISUAL, - SDL_GL_RETAINED_BACKING, - SDL_GL_CONTEXT_MAJOR_VERSION, - SDL_GL_CONTEXT_MINOR_VERSION, - SDL_GL_CONTEXT_EGL, - SDL_GL_CONTEXT_FLAGS, - SDL_GL_CONTEXT_PROFILE_MASK, - SDL_GL_SHARE_WITH_CURRENT_CONTEXT, - SDL_GL_FRAMEBUFFER_SRGB_CAPABLE -} SDL_GLattr; - -typedef enum -{ - SDL_GL_CONTEXT_PROFILE_CORE = 0x0001, - SDL_GL_CONTEXT_PROFILE_COMPATIBILITY = 0x0002, - SDL_GL_CONTEXT_PROFILE_ES = 0x0004 /* GLX_CONTEXT_ES2_PROFILE_BIT_EXT */ -} SDL_GLprofile; - -typedef enum -{ - SDL_GL_CONTEXT_DEBUG_FLAG = 0x0001, - SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG = 0x0002, - SDL_GL_CONTEXT_ROBUST_ACCESS_FLAG = 0x0004, - SDL_GL_CONTEXT_RESET_ISOLATION_FLAG = 0x0008 -} SDL_GLcontextFlag; - - -/* Function prototypes */ - -/** - * \brief Get the number of video drivers compiled into SDL - * - * \sa SDL_GetVideoDriver() - */ -extern DECLSPEC int SDLCALL SDL_GetNumVideoDrivers(void); - -/** - * \brief Get the name of a built in video driver. - * - * \note The video drivers are presented in the order in which they are - * normally checked during initialization. - * - * \sa SDL_GetNumVideoDrivers() - */ -extern DECLSPEC const char *SDLCALL SDL_GetVideoDriver(int index); - -/** - * \brief Initialize the video subsystem, optionally specifying a video driver. - * - * \param driver_name Initialize a specific driver by name, or NULL for the - * default video driver. - * - * \return 0 on success, -1 on error - * - * This function initializes the video subsystem; setting up a connection - * to the window manager, etc, and determines the available display modes - * and pixel formats, but does not initialize a window or graphics mode. - * - * \sa SDL_VideoQuit() - */ -extern DECLSPEC int SDLCALL SDL_VideoInit(const char *driver_name); - -/** - * \brief Shuts down the video subsystem. - * - * This function closes all windows, and restores the original video mode. - * - * \sa SDL_VideoInit() - */ -extern DECLSPEC void SDLCALL SDL_VideoQuit(void); - -/** - * \brief Returns the name of the currently initialized video driver. - * - * \return The name of the current video driver or NULL if no driver - * has been initialized - * - * \sa SDL_GetNumVideoDrivers() - * \sa SDL_GetVideoDriver() - */ -extern DECLSPEC const char *SDLCALL SDL_GetCurrentVideoDriver(void); - -/** - * \brief Returns the number of available video displays. - * - * \sa SDL_GetDisplayBounds() - */ -extern DECLSPEC int SDLCALL SDL_GetNumVideoDisplays(void); - -/** - * \brief Get the name of a display in UTF-8 encoding - * - * \return The name of a display, or NULL for an invalid display index. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC const char * SDLCALL SDL_GetDisplayName(int displayIndex); - -/** - * \brief Get the desktop area represented by a display, with the primary - * display located at 0,0 - * - * \return 0 on success, or -1 if the index is out of range. - * - * \sa SDL_GetNumVideoDisplays() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayBounds(int displayIndex, SDL_Rect * rect); - -/** - * \brief Returns the number of available display modes. - * - * \sa SDL_GetDisplayMode() - */ -extern DECLSPEC int SDLCALL SDL_GetNumDisplayModes(int displayIndex); - -/** - * \brief Fill in information about a specific display mode. - * - * \note The display modes are sorted in this priority: - * \li bits per pixel -> more colors to fewer colors - * \li width -> largest to smallest - * \li height -> largest to smallest - * \li refresh rate -> highest to lowest - * - * \sa SDL_GetNumDisplayModes() - */ -extern DECLSPEC int SDLCALL SDL_GetDisplayMode(int displayIndex, int modeIndex, - SDL_DisplayMode * mode); - -/** - * \brief Fill in information about the desktop display mode. - */ -extern DECLSPEC int SDLCALL SDL_GetDesktopDisplayMode(int displayIndex, SDL_DisplayMode * mode); - -/** - * \brief Fill in information about the current display mode. - */ -extern DECLSPEC int SDLCALL SDL_GetCurrentDisplayMode(int displayIndex, SDL_DisplayMode * mode); - - -/** - * \brief Get the closest match to the requested display mode. - * - * \param displayIndex The index of display from which mode should be queried. - * \param mode The desired display mode - * \param closest A pointer to a display mode to be filled in with the closest - * match of the available display modes. - * - * \return The passed in value \c closest, or NULL if no matching video mode - * was available. - * - * The available display modes are scanned, and \c closest is filled in with the - * closest mode matching the requested mode and returned. The mode format and - * refresh_rate default to the desktop mode if they are 0. The modes are - * scanned with size being first priority, format being second priority, and - * finally checking the refresh_rate. If all the available modes are too - * small, then NULL is returned. - * - * \sa SDL_GetNumDisplayModes() - * \sa SDL_GetDisplayMode() - */ -extern DECLSPEC SDL_DisplayMode * SDLCALL SDL_GetClosestDisplayMode(int displayIndex, const SDL_DisplayMode * mode, SDL_DisplayMode * closest); - -/** - * \brief Get the display index associated with a window. - * - * \return the display index of the display containing the center of the - * window, or -1 on error. - */ -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayIndex(SDL_Window * window); - -/** - * \brief Set the display mode used when a fullscreen window is visible. - * - * By default the window's dimensions and the desktop format and refresh rate - * are used. - * - * \param window The window for which the display mode should be set. - * \param mode The mode to use, or NULL for the default mode. - * - * \return 0 on success, or -1 if setting the display mode failed. - * - * \sa SDL_GetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowDisplayMode(SDL_Window * window, - const SDL_DisplayMode - * mode); - -/** - * \brief Fill in information about the display mode used when a fullscreen - * window is visible. - * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_SetWindowFullscreen() - */ -extern DECLSPEC int SDLCALL SDL_GetWindowDisplayMode(SDL_Window * window, - SDL_DisplayMode * mode); - -/** - * \brief Get the pixel format associated with the window. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowPixelFormat(SDL_Window * window); - -/** - * \brief Create a window with the specified position, dimensions, and flags. - * - * \param title The title of the window, in UTF-8 encoding. - * \param x The x position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y position of the window, ::SDL_WINDOWPOS_CENTERED, or - * ::SDL_WINDOWPOS_UNDEFINED. - * \param w The width of the window. - * \param h The height of the window. - * \param flags The flags for the window, a mask of any of the following: - * ::SDL_WINDOW_FULLSCREEN, ::SDL_WINDOW_OPENGL, - * ::SDL_WINDOW_HIDDEN, ::SDL_WINDOW_BORDERLESS, - * ::SDL_WINDOW_RESIZABLE, ::SDL_WINDOW_MAXIMIZED, - * ::SDL_WINDOW_MINIMIZED, ::SDL_WINDOW_INPUT_GRABBED, - * ::SDL_WINDOW_ALLOW_HIGHDPI. - * - * \return The id of the window created, or zero if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindow(const char *title, - int x, int y, int w, - int h, Uint32 flags); - -/** - * \brief Create an SDL window from an existing native window. - * - * \param data A pointer to driver-dependent window creation data - * - * \return The id of the window created, or zero if window creation failed. - * - * \sa SDL_DestroyWindow() - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_CreateWindowFrom(const void *data); - -/** - * \brief Get the numeric ID of a window, for logging purposes. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowID(SDL_Window * window); - -/** - * \brief Get a window from a stored ID, or NULL if it doesn't exist. - */ -extern DECLSPEC SDL_Window * SDLCALL SDL_GetWindowFromID(Uint32 id); - -/** - * \brief Get the window flags. - */ -extern DECLSPEC Uint32 SDLCALL SDL_GetWindowFlags(SDL_Window * window); - -/** - * \brief Set the title of a window, in UTF-8 format. - * - * \sa SDL_GetWindowTitle() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowTitle(SDL_Window * window, - const char *title); - -/** - * \brief Get the title of a window, in UTF-8 format. - * - * \sa SDL_SetWindowTitle() - */ -extern DECLSPEC const char *SDLCALL SDL_GetWindowTitle(SDL_Window * window); - -/** - * \brief Set the icon for a window. - * - * \param window The window for which the icon should be set. - * \param icon The icon for the window. - */ -extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_Window * window, - SDL_Surface * icon); - -/** - * \brief Associate an arbitrary named pointer with a window. - * - * \param window The window to associate with the pointer. - * \param name The name of the pointer. - * \param userdata The associated pointer. - * - * \return The previous value associated with 'name' - * - * \note The name is case-sensitive. - * - * \sa SDL_GetWindowData() - */ -extern DECLSPEC void* SDLCALL SDL_SetWindowData(SDL_Window * window, - const char *name, - void *userdata); - -/** - * \brief Retrieve the data pointer associated with a window. - * - * \param window The window to query. - * \param name The name of the pointer. - * - * \return The value associated with 'name' - * - * \sa SDL_SetWindowData() - */ -extern DECLSPEC void *SDLCALL SDL_GetWindowData(SDL_Window * window, - const char *name); - -/** - * \brief Set the position of a window. - * - * \param window The window to reposition. - * \param x The x coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * \param y The y coordinate of the window, ::SDL_WINDOWPOS_CENTERED, or - ::SDL_WINDOWPOS_UNDEFINED. - * - * \note The window coordinate origin is the upper left of the display. - * - * \sa SDL_GetWindowPosition() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowPosition(SDL_Window * window, - int x, int y); - -/** - * \brief Get the position of a window. - * - * \param window The window to query. - * \param x Pointer to variable for storing the x position, may be NULL - * \param y Pointer to variable for storing the y position, may be NULL - * - * \sa SDL_SetWindowPosition() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowPosition(SDL_Window * window, - int *x, int *y); - -/** - * \brief Set the size of a window's client area. - * - * \param window The window to resize. - * \param w The width of the window, must be >0 - * \param h The height of the window, must be >0 - * - * \note You can't change the size of a fullscreen window, it automatically - * matches the size of the display mode. - * - * \sa SDL_GetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowSize(SDL_Window * window, int w, - int h); - -/** - * \brief Get the size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL - * - * \sa SDL_SetWindowSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowSize(SDL_Window * window, int *w, - int *h); - -/** - * \brief Set the minimum size of a window's client area. - * - * \param window The window to set a new minimum size. - * \param min_w The minimum width of the window, must be >0 - * \param min_h The minimum height of the window, must be >0 - * - * \note You can't change the minimum size of a fullscreen window, it - * automatically matches the size of the display mode. - * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowMinimumSize(SDL_Window * window, - int min_w, int min_h); - -/** - * \brief Get the minimum size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the minimum width, may be NULL - * \param h Pointer to variable for storing the minimum height, may be NULL - * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowMinimumSize(SDL_Window * window, - int *w, int *h); - -/** - * \brief Set the maximum size of a window's client area. - * - * \param window The window to set a new maximum size. - * \param max_w The maximum width of the window, must be >0 - * \param max_h The maximum height of the window, must be >0 - * - * \note You can't change the maximum size of a fullscreen window, it - * automatically matches the size of the display mode. - * - * \sa SDL_GetWindowMaximumSize() - * \sa SDL_SetWindowMinimumSize() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowMaximumSize(SDL_Window * window, - int max_w, int max_h); - -/** - * \brief Get the maximum size of a window's client area. - * - * \param window The window to query. - * \param w Pointer to variable for storing the maximum width, may be NULL - * \param h Pointer to variable for storing the maximum height, may be NULL - * - * \sa SDL_GetWindowMinimumSize() - * \sa SDL_SetWindowMaximumSize() - */ -extern DECLSPEC void SDLCALL SDL_GetWindowMaximumSize(SDL_Window * window, - int *w, int *h); - -/** - * \brief Set the border state of a window. - * - * This will add or remove the window's SDL_WINDOW_BORDERLESS flag and - * add or remove the border from the actual window. This is a no-op if the - * window's border already matches the requested state. - * - * \param window The window of which to change the border state. - * \param bordered SDL_FALSE to remove border, SDL_TRUE to add border. - * - * \note You can't change the border state of a fullscreen window. - * - * \sa SDL_GetWindowFlags() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowBordered(SDL_Window * window, - SDL_bool bordered); - -/** - * \brief Show a window. - * - * \sa SDL_HideWindow() - */ -extern DECLSPEC void SDLCALL SDL_ShowWindow(SDL_Window * window); - -/** - * \brief Hide a window. - * - * \sa SDL_ShowWindow() - */ -extern DECLSPEC void SDLCALL SDL_HideWindow(SDL_Window * window); - -/** - * \brief Raise a window above other windows and set the input focus. - */ -extern DECLSPEC void SDLCALL SDL_RaiseWindow(SDL_Window * window); - -/** - * \brief Make a window as large as possible. - * - * \sa SDL_RestoreWindow() - */ -extern DECLSPEC void SDLCALL SDL_MaximizeWindow(SDL_Window * window); - -/** - * \brief Minimize a window to an iconic representation. - * - * \sa SDL_RestoreWindow() - */ -extern DECLSPEC void SDLCALL SDL_MinimizeWindow(SDL_Window * window); - -/** - * \brief Restore the size and position of a minimized or maximized window. - * - * \sa SDL_MaximizeWindow() - * \sa SDL_MinimizeWindow() - */ -extern DECLSPEC void SDLCALL SDL_RestoreWindow(SDL_Window * window); - -/** - * \brief Set a window's fullscreen state. - * - * \return 0 on success, or -1 if setting the display mode failed. - * - * \sa SDL_SetWindowDisplayMode() - * \sa SDL_GetWindowDisplayMode() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowFullscreen(SDL_Window * window, - Uint32 flags); - -/** - * \brief Get the SDL surface associated with the window. - * - * \return The window's framebuffer surface, or NULL on error. - * - * A new surface will be created with the optimal format for the window, - * if necessary. This surface will be freed when the window is destroyed. - * - * \note You may not combine this with 3D or the rendering API on this window. - * - * \sa SDL_UpdateWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() - */ -extern DECLSPEC SDL_Surface * SDLCALL SDL_GetWindowSurface(SDL_Window * window); - -/** - * \brief Copy the window surface to the screen. - * - * \return 0 on success, or -1 on error. - * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRects() - */ -extern DECLSPEC int SDLCALL SDL_UpdateWindowSurface(SDL_Window * window); - -/** - * \brief Copy a number of rectangles on the window surface to the screen. - * - * \return 0 on success, or -1 on error. - * - * \sa SDL_GetWindowSurface() - * \sa SDL_UpdateWindowSurfaceRect() - */ -extern DECLSPEC int SDLCALL SDL_UpdateWindowSurfaceRects(SDL_Window * window, - const SDL_Rect * rects, - int numrects); - -/** - * \brief Set a window's input grab mode. - * - * \param window The window for which the input grab mode should be set. - * \param grabbed This is SDL_TRUE to grab input, and SDL_FALSE to release input. - * - * \sa SDL_GetWindowGrab() - */ -extern DECLSPEC void SDLCALL SDL_SetWindowGrab(SDL_Window * window, - SDL_bool grabbed); - -/** - * \brief Get a window's input grab mode. - * - * \return This returns SDL_TRUE if input is grabbed, and SDL_FALSE otherwise. - * - * \sa SDL_SetWindowGrab() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GetWindowGrab(SDL_Window * window); - -/** - * \brief Set the brightness (gamma correction) for a window. - * - * \return 0 on success, or -1 if setting the brightness isn't supported. - * - * \sa SDL_GetWindowBrightness() - * \sa SDL_SetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowBrightness(SDL_Window * window, float brightness); - -/** - * \brief Get the brightness (gamma correction) for a window. - * - * \return The last brightness value passed to SDL_SetWindowBrightness() - * - * \sa SDL_SetWindowBrightness() - */ -extern DECLSPEC float SDLCALL SDL_GetWindowBrightness(SDL_Window * window); - -/** - * \brief Set the gamma ramp for a window. - * - * \param window The window for which the gamma ramp should be set. - * \param red The translation table for the red channel, or NULL. - * \param green The translation table for the green channel, or NULL. - * \param blue The translation table for the blue channel, or NULL. - * - * \return 0 on success, or -1 if gamma ramps are unsupported. - * - * Set the gamma translation table for the red, green, and blue channels - * of the video hardware. Each table is an array of 256 16-bit quantities, - * representing a mapping between the input and output for that channel. - * The input is the index into the array, and the output is the 16-bit - * gamma value at that index, scaled to the output color precision. - * - * \sa SDL_GetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_SetWindowGammaRamp(SDL_Window * window, - const Uint16 * red, - const Uint16 * green, - const Uint16 * blue); - -/** - * \brief Get the gamma ramp for a window. - * - * \param window The window from which the gamma ramp should be queried. - * \param red A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the red channel, or NULL. - * \param green A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the green channel, or NULL. - * \param blue A pointer to a 256 element array of 16-bit quantities to hold - * the translation table for the blue channel, or NULL. - * - * \return 0 on success, or -1 if gamma ramps are unsupported. - * - * \sa SDL_SetWindowGammaRamp() - */ -extern DECLSPEC int SDLCALL SDL_GetWindowGammaRamp(SDL_Window * window, - Uint16 * red, - Uint16 * green, - Uint16 * blue); - -/** - * \brief Destroy a window. - */ -extern DECLSPEC void SDLCALL SDL_DestroyWindow(SDL_Window * window); - - -/** - * \brief Returns whether the screensaver is currently enabled (default on). - * - * \sa SDL_EnableScreenSaver() - * \sa SDL_DisableScreenSaver() - */ -extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenSaverEnabled(void); - -/** - * \brief Allow the screen to be blanked by a screensaver - * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_DisableScreenSaver() - */ -extern DECLSPEC void SDLCALL SDL_EnableScreenSaver(void); - -/** - * \brief Prevent the screen from being blanked by a screensaver - * - * \sa SDL_IsScreenSaverEnabled() - * \sa SDL_EnableScreenSaver() - */ -extern DECLSPEC void SDLCALL SDL_DisableScreenSaver(void); - - -/** - * \name OpenGL support functions - */ -/* @{ */ - -/** - * \brief Dynamically load an OpenGL library. - * - * \param path The platform dependent OpenGL library name, or NULL to open the - * default OpenGL library. - * - * \return 0 on success, or -1 if the library couldn't be loaded. - * - * This should be done after initializing the video driver, but before - * creating any OpenGL windows. If no OpenGL library is loaded, the default - * library will be loaded upon creation of the first OpenGL window. - * - * \note If you do this, you need to retrieve all of the GL functions used in - * your program from the dynamic library using SDL_GL_GetProcAddress(). - * - * \sa SDL_GL_GetProcAddress() - * \sa SDL_GL_UnloadLibrary() - */ -extern DECLSPEC int SDLCALL SDL_GL_LoadLibrary(const char *path); - -/** - * \brief Get the address of an OpenGL function. - */ -extern DECLSPEC void *SDLCALL SDL_GL_GetProcAddress(const char *proc); - -/** - * \brief Unload the OpenGL library previously loaded by SDL_GL_LoadLibrary(). - * - * \sa SDL_GL_LoadLibrary() - */ -extern DECLSPEC void SDLCALL SDL_GL_UnloadLibrary(void); - -/** - * \brief Return true if an OpenGL extension is supported for the current - * context. - */ -extern DECLSPEC SDL_bool SDLCALL SDL_GL_ExtensionSupported(const char - *extension); - -/** - * \brief Reset all previously set OpenGL context attributes to their default values - */ -extern DECLSPEC void SDLCALL SDL_GL_ResetAttributes(void); - -/** - * \brief Set an OpenGL window attribute before window creation. - */ -extern DECLSPEC int SDLCALL SDL_GL_SetAttribute(SDL_GLattr attr, int value); - -/** - * \brief Get the actual value for an attribute from the current context. - */ -extern DECLSPEC int SDLCALL SDL_GL_GetAttribute(SDL_GLattr attr, int *value); - -/** - * \brief Create an OpenGL context for use with an OpenGL window, and make it - * current. - * - * \sa SDL_GL_DeleteContext() - */ -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_CreateContext(SDL_Window * - window); - -/** - * \brief Set up an OpenGL context for rendering into an OpenGL window. - * - * \note The context must have been created with a compatible window. - */ -extern DECLSPEC int SDLCALL SDL_GL_MakeCurrent(SDL_Window * window, - SDL_GLContext context); - -/** - * \brief Get the currently active OpenGL window. - */ -extern DECLSPEC SDL_Window* SDLCALL SDL_GL_GetCurrentWindow(void); - -/** - * \brief Get the currently active OpenGL context. - */ -extern DECLSPEC SDL_GLContext SDLCALL SDL_GL_GetCurrentContext(void); - -/** - * \brief Get the size of a window's underlying drawable (for use with glViewport). - * - * \param window Window from which the drawable size should be queried - * \param w Pointer to variable for storing the width, may be NULL - * \param h Pointer to variable for storing the height, may be NULL - * - * This may differ from SDL_GetWindowSize if we're rendering to a high-DPI - * drawable, i.e. the window was created with SDL_WINDOW_ALLOW_HIGHDPI on a - * platform with high-DPI support (Apple calls this "Retina"), and not disabled - * by the SDL_HINT_VIDEO_HIGHDPI_DISABLED hint. - * - * \sa SDL_GetWindowSize() - * \sa SDL_CreateWindow() - */ -extern DECLSPEC void SDLCALL SDL_GL_GetDrawableSize(SDL_Window * window, int *w, - int *h); - -/** - * \brief Set the swap interval for the current OpenGL context. - * - * \param interval 0 for immediate updates, 1 for updates synchronized with the - * vertical retrace. If the system supports it, you may - * specify -1 to allow late swaps to happen immediately - * instead of waiting for the next retrace. - * - * \return 0 on success, or -1 if setting the swap interval is not supported. - * - * \sa SDL_GL_GetSwapInterval() - */ -extern DECLSPEC int SDLCALL SDL_GL_SetSwapInterval(int interval); - -/** - * \brief Get the swap interval for the current OpenGL context. - * - * \return 0 if there is no vertical retrace synchronization, 1 if the buffer - * swap is synchronized with the vertical retrace, and -1 if late - * swaps happen immediately instead of waiting for the next retrace. - * If the system can't determine the swap interval, or there isn't a - * valid current context, this will return 0 as a safe default. - * - * \sa SDL_GL_SetSwapInterval() - */ -extern DECLSPEC int SDLCALL SDL_GL_GetSwapInterval(void); - -/** - * \brief Swap the OpenGL buffers for a window, if double-buffering is - * supported. - */ -extern DECLSPEC void SDLCALL SDL_GL_SwapWindow(SDL_Window * window); - -/** - * \brief Delete an OpenGL context. - * - * \sa SDL_GL_CreateContext() - */ -extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context); - -/* @} *//* OpenGL support functions */ - - -/* Ends C function definitions when using C++ */ -#ifdef __cplusplus -} -#endif -#include "close_code.h" - -#endif /* _SDL_video_h */ - -/* vi: set ts=4 sw=4 expandtab: */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Resources/Info.plist projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Resources/Info.plist --- projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/Resources/Info.plist 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/Resources/Info.plist 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ - - - - - BuildMachineOSBuild - 13C64 - CFBundleDevelopmentRegion - English - CFBundleExecutable - SDL2 - CFBundleGetInfoString - http://www.libsdl.org - CFBundleIdentifier - org.libsdl.SDL2 - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Simple DirectMedia Layer - CFBundlePackageType - FMWK - CFBundleShortVersionString - 2.0.3 - CFBundleSignature - SDLX - CFBundleVersion - 2.0.3 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 5A3005 - DTPlatformVersion - GM - DTSDKBuild - 13A595 - DTSDKName - macosx10.9 - DTXcode - 0502 - DTXcodeBuild - 5A3005 - - Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-emscripten/SDL2.framework/Versions/Current/SDL2 and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-emscripten/SDL2.framework/Versions/Current/SDL2 differ diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/config.inp projectm-3.1.0/src/projectM-iTunes/config.inp --- projectm-2.2.0~git28bb9/src/projectM-iTunes/config.inp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/config.inp 2018-10-16 14:16:33.000000000 +0000 @@ -2,8 +2,8 @@ # Configuration File for projectM Texture Size = 2048 # Size of internal rendering texture -Mesh X = 64 # Width of PerPixel Equation mesh -Mesh Y = 36 # Height of PerPixel Equation mesh +Mesh X = 200 # Width of PerPixel Equation mesh +Mesh Y = 160 # Height of PerPixel Equation mesh FPS = 60 # Frames Per Second Fullscreen = false Window Width = 1920 # startup window width diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/.gitignore projectm-3.1.0/src/projectM-iTunes/.gitignore --- projectm-2.2.0~git28bb9/src/projectM-iTunes/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/.gitignore 2018-10-16 14:16:33.000000000 +0000 @@ -0,0 +1 @@ +iProjectM.pkg diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/iprojectM.hpp projectm-3.1.0/src/projectM-iTunes/iprojectM.hpp --- projectm-2.2.0~git28bb9/src/projectM-iTunes/iprojectM.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/iprojectM.hpp 2018-10-16 14:16:33.000000000 +0000 @@ -52,7 +52,7 @@ #include "libprojectM/projectM.hpp" #include "getConfigFilename.h" #include -#include +#include #if TARGET_OS_MAC #import @@ -73,25 +73,21 @@ #define kTVisualPluginCreator 'hook' -#define kTVisualPluginMajorVersion 2 -#define kTVisualPluginMinorVersion 2 +#define kTVisualPluginMajorVersion 3 +#define kTVisualPluginMinorVersion 0 #define kTVisualPluginReleaseStage betaStage #define kTVisualPluginNonFinalRelease 0 struct VisualPluginData; -#if TARGET_OS_MAC #import #import // "namespace" our ObjC classname to avoid load conflicts between multiple visualizer plugins #define VisualView iProjectM_VisualView -#define GLVisualView iProjectM_GLVisualView @class VisualView; -@class GLVisualView; -#endif #define kInfoTimeOutInSeconds 10 // draw info/artwork for N seconds when it changes or playback starts #define kPlayingPulseRateInHz 60 // when iTunes is playing, draw N times a second @@ -130,6 +126,8 @@ Boolean playing; // is iTunes currently playing audio? Boolean padding[3]; + + Boolean readyToDraw; time_t drawInfoTimeOut; // when should we stop showing info/artwork? @@ -160,7 +158,7 @@ OSStatus ConfigureVisual( VisualPluginData * visualPluginData ); -void initProjectM( VisualPluginData * visualPluginData ); +void initProjectM( VisualPluginData * visualPluginData, std::string presetPath ); void renderProjectMTexture( VisualPluginData * visualPluginData ); void keypressProjectM( VisualPluginData * visualPluginData, projectMEvent event, projectMKeycode keycode, projectMModifier mod ); diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/iprojectM_mac.mm projectm-3.1.0/src/projectM-iTunes/iprojectM_mac.mm --- projectm-2.2.0~git28bb9/src/projectM-iTunes/iprojectM_mac.mm 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/iprojectM_mac.mm 2018-10-16 14:16:33.000000000 +0000 @@ -3,11 +3,12 @@ // based on the iTunes SDK example code +// https://www.fenestrated.net/mirrors/Apple%20Technotes%20(As%20of%202002)/tn/tn2016.html + #import "iprojectM.hpp" #import -#import -#import +#import #import #include "libprojectM/cocoatoprojectM.h" @@ -41,29 +42,17 @@ CGPoint where; VISUAL_PLATFORM_VIEW drawView = visualPluginData->subview; - - if ( drawView == NULL ) - return; - - [[drawView openGLContext] makeCurrentContext]; - - if (visualPluginData->pm == NULL) { - initProjectM(visualPluginData); - - // correctly size it - ResizeVisual(visualPluginData); - } + if (!visualPluginData->readyToDraw) + return; glClearColor( 0.0, 0.5, 0.0, 0.0 ); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // render visualPluginData->pm->renderFrame(); - //renderProjectMTexture(visualPluginData); - + glFlush(); - return; // TODO: artwork overlay @@ -146,6 +135,7 @@ visualPluginData->destView = destView; visualPluginData->destRect = [destView bounds]; visualPluginData->destOptions = options; + visualPluginData->readyToDraw = false; UpdateInfoTimeOut( visualPluginData ); @@ -166,7 +156,26 @@ status = memFullErr; } + + [[visualPluginData->subview openGLContext] makeCurrentContext]; + + #endif + NSLog(@"activate visual"); + if (visualPluginData->pm == NULL) { + + NSBundle* me = [NSBundle bundleForClass: VisualView.class]; + NSLog(@"main bundle: %@", [me bundlePath]); + NSString* presetsPath = [me pathForResource:@"presets" ofType:nil]; + NSLog(@"presets path %@", presetsPath); + + initProjectM(visualPluginData, std::string([presetsPath UTF8String])); + + // correctly size it + ResizeVisual(visualPluginData); + } + + NSLog(@"activated visual"); return status; } @@ -200,7 +209,8 @@ visualPluginData->destView = NULL; visualPluginData->destRect = CGRectNull; visualPluginData->drawInfoTimeOut = 0; - + visualPluginData->readyToDraw = false; + if (visualPluginData->pm != NULL) { delete(visualPluginData->pm); visualPluginData->pm = NULL; @@ -215,10 +225,13 @@ // OSStatus ResizeVisual( VisualPluginData * visualPluginData ) { - visualPluginData->destRect = [visualPluginData->destView bounds]; + visualPluginData->destRect = [visualPluginData->subview bounds]; if (visualPluginData->pm != NULL) { visualPluginData->pm->projectM_resetGL(visualPluginData->destRect.size.width, visualPluginData->destRect.size.height); + NSLog(@"resized to %@ %@", [NSNumber numberWithDouble: visualPluginData->destRect.size.width], [NSNumber numberWithDouble: visualPluginData->destRect.size.height]); + + visualPluginData->readyToDraw = true; } return noErr; @@ -248,6 +261,37 @@ @synthesize visualPluginData = _visualPluginData; +- (id)initWithFrame:(NSRect)frame +{ + NSLog(@"initWithFrame called"); + NSOpenGLPixelFormatAttribute pixelFormatAttributes[] = + { + NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, +// NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion4_1Core, +// NSOpenGLPFAColorSize , 24 , +// NSOpenGLPFAAlphaSize , 8 , +// NSOpenGLPFADoubleBuffer , + NSOpenGLPFAAccelerated , + 0 + }; + NSOpenGLPixelFormat *pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:pixelFormatAttributes]; + if (pixelFormat == nil) + { + NSLog(@"Unable to create pixel format."); + return self; + } + self = [super initWithFrame:frame pixelFormat:pixelFormat]; + if (self == nil) + { + NSLog(@"Unable to create an OpenGL context."); + return self; + } + + NSLog(@"super initWithFrame called"); + + return self; +} + //------------------------------------------------------------------------------------------------- // isOpaque //------------------------------------------------------------------------------------------------- @@ -360,7 +404,7 @@ // OptionBits GetVisualOptions( void ) { - OptionBits options = (kVisualSupportsMuxedGraphics | kVisualWantsIdleMessages); + OptionBits options = (kVisualUsesOnly3D | kVisualWantsIdleMessages); #if USE_SUBVIEW options |= kVisualUsesSubview; @@ -395,4 +439,4 @@ } return status; -} \ No newline at end of file +} diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/iprojectM.mm projectm-3.1.0/src/projectM-iTunes/iprojectM.mm --- projectm-2.2.0~git28bb9/src/projectM-iTunes/iprojectM.mm 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/iprojectM.mm 2018-10-16 14:16:33.000000000 +0000 @@ -7,7 +7,7 @@ // projectM -void initProjectM( VisualPluginData * visualPluginData ) { +void initProjectM( VisualPluginData * visualPluginData, std::string presetPath ) { // std::string config_filename = getConfigFilename(); std::string cfg_path = "/usr/local/share/projectM/config.inp"; @@ -19,24 +19,31 @@ settings.textureSize = 2048; // idk? settings.windowWidth = 1920; settings.windowHeight = 1280; - settings.smoothPresetDuration = 3; // seconds - settings.presetDuration = 5; // seconds - settings.beatSensitivity = 0.8; + settings.smoothPresetDuration = 1; // seconds + settings.presetDuration = 9; // seconds + settings.beatSensitivity = 3; settings.aspectCorrection = 1; settings.easterEgg = 0; // ??? settings.shuffleEnabled = 1; settings.softCutRatingsEnabled = 1; // ??? - settings.presetURL = "/usr/local/share/projectM/presets"; + + settings.presetURL = presetPath; settings.titleFontURL = "/usr/local/share/projectM/fonts/Vera.ttf"; settings.menuFontURL = "/usr/local/share/projectM/fonts/VeraMono.ttf"; - //projectM *pm = new projectM(settings, 0); + projectM *pm = new projectM(settings, 0); + NSLog(@"GL_VERSION: %s", glGetString(GL_VERSION)); + NSLog(@"GL_SHADING_LANGUAGE_VERSION: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); + NSLog(@"GL_VENDOR: %s", glGetString(GL_VENDOR)); + // use config file - projectM *pm = new projectM(cfg_path); - +// projectM *pm = new projectM(cfg_path); + visualPluginData->pm = pm; pm->selectRandom(true); + NSLog(@"random selected"); + } void keypressProjectM( VisualPluginData * visualPluginData, projectMEvent event, projectMKeycode keycode, projectMModifier mod ) { @@ -44,6 +51,8 @@ } void renderProjectMTexture( VisualPluginData * visualPluginData ){ + // this needs to be updated for gl3 (see SDL version) +#if 0 static int textureHandle = visualPluginData->pm->initRenderToTexture(); glClear(GL_COLOR_BUFFER_BIT); @@ -82,6 +91,7 @@ glMatrixMode(GL_MODELVIEW); glDisable(GL_DEPTH_TEST); +#endif } //------------------------------------------------------------------------------------------------- @@ -344,7 +354,7 @@ // Invalidate visual seems to lag a few frames behind, so let's draw as soon as possible DrawVisual( visualPluginData ); - //InvalidateVisual( visualPluginData ); +// InvalidateVisual( visualPluginData ); break; } /* @@ -356,10 +366,10 @@ */ case kVisualPluginDrawMessage: { - #if !USE_SUBVIEW +#if !USE_SUBVIEW // Now drawing in kVisualPluginPulseMessage -revmischa 09/14 - //DrawVisual( visualPluginData ); - #endif + DrawVisual( visualPluginData ); +#endif break; } /* @@ -463,6 +473,6 @@ playerMessageInfo.u.registerVisualPluginMessage.maxHeight = 0; // no max height limit status = PlayerRegisterVisualPlugin( messageInfo->u.initMessage.appCookie, messageInfo->u.initMessage.appProc, &playerMessageInfo ); - + return status; } Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/macos/contrib/libbz2.a and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/macos/contrib/libbz2.a differ Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/macos/contrib/libfreetype.a and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/macos/contrib/libfreetype.a differ Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/macos/contrib/libftgl.a and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/macos/contrib/libftgl.a differ Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/macos/contrib/libGLEW.a and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/macos/contrib/libGLEW.a differ Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/macos/contrib/libpng15.a and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/macos/contrib/libpng15.a differ Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/macos/contrib/libz.a and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/macos/contrib/libz.a differ diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-iTunes/projectM Visualizer.xcodeproj/project.pbxproj" 2018-10-16 14:16:33.000000000 +0000 @@ -7,18 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - C34045C01B1E21B500139822 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34045BF1B1E21B500139822 /* Cg.framework */; }; - C34045C11B1E21B500139822 /* Cg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34045BF1B1E21B500139822 /* Cg.framework */; }; - C34045C31B1E220800139822 /* Cg.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = C34045BF1B1E21B500139822 /* Cg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - C34E81141956D096001AC5B5 /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81131956D096001AC5B5 /* libRenderer.a */; }; - C34E81171956D0AC001AC5B5 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81151956D0AC001AC5B5 /* libMilkdropPresetFactory.a */; }; - C34E81181956D0AC001AC5B5 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81161956D0AC001AC5B5 /* libNativePresetFactory.a */; }; + 16FE0B2121157D62005F170D /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */; }; + 16FE0B2221157D63005F170D /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716F21125D85001806E7 /* libNativePresetFactory.a */; }; + 16FE0B2321157D63005F170D /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716B21125D85001806E7 /* libprojectM.a */; }; + 16FE0B2421157D63005F170D /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 168F716921125D85001806E7 /* libRenderer.a */; }; C34E811C1956D0D4001AC5B5 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E811B1956D0D4001AC5B5 /* libz.a */; }; C34E811E1956D0D6001AC5B5 /* libpng15.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E811D1956D0D6001AC5B5 /* libpng15.a */; }; - C34E81201956D0D8001AC5B5 /* libftgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E811F1956D0D8001AC5B5 /* libftgl.a */; }; - C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81211956D0D9001AC5B5 /* libfreetype.a */; }; C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34E81231956D0DA001AC5B5 /* libbz2.a */; }; - C37822041956D90D0058A694 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3FAE59C17B88BF800F4B110 /* libprojectM.a */; }; C37EBD2C19A0112900220265 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7B217B82CC3009E58CB /* Cocoa.framework */; }; C37EBD3219A0112900220265 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD3019A0112900220265 /* InfoPlist.strings */; }; C37EBD3419A0112900220265 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C37EBD3319A0112900220265 /* main.m */; }; @@ -26,13 +21,12 @@ C37EBD3B19A0112900220265 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C37EBD3A19A0112900220265 /* AppDelegate.m */; }; C37EBD3E19A0112900220265 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD3C19A0112900220265 /* MainMenu.xib */; }; C37EBD4019A0112900220265 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD3F19A0112900220265 /* Images.xcassets */; }; - C37EBD5B19A0118600220265 /* iProjectM.pkg in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD5A19A0118600220265 /* iProjectM.pkg */; }; + C37EBD5B19A0118600220265 /* iTunes Visualizer.pkg in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD5A19A0118600220265 /* iTunes Visualizer.pkg */; }; C37EBD5D19A0146F00220265 /* images in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD5C19A0146F00220265 /* images */; }; C37EBD5F19A0164400220265 /* selectViz.png in Resources */ = {isa = PBXBuildFile; fileRef = C37EBD5E19A0164400220265 /* selectViz.png */; }; C38E8C881B1A12540029901E /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = C38E8C871B1A12540029901E /* Preferences.xib */; }; C38E8C8B1B1A13AE0029901E /* Preferences.m in Sources */ = {isa = PBXBuildFile; fileRef = C38E8C8A1B1A13AE0029901E /* Preferences.m */; }; C38E8C8E1B1A14470029901E /* AudioInputDeviceList.m in Sources */ = {isa = PBXBuildFile; fileRef = C38E8C8D1B1A14470029901E /* AudioInputDeviceList.m */; }; - C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C3C24434195764870021FCD4 /* libGLEW.a */; }; C3F9D7B317B82CC3009E58CB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7B217B82CC3009E58CB /* Cocoa.framework */; }; C3F9D7CF17B831F3009E58CB /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3F9D7CE17B831F3009E58CB /* OpenGL.framework */; }; C3F9D7D317B83CCB009E58CB /* iprojectM_mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = C3F9D7D017B83CCB009E58CB /* iprojectM_mac.mm */; }; @@ -40,23 +34,54 @@ C3F9D7D917B83CF1009E58CB /* iTunesAPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3F9D7D617B83CF1009E58CB /* iTunesAPI.cpp */; }; C3FAE59217B87D8700F4B110 /* getConfigFilename.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3FAE59017B87D8700F4B110 /* getConfigFilename.cpp */; }; C3FAE5AA17B898C200F4B110 /* iProjectM-pkg.plist in plist */ = {isa = PBXBuildFile; fileRef = C3FAE5A717B898B000F4B110 /* iProjectM-pkg.plist */; }; - C3FAF97717B89F7400F4B110 /* shaders in share */ = {isa = PBXBuildFile; fileRef = C3FAF97617B89F7200F4B110 /* shaders */; }; - C3FAF97817B89F7B00F4B110 /* config.inp in share */ = {isa = PBXBuildFile; fileRef = C3FAF97517B89F7200F4B110 /* config.inp */; }; - C3FAF97B17B8A45200F4B110 /* fonts in share */ = {isa = PBXBuildFile; fileRef = C3FAF97917B8A43B00F4B110 /* fonts */; }; /* End PBXBuildFile section */ -/* Begin PBXCopyFilesBuildPhase section */ - C3C24430195764660021FCD4 /* Copy Files */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; - files = ( - C34045C31B1E220800139822 /* Cg.framework in Copy Files */, - ); - name = "Copy Files"; - runOnlyForDeploymentPostprocessing = 0; +/* Begin PBXContainerItemProxy section */ + 168F716821125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 16178B12207A6F4000D3B0C8; + remoteInfo = Renderer; + }; + 168F716A21125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 16A49E57207A7C8C00E508EA; + remoteInfo = projectM; + }; + 168F716C21125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1612C9A4207A855D00862A3A; + remoteInfo = MilkdropPresetFactory; + }; + 168F716E21125D85001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1612C9AC207A856A00862A3A; + remoteInfo = NativePresetFactory; + }; + 16FE0B1B21157D55005F170D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 16A49E56207A7C8C00E508EA; + remoteInfo = projectM; + }; + 16FE0B2521157D84005F170D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C3F9D7A717B82CC3009E58CB /* Project object */; + proxyType = 1; + remoteGlobalIDString = C3F9D7AE17B82CC3009E58CB; + remoteInfo = iProjectM; }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ C3FAE5A917B898BB00F4B110 /* plist */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -68,28 +93,17 @@ name = plist; runOnlyForDeploymentPostprocessing = 0; }; - C3FAF97317B89F1700F4B110 /* share */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = share; - dstSubfolderSpec = 16; - files = ( - C3FAF97717B89F7400F4B110 /* shaders in share */, - C3FAF97B17B8A45200F4B110 /* fonts in share */, - C3FAF97817B89F7B00F4B110 /* config.inp in share */, - ); - name = share; - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - C34045BF1B1E21B500139822 /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = /Library/Frameworks/Cg.framework; sourceTree = ""; }; + 168F716121125D85001806E7 /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM.xcodeproj; sourceTree = ""; }; + 16A4214420781835006F30CE /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/.libs/libRenderer.a; sourceTree = ""; }; + 16A4214520781835006F30CE /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/.libs/libMilkdropPresetFactory.a; sourceTree = ""; }; + 16A4214620781835006F30CE /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/.libs/libNativePresetFactory.a; sourceTree = ""; }; + 16A4214720781836006F30CE /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprojectM.a; path = ../libprojectM/.libs/libprojectM.a; sourceTree = ""; }; + 16A42150207818F6006F30CE /* Cg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cg.framework; path = ../../../../../../Library/Frameworks/Cg.framework; sourceTree = ""; }; C34E810E1956CD2F001AC5B5 /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; C34E81101956CD3A001AC5B5 /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; }; - C34E81131956D096001AC5B5 /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/libRenderer.a; sourceTree = SOURCE_ROOT; }; - C34E81151956D0AC001AC5B5 /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.a; sourceTree = SOURCE_ROOT; }; - C34E81161956D0AC001AC5B5 /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/libNativePresetFactory.a; sourceTree = SOURCE_ROOT; }; C34E81191956D0C3001AC5B5 /* contrib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = contrib; path = macos/contrib; sourceTree = ""; }; C34E811B1956D0D4001AC5B5 /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libz.a; path = macos/contrib/libz.a; sourceTree = ""; }; C34E811D1956D0D6001AC5B5 /* libpng15.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng15.a; path = macos/contrib/libpng15.a; sourceTree = ""; }; @@ -108,7 +122,7 @@ C37EBD3D19A0112900220265 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; C37EBD3F19A0112900220265 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; C37EBD4619A0112900220265 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; - C37EBD5A19A0118600220265 /* iProjectM.pkg */ = {isa = PBXFileReference; lastKnownFileType = text; path = iProjectM.pkg; sourceTree = ""; }; + C37EBD5A19A0118600220265 /* iTunes Visualizer.pkg */ = {isa = PBXFileReference; lastKnownFileType = file; path = "iTunes Visualizer.pkg"; sourceTree = ""; }; C37EBD5C19A0146F00220265 /* images */ = {isa = PBXFileReference; lastKnownFileType = folder; name = images; path = ../images; sourceTree = ""; }; C37EBD5E19A0164400220265 /* selectViz.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = selectViz.png; path = images/selectViz.png; sourceTree = ""; }; C37EBD6019A01BEE00220265 /* projectM Visualizer.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "projectM Visualizer.entitlements"; sourceTree = ""; }; @@ -134,7 +148,6 @@ C3FAE59017B87D8700F4B110 /* getConfigFilename.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = getConfigFilename.cpp; sourceTree = ""; }; C3FAE59117B87D8700F4B110 /* getConfigFilename.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getConfigFilename.h; sourceTree = ""; }; C3FAE59A17B88B9000F4B110 /* projectM Visualizer-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "projectM Visualizer-Info.plist"; sourceTree = ""; }; - C3FAE59C17B88BF800F4B110 /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libprojectM.a; path = ../libprojectM/libprojectM.a; sourceTree = SOURCE_ROOT; }; C3FAE5A717B898B000F4B110 /* iProjectM-pkg.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iProjectM-pkg.plist"; sourceTree = SOURCE_ROOT; }; C3FAF97517B89F7200F4B110 /* config.inp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = config.inp; sourceTree = ""; }; C3FAF97617B89F7200F4B110 /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; path = shaders; sourceTree = ""; }; @@ -146,7 +159,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C34045C11B1E21B500139822 /* Cg.framework in Frameworks */, C37EBD2C19A0112900220265 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -155,25 +167,32 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C3C24435195764870021FCD4 /* libGLEW.a in Frameworks */, - C37822041956D90D0058A694 /* libprojectM.a in Frameworks */, + 16FE0B2121157D62005F170D /* libMilkdropPresetFactory.a in Frameworks */, + 16FE0B2221157D63005F170D /* libNativePresetFactory.a in Frameworks */, + 16FE0B2321157D63005F170D /* libprojectM.a in Frameworks */, + 16FE0B2421157D63005F170D /* libRenderer.a in Frameworks */, C34E81241956D0DA001AC5B5 /* libbz2.a in Frameworks */, - C34E81221956D0D9001AC5B5 /* libfreetype.a in Frameworks */, - C34045C01B1E21B500139822 /* Cg.framework in Frameworks */, - C34E81201956D0D8001AC5B5 /* libftgl.a in Frameworks */, C34E811E1956D0D6001AC5B5 /* libpng15.a in Frameworks */, C34E811C1956D0D4001AC5B5 /* libz.a in Frameworks */, C3F9D7CF17B831F3009E58CB /* OpenGL.framework in Frameworks */, C3F9D7B317B82CC3009E58CB /* Cocoa.framework in Frameworks */, - C34E81181956D0AC001AC5B5 /* libNativePresetFactory.a in Frameworks */, - C34E81141956D096001AC5B5 /* libRenderer.a in Frameworks */, - C34E81171956D0AC001AC5B5 /* libMilkdropPresetFactory.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 168F716221125D85001806E7 /* Products */ = { + isa = PBXGroup; + children = ( + 168F716921125D85001806E7 /* libRenderer.a */, + 168F716B21125D85001806E7 /* libprojectM.a */, + 168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */, + 168F716F21125D85001806E7 /* libNativePresetFactory.a */, + ); + name = Products; + sourceTree = ""; + }; C37EBD2D19A0112900220265 /* projectM Visualizer */ = { isa = PBXGroup; children = ( @@ -208,10 +227,10 @@ C3F9D7A617B82CC3009E58CB = { isa = PBXGroup; children = ( + 168F716121125D85001806E7 /* libprojectM.xcodeproj */, C38212791A5A2114002A8D78 /* gles_conv.txt */, C37EBD5E19A0164400220265 /* selectViz.png */, - C37EBD5A19A0118600220265 /* iProjectM.pkg */, - C34045BF1B1E21B500139822 /* Cg.framework */, + C37EBD5A19A0118600220265 /* iTunes Visualizer.pkg */, C34E81191956D0C3001AC5B5 /* contrib */, C3FAF97A17B8A44100F4B110 /* share */, C3FAE5A417B88C5B00F4B110 /* libprojectM */, @@ -240,6 +259,7 @@ C3F9D7B117B82CC3009E58CB /* Frameworks */ = { isa = PBXGroup; children = ( + 16A42150207818F6006F30CE /* Cg.framework */, C3C24434195764870021FCD4 /* libGLEW.a */, C37821FF1956D82A0058A694 /* libc++.1.dylib */, C34E81231956D0DA001AC5B5 /* libbz2.a */, @@ -290,10 +310,10 @@ C3FAE5A417B88C5B00F4B110 /* libprojectM */ = { isa = PBXGroup; children = ( - C34E81151956D0AC001AC5B5 /* libMilkdropPresetFactory.a */, - C34E81161956D0AC001AC5B5 /* libNativePresetFactory.a */, - C34E81131956D096001AC5B5 /* libRenderer.a */, - C3FAE59C17B88BF800F4B110 /* libprojectM.a */, + 16A4214520781835006F30CE /* libMilkdropPresetFactory.a */, + 16A4214620781835006F30CE /* libNativePresetFactory.a */, + 16A4214720781836006F30CE /* libprojectM.a */, + 16A4214420781835006F30CE /* libRenderer.a */, ); name = libprojectM; sourceTree = ""; @@ -322,6 +342,7 @@ buildRules = ( ); dependencies = ( + 16FE0B2621157D84005F170D /* PBXTargetDependency */, ); name = "projectM Visualizer"; productName = "projectM Visualizer"; @@ -335,13 +356,12 @@ C3F9D7AB17B82CC3009E58CB /* Sources */, C3F9D7AC17B82CC3009E58CB /* Frameworks */, C3FAE5A917B898BB00F4B110 /* plist */, - C3C24430195764660021FCD4 /* Copy Files */, - C3FAF97317B89F1700F4B110 /* share */, C3FAE5AB17B898F800F4B110 /* Generate Installer Package */, ); buildRules = ( ); dependencies = ( + 16FE0B1C21157D55005F170D /* PBXTargetDependency */, ); name = iProjectM; productName = iProjectM; @@ -354,7 +374,7 @@ C3F9D7A717B82CC3009E58CB /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0630; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = projectM; TargetAttributes = { C37EBD2A19A0112900220265 = { @@ -378,6 +398,12 @@ mainGroup = C3F9D7A617B82CC3009E58CB; productRefGroup = C3F9D7B017B82CC3009E58CB /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 168F716221125D85001806E7 /* Products */; + ProjectRef = 168F716121125D85001806E7 /* libprojectM.xcodeproj */; + }, + ); projectRoot = ""; targets = ( C3F9D7AE17B82CC3009E58CB /* iProjectM */, @@ -386,6 +412,37 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 168F716921125D85001806E7 /* libRenderer.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRenderer.a; + remoteRef = 168F716821125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 168F716B21125D85001806E7 /* libprojectM.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprojectM.a; + remoteRef = 168F716A21125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 168F716D21125D85001806E7 /* libMilkdropPresetFactory.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMilkdropPresetFactory.a; + remoteRef = 168F716C21125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 168F716F21125D85001806E7 /* libNativePresetFactory.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libNativePresetFactory.a; + remoteRef = 168F716E21125D85001806E7 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ C37EBD2919A0112900220265 /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -398,7 +455,7 @@ C37EBD4019A0112900220265 /* Images.xcassets in Resources */, C37EBD3819A0112900220265 /* Credits.rtf in Resources */, C37EBD3E19A0112900220265 /* MainMenu.xib in Resources */, - C37EBD5B19A0118600220265 /* iProjectM.pkg in Resources */, + C37EBD5B19A0118600220265 /* iTunes Visualizer.pkg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -417,7 +474,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "mkdir -p \"$DSTROOT/usr/local/share/projectM/presets\"\n#cp -r \"$SRCROOT\"/../../presets/custom/* \"$DSTROOT/usr/local/share/projectM/presets/\"\ncp -r \"$SRCROOT\"/../../presets/presets_tryptonaut/* \"$DSTROOT/usr/local/share/projectM/presets/\"\ncp -r \"$SRCROOT\"/../../presets/presets_bltc201/* \"$DSTROOT/usr/local/share/projectM/presets/\"\n#rm -rf \"$SRCROOT/iProjectM.bundle\"\n#cp -r \"$DSTROOT/Library/iTunes/iTunes Plug-ins/iProjectM.bundle\" $SRCROOT/\ninstall_name_tool -change @executable_path/../Frameworks/Cg.framework/Cg @loader_path/../Frameworks/Cg.framework/Cg \"$DSTROOT/Library/iTunes/iTunes Plug-ins/iProjectM.bundle/Contents/MacOS/iProjectM\"\ncp -r $CONFIGURATION_BUILD_DIR/share/* \"$DSTROOT/usr/local/share/projectM\"\npkgbuild --component-plist \"$SRCROOT/iProjectM-pkg.plist\" --root \"$DSTROOT\" \"$SRCROOT/iProjectM.pkg\"\n"; + shellScript = "POUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\ncp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\"\n\n\npkgbuild --component-plist \"$SRCROOT/iProjectM-pkg.plist\" --root \"$DSTROOT\" \"$SRCROOT/iTunes Visualizer.pkg\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -446,6 +503,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 16FE0B1C21157D55005F170D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = projectM; + targetProxy = 16FE0B1B21157D55005F170D /* PBXContainerItemProxy */; + }; + 16FE0B2621157D84005F170D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C3F9D7AE17B82CC3009E58CB /* iProjectM */; + targetProxy = 16FE0B2521157D84005F170D /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ C37EBD3019A0112900220265 /* InfoPlist.strings */ = { isa = PBXVariantGroup; @@ -504,8 +574,21 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "projectM Visualizer/projectM Visualizer-Info.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../libprojectM/.libs\"", + "\"$(SRCROOT)/../libprojectM/Renderer/.libs\"", + "\"$(SRCROOT)/../libprojectM/MilkdropPresetFactory/.libs\"", + "\"$(SRCROOT)/../libprojectM/NativePresetFactory/.libs\"", + "$(SRCROOT)", + "\"$(SRCROOT)/../NativePresets/.libs\"", + "\"$(SRCROOT)/..\"", + "\"$(SRCROOT)/macos/contrib\"", + "$(PROJECT_DIR)/macos/contrib", + ); MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; + PRODUCT_BUNDLE_IDENTIFIER = biz.int80.iProjectM; PRODUCT_NAME = "projectM Visualizer"; WRAPPER_EXTENSION = app; }; @@ -537,7 +620,20 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; INFOPLIST_FILE = "projectM Visualizer/projectM Visualizer-Info.plist"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/../libprojectM/.libs\"", + "\"$(SRCROOT)/../libprojectM/Renderer/.libs\"", + "\"$(SRCROOT)/../libprojectM/MilkdropPresetFactory/.libs\"", + "\"$(SRCROOT)/../libprojectM/NativePresetFactory/.libs\"", + "$(SRCROOT)", + "\"$(SRCROOT)/../NativePresets/.libs\"", + "\"$(SRCROOT)/..\"", + "\"$(SRCROOT)/macos/contrib\"", + "$(PROJECT_DIR)/macos/contrib", + ); MACOSX_DEPLOYMENT_TARGET = 10.8; + PRODUCT_BUNDLE_IDENTIFIER = biz.int80.iProjectM; PRODUCT_NAME = "projectM Visualizer"; WRAPPER_EXTENSION = app; }; @@ -550,20 +646,33 @@ CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; DYLIB_CURRENT_VERSION = 1.0.0; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_INPUT_FILETYPE = automatic; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -572,7 +681,9 @@ GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "${SRCROOT}/.."; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks/"; @@ -592,24 +703,38 @@ CLANG_CXX_LANGUAGE_STANDARD = "compiler-default"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_LOCATION = YES; DYLIB_CURRENT_VERSION = 1.0.0; + ENABLE_STRICT_OBJC_MSGSEND = YES; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_INPUT_FILETYPE = automatic; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = s; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = "${SRCROOT}/.."; LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks/"; @@ -633,24 +758,27 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = NO; GENERATE_PKGINFO_FILE = YES; + HEADER_SEARCH_PATHS = ( + "${SRCROOT}/..", + "${SRCROOT}/../..", + "$(SRCROOT)/../libprojectM", + ); INFOPLIST_FILE = "iProjectM/projectM Visualizer-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/iTunes/iTunes Plug-ins"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../libprojectM\"", - "\"$(SRCROOT)/../libprojectM/Renderer\"", - "\"$(SRCROOT)/../libprojectM/MilkdropPresetFactory\"", - "\"$(SRCROOT)/../libprojectM/NativePresetFactory\"", + "\"$(SRCROOT)/../libprojectM/.libs\"", + "\"$(SRCROOT)/../libprojectM/Renderer/.libs\"", + "\"$(SRCROOT)/../libprojectM/MilkdropPresetFactory/.libs\"", + "\"$(SRCROOT)/../libprojectM/NativePresetFactory/.libs\"", "$(SRCROOT)", - "\"$(SRCROOT)/../NativePresets\"", + "\"$(SRCROOT)/../NativePresets/.libs\"", "\"$(SRCROOT)/..\"", "\"$(SRCROOT)/macos/contrib\"", - /Users/snooz/dev/projectm/src/libprojectM, - /Users/snooz/dev/projectm/src/libprojectM/Renderer, - /Users/snooz/dev/projectm/src/libprojectM/MilkdropPresetFactory, - /Users/snooz/dev/projectm/src/libprojectM/NativePresetFactory, "$(PROJECT_DIR)/macos/contrib", ); + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_BUNDLE_IDENTIFIER = "biz.int80.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = iProjectM; WRAPPER_EXTENSION = bundle; }; @@ -667,24 +795,27 @@ ); GCC_PRECOMPILE_PREFIX_HEADER = NO; GENERATE_PKGINFO_FILE = YES; + HEADER_SEARCH_PATHS = ( + "${SRCROOT}/..", + "${SRCROOT}/../..", + "$(SRCROOT)/../libprojectM", + ); INFOPLIST_FILE = "iProjectM/projectM Visualizer-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/iTunes/iTunes Plug-ins"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "\"$(SRCROOT)/../libprojectM\"", - "\"$(SRCROOT)/../libprojectM/Renderer\"", - "\"$(SRCROOT)/../libprojectM/MilkdropPresetFactory\"", - "\"$(SRCROOT)/../libprojectM/NativePresetFactory\"", + "\"$(SRCROOT)/../libprojectM/.libs\"", + "\"$(SRCROOT)/../libprojectM/Renderer/.libs\"", + "\"$(SRCROOT)/../libprojectM/MilkdropPresetFactory/.libs\"", + "\"$(SRCROOT)/../libprojectM/NativePresetFactory/.libs\"", "$(SRCROOT)", - "\"$(SRCROOT)/../NativePresets\"", + "\"$(SRCROOT)/../NativePresets/.libs\"", "\"$(SRCROOT)/..\"", "\"$(SRCROOT)/macos/contrib\"", - /Users/snooz/dev/projectm/src/libprojectM, - /Users/snooz/dev/projectm/src/libprojectM/Renderer, - /Users/snooz/dev/projectm/src/libprojectM/MilkdropPresetFactory, - /Users/snooz/dev/projectm/src/libprojectM/NativePresetFactory, "$(PROJECT_DIR)/macos/contrib", ); + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_BUNDLE_IDENTIFIER = "biz.int80.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = iProjectM; WRAPPER_EXTENSION = bundle; }; diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/shaders/blur.cg projectm-3.1.0/src/projectM-iTunes/shaders/blur.cg --- projectm-2.2.0~git28bb9/src/projectM-iTunes/shaders/blur.cg 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/shaders/blur.cg 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -struct outtype {float4 color : COLOR;}; - -uniform float4 srctexsize; - -outtype blur1(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ -float2 uv2 = uv.xy + srctexsize.zw*float2(1,1); - -float d=.00175; - -float3 val = tex2D(sampler_blur, float2(uv.x-d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x+d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y + d)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y - d)).xyz; - -float3 val2 = tex2D(sampler_blur, float2(uv.x-d, uv.y -d)).xyz; -val += tex2D(sampler_blur, float2(uv.x-d, uv.y +d)).xyz; -val += tex2D(sampler_blur, float2(uv.x+d, uv.y + d)).xyz; -val += tex2D(sampler_blur, float2(uv.x +d, uv.y - d)).xyz; - -outtype OUT; -val *= 0.65; -val2 *= 0.35; - -OUT.color.xyz = val* 0.25 + val2 * 0.25; -OUT.color.w = 1; -return OUT; -} - -outtype blur2(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ -float2 uv2 = uv.xy + srctexsize.zw*float2(1,0); - -float d = srctexsize.z; -d=.0015; - -float3 val = tex2D(sampler_blur, float2(uv.x-d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x+d, uv.y)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y + d)).xyz; -val += tex2D(sampler_blur, float2(uv.x, uv.y - d)).xyz; - -val *= 0.25; - -float t = min( min(uv.x, uv.y), 1-max(uv.x,uv.y) ); -t = sqrt(t); - -float minimum = 0.5; -float variance = 0.5; -float size = 50; - -t = minimum + variance*saturate(t*size); -t = 1; -val.xyz *= t; - -outtype OUT; -OUT.color.xyz = val; -OUT.color.w = 1; -return OUT; -} - -outtype blurHoriz(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ - - // LONG HORIZ. PASS 1: - const float w[8] = { 4.0, 3.8, 3.5, 2.9, 1.9, 1.2, 0.7, 0.3 }; - const float w1 = w[0] + w[1]; - const float w2 = w[2] + w[3]; - const float w3 = w[4] + w[5]; - const float w4 = w[6] + w[7]; - const float d1 = 0 + 2*w[1]/w1; - const float d2 = 2 + 2*w[3]/w2; - const float d3 = 4 + 2*w[5]/w3; - const float d4 = 6 + 2*w[7]/w4; - const float w_div = 0.5/(w1+w2+w3+w4); - -float fscale = 1; -float fbias = 0; - - - // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels. - //float2 uv2 = uv.xy;// + srctexsize.zw*float2(0.5,0.5); - float2 uv2 = uv.xy + srctexsize.zw*float2(1,1); // + moves blur UP, LEFT by 1-pixel increments - - float3 blur = - ( tex2D( sampler_blur, uv2 + float2( d1*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d1*srctexsize.z,0) ).xyz)*w1 + - ( tex2D( sampler_blur, uv2 + float2( d2*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d2*srctexsize.z,0) ).xyz)*w2 + - ( tex2D( sampler_blur, uv2 + float2( d3*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d3*srctexsize.z,0) ).xyz)*w3 + - ( tex2D( sampler_blur, uv2 + float2( d4*srctexsize.z,0) ).xyz - + tex2D( sampler_blur, uv2 + float2(-d4*srctexsize.z,0) ).xyz)*w4 - ; - blur.xyz *= w_div; - - blur.xyz = blur.xyz*fscale + fbias; - - outtype OUT; - OUT.color.xyz = blur; - OUT.color.w = 1; - -return OUT; -} - -outtype blurVert(float2 uv : TEXCOORD0, uniform sampler2D sampler_blur : TEX0) -{ - //SHORT VERTICAL PASS 2: - - - const float w[8] = { 4.0, 3.8, 3.5, 2.9, 1.9, 1.2, 0.7, 0.3 }; - - const float w1 = w[0]+w[1] + w[2]+w[3]; - const float w2 = w[4]+w[5] + w[6]+w[7]; - const float d1 = 0 + 2*((w[2]+w[3])/w1); - const float d2 = 2 + 2*((w[6]+w[7])/w2); - const float w_div = 1.0/((w1+w2)*2); - - - - // note: if you just take one sample at exactly uv.xy, you get an avg of 4 pixels. - //float2 uv2 = uv.xy;// + srctexsize.zw*float2(-0.5,-0.5); - float2 uv2 = uv.xy + srctexsize.zw*float2(1,0); // + moves blur UP, LEFT by TWO-pixel increments! (since texture is 1/2 the size of blur1_ps) - - float3 blur = - ( tex2D( sampler_blur, uv2 + float2(0, d1*srctexsize.w) ).xyz - + tex2D( sampler_blur, uv2 + float2(0,-d1*srctexsize.w) ).xyz)*w1 + - ( tex2D( sampler_blur, uv2 + float2(0, d2*srctexsize.w) ).xyz - + tex2D( sampler_blur, uv2 + float2(0,-d2*srctexsize.w) ).xyz)*w2 - ; - blur.xyz *= w_div; - - // tone it down at the edges: (only happens on 1st X pass!) - float t = min( min(uv.x, uv.y), 1-max(uv.x,uv.y) ); - - float minimum = 0.5; - float variance = 0.5; - float size = 50; - - - blur.xyz *= t; - - t = sqrt(t); - t = minimum + variance*saturate(t*size); - t=1; - blur.xyz *= t; - -outtype OUT; -OUT.color.xyz = blur; -OUT.color.w = 1; -return OUT; -} diff -Nru projectm-2.2.0~git28bb9/src/projectM-iTunes/shaders/projectM.cg projectm-3.1.0/src/projectM-iTunes/shaders/projectM.cg --- projectm-2.2.0~git28bb9/src/projectM-iTunes/shaders/projectM.cg 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-iTunes/shaders/projectM.cg 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ -#define M_PI 3.14159265359 -#define M_PI_2 6.28318530718 -#define M_INV_PI_2 0.159154943091895 - -#define q1 _qa.x -#define q2 _qa.y -#define q3 _qa.z -#define q4 _qa.w -#define q5 _qb.x -#define q6 _qb.y -#define q7 _qb.z -#define q8 _qb.w -#define q9 _qc.x -#define q10 _qc.y -#define q11 _qc.z -#define q12 _qc.w -#define q13 _qd.x -#define q14 _qd.y -#define q15 _qd.z -#define q16 _qd.w -#define q17 _qe.x -#define q18 _qe.y -#define q19 _qe.z -#define q20 _qe.w -#define q21 _qf.x -#define q22 _qf.y -#define q23 _qf.z -#define q24 _qf.w -#define q25 _qg.x -#define q26 _qg.y -#define q27 _qg.z -#define q28 _qg.w -#define q29 _qh.x -#define q30 _qh.y -#define q31 _qh.z -#define q32 _qh.w - -#define lum(x) (dot(x,float3(0.32,0.49,0.29))) -#define tex2d tex2D -#define tex3d tex3D - -#define sampler sampler2D - -#define getrad sqrt((uv.x-0.5)*2*(uv.x-0.5)*2+(uv.y-0.5)*2*(uv.y-0.5)*2)*.7071067 -#define getang atan2(((uv.y-0.5)*2),((uv.x-0.5)*2)) - -#define GetMain(uv) (tex2D(sampler_main,uv).xyz) -#define GetPixel(uv) (tex2D(sampler_main,uv).xyz) - -#define uv_orig uv - -uniform sampler2D sampler_main; -uniform sampler2D sampler_fw_main; -uniform sampler2D sampler_pw_main; -uniform sampler2D sampler_fc_main; -uniform sampler2D sampler_pc_main; - -uniform sampler2D sampler_noise_lq; -uniform sampler2D sampler_noise_lq_lite; -uniform sampler2D sampler_noise_mq; -uniform sampler2D sampler_noise_hq; -uniform sampler2D sampler_noise_perlin; -uniform sampler3D sampler_noisevol_lq; -uniform sampler3D sampler_noisevol_hq; - -uniform sampler2D sampler_blur1; -uniform sampler2D sampler_blur2; -uniform sampler2D sampler_blur3; - -float4 texsize_noise_lq; -float4 texsize_noise_mq; -float4 texsize_noise_hq; -float4 texsize_noise_perlin; -float4 texsize_noise_lq_lite; - -float4 _qa; -float4 _qb; -float4 _qc; -float4 _qd; -float4 _qe; -float4 _qf; -float4 _qg; -float4 _qh; - -float blur1_min; -float blur1_max; -float blur2_min; -float blur2_max; -float blur3_min; -float blur3_max; - -#define GetBlur1(uv) (tex2D(sampler_blur1,uv).xyz*blur1_max+blur1_min) -#define GetBlur2(uv) (tex2D(sampler_blur2,uv).xyz*blur2_max+blur2_min) -#define GetBlur3(uv) (tex2D(sampler_blur3,uv).xyz*blur3_max+blur3_min) - -float4 slow_roam_cos; -float4 roam_cos; -float4 slow_roam_sin; -float4 roam_sin; - -float time; -float4 rand_preset; -float4 rand_frame; -float progress; -float frame; -float fps; -float bass; -float mid; -float treb; -float vol; -float bass_att; -float mid_att; -float treb_att; -float vol_att; -float4 texsize; -float4 aspect; - -float max( float a, float b ) { - return (a > b ? a : b); -} - -float3 max(float3 a, float4 b) { - return float3( a.x > b.x ? a.x : b.x, - a.y > b.y ? a.y : b.y, - a.z > b.z ? a.z : b.z ); -} - -float3 max(float3 a, float3 b) { - return float3( a.x > b.x ? a.x : b.x, - a.y > b.y ? a.y : b.y, - a.z > b.z ? a.z : b.z ); -} - -struct outtype {float4 color : COLOR;}; -outtype OUT; -float3 ret; diff -Nru projectm-2.2.0~git28bb9/src/projectM-jack/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-jack/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-jack/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-jack/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-jack/cmake/documentation.cmake projectm-3.1.0/src/projectM-jack/cmake/documentation.cmake --- projectm-2.2.0~git28bb9/src/projectM-jack/cmake/documentation.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-jack/cmake/documentation.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -# Copyright (C) 2009 Julian Andres Klode . -# Licensed under the same terms as APT; i.e. GPL 3 or later. - -macro(add_debiandoc target sourcefiles installdest) - foreach(file ${sourcefiles}) - get_filename_component(relfile ${file} NAME) - string(REPLACE ".sgml" "" manual ${relfile}) - get_filename_component(absolute ${file} ABSOLUTE) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${manual}.html - COMMAND debiandoc2html ${absolute} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${file} - ) - set(commands ${commands} ${CMAKE_CURRENT_BINARY_DIR}/${manual}.html) - if (NOT ${installdest} EQUAL "" ) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${manual}.html - DESTINATION ${installdest}) - endif (NOT ${installdest} EQUAL "" ) - endforeach(file ${sourcefiles}) - - add_custom_target(${target} ALL DEPENDS ${commands}) -endmacro(add_debiandoc target sourcefiles installdest) - - -macro(add_po4a type master po target deps) - add_custom_command(OUTPUT ${target} - COMMAND po4a-translate --keep 0 -f ${type} -m ${master} - -p ${po} -l ${target} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${deps} ${master} ${po}) -endmacro(add_po4a type master po target deps) - - -# Macro for XML man pages. -macro(add_xml_manpages target manpages translations entities) - foreach(manpage ${manpages}) - string(LENGTH ${manpage} manpage_length) - math(EXPR manpage_length ${manpage_length}-1) - string(SUBSTRING ${manpage} ${manpage_length} 1 section) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${manpage} - COMMAND xmlto man ${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.xml - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.xml - ) - - - set(commands ${commands} ${CMAKE_CURRENT_BINARY_DIR}/${manpage}) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${manpage} - DESTINATION share/man/man${section}) - - # Add the translations for the manpage. - foreach(translation ${translations}) - set(entities) - # transdir = shortcut to the output directory for translations. - set(transdir ${CMAKE_CURRENT_BINARY_DIR}/${translation}) - - foreach(entity ${entities}) - add_custom_command(OUTPUT ${transdir}/${entity} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CMAKE_COMMAND} -E make_directory ${transdir} - COMMAND ${CMAKE_COMMAND} -E copy ${entity} ${transdir}) - set(ent_cmds ${ent_cmds} ${transdir}/${entity}) - endforeach(entity ${entities}) - - - - add_po4a(docbook ${manpage}.xml po/${translation}.po - ${transdir}/${manpage}.xml "${ent_cmds}") - - - add_custom_command(OUTPUT ${transdir}/${manpage} - COMMAND xmlto -o ${transdir} man ${transdir}/${manpage}.xml - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${transdir}/${manpage}.xml) - - set(nls-cmd ${nls-cmd} ${transdir}/${manpage}) - install(FILES ${transdir}/${manpage} - DESTINATION share/man/${translation}/man${section}) - - endforeach(translation ${translations}) - endforeach(manpage ${manpages}) - - add_custom_target(${target} ALL DEPENDS ${commands}) - # Sort the list of the translations. - list(SORT nls-cmd) - add_custom_target(nls-${target} ALL DEPENDS ${nls-cmd}) -endmacro(add_xml_manpages manpages) - - -macro(add_manpages target manpages translations) - foreach(man ${manpages}) - string(LENGTH ${man} manpage_length) - math(EXPR manpage_length ${manpage_length}-1) - string(SUBSTRING ${man} ${manpage_length} 1 section) - install(FILES ${man} DESTINATION share/man/man${section}) - - if (USE_NLS) - foreach(translation ${translations}) - set(transdir ${CMAKE_CURRENT_BINARY_DIR}/${translation}) - add_po4a(man ${man} po/${translation}.po ${transdir}/${man} "") - install(FILES ${transdir}/${man} - DESTINATION share/man/${translation}/man${section}) - set(files ${files} ${transdir}/${man}) - endforeach(translation ${translations}) - endif(USE_NLS) - endforeach(man ${manpages}) - add_custom_target(${target} ALL DEPENDS ${files}) -endmacro(add_manpages target manpages translations) diff -Nru projectm-2.2.0~git28bb9/src/projectM-jack/CMakeLists.txt projectm-3.1.0/src/projectM-jack/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-jack/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-jack/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,173 +0,0 @@ -PROJECT(projectM-jack) -cmake_minimum_required(VERSION 2.4.0) - -cmake_policy(SET CMP0005 OLD) - -INCLUDE(cmake/CPack-projectM.cmake) - - -OPTION(QT_JACK_SUPPORT "Enable Qt4 GUI Support for the projectM jack port" ON) -OPTION(BUILD_PROJECTM_JACK_STATIC "Build a binary that only depends on jack and stnadard MACOSX libraries" OFF) -OPTION(HTTP_REMOTE_CONTROL "Enable HTTP remote control" OFF) - -if (QT_JACK_SUPPORT) - -set(QT_USE_OPENGL TRUE) - -include(${QT_USE_FILE} FindPkgConfig.cmake) - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') -else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) - set(LIBPROJECTM-QT_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -if (APPLE) -ADD_DEFINITIONS(-DRESOURCE_PREFIX='\"Resources\"') -else (APPLE) -ADD_DEFINITIONS(-DRESOURCE_PREFIX='\"share/projectM\"') -endif (APPLE) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(Qt4 REQUIRED) - -pkg_search_module(JACK REQUIRED jack) - -if (LIBPROJECTM_FOUND) -MESSAGE (STATUS "[projectM-jack] projectM detected.") -else(LIBPROJECTM_FOUND) -MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - -if (LIBPROJECTM-QT_FOUND) -MESSAGE (STATUS "[projectM-jack] projectM-qt detected.") -else(LIBPROJECTM-QT_FOUND) -MESSAGE (FATAL_ERROR "projectM-qt NOT detected. Please install the projectM-qt module or build from the top level projectM source directory. You can also disable QT_PROJECTM_JACK support and use the SDL port instead") -endif(LIBPROJECTM-QT_FOUND) - -if (JACK_FOUND) -MESSAGE(STATUS "[projectM-jack] jack detected.") -else (JACK_FOUND) -MESSAGE( "JACK is NOT found. Please install jack from http://www.jackaudio.org.") -endif(JACK_FOUND) - - -if(HTTP_REMOTE_CONTROL) -set(projectM_jack_SRCS - qprojectM-jack.cpp ConfigFile.h ConfigFile.cpp HTTPRemoteControl.cpp -) -else(HTTP_REMOTE_CONTROL) -set(projectM_jack_SRCS - qprojectM-jack.cpp ConfigFile.h ConfigFile.cpp -) -endif(HTTP_REMOTE_CONTROL) - -if(HTTP_REMOTE_CONTROL) -set(projectM_jack_MOC_HDRS - HTTPRemoteControl.h -) -endif(HTTP_REMOTE_CONTROL) - - -# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx. -qt4_wrap_cpp(projectM_jack_MOC_SRCS ${projectM_jack_MOC_HDRS}) - - -ADD_DEFINITIONS(-DLINUX) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_NO_DEBUG) - - -if(HTTP_REMOTE_CONTROL) - ADD_DEFINITIONS(-DHTTP_REMOTE_CONTROL) - SET(QXT_USE_QXTWEB TRUE) - SET(QXT_USE_QXTCORE TRUE) - find_package(Qxt REQUIRED) -endif(HTTP_REMOTE_CONTROL) - - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM-qt ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) -# projectM-qt places itself in same location as (lib)projectM -# whether it should is a whole other issue -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QXT_INCLUDE_DIRS} ${QT_QTNETWORK_INCLUDE_DIR}) - -LINK_DIRECTORIES(${PROJECTM_LINK}) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -ADD_EXECUTABLE(projectM-jack ${projectM_jack_SRCS} ${projectM_jack_MOC_SRCS}) - -if (BUILD_PROJECTM_JACK_STATIC) -if (BUILD_PROJECTM_QT_STATIC) -SET(PACKAGED_LIBRARIES ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine/libprojectM.a ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt/libprojectM-qt.a) -else(BUILD_PROJECTM_QT_STATIC) -SET(PACKAGED_LIBRARIES ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine/libprojectM.a projectM-qt) -endif(BUILD_PROJECTM_QT_STATIC) -else (BUILD_PROJECTM_JACK_STATIC) -SET(PACKAGED_LIBRARIES projectM-qt projectM) -endif (BUILD_PROJECTM_JACK_STATIC) - -TARGET_LINK_LIBRARIES(projectM-jack ${PACKAGED_LIBRARIES} jack ${QT_QTGUI_LIBRARIES} ${QT_QTOPENGL_LIBRARIES} ${QT_QTCORE_LIBRARIES} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QXT_LIBRARIES}) - -INSTALL(TARGETS projectM-jack DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) -install(FILES "projectM-jack.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - -else (QT_JACK_SUPPORT) -ADD_EXECUTABLE(projectM-jack projectM-jack.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp) - -INCLUDE(FindPkgConfig.cmake) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(SDL) - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) -else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -pkg_search_module(JACK REQUIRED jack) - -if (JACK_FOUND) -MESSAGE(STATUS "[projectM-jack] jack detected.") -else (JACK_FOUND) -MESSAGE(FATAL_ERROR "JACK is NOT found. Please install jack from http://www.jackaudio.org.") -endif(JACK_FOUND) - -if (LIBPROJECTM_FOUND) -MESSAGE (STATUS "[projectM-jack] projectM detected.") -else(LIBPROJECTM_FOUND) -MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/projectM-engine) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/projectM-engine) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR}) -LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS}) - -TARGET_LINK_LIBRARIES(projectM-jack projectM jack ${SDL_LIBRARY}) - -INSTALL(TARGETS projectM-jack DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) -install(FILES "projectM-jack.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) -endif(QT_JACK_SUPPORT) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-jack/FindPkgConfig.cmake projectm-3.1.0/src/projectM-jack/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-jack/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-jack/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/projectM-libvisual/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-libvisual/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-libvisual/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-libvisual/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "0") -SET(CPACK_PACKAGE_VERSION_PATCH "1") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-libvisual/CMakeLists.txt projectm-3.1.0/src/projectM-libvisual/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-libvisual/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-libvisual/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -PROJECT(projectM_libvisual) -cmake_minimum_required(VERSION 2.4.0) - -INCLUDE(cmake/CPack-projectM.cmake) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -ADD_LIBRARY(projectM_libvisual SHARED actor_projectM.cpp lvtoprojectM.h ConfigFile.h ConfigFile.cpp) - -INCLUDE(FindPkgConfig.cmake) -cmake_policy(SET CMP0005 OLD) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(SDL) - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') -else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -ADD_DEFINITIONS(-DLINUX) - -pkg_search_module(LIBVISUAL REQUIRED libvisual-0.4) - -if (LIBPROJECTM_FOUND) - MESSAGE (STATUS "[projectM-libvisual] projectM detected.") -else(LIBPROJECTM_FOUND) - MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - -if(LIBVISUAL_FOUND) - MESSAGE(STATUS "[projectM-libvisual] libvisual detected.") -else(LIBVISUAL_FOUND) - MESSAGE(FATAL_ERROR "libvisual 0.4 not found! Please visit http://libvisual.sf.net and download the module.") -endif(LIBVISUAL_FOUND) - - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBVISUAL_INCLUDEDIR} ${SDL_INCLUDE_DIR}) -LINK_DIRECTORIES(${PROJECTM_LINK}) - -TARGET_LINK_LIBRARIES(projectM_libvisual projectM ${SDL_LIBRARY} ${LIBVISUAL_LIBRARIES}) - -INSTALL(TARGETS projectM_libvisual DESTINATION ${LIBVISUAL_PLUGINSDIR}/actor ) diff -Nru projectm-2.2.0~git28bb9/src/projectM-libvisual/FindPkgConfig.cmake projectm-3.1.0/src/projectM-libvisual/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-libvisual/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-libvisual/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,365 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_PLUGINSDIR) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PLUGINSDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" PLUGINSDIR "" --variable=pluginsbasedir ) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-libvisual-alsa/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-libvisual-alsa/CMakeLists.txt projectm-3.1.0/src/projectM-libvisual-alsa/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-libvisual-alsa/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-libvisual-alsa/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -PROJECT(projectM-libvisual-alsa) -cmake_minimum_required(VERSION 2.4.0) - -ADD_EXECUTABLE(projectM-libvisual-alsa projectM-libvisual-alsa.c display.c glxdriver.c x11driver.c sdldriver.c lv_x11_key.c) - -cmake_policy(SET CMP0005 OLD) - -INCLUDE(FindPkgConfig.cmake) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(SDL) -FIND_PACKAGE(X11) -INCLUDE(cmake/CPack-projectM.cmake) - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) -else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -if (LIBPROJECTM_FOUND) -MESSAGE (STATUS "[projectM-libvisual-alsa] projectM detected.") -else(LIBPROJECTM_FOUND) -MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - -pkg_search_module(LIBVISUAL REQUIRED libvisual-0.4) - -if(LIBVISUAL_FOUND) -MESSAGE(STATUS "[projectM-libvisual] libvisual detected.") -else(LIBVISUAL_FOUND) -MESSAGE(FATAL_ERROR "libvisual 0.4 not found! Please visit http://libvisual.sf.net and download the module.") -endif(LIBVISUAL_FOUND) - -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') - -INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR} ${LIBVISUAL_INCLUDEDIR} ${X11_INCLUDE_DIR}) - -LINK_DIRECTORIES(${LIBVISUAL_LDFLAGS}) - -TARGET_LINK_LIBRARIES(projectM-libvisual-alsa -lXxf86vm -L/usr/X11R6/lib ${OPENGL_LIBRARIES} ${LIBVISUAL_LIBRARIES} ${X11_LIBRARIES} ${SDL_LIBRARY} ${GTK_LIBRARIES}) - -INSTALL(TARGETS projectM-libvisual-alsa DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) -install(FILES "projectM-libvisual-alsa.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-libvisual-alsa/FindPkgConfig.cmake projectm-3.1.0/src/projectM-libvisual-alsa/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-libvisual-alsa/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-libvisual-alsa/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/projectM-moviegen/projectMmovie.c projectm-3.1.0/src/projectM-moviegen/projectMmovie.c --- projectm-2.2.0~git28bb9/src/projectM-moviegen/projectMmovie.c 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-moviegen/projectMmovie.c 2018-10-16 14:16:34.000000000 +0000 @@ -229,7 +229,7 @@ } #endif -#ifdef MACOS +#ifdef __APPLE__ globalPM->fontURL = (char *)malloc( sizeof( char ) * 512 ); strcpy( globalPM->fontURL, "../../fonts" ); diff -Nru projectm-2.2.0~git28bb9/src/projectM-pulseaudio/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-pulseaudio/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-pulseaudio/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-pulseaudio/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-pulseaudio/cmake/documentation.cmake projectm-3.1.0/src/projectM-pulseaudio/cmake/documentation.cmake --- projectm-2.2.0~git28bb9/src/projectM-pulseaudio/cmake/documentation.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-pulseaudio/cmake/documentation.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,111 +0,0 @@ -# Copyright (C) 2009 Julian Andres Klode . -# Licensed under the same terms as APT; i.e. GPL 3 or later. - -macro(add_debiandoc target sourcefiles installdest) - foreach(file ${sourcefiles}) - get_filename_component(relfile ${file} NAME) - string(REPLACE ".sgml" "" manual ${relfile}) - get_filename_component(absolute ${file} ABSOLUTE) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${manual}.html - COMMAND debiandoc2html ${absolute} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${file} - ) - set(commands ${commands} ${CMAKE_CURRENT_BINARY_DIR}/${manual}.html) - if (NOT ${installdest} EQUAL "" ) - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${manual}.html - DESTINATION ${installdest}) - endif (NOT ${installdest} EQUAL "" ) - endforeach(file ${sourcefiles}) - - add_custom_target(${target} ALL DEPENDS ${commands}) -endmacro(add_debiandoc target sourcefiles installdest) - - -macro(add_po4a type master po target deps) - add_custom_command(OUTPUT ${target} - COMMAND po4a-translate --keep 0 -f ${type} -m ${master} - -p ${po} -l ${target} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${deps} ${master} ${po}) -endmacro(add_po4a type master po target deps) - - -# Macro for XML man pages. -macro(add_xml_manpages target manpages translations entities) - foreach(manpage ${manpages}) - string(LENGTH ${manpage} manpage_length) - math(EXPR manpage_length ${manpage_length}-1) - string(SUBSTRING ${manpage} ${manpage_length} 1 section) - - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${manpage} - COMMAND xmlto man ${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.xml - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${manpage}.xml - ) - - - set(commands ${commands} ${CMAKE_CURRENT_BINARY_DIR}/${manpage}) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${manpage} - DESTINATION share/man/man${section}) - - # Add the translations for the manpage. - foreach(translation ${translations}) - set(entities) - # transdir = shortcut to the output directory for translations. - set(transdir ${CMAKE_CURRENT_BINARY_DIR}/${translation}) - - foreach(entity ${entities}) - add_custom_command(OUTPUT ${transdir}/${entity} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CMAKE_COMMAND} -E make_directory ${transdir} - COMMAND ${CMAKE_COMMAND} -E copy ${entity} ${transdir}) - set(ent_cmds ${ent_cmds} ${transdir}/${entity}) - endforeach(entity ${entities}) - - - - add_po4a(docbook ${manpage}.xml po/${translation}.po - ${transdir}/${manpage}.xml "${ent_cmds}") - - - add_custom_command(OUTPUT ${transdir}/${manpage} - COMMAND xmlto -o ${transdir} man ${transdir}/${manpage}.xml - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${transdir}/${manpage}.xml) - - set(nls-cmd ${nls-cmd} ${transdir}/${manpage}) - install(FILES ${transdir}/${manpage} - DESTINATION share/man/${translation}/man${section}) - - endforeach(translation ${translations}) - endforeach(manpage ${manpages}) - - add_custom_target(${target} ALL DEPENDS ${commands}) - # Sort the list of the translations. - list(SORT nls-cmd) - add_custom_target(nls-${target} ALL DEPENDS ${nls-cmd}) -endmacro(add_xml_manpages manpages) - - -macro(add_manpages target manpages translations) - foreach(man ${manpages}) - string(LENGTH ${man} manpage_length) - math(EXPR manpage_length ${manpage_length}-1) - string(SUBSTRING ${man} ${manpage_length} 1 section) - install(FILES ${man} DESTINATION share/man/man${section}) - - if (USE_NLS) - foreach(translation ${translations}) - set(transdir ${CMAKE_CURRENT_BINARY_DIR}/${translation}) - add_po4a(man ${man} po/${translation}.po ${transdir}/${man} "") - install(FILES ${transdir}/${man} - DESTINATION share/man/${translation}/man${section}) - set(files ${files} ${transdir}/${man}) - endforeach(translation ${translations}) - endif(USE_NLS) - endforeach(man ${manpages}) - add_custom_target(${target} ALL DEPENDS ${files}) -endmacro(add_manpages target manpages translations) diff -Nru projectm-2.2.0~git28bb9/src/projectM-pulseaudio/CMakeLists.txt projectm-3.1.0/src/projectM-pulseaudio/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-pulseaudio/CMakeLists.txt 2017-02-21 09:47:37.000000000 +0000 +++ projectm-3.1.0/src/projectM-pulseaudio/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ -PROJECT(projectM-pulseaudio) - -cmake_minimum_required(VERSION 3.0) - -Include(cmake/CPack-projectM.cmake) - -# Include the current dir as a source for find_package macro -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) - -set(QT_USE_OPENGL TRUE) - -cmake_policy(SET CMP0005 OLD) - -include(${QT_USE_FILE} FindPkgConfig.cmake) - -# only search for these modules when not building monolithically - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - pkg_search_module(LIBPROJECTM-QT REQUIRED libprojectM-qt) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') -else(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) - set(LIBPROJECTM-QT_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(Qt5Widgets REQUIRED) -FIND_PACKAGE(Qt5OpenGL REQUIRED) -FIND_PACKAGE(Qt5Core REQUIRED) - - -pkg_search_module(LIBPULSE REQUIRED libpulse>=0.9.8) - -if (LIBPROJECTM_FOUND) -MESSAGE (STATUS "[projectM-pulseaudio] projectM detected.") -else(LIBPROJECTM_FOUND) -MESSAGE (FATAL_ERROR "projectM NOT detected. Please install the projectM module or build from the top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - -if (LIBPROJECTM-QT_FOUND) -MESSAGE (STATUS "[projectM-pulseaudio] projectM-qt detected.") -else(LIBPROJECTM-QT_FOUND) -MESSAGE (FATAL_ERROR "projectM-qt NOT detected. Please install the projectM-qt module or build from the top level projectM source directory.") -endif(LIBPROJECTM-QT_FOUND) - -if (LIBPULSE_FOUND) -MESSAGE(STATUS "[projectM-pulseaudio] pulse audio detected.") -else (LIBPULSE_FOUND) -MESSAGE(FATAL_ERROR "ERROR: Pulse Audio is NOT found. Please install pulse audio 0.9.8 or greater from www.pulseaudio.org.") -endif(LIBPULSE_FOUND) - -# ftgl - OpenGL library to use arbitrary fonts -pkg_search_module(FTGL REQUIRED ftgl) -if (FTGL_FOUND) - message(STATUS "[projectm-pulseaudio] ftgl library detected.") - message(STATUS "FTGL_LIBRARIES = ${FTGL_LIBRARIES}") - message(STATUS "FTGL_LIBRARY_DIRS = ${FTGL_LIBRARY_DIRS}") - include_directories(${FTGL_INCLUDE_DIRS}) - link_directories(${FTGL_LIBRARY_DIRS}) -else (FTGL_FOUND USE) -## message(FATAL_ERROR "ERROR: ftgl library not detected. Please install it from ftgl.wiki.sourceforge.net") -endif (FTGL_FOUND) - -set(projectM_pulseaudio_SRCS - qprojectM-pulseaudio.cpp ConfigFile.h ConfigFile.cpp QPulseAudioThread.cpp QPulseAudioDeviceChooser.cpp QPulseAudioDeviceModel.cpp -) - -set(projectM_pulseaudio_MOC_HDRS - QPulseAudioThread.hpp QPulseAudioDeviceChooser.hpp QPulseAudioDeviceModel.hpp -) - -set(projectM_pulseaudio_UIS - PulseDeviceChooserDialog.ui -) - - -qt5_wrap_ui(projectM_pulseaudio_UIS_H ${projectM_pulseaudio_UIS}) - -# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx. -qt5_wrap_cpp(projectM_pulseaudio_MOC_SRCS ${projectM_pulseaudio_MOC_HDRS}) - -ADD_DEFINITIONS(-DLINUX) -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_NO_DEBUG) - - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/projectM-qt) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM ${PROJECTM_ROOT_BINARY_DIR}/projectM-qt) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM ${LIBPROJECTM-QT_INCLUDEDIR}/libprojectM-qt) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS} ${LIBPROJECTM-QT_LDFLAGS}) - # projectM-qt places itself in same location as (lib)projectM - # whether it should is a whole other issue -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} - ${Qt5Widgets_INCLUDE_DIR} - ${Qt5OpenGL_INCLUDE_DIR} - ${Qt5Core_INCLUDE_DIR} - ${LIBPULSE_INCLUDEDIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/projectM-pulseaudio -) - -LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/libprojectM) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -ADD_EXECUTABLE(projectM-pulseaudio ${projectM_pulseaudio_SRCS} ${projectM_pulseaudio_MOC_SRCS} ${projectM_pulseaudio_UIS_H}) - -set(LINK_LIBS ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES} ${Qt5Core_LIBRARIES} ${GLEW_LIBRARY} ${FTGL_LIBRARIES} ${PROJECTM_LIBRARY} $) -TARGET_LINK_LIBRARIES(projectM-pulseaudio projectM-qt ${PROJECTM_LIBRARY} pulse ${PROJECTM_LIBRARY} ${LINK_LIBS}) - -INSTALL(TARGETS projectM-pulseaudio DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) -install(FILES "projectM-pulseaudio.desktop" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) diff -Nru projectm-2.2.0~git28bb9/src/projectM-pulseaudio/FindPkgConfig.cmake projectm-3.1.0/src/projectM-pulseaudio/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-pulseaudio/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-pulseaudio/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/projectM-pulseaudio/Makefile.am projectm-3.1.0/src/projectM-pulseaudio/Makefile.am --- projectm-2.2.0~git28bb9/src/projectM-pulseaudio/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-pulseaudio/Makefile.am 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,69 @@ +SUFFIXES = .hpp .cpp _moc.cpp _qrc.qrc + +projectM_pulseaudio_qtheaders = \ + QPulseAudioDeviceChooser.hpp \ + QPulseAudioDeviceModel.hpp \ + QPulseAudioThread.hpp + +nodist_projectM_pulseaudio_moc_sources = $(projectM_pulseaudio_qtheaders:.hpp=_moc.cpp) + +.hpp_moc.cpp: + @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(MOC_CPPFLAGS)\ + $(qt_CPPFLAGS) $(qt_LDFLAGS) $(qt_LIBS) $< + +ui_PulseDeviceChooserDialog.h: PulseDeviceChooserDialog.ui + @UIC@ -o $@ $< + +AM_CPPFLAGS = \ + -include $(top_builddir)/config.h \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DPROJECTM_PREFIX=\""${prefix}"\" \ + -I${top_srcdir}/src/libprojectM \ + -I${top_srcdir}/src/libprojectM/Renderer \ + -I${top_srcdir}/src/projectM-qt \ + ${QT_CFLAGS} \ + ${LIBPULSE_CFLAGS} \ + -fPIC + +AM_CFLAGS = ${my_CFLAGS} \ + -fvisibility=hidden \ + -ffunction-sections \ + -fdata-sections + +bin_PROGRAMS = projectM-pulseaudio + +projectM_pulseaudio_SOURCES = \ + qprojectM-pulseaudio.cpp \ + QPulseAudioDeviceChooser.cpp \ + QPulseAudioDeviceModel.cpp \ + QPulseAudioThread.cpp \ + PulseDeviceChooserDialog.ui \ + $(projectM_pulseaudio_qtheaders) + +nodist_projectM_pulseaudio_SOURCES = \ + $(nodist_projectM_pulseaudio_moc_sources) + +projectM_pulseaudio_LDADD = \ + ${LIBPULSE_LIBS} \ + ../projectM-qt/libprojectM_qt.a \ + ../libprojectM/libprojectM.la \ + ${QT_LIBS} + +projectM_pulseaudio_LDFLAGS = -static + +projectM_pulseaudio_PROGRAM = projectM-pulseaudio + +BUILT_SOURCES = \ + ui_PulseDeviceChooserDialog.h + +CLEANFILES = \ + ${BUILT_SOURCES} \ + ${nodist_projectM_pulseaudio_moc_sources} + +desktopdir = $(datadir)/applications +dist_desktop_DATA = projectM-pulseaudio.desktop + +icondir = $(datadir)/pixmaps +dist_icon_DATA = ${top_srcdir}/src/projectM-qt/images/icons/prjm16-transparent.svg + +dist_man_MANS = projectM-pulseaudio.1 diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-qt/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-qt/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/CMakeLists.txt projectm-3.1.0/src/projectM-qt/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-qt/CMakeLists.txt 2017-02-21 09:42:06.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,136 +0,0 @@ - -project(projectM-qt) # the name of your project -cmake_minimum_required(VERSION 3.0.0) -cmake_policy(SET CMP0005 OLD) - -include(cmake/CPack-projectM.cmake) - -include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ) - -include(FindPkgConfig.cmake) -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(LIBPROJECTM_FOUND true) -else(${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) -endif(${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -OPTION(BUILD_PROJECTM_QT_STATIC "Build a static library of projectM-qt rather than the usual shared library format" OFF) - -# projectM-Qt version block -set(PROJECTM_QT_VERSION 1.10) -set(PROJECTM_QT_ABI_LEVEL 1) -# - -find_package(Qt5Widgets REQUIRED) # find and setup Qt5 for this project -find_package(Qt5OpenGL REQUIRED) - -#include(${QT_USE_FILE}) - -if (Qt5Widgets_FOUND) -MESSAGE(STATUS "[projectM-qt] Qt5Widgets detected.") -else (Qt5Widgets_FOUND) -MESSAGE(FATAL_ERROR "Qt5Widgets not detected. Please install Qt5 before continuing (visit www.trolltech.org for more info)") -endif(Qt5Widgets_FOUND) -set(QT_USE_OPENGL TRUE) - -if (LIBPROJECTM_FOUND) - MESSAGE(STATUS "[projectM-qt] projectM detected.") -else (LIBPROJECTM_FOUND) - MESSAGE(FATAL_ERROR "projectM not detected! Please install the projectM module or build from top level projectM source directory.") -endif(LIBPROJECTM_FOUND) - - -CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/libprojectM-qt.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" @ONLY) - -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${PROJECTM_PREFIX}\"') -ADD_DEFINITIONS(${QT_DEFINITIONS}) -ADD_DEFINITIONS(-DQT_PLUGIN) -ADD_DEFINITIONS(-DQT_NO_DEBUG) -#ADD_DEFINITIONS(-DQT_STATIC) - -# the variable "projectM-qt_SRCS" contains all .cpp files of this project -set(projectM-qt_SRCS - qprojectm_mainwindow.cpp - qprojectm_mainwindow.hpp - configfile.hpp configfile.cpp - qpresetfiledialog.hpp - qplaylistfiledialog.cpp - qplaylistfiledialog.hpp - qplaylistmodel.cpp - qplaylistmodel.hpp - qxmlplaylisthandler.hpp - qprojectmconfigdialog.cpp - qprojectmconfigdialog.hpp - qplaylisttableview.hpp - qpresettextedit.cpp - qpresettextedit.hpp - qpreseteditordialog.cpp - qpreseteditordialog.hpp - qprojectm.hpp - qprojectmwidget.hpp -) - - -set(projectM-qt_MOC_HDRS - qprojectm_mainwindow.hpp - qpresetfiledialog.hpp - qplaylistfiledialog.hpp - qplaylistmodel.hpp - qprojectmconfigdialog.hpp - qplaylisttableview.hpp - qpresettextedit.hpp - qpreseteditordialog.hpp - qprojectm.hpp - qprojectmwidget.hpp -) - -set(projectM-qt_UIS - qprojectm_mainwindow.ui - qprojectmconfigdialog.ui - qpreseteditordialog.ui -) - -# Qt resource file -set( projectM-qt_RESOURCES - application.qrc -) - -# compile resources -qt5_add_resources( projectM-qt_RC_SRCS ${projectM-qt_RESOURCES} ) - -qt5_wrap_ui(projectM-qt_UIS_H ${projectM-qt_UIS}) - -# After this call, foo_MOC_SRCS = moc_Class1.cxx moc_Class2.cxx moc_Class3.cxx. -qt5_wrap_cpp(projectM-qt_MOC_SRCS ${projectM-qt_MOC_HDRS}) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -if (BUILD_PROJECTM_QT_STATIC) -ADD_LIBRARY(projectM-qt STATIC ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H}) -else(BUILD_PROJECTM_QT_STATIC) -ADD_LIBRARY(projectM-qt SHARED ${projectM-qt_SRCS} ${projectM-qt_RC_SRCS} ${projectM-qt_MOC_SRCS} ${projectM-qt_UIS_H}) -endif(BUILD_PROJECTM_QT_STATIC) - -SET_TARGET_PROPERTIES(projectM-qt PROPERTIES VERSION ${PROJECTM_QT_VERSION} SOVERSION ${PROJECTM_QT_ABI_LEVEL}) - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${projectM-complete_SOURCE_DIR}/libprojectM) - set(PROJECTM_LINK ${projectM-complete_BINARY_DIR}/libprojectM) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${PROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -LINK_DIRECTORIES(${PROJECTM_LINK}) - -include_directories(${PROJECTM_INCLUDE} ${Qt5Widgets_INCLUDE_DIR} ${Qt5OpenGL_INCLUDE_DIR} ${CMAKE_CURRENT_LIBRARY_DIR}) - -# link the "qprojectM" target against the Qt libraries. which libraries exactly, is defined by the "include(${QT_USE_FILE})" line above, which sets up this variable. -target_link_libraries(projectM-qt projectM GLEW GL ${Qt5Widgets_LIBRARIES} ${Qt5OpenGL_LIBRARIES} $) - -install(FILES qprojectm_mainwindow.hpp DESTINATION include/libprojectM-qt) -install(TARGETS projectM-qt DESTINATION lib) -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libprojectM-qt.pc" DESTINATION lib/pkgconfig) -install(FILES "images/icons/prjm16-transparent.svg" DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/FindPkgConfig.cmake projectm-3.1.0/src/projectM-qt/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-qt/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/images/icons/CMakeLists.txt projectm-3.1.0/src/projectM-qt/images/icons/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-qt/images/icons/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/images/icons/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -########### install files ############### - -kde4_install_icons( ${DATA_INSTALL_DIR}/amarok/icons ) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/libprojectM-qt.pc.in projectm-3.1.0/src/projectM-qt/libprojectM-qt.pc.in --- projectm-2.2.0~git28bb9/src/projectM-qt/libprojectM-qt.pc.in 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/libprojectM-qt.pc.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include -pkgdatadir=@CMAKE_INSTALL_PREFIX@/share/projectM-qt -sysconfdir=@CMAKE_INSTALL_PREFIX@/share/projectM-qt - -Name: libprojectM-qt -Version: 1.2.0 -Description: projectM-qt provides a full featured Qt4 graphical user interface to projectM -Requires: libprojectM QtCore QtGui QtXml QtOpenGL -+Libs: -L${libdir} -lprojectM-qt -+Cflags: -I${includedir} diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/Makefile.am projectm-3.1.0/src/projectM-qt/Makefile.am --- projectm-2.2.0~git28bb9/src/projectM-qt/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/Makefile.am 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,77 @@ +SUFFIXES = .hpp .cpp _moc.cpp _qrc.qrc + +projectM_qt_qtheaders = qprojectm_mainwindow.hpp \ + qpresetfiledialog.hpp \ + qplaylistfiledialog.hpp \ + qplaylistmodel.hpp \ + qprojectmconfigdialog.hpp \ + qplaylisttableview.hpp \ + qpresettextedit.hpp \ + qpreseteditordialog.hpp \ + qprojectm.hpp \ + qprojectmwidget.hpp + +nodist_projectM_qt_moc_sources = $(projectM_qt_qtheaders:.hpp=_moc.cpp) + +.hpp_moc.cpp: + @MOC@ -o$@ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(MOC_CPPFLAGS)\ + $(qt_CPPFLAGS) $(qt_LDFLAGS) $(qt_LIBS) $< + +ui_qprojectm_mainwindow.h: qprojectm_mainwindow.ui + @UIC@ -o $@ $< + +ui_qpreseteditordialog.h: qpreseteditordialog.ui + @UIC@ -o $@ $< + +ui_qprojectmconfigdialog.h: qprojectmconfigdialog.ui + @UIC@ -o $@ $< + +application_qrc.cpp: application.qrc + @RCC@ -o $@ $< + + +BUILT_SOURCES = \ + ui_qprojectm_mainwindow.h \ + ui_qpreseteditordialog.h \ + ui_qprojectmconfigdialog.h + +noinst_LIBRARIES = libprojectM_qt.a + +libprojectM_qt_a_SOURCES = \ + qprojectm_mainwindow.cpp \ + configfile.hpp configfile.cpp \ + qplaylistfiledialog.cpp \ + qplaylistmodel.cpp \ + qprojectmconfigdialog.cpp \ + qpresettextedit.cpp \ + qpreseteditordialog.cpp \ + qprojectm_mainwindow.ui \ + qpreseteditordialog.ui \ + qprojectmconfigdialog.ui \ + $(projectM_qt_qtheaders) \ + qxmlplaylisthandler.hpp \ + nullable.hpp \ + application.qrc \ + images/* + +nodist_libprojectM_qt_a_SOURCES = \ + application_qrc.cpp \ + $(nodist_projectM_qt_moc_sources) + +AM_CPPFLAGS = \ + -include $(top_builddir)/config.h \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -I${top_srcdir}/src/libprojectM \ + -I${top_srcdir}/src/libprojectM/Renderer \ + ${QT_CFLAGS} \ + -fPIC + +AM_CFLAGS = ${my_CFLAGS} \ + -fvisibility=hidden \ + -ffunction-sections \ + -fdata-sections + +CLEANFILES = \ + application_qrc.cpp \ + ${BUILT_SOURCES} \ + ${nodist_projectM_qt_moc_sources} diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/nullable.hpp projectm-3.1.0/src/projectM-qt/nullable.hpp --- projectm-2.2.0~git28bb9/src/projectM-qt/nullable.hpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/nullable.hpp 2018-10-16 14:16:34.000000000 +0000 @@ -31,6 +31,8 @@ Nullable & operator=(const Value & value) { m_value = value; m_hasValue = true; + static Nullable tmp = 0; + return tmp; } void nullify() { diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/qplaylistmodel.cpp projectm-3.1.0/src/projectM-qt/qplaylistmodel.cpp --- projectm-2.2.0~git28bb9/src/projectM-qt/qplaylistmodel.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/qplaylistmodel.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -318,11 +318,7 @@ int QPlaylistModel::columnCount ( const QModelIndex & parent ) const { - - if ( rowCount() > 0 ) - return softCutRatingsEnabled() ? 3 : 2; - else - return 0; + return softCutRatingsEnabled() ? 3 : 2; } void QPlaylistModel::appendRow ( const QString & presetURL, const QString & presetName, int rating, int breedability ) diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/qprojectm_mainwindow.cpp projectm-3.1.0/src/projectM-qt/qprojectm_mainwindow.cpp --- projectm-2.2.0~git28bb9/src/projectM-qt/qprojectm_mainwindow.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/qprojectm_mainwindow.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -38,6 +38,8 @@ #include "nullable.hpp" #include "qprojectmwidget.hpp" +extern int qInitResources(); + class PlaylistWriteFunctor { public: PlaylistWriteFunctor(const QVector::iterator & begin, @@ -77,7 +79,7 @@ configDialog(0), hHeader(0), vHeader(0), _menuVisible(true), _menuAndStatusBarsVisible(true), activePresetIndex(new Nullable), playlistItemCounter(0), m_QPresetEditorDialog(0) { - + qInitResources(); ui = new Ui::QProjectM_MainWindow(); ui->setupUi ( this ); diff -Nru projectm-2.2.0~git28bb9/src/projectM-qt/src.pro projectm-3.1.0/src/projectM-qt/src.pro --- projectm-2.2.0~git28bb9/src/projectM-qt/src.pro 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-qt/src.pro 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -SOURCES += qgltest.cpp \ - main.cpp -HEADERS += qgltest.h \ - QProjectMFileDialog.hpp -TEMPLATE = app -CONFIG += warn_on \ - thread \ - qt -TARGET = ../bin/qgltest -RESOURCES = application.qrc -DISTFILES += ../CMakeLists.txt \ -CMakeLists.txt diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/cmake/FindSDL2.cmake projectm-3.1.0/src/projectM-sdl/cmake/FindSDL2.cmake --- projectm-2.2.0~git28bb9/src/projectM-sdl/cmake/FindSDL2.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/cmake/FindSDL2.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,169 +0,0 @@ - -# This module defines -# SDL2_LIBRARY, the name of the library to link against -# SDL2_FOUND, if false, do not try to link to SDL2 -# SDL2_INCLUDE_DIR, where to find SDL.h -# -# This module responds to the the flag: -# SDL2_BUILDING_LIBRARY -# If this is defined, then no SDL2main will be linked in because -# only applications need main(). -# Otherwise, it is assumed you are building an application and this -# module will attempt to locate and set the the proper link flags -# as part of the returned SDL2_LIBRARY variable. -# -# Don't forget to include SDLmain.h and SDLmain.m your project for the -# OS X framework based version. (Other versions link to -lSDL2main which -# this module will try to find on your behalf.) Also for OS X, this -# module will automatically add the -framework Cocoa on your behalf. -# -# -# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration -# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library -# (SDL2.dll, libsdl2.so, SDL2.framework, etc). -# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again. -# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value -# as appropriate. These values are used to generate the final SDL2_LIBRARY -# variable, but when these values are unset, SDL2_LIBRARY does not get created. -# -# -# $SDL2DIR is an environment variable that would -# correspond to the ./configure --prefix=$SDL2DIR -# used in building SDL2. -# l.e.galup 9-20-02 -# -# Modified by Eric Wing. -# Added code to assist with automated building by using environmental variables -# and providing a more controlled/consistent search behavior. -# Added new modifications to recognize OS X frameworks and -# additional Unix paths (FreeBSD, etc). -# Also corrected the header search path to follow "proper" SDL guidelines. -# Added a search for SDL2main which is needed by some platforms. -# Added a search for threads which is needed by some platforms. -# Added needed compile switches for MinGW. -# -# On OSX, this will prefer the Framework version (if found) over others. -# People will have to manually change the cache values of -# SDL2_LIBRARY to override this selection or set the CMake environment -# CMAKE_INCLUDE_PATH to modify the search paths. -# -# Note that the header path has changed from SDL2/SDL.h to just SDL.h -# This needed to change because "proper" SDL convention -# is #include "SDL.h", not . This is done for portability -# reasons because not all systems place things in SDL2/ (see FreeBSD). - -#============================================================================= -# Copyright 2003-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -message("") - -SET(SDL2_SEARCH_PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts - /opt/csw # Blastwave - /opt - ${SDL2_PATH} -) - -FIND_PATH(SDL2_INCLUDE_DIR SDL.h - HINTS - $ENV{SDL2DIR} - PATH_SUFFIXES include/SDL2 include - PATHS ${SDL2_SEARCH_PATHS} -) - -FIND_LIBRARY(SDL2_LIBRARY_TEMP - NAMES SDL2 - HINTS - $ENV{SDL2DIR} - PATH_SUFFIXES lib64 lib - PATHS ${SDL2_SEARCH_PATHS} -) - -IF(NOT SDL2_BUILDING_LIBRARY) - IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") - # Non-OS X framework versions expect you to also dynamically link to - # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms - # seem to provide SDL2main for compatibility even though they don't - # necessarily need it. - FIND_LIBRARY(SDL2MAIN_LIBRARY - NAMES SDL2main - HINTS - $ENV{SDL2DIR} - PATH_SUFFIXES lib64 lib - PATHS ${SDL2_SEARCH_PATHS} - ) - ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework") -ENDIF(NOT SDL2_BUILDING_LIBRARY) - -# SDL2 may require threads on your system. -# The Apple build may not need an explicit flag because one of the -# frameworks may already provide it. -# But for non-OSX systems, I will use the CMake Threads package. -IF(NOT APPLE) - FIND_PACKAGE(Threads) -ENDIF(NOT APPLE) - -# MinGW needs an additional library, mwindows -# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows -# (Actually on second look, I think it only needs one of the m* libraries.) -IF(MINGW) - SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW") -ENDIF(MINGW) - -IF(SDL2_LIBRARY_TEMP) - # For SDL2main - IF(NOT SDL2_BUILDING_LIBRARY) - IF(SDL2MAIN_LIBRARY) - SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP}) - ENDIF(SDL2MAIN_LIBRARY) - ENDIF(NOT SDL2_BUILDING_LIBRARY) - - # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa. - # CMake doesn't display the -framework Cocoa string in the UI even - # though it actually is there if I modify a pre-used variable. - # I think it has something to do with the CACHE STRING. - # So I use a temporary variable until the end so I can set the - # "real" variable in one-shot. - IF(APPLE) - SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa") - ENDIF(APPLE) - - # For threads, as mentioned Apple doesn't need this. - # In fact, there seems to be a problem if I used the Threads package - # and try using this line, so I'm just skipping it entirely for OS X. - IF(NOT APPLE) - SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT}) - ENDIF(NOT APPLE) - - # For MinGW library - IF(MINGW) - SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP}) - ENDIF(MINGW) - - # Set the final string here so the GUI reflects the final state. - SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found") - # Set the temp variable to INTERNAL so it is not seen in the CMake GUI - SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "") -ENDIF(SDL2_LIBRARY_TEMP) - -message("") - -INCLUDE(FindPackageHandleStandardArgs) - -FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/cmake_install.cmake projectm-3.1.0/src/projectM-sdl/cmake_install.cmake --- projectm-2.2.0~git28bb9/src/projectM-sdl/cmake_install.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/cmake_install.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,34 +0,0 @@ -# Install script for directory: /home/cyber/dev/projectM/src/projectM-sdl - -# Set the install prefix -if(NOT DEFINED CMAKE_INSTALL_PREFIX) - set(CMAKE_INSTALL_PREFIX "/usr/local") -endif() -string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") - -# Set the install configuration name. -if(NOT DEFINED CMAKE_INSTALL_CONFIG_NAME) - if(BUILD_TYPE) - string(REGEX REPLACE "^[^A-Za-z0-9_]+" "" - CMAKE_INSTALL_CONFIG_NAME "${BUILD_TYPE}") - else() - set(CMAKE_INSTALL_CONFIG_NAME "") - endif() - message(STATUS "Install configuration: \"${CMAKE_INSTALL_CONFIG_NAME}\"") -endif() - -# Set the component getting installed. -if(NOT CMAKE_INSTALL_COMPONENT) - if(COMPONENT) - message(STATUS "Install component: \"${COMPONENT}\"") - set(CMAKE_INSTALL_COMPONENT "${COMPONENT}") - else() - set(CMAKE_INSTALL_COMPONENT) - endif() -endif() - -# Install shared libraries without execute permission? -if(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE) - set(CMAKE_INSTALL_SO_NO_EXE "1") -endif() - diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -PROJECT(projectM-sdl) - -# no fucking idea wtf dont care -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) -INCLUDE(../cmake/CPack-projectM.cmake) - -SET(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM/Renderer) - -# we're producing an executable called projectMSDL -ADD_EXECUTABLE(projectMSDL projectM_SDL_main.cpp -) - -# openGL -FIND_PACKAGE(OpenGL) - -# SDL2 -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) # has FindSDL2 -FIND_PACKAGE(SDL2 REQUIRED) - -# link in projectM -# i have no idea if this is correct -TARGET_LINK_LIBRARIES(projectMSDL projectM ${OPENGL_LIBRARIES} ${SDL2_LIBRARY}) -SET(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL2_INCLUDE_DIR}) -LINK_DIRECTORIES(${PROJECTM_LINK}) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/config.inp projectm-3.1.0/src/projectM-sdl/config.inp --- projectm-2.2.0~git28bb9/src/projectM-sdl/config.inp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/config.inp 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,22 @@ +# config.inp +# Configuration File for projectM + +#Texture Size = 1024 # Size of internal rendering texture + +Mesh X = 220 # Width of PerPixel Equation mesh +Mesh Y = 125 # Height of PerPixel Equation mesh +FPS = 60 # Frames Per Second +Fullscreen = false +Window Width = 512 # startup window width +Window Height = 512 # startup window height + +Smooth Transition Duration = 1 # in seconds +Preset Duration = 10 # in seconds +Easter Egg Parameter = 1 + +Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent +Aspect Correction = true # Custom Shape Aspect Correction + +Preset Path = presets # preset location +Title Font = Vera.ttf +Menu Font = VeraMono.ttf diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/fonts/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/fonts/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/fonts/CMakeLists.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/fonts/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(fonts) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/.gitignore projectm-3.1.0/src/projectM-sdl/.gitignore --- projectm-2.2.0~git28bb9/src/projectM-sdl/.gitignore 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/.gitignore 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1 @@ +projectMSDL \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/Makefile.am projectm-3.1.0/src/projectM-sdl/Makefile.am --- projectm-2.2.0~git28bb9/src/projectM-sdl/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/Makefile.am 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,13 @@ +AM_CPPFLAGS = \ +${my_CFLAGS} \ +-include $(top_builddir)/config.h \ +-DSYSCONFDIR=\""$(sysconfdir)"\" \ +-I${top_srcdir}/src/libprojectM \ +-I${top_srcdir}/src/libprojectM/Renderer \ +${SDL_CFLAGS} + +bin_PROGRAMS = projectMSDL +projectMSDL_SOURCES = pmSDL.cpp projectM_SDL_main.cpp pmSDL.hpp +projectMSDL_LDADD = ${SDL_LIBS} ../libprojectM/libprojectM.la +projectMSDL_LDFLAGS = -static +projectMSDL_PROGRAM = projectMSDL diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/pmSDL.cpp projectm-3.1.0/src/projectM-sdl/pmSDL.cpp --- projectm-2.2.0~git28bb9/src/projectM-sdl/pmSDL.cpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/pmSDL.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,339 @@ +// +// pmSDL.cpp +// SDLprojectM +// +// Created by Mischa Spiegelmock on 2017-09-18. +// + +#include "pmSDL.hpp" +#include +#include +#include "Renderer/ShaderEngine.hpp" + +void projectMSDL::audioInputCallbackF32(void *userdata, unsigned char *stream, int len) { + projectMSDL *app = (projectMSDL *) userdata; + // printf("LEN: %i\n", len); + // stream is (i think) samples*channels floats (native byte order) of len BYTES + app->pcm()->addPCMfloat((float *)stream, len/sizeof(float)); +} + +void projectMSDL::audioInputCallbackS16(void *userdata, unsigned char *stream, int len) { + // printf("LEN: %i\n", len); + projectMSDL *app = (projectMSDL *) userdata; + short pcm16[2][512]; + + for (int i = 0; i < 512; i++) { + for (int j = 0; j < app->audioChannelsCount; j++) { + pcm16[j][i] = stream[i+j]; + } + } + app->pcm()->addPCM16(pcm16); +} + +SDL_AudioDeviceID projectMSDL::selectAudioInput(int count) { + // ask the user which capture device to use + // printf("Please select which audio input to use:\n"); + printf("Detected devices:\n"); + for (int i = 0; i < count; i++) { + printf(" %i: 🎤%s\n", i, SDL_GetAudioDeviceName(i, true)); + } + + return 0; +} + +int projectMSDL::openAudioInput() { + // get audio driver name (static) + const char* driver_name = SDL_GetCurrentAudioDriver(); + SDL_Log("Using audio driver: %s\n", driver_name); + + // get audio input device + int i, count = SDL_GetNumAudioDevices(true); // capture, please + if (count == 0) { + SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION, "No audio capture devices found"); + SDL_Quit(); + } + for (i = 0; i < count; i++) { + SDL_Log("Found audio capture device %d: %s", i, SDL_GetAudioDeviceName(i, true)); + } + + SDL_AudioDeviceID selectedAudioDevice = 0; // device to open + if (count > 1) { + // need to choose which input device to use + selectedAudioDevice = selectAudioInput(count); + if (selectedAudioDevice > count) { + SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION, "No audio input device specified."); + SDL_Quit(); + } + } + + // params for audio input + SDL_AudioSpec want, have; + + // requested format + SDL_zero(want); + want.freq = 48000; + want.format = AUDIO_F32; // float + want.channels = 2; + want.samples = 512; + want.callback = projectMSDL::audioInputCallbackF32; + want.userdata = this; + + audioDeviceID = SDL_OpenAudioDevice(SDL_GetAudioDeviceName(selectedAudioDevice, true), true, &want, &have, 0); + + if (audioDeviceID == 0) { + SDL_LogCritical(SDL_LOG_CATEGORY_APPLICATION, "Failed to open audio capture device: %s", SDL_GetError()); + SDL_Quit(); + } + + // read characteristics of opened capture device + SDL_Log("Opened audio capture device %i: %s", audioDeviceID, SDL_GetAudioDeviceName(selectedAudioDevice, true)); + SDL_Log("Sample rate: %i, frequency: %i, channels: %i, format: %i", have.samples, have.freq, have.channels, have.format); + audioChannelsCount = have.channels; + audioSampleRate = have.freq; + audioSampleCount = have.samples; + audioFormat = have.format; + audioInputDevice = audioDeviceID; + return 1; +} + +void projectMSDL::beginAudioCapture() { + // allocate a buffer to store PCM data for feeding in + unsigned int maxSamples = audioChannelsCount * audioSampleCount; + SDL_PauseAudioDevice(audioDeviceID, false); +} + +void projectMSDL::endAudioCapture() { + SDL_PauseAudioDevice(audioDeviceID, true); +} + +void projectMSDL::maximize() { + SDL_DisplayMode dm; + if (SDL_GetDesktopDisplayMode(0, &dm) != 0) { + SDL_Log("SDL_GetDesktopDisplayMode failed: %s", SDL_GetError()); + return; + } + + SDL_SetWindowSize(win, dm.w, dm.h); + resize(dm.w, dm.h); +} + +void projectMSDL::toggleFullScreen() { + maximize(); + if (isFullScreen) { + SDL_SetWindowFullscreen(win, SDL_WINDOW_FULLSCREEN_DESKTOP); + isFullScreen = false; + SDL_ShowCursor(true); + } else { + SDL_ShowCursor(false); + SDL_SetWindowFullscreen(win, SDL_WINDOW_FULLSCREEN); + isFullScreen = true; + } +} + +void projectMSDL::keyHandler(SDL_Event *sdl_evt) { + projectMEvent evt; + projectMKeycode key; + projectMModifier mod; + SDL_Keymod sdl_mod = (SDL_Keymod) sdl_evt->key.keysym.mod; + SDL_Keycode sdl_keycode = sdl_evt->key.keysym.sym; + + // handle keyboard input (for our app first, then projectM) + switch (sdl_keycode) { + case SDLK_f: + if (sdl_mod & KMOD_LGUI || sdl_mod & KMOD_RGUI || sdl_mod & KMOD_LCTRL) { + // command-f: fullscreen + toggleFullScreen(); + return; // handled + } + break; + } + + // translate into projectM codes and perform default projectM handler + evt = sdl2pmEvent(sdl_evt); + key = sdl2pmKeycode(sdl_keycode); + mod = sdl2pmModifier(sdl_mod); + key_handler(evt, key, mod); +} + +void projectMSDL::addFakePCM() { + int i; + short pcm_data[2][512]; + /** Produce some fake PCM data to stuff into projectM */ + for ( i = 0 ; i < 512 ; i++ ) { + if ( i % 2 == 0 ) { + pcm_data[0][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); + pcm_data[1][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); + } else { + pcm_data[0][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); + pcm_data[1][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); + } + if ( i % 2 == 1 ) { + pcm_data[0][i] = -pcm_data[0][i]; + pcm_data[1][i] = -pcm_data[1][i]; + } + } + + /** Add the waveform data */ + pcm()->addPCM16(pcm_data); +} + +void projectMSDL::resize(unsigned int width_, unsigned int height_) { + width = width_; + height = height_; + projectM_resetGL(width, height); +} + +void projectMSDL::pollEvent() { + SDL_Event evt; + + while (SDL_PollEvent(&evt)) + { + switch (evt.type) { + case SDL_WINDOWEVENT: + switch (evt.window.event) { + case SDL_WINDOWEVENT_RESIZED: + resize(evt.window.data1, evt.window.data2); + break; + } + break; + case SDL_KEYDOWN: + keyHandler(&evt); + break; + case SDL_QUIT: + done = true; + break; + } + } +} + +void projectMSDL::renderFrame() { + glClearColor( 0.0, 0.0, 0.0, 0.0 ); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + projectM::renderFrame(); + + if (renderToTexture) { + renderTexture(); + } + + SDL_GL_SwapWindow(win); +} + +projectMSDL::projectMSDL(Settings settings, int flags) : projectM(settings, flags) { + width = getWindowWidth(); + height = getWindowHeight(); + done = 0; + isFullScreen = false; +} + +projectMSDL::projectMSDL(std::string config_file, int flags) : projectM(config_file, flags) { + width = getWindowWidth(); + height = getWindowHeight(); + done = 0; + isFullScreen = false; +} + +void projectMSDL::init(SDL_Window *window, SDL_GLContext *_glCtx, const bool _renderToTexture) { + win = window; + glCtx = _glCtx; + projectM_resetGL(width, height); + + // are we rendering to a texture? + renderToTexture = _renderToTexture; + if (renderToTexture) { + programID = ShaderEngine::CompileShaderProgram(ShaderEngine::v2f_c4f_t2f_vert, ShaderEngine::v2f_c4f_t2f_frag, "v2f_c4f_t2f"); + textureID = projectM::initRenderToTexture(); + + float points[16] = { + -0.8, -0.8, + 0.0, 0.0, + + -0.8, 0.8, + 0.0, 1.0, + + 0.8, -0.8, + 1.0, 0.0, + + 0.8, 0.8, + 1.0, 1.0, + }; + + glGenBuffers(1, &m_vbo); + glBindBuffer(GL_ARRAY_BUFFER, m_vbo); + glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 16, points, GL_DYNAMIC_DRAW); + + glGenVertexArrays(1, &m_vao); + glBindVertexArray(m_vao); + + glEnableVertexAttribArray(0); + glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)0); // Positions + + glDisableVertexAttribArray(1); + + glEnableVertexAttribArray(2); + glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(float)*4, (void*)(sizeof(float)*2)); // Textures + + glBindVertexArray(0); + glBindBuffer(GL_ARRAY_BUFFER, 0); + } +} + + +std::string projectMSDL::getActivePresetName() +{ + unsigned int index = 0; + if (selectedPresetIndex(index)) { + return getPresetName(index); + } + return std::string(); +} + + +void projectMSDL::renderTexture() { + static int frame = 0; + frame++; + + glClear(GL_COLOR_BUFFER_BIT); + glClear(GL_DEPTH_BUFFER_BIT); + + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + glViewport(0, 0, getWindowWidth(), getWindowHeight()); + + glUseProgram(programID); + + glUniform1i(glGetUniformLocation(programID, "texture_sampler"), 0); + + glm::mat4 mat_proj = glm::frustum(-1.0f, 1.0f, -1.0f, 1.0f, 2.0f, 10.0f); + + glEnable(GL_DEPTH_TEST); + + glm::mat4 mat_model = glm::mat4(1.0f); + mat_model = glm::translate(mat_model, glm::vec3(cos(frame*0.023), + cos(frame*0.017), + -5+sin(frame*0.022)*2)); + mat_model = glm::rotate(mat_model, glm::radians((float) sin(frame*0.0043)*360), + glm::vec3(sin(frame*0.0017), + sin(frame *0.0032), + 1)); + + glm::mat4 mat_transf = glm::mat4(1.0f); + mat_transf = mat_proj * mat_model; + + glUniformMatrix4fv(glGetUniformLocation(programID, "vertex_transformation"), 1, GL_FALSE, glm::value_ptr(mat_transf)); + + glActiveTexture(GL_TEXTURE0); + + glBindTexture(GL_TEXTURE_2D, textureID); + + glVertexAttrib4f(1, 1.0, 1.0, 1.0, 1.0); + + glBindVertexArray(m_vao); + + glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); + + glBindVertexArray(0); + + glDisable(GL_DEPTH_TEST); +} + diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/pmSDL.hpp projectm-3.1.0/src/projectM-sdl/pmSDL.hpp --- projectm-2.2.0~git28bb9/src/projectM-sdl/pmSDL.hpp 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/pmSDL.hpp 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,76 @@ +// +// pmSDL.hpp +// SDLprojectM +// +// Created by Mischa Spiegelmock on 2017-09-18. +// + +#ifndef pmSDL_hpp +#define pmSDL_hpp + +#include "projectM-opengl.h" +#include +#include +#include +#include +#include + +// DATADIR_PATH should be set by the root Makefile if this is being +// built with autotools. +#ifndef DATADIR_PATH + #ifdef DEBUG + #define DATADIR_PATH "." + #warning "DATADIR_PATH is not defined - falling back to ./" + #else + #define DATADIR_PATH "/usr/local/share/projectM" + #warning "DATADIR_PATH is not defined - falling back to /usr/local/share/projectM" + #endif +#endif + +class projectMSDL : public projectM { +public: + bool done; + + projectMSDL(Settings settings, int flags); + projectMSDL(std::string config_file, int flags); + void init(SDL_Window *window, SDL_GLContext *glCtx, const bool renderToTexture = false); + int openAudioInput(); + void beginAudioCapture(); + void endAudioCapture(); + void toggleFullScreen(); + void resize(unsigned int width, unsigned int height); + void renderFrame(); + void pollEvent(); + void maximize(); + std::string getActivePresetName(); + void addFakePCM(); + +private: + SDL_Window *win; + SDL_GLContext *glCtx; + bool isFullScreen; + SDL_AudioDeviceID audioInputDevice; + unsigned int width, height; + bool renderToTexture; + GLuint programID = 0; + GLuint m_vbo = 0; + GLuint m_vao = 0; + GLuint textureID = 0; + + // audio input device characteristics + unsigned short audioChannelsCount; + unsigned short audioSampleRate; + unsigned short audioSampleCount; + SDL_AudioFormat audioFormat; + SDL_AudioDeviceID audioDeviceID; + + static void audioInputCallbackF32(void *userdata, unsigned char *stream, int len); + static void audioInputCallbackS16(void *userdata, unsigned char *stream, int len); + + void keyHandler(SDL_Event *); + SDL_AudioDeviceID selectAudioInput(int count); + void renderTexture(); +}; + + +#endif /* pmSDL_hpp */ diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_milkdrop/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/presets/presets_milkdrop/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_milkdrop/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/presets/presets_milkdrop/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -PROJECT(presets_milkdrop) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_milkdrop_104/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/presets/presets_milkdrop_104/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_milkdrop_104/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/presets/presets_milkdrop_104/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -PROJECT(presets_milkdrop_104) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_milkdrop_200/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/presets/presets_milkdrop_200/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_milkdrop_200/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/presets/presets_milkdrop_200/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -PROJECT(presets_milkdrop_200) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_projectM/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/presets/presets_projectM/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_projectM/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/presets/presets_projectM/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -PROJECT(presets-projectm) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) \ No newline at end of file diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_stock/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/presets/presets_stock/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_stock/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/presets/presets_stock/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(presets) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/CMakeLists.txt projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -PROJECT(presets) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -Include(../src/cmake/CPack-projectM.cmake) - diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ finally some serious stfu (loavthe).milk" 2018-10-16 14:16:32.000000000 +0000 @@ -537,7 +537,7 @@ warp_65=`pln.yz=op.yz+surfp.yz*(pln.w+0.5).xx; warp_66=`bpr.xy=op.yz+surfp.yz*(pln.w-5).xx; warp_67=`cnt.xyz=pln.x>0?((abs(bpr.x)<5)&&(abs(bpr.y)<5)?bpr.xyz:cnt):cnt; -warp_68=`tuv.xyz=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzx:tuv):tuv; +warp_68=`tuv.xyzw=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzxw:tuv):tuv; warp_69=`sp=tuv.x; warp_70=`float3 t1,t2,a1,a2; warp_71=`b2=tex2D(base02,cnt.xy*0.1+0.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/[dylan] cube in a room -no effects - code is very messy nz+ shit-ass tape.milk" 2018-10-16 14:16:32.000000000 +0000 @@ -537,7 +537,7 @@ warp_65=`pln.yz=op.yz+surfp.yz*(pln.w+0.5).xx; warp_66=`bpr.xy=op.yz+surfp.yz*(pln.w-5).xx; warp_67=`cnt.xyz=pln.x>0?((abs(bpr.x)<5)&&(abs(bpr.y)<5)?bpr.xyz:cnt):cnt; -warp_68=`tuv.xyz=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzx:tuv):tuv; +warp_68=`tuv.xyzw=pln.x>0?( (abs(pln.y)<0.5)&&(abs(pln.z)<0.5)?pln.yzxw:tuv):tuv; warp_69=`sp=tuv.x; warp_70=`float3 t1,t2,a1,a2; warp_71=`b2=tex2D(base02,cnt.xy*0.1+0.5); diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/martin - adrift on a dead planet - lard mix.milk" 2018-10-16 14:16:32.000000000 +0000 @@ -743,8 +743,8 @@ warp_147=`//ret = hormask; warp_148=`} warp_149=` -warp_150=`written by martin -warp_151=`END +warp_150=`//written by martin +warp_151=`//END comp_1=`shader_body comp_2=`{ comp_3=` diff -Nru "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" --- "/tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" 2017-02-20 17:01:52.000000000 +0000 +++ "/tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/presets/presets_tryptonaut/martin - fresco flash - cainlien.milk" 2018-10-16 14:16:32.000000000 +0000 @@ -663,5 +663,5 @@ comp_56=`ret = 1-exp(.1-ret1) ; comp_57=`} comp_58=` -comp_59=`written by martin -comp_60=`END \ No newline at end of file +comp_59=`//written by martin +comp_60=`//END Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/src/projectM-sdl/projectM-SDL/AppIcon.icns and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/src/projectM-sdl/projectM-SDL/AppIcon.icns differ diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/projectM-SDL/Info.plist projectm-3.1.0/src/projectM-sdl/projectM-SDL/Info.plist --- projectm-2.2.0~git28bb9/src/projectM-sdl/projectM-SDL/Info.plist 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/projectM-SDL/Info.plist 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + SDLprojectM + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + projectM-SDL.app + CFBundlePackageType + BNDL + CFBundleShortVersionString + 3.0 + CFBundleVersion + 1 + NSHumanReadableCopyright + LGPL + CFBundleIconFile + AppIcon + + diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/projectM_SDL_main.cpp projectm-3.1.0/src/projectM-sdl/projectM_SDL_main.cpp --- projectm-2.2.0~git28bb9/src/projectM-sdl/projectM_SDL_main.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/projectM_SDL_main.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -3,184 +3,223 @@ // projectM-sdl // // Created by Mischa Spiegelmock on 6/3/15. -// Copyright (c) 2015 Mischa Spiegelmock. All rights reserved. // -// This is an implementation of projectM using libsdl2 +// This is an implementation of projectM using libSDL2 +#include "pmSDL.hpp" -#include +#define FAKE_AUDIO 0 +#define TEST_ALL_PRESETS 0 -#ifdef __linux__ -#ifdef USE_GLES1 -#include -#else -#include -#endif +#if OGL_DEBUG +void DebugLog(GLenum source, + GLenum type, + GLuint id, + GLenum severity, + GLsizei length, + const GLchar* message, + const void* userParam) { + + /*if (type != GL_DEBUG_TYPE_OTHER)*/ + { + std::cerr << " -- \n" << "Type: " << + type << "; Source: " << + source <<"; ID: " << id << "; Severity: " << + severity << "\n" << message << "\n"; + } + } #endif -#ifdef __APPLE__ -#include -#include -#include -#endif - -#include -#include -const float FPS = 60; - -typedef struct { - projectM *pm; - SDL_Window *win; - SDL_Renderer *rend; - bool done; - projectM::Settings settings; - SDL_AudioDeviceID audioInputDevice; -} projectMApp; - -int selectAudioInput(projectMApp *app) { - // audio input stuff here is very platform-specific - // too bad the libsdl2 audio capture support doesn't exist - - #ifdef __APPLE__ -// UInt32 audioInputIsAvailable; -// UInt32 propertySize = sizeof (audioInputIsAvailable); - -// AudioSessionGetProperty ( -// kAudioSessionProperty_AudioInputAvailable, -// &propertySize, -// &audioInputIsAvailable // A nonzero value on output means that -// // audio input is available -// ); - - #endif - - return 1; +// return path to config file to use +std::string getConfigFilePath() { + const char *path = DATADIR_PATH; + struct stat sb; + + // check if datadir exists. + // it should exist if this application was installed. if not, assume we're developing it and use currect directory + if (stat(path, &sb) != 0) { + SDL_LogWarn(SDL_LOG_CATEGORY_ERROR, "Could not open datadir path %s.\n", DATADIR_PATH); + } + + std::string configFilePath = path; + configFilePath += "/config.inp"; + + // check if config file exists + if (stat(configFilePath.c_str(), &sb) != 0) { + SDL_LogWarn(SDL_LOG_CATEGORY_ERROR, "No config file %s found. Using development settings.\n", configFilePath.c_str()); + return ""; + } + + return configFilePath; } -void renderFrame(projectMApp *app) { - int i; - short pcm_data[2][512]; - SDL_Event evt; - - SDL_PollEvent(&evt); - switch (evt.type) { - case SDL_KEYDOWN: - // ... - break; - case SDL_QUIT: - app->done = true; - break; - } +int main(int argc, char *argv[]) { +#if UNLOCK_FPS + setenv("vblank_mode", "0", 1); +#endif -// projectMEvent evt; -// projectMKeycode key; -// projectMModifier mod; -// -// /** Process SDL events */ -// SDL_Event event; -// while ( SDL_PollEvent( &event ) ) { -// /** Translate into projectM codes and process */ -// evt = sdl2pmEvent( event ); -// key = sdl2pmKeycode( event.key.keysym.sym ); -// mod = sdl2pmModifier( (SDLMod)event.key.keysym.mod ); -// if ( evt == PROJECTM_KEYDOWN ) { -// pm->key_handler( evt, key, mod ); -// } -// } - - /** Produce some fake PCM data to stuff into projectM */ - for ( i = 0 ; i < 512 ; i++ ) { - if ( i % 2 == 0 ) { - pcm_data[0][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); - pcm_data[1][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); - } else { - pcm_data[0][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); - pcm_data[1][i] = (float)( rand() / ( (float)RAND_MAX ) * (pow(2,14) ) ); - } - if ( i % 2 == 1 ) { - pcm_data[0][i] = -pcm_data[0][i]; - pcm_data[1][i] = -pcm_data[1][i]; - } - } - - /** Add the waveform data */ - app->pm->pcm()->addPCM16(pcm_data); + SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO); - glClearColor( 0.0, 0.5, 0.0, 0.0 ); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + if (! SDL_VERSION_ATLEAST(2, 0, 5)) { + SDL_Log("SDL version 2.0.5 or greater is required. You have %i.%i.%i", SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL); + return 1; + } - app->pm->renderFrame(); - glFlush(); + // default window size to usable bounds (e.g. minus menubar and dock) + SDL_Rect initialWindowBounds; +#if SDL_VERSION_ATLEAST(2, 0, 5) + // new and better + SDL_GetDisplayUsableBounds(0, &initialWindowBounds); +#else + SDL_GetDisplayBounds(0, &initialWindowBounds); +#endif + int width = initialWindowBounds.w; + int height = initialWindowBounds.h; + int renderIndex = 0; + +#ifdef USE_GLES + for(int i = 0; i < SDL_GetNumRenderDrivers(); i++) { + SDL_RendererInfo info; + if (SDL_GetRenderDriverInfo(i, &info) == 0) { + if (std::string(info.name) == "opengles2") { + renderIndex = i; + break; + } + } + } + // use GLES 2.0 (this may need adjusting) + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES); - SDL_RenderPresent(app->rend); -} +#else + // Disabling compatibility profile + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); + SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); + +#endif + + SDL_Window *win = SDL_CreateWindow("projectM", 0, 0, width, height, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); + SDL_GLContext glCtx = SDL_GL_CreateContext(win); -int main( int argc, char *argv[] ) { - projectMApp app; - app.done = 0; - int width = 784, - height = 784; + SDL_Log("GL_VERSION: %s", glGetString(GL_VERSION)); + SDL_Log("GL_SHADING_LANGUAGE_VERSION: %s", glGetString(GL_SHADING_LANGUAGE_VERSION)); + SDL_Log("GL_VENDOR: %s", glGetString(GL_VENDOR)); - SDL_Init(SDL_INIT_VIDEO); + SDL_SetWindowTitle(win, "projectM Visualizer"); + projectMSDL *app; + + // load configuration file + std::string configFilePath = getConfigFilePath(); + + if (! configFilePath.empty()) { + // found config file, use it + app = new projectMSDL(configFilePath, 0); + SDL_Log("Using config from %s", configFilePath.c_str()); + } else { + SDL_Log("Config file not found, using development settings"); + float heightWidthRatio = (float)height / (float)width; + projectM::Settings settings; + settings.windowWidth = width; + settings.windowHeight = height; + settings.meshX = 300; + settings.meshY = settings.meshX * heightWidthRatio; + settings.fps = 60; + settings.smoothPresetDuration = 3; // seconds + settings.presetDuration = 7; // seconds + settings.beatSensitivity = 0.8; + settings.aspectCorrection = 1; + settings.shuffleEnabled = 1; + settings.softCutRatingsEnabled = 1; // ??? + // get path to our app, use CWD for presets/fonts/etc + std::string base_path = SDL_GetBasePath(); + settings.presetURL = base_path + "presets"; +// settings.presetURL = base_path + "presets/presets_shader_test"; + settings.menuFontURL = base_path + "fonts/Vera.ttf"; + settings.titleFontURL = base_path + "fonts/Vera.ttf"; + // init with settings + app = new projectMSDL(settings, 0); + } + app->init(win, &glCtx); + +#if OGL_DEBUG + glEnable(GL_DEBUG_OUTPUT); + glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); + glDebugMessageCallback(DebugLog, NULL); +#endif + +#if !FAKE_AUDIO // get an audio input device - if (! selectAudioInput(&app)) { - fprintf(stderr, "Failed to open audio input device\n"); - return 1; + if (app->openAudioInput()) + app->beginAudioCapture(); +#endif + +#if TEST_ALL_PRESETS + uint buildErrors = 0; + for(int i = 0; i < app->getPlaylistSize(); i++) { + std::cout << i << "\t" << app->getPresetName(i) << std::endl; + app->selectPreset(i); + if (app->getErrorLoadingCurrentPreset()) { + buildErrors++; + } + } + + if (app->getPlaylistSize()) { + fprintf(stdout, "Preset loading errors: %d/%d [%d%%]\n", buildErrors, app->getPlaylistSize(), (buildErrors*100) / app->getPlaylistSize()); } - app.win = SDL_CreateWindow("projectM", 0, 0, width, height, 0); - app.rend = SDL_CreateRenderer(app.win, 0, SDL_RENDERER_ACCELERATED); - if (! app.rend) { - fprintf(stderr, "Failed to create renderer: %s\n", SDL_GetError()); - return PROJECTM_ERROR; - } - SDL_SetWindowTitle(app.win, "SDL Fun Party Time"); - printf("SDL init version 2\n"); - - #ifdef PANTS - if ( fsaa ) { - SDL_GL_GetAttribute( SDL_GL_MULTISAMPLEBUFFERS, &value ); - printf( "SDL_GL_MULTISAMPLEBUFFERS: requested 1, got %d\n", value ); - SDL_GL_GetAttribute( SDL_GL_MULTISAMPLESAMPLES, &value ); - printf( "SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa, value ); - } - #endif - - app.settings.meshX = 1; - app.settings.meshY = 1; - app.settings.fps = FPS; - app.settings.textureSize = 2048; // idk? - app.settings.windowWidth = width; - app.settings.windowHeight = height; - app.settings.smoothPresetDuration = 3; // seconds - app.settings.presetDuration = 5; // seconds - app.settings.beatSensitivity = 0.8; - app.settings.aspectCorrection = 1; - app.settings.easterEgg = 0; // ??? - app.settings.shuffleEnabled = 1; - app.settings.softCutRatingsEnabled = 1; // ??? - app.settings.presetURL = "presets/presets_tryptonaut"; - app.settings.menuFontURL = "fonts/Vera.ttf"; - app.settings.titleFontURL = "fonts/Vera.ttf"; - - // init projectM - app.pm = new projectM(app.settings); - app.pm->selectRandom(true); - app.pm->projectM_resetGL(width, height); + return PROJECTM_SUCCESS; +#endif + +#if UNLOCK_FPS + int32_t frame_count = 0; + struct timespec now; + clock_gettime(CLOCK_MONOTONIC_RAW, &now); + int64_t start = ( ((int64_t)now.tv_sec * 1000L) + (now.tv_nsec / 1000000L) ); +#endif // standard main loop - const Uint32 frame_delay = 1000/FPS; + int fps = app->settings().fps; + printf("fps: %d\n", fps); + if (fps <= 0) + fps = 60; + const Uint32 frame_delay = 1000/fps; Uint32 last_time = SDL_GetTicks(); - while (! app.done) { - renderFrame(&app); + while (! app->done) { + app->renderFrame(); +#if FAKE_AUDIO + app->addFakePCM(); +#endif + +#if UNLOCK_FPS + frame_count++; + clock_gettime(CLOCK_MONOTONIC_RAW, &now); + if (( ((int64_t)now.tv_sec * 1000L) + (now.tv_nsec / 1000000L) ) - start > 5000) { + SDL_GL_DeleteContext(glCtx); + delete(app); + fprintf(stdout, "Frames[%d]\n", frame_count); + exit(0); + } +#else + app->pollEvent(); Uint32 elapsed = SDL_GetTicks() - last_time; if (elapsed < frame_delay) SDL_Delay(frame_delay - elapsed); last_time = SDL_GetTicks(); +#endif } + + SDL_GL_DeleteContext(glCtx); +#if !FAKE_AUDIO + app->endAudioCapture(); +#endif + delete app; return PROJECTM_SUCCESS; } + + diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/projectMSDL-pkg.plist projectm-3.1.0/src/projectM-sdl/projectMSDL-pkg.plist --- projectm-2.2.0~git28bb9/src/projectM-sdl/projectMSDL-pkg.plist 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/projectMSDL-pkg.plist 2018-10-16 14:16:34.000000000 +0000 @@ -0,0 +1,14 @@ + + + + + + BundleOverwriteAction + upgrade + RootRelativeBundlePath + /Applications/projectM SDL.app + BundleIsVersionChecked + + + + diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj projectm-3.1.0/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj --- projectm-2.2.0~git28bb9/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj 2018-10-16 14:16:34.000000000 +0000 @@ -7,13 +7,17 @@ objects = { /* Begin PBXBuildFile section */ - C307DFD41D565B57002F6B9E /* presets in CopyFiles */ = {isa = PBXBuildFile; fileRef = C307DFD31D565B57002F6B9E /* presets */; }; - C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; }; - C34521511BF022B1001707D2 /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521501BF022B1001707D2 /* libprojectM.a */; }; - C34521531BF022ED001707D2 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521521BF022ED001707D2 /* SDL2.framework */; }; - C34521571BF0250D001707D2 /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521561BF0250D001707D2 /* libMilkdropPresetFactory.a */; }; - C34521591BF02516001707D2 /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521581BF02516001707D2 /* libNativePresetFactory.a */; }; - C345215A1BF0259C001707D2 /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521541BF02333001707D2 /* libRenderer.a */; }; + 1612C997207A80A200862A3A /* libprojectM.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C994207A807000862A3A /* libprojectM.a */; }; + 1612C998207A80A200862A3A /* libRenderer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C992207A807000862A3A /* libRenderer.a */; }; + 1612C9E2207A85C100862A3A /* libMilkdropPresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C9DF207A85BD00862A3A /* libMilkdropPresetFactory.a */; }; + 1612C9E3207A85C100862A3A /* libNativePresetFactory.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612C9E1207A85BD00862A3A /* libNativePresetFactory.a */; }; + 16355BFE2143C0F400B3748F /* projectM_SDL_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */; }; + 16355BFF2143C0F600B3748F /* pmSDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 169501FE1F7009E9008FAF86 /* pmSDL.cpp */; }; + 168F7156211248E4001806E7 /* SDLprojectM in Executable */ = {isa = PBXBuildFile; fileRef = C34521441BF02294001707D2 /* SDLprojectM */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; + 168F715921124C0E001806E7 /* config.inp in Support files */ = {isa = PBXBuildFile; fileRef = 16B52AAA21105A6900830F34 /* config.inp */; }; + 168F715A21124C14001806E7 /* fonts in Support files */ = {isa = PBXBuildFile; fileRef = C3D30B8F1BF02BE5009AAACD /* fonts */; }; + 168F715C21124CDF001806E7 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 166853F02105E2850042793A /* SDL2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 168F718021126256001806E7 /* AppIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 168F717F21126256001806E7 /* AppIcon.icns */; }; C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215B1BF025A9001707D2 /* OpenGL.framework */; }; C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215D1BF025CF001707D2 /* CoreFoundation.framework */; }; C34521651BF025E5001707D2 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215F1BF025E5001707D2 /* libbz2.a */; }; @@ -22,32 +26,137 @@ C34521681BF025E5001707D2 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521621BF025E5001707D2 /* libGLEW.a */; }; C34521691BF025E5001707D2 /* libpng15.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521631BF025E5001707D2 /* libpng15.a */; }; C345216A1BF025E5001707D2 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521641BF025E5001707D2 /* libz.a */; }; - C3D30B901BF02BEC009AAACD /* fonts in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3D30B8F1BF02BE5009AAACD /* fonts */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 1612C991207A807000862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 16178B12207A6F4000D3B0C8; + remoteInfo = Renderer; + }; + 1612C993207A807000862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 16A49E57207A7C8C00E508EA; + remoteInfo = projectM; + }; + 1612C999207A80B800862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 16A49E56207A7C8C00E508EA; + remoteInfo = projectM; + }; + 1612C9D6207A85BD00862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 16178B11207A6F4000D3B0C8; + remoteInfo = Renderer; + }; + 1612C9D8207A85BD00862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1612C9A3207A855D00862A3A; + remoteInfo = MilkdropPresetFactory; + }; + 1612C9DA207A85BD00862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1612C9AB207A856A00862A3A; + remoteInfo = NativePresetFactory; + }; + 1612C9DE207A85BD00862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1612C9A4207A855D00862A3A; + remoteInfo = MilkdropPresetFactory; + }; + 1612C9E0207A85BD00862A3A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 1612C9AC207A856A00862A3A; + remoteInfo = NativePresetFactory; + }; + 168F714F21120496001806E7 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C345213C1BF02293001707D2 /* Project object */; + proxyType = 1; + remoteGlobalIDString = C34521431BF02293001707D2; + remoteInfo = SDLprojectM; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ - C34521421BF02293001707D2 /* CopyFiles */ = { + 168F7155211248DE001806E7 /* Executable */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 6; + files = ( + 168F7156211248E4001806E7 /* SDLprojectM in Executable */, + ); + name = Executable; + runOnlyForDeploymentPostprocessing = 0; + }; + 168F715821124BFC001806E7 /* Support files */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + 168F715921124C0E001806E7 /* config.inp in Support files */, + 168F715A21124C14001806E7 /* fonts in Support files */, + ); + name = "Support files"; + runOnlyForDeploymentPostprocessing = 0; + }; + 168F715B21124CD1001806E7 /* Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 168F715C21124CDF001806E7 /* SDL2.framework in Frameworks */, + ); + name = Frameworks; + runOnlyForDeploymentPostprocessing = 0; + }; + C34521421BF02293001707D2 /* Copy Files */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 12; dstPath = ""; dstSubfolderSpec = 16; files = ( - C3D30B901BF02BEC009AAACD /* fonts in CopyFiles */, - C307DFD41D565B57002F6B9E /* presets in CopyFiles */, ); + name = "Copy Files"; runOnlyForDeploymentPostprocessing = 0; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 1612C98C207A807000862A3A /* libprojectM.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libprojectM.xcodeproj; path = ../libprojectM/libprojectM.xcodeproj; sourceTree = ""; }; + 1612CA10207A8D2400862A3A /* shaders */ = {isa = PBXFileReference; lastKnownFileType = folder; path = shaders; sourceTree = ""; }; + 166853F02105E2850042793A /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../../Library/Frameworks/SDL2.framework; sourceTree = ""; }; + 166853F22105E2CF0042793A /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = ""; }; + 168F714921120210001806E7 /* projectM SDL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "projectM SDL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 168F714B21120211001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 168F717621125ED8001806E7 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 168F717F21126256001806E7 /* AppIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = AppIcon.icns; sourceTree = ""; }; + 169501FE1F7009E9008FAF86 /* pmSDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pmSDL.cpp; sourceTree = ""; }; + 169501FF1F7009E9008FAF86 /* pmSDL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = pmSDL.hpp; sourceTree = ""; }; + 16B52AA8211054E900830F34 /* projectMSDL-pkg.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "projectMSDL-pkg.plist"; sourceTree = ""; }; + 16B52AAA21105A6900830F34 /* config.inp */ = {isa = PBXFileReference; lastKnownFileType = text; path = config.inp; sourceTree = ""; }; C307DFD31D565B57002F6B9E /* presets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = presets; path = ../../presets; sourceTree = ""; }; C34521441BF02294001707D2 /* SDLprojectM */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = SDLprojectM; sourceTree = BUILT_PRODUCTS_DIR; }; C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = projectM_SDL_main.cpp; sourceTree = SOURCE_ROOT; }; - C34521501BF022B1001707D2 /* libprojectM.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libprojectM.a; sourceTree = ""; }; - C34521521BF022ED001707D2 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = ../../../../../../Library/Frameworks/SDL2.framework; sourceTree = ""; }; - C34521541BF02333001707D2 /* libRenderer.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRenderer.a; path = ../libprojectM/Renderer/libRenderer.a; sourceTree = ""; }; - C34521561BF0250D001707D2 /* libMilkdropPresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMilkdropPresetFactory.a; path = ../libprojectM/MilkdropPresetFactory/libMilkdropPresetFactory.a; sourceTree = ""; }; - C34521581BF02516001707D2 /* libNativePresetFactory.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libNativePresetFactory.a; path = ../libprojectM/NativePresetFactory/libNativePresetFactory.a; sourceTree = ""; }; C345215B1BF025A9001707D2 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; C345215D1BF025CF001707D2 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; C345215F1BF025E5001707D2 /* libbz2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbz2.a; path = "../projectM-iTunes/macos/contrib/libbz2.a"; sourceTree = ""; }; @@ -60,82 +169,157 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 168F714621120210001806E7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; C34521411BF02293001707D2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 1612C9E2207A85C100862A3A /* libMilkdropPresetFactory.a in Frameworks */, + 1612C9E3207A85C100862A3A /* libNativePresetFactory.a in Frameworks */, + C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */, + C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */, C34521651BF025E5001707D2 /* libbz2.a in Frameworks */, C34521661BF025E5001707D2 /* libfreetype.a in Frameworks */, C34521671BF025E5001707D2 /* libftgl.a in Frameworks */, C34521681BF025E5001707D2 /* libGLEW.a in Frameworks */, C34521691BF025E5001707D2 /* libpng15.a in Frameworks */, C345216A1BF025E5001707D2 /* libz.a in Frameworks */, - C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */, - C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */, - C345215A1BF0259C001707D2 /* libRenderer.a in Frameworks */, - C34521591BF02516001707D2 /* libNativePresetFactory.a in Frameworks */, - C34521531BF022ED001707D2 /* SDL2.framework in Frameworks */, - C34521571BF0250D001707D2 /* libMilkdropPresetFactory.a in Frameworks */, - C34521511BF022B1001707D2 /* libprojectM.a in Frameworks */, + 1612C997207A80A200862A3A /* libprojectM.a in Frameworks */, + 1612C998207A80A200862A3A /* libRenderer.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - C345213B1BF02293001707D2 = { + 161070CE1F7041B0001905AB /* Frameworks */ = { + isa = PBXGroup; + children = ( + 166853F22105E2CF0042793A /* SDL2.framework */, + C345215D1BF025CF001707D2 /* CoreFoundation.framework */, + C345215B1BF025A9001707D2 /* OpenGL.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 1612C98D207A807000862A3A /* Products */ = { + isa = PBXGroup; + children = ( + 1612C992207A807000862A3A /* libRenderer.a */, + 1612C994207A807000862A3A /* libprojectM.a */, + 1612C9DF207A85BD00862A3A /* libMilkdropPresetFactory.a */, + 1612C9E1207A85BD00862A3A /* libNativePresetFactory.a */, + ); + name = Products; + sourceTree = ""; + }; + 168F714A21120210001806E7 /* projectM-SDL */ = { + isa = PBXGroup; + children = ( + 168F717F21126256001806E7 /* AppIcon.icns */, + 168F714B21120211001806E7 /* Info.plist */, + ); + path = "projectM-SDL"; + sourceTree = ""; + }; + 168F717521125ED8001806E7 /* projectM */ = { + isa = PBXGroup; + children = ( + 168F717621125ED8001806E7 /* Info.plist */, + ); + path = projectM; + sourceTree = ""; + }; + 16A42128207802AF006F30CE /* Dependencies */ = { isa = PBXGroup; children = ( - C307DFD31D565B57002F6B9E /* presets */, C345215F1BF025E5001707D2 /* libbz2.a */, C34521601BF025E5001707D2 /* libfreetype.a */, C34521611BF025E5001707D2 /* libftgl.a */, C34521621BF025E5001707D2 /* libGLEW.a */, C34521631BF025E5001707D2 /* libpng15.a */, C34521641BF025E5001707D2 /* libz.a */, - C345215D1BF025CF001707D2 /* CoreFoundation.framework */, - C345215B1BF025A9001707D2 /* OpenGL.framework */, - C34521581BF02516001707D2 /* libNativePresetFactory.a */, - C34521561BF0250D001707D2 /* libMilkdropPresetFactory.a */, - C34521541BF02333001707D2 /* libRenderer.a */, - C34521521BF022ED001707D2 /* SDL2.framework */, - C34521501BF022B1001707D2 /* libprojectM.a */, - C34521461BF02294001707D2 /* SDLprojectM */, - C34521451BF02294001707D2 /* Products */, - C3D30B8F1BF02BE5009AAACD /* fonts */, ); + name = Dependencies; sourceTree = ""; }; - C34521451BF02294001707D2 /* Products */ = { + C345213B1BF02293001707D2 = { isa = PBXGroup; children = ( - C34521441BF02294001707D2 /* SDLprojectM */, + 169501FF1F7009E9008FAF86 /* pmSDL.hpp */, + 169501FE1F7009E9008FAF86 /* pmSDL.cpp */, + C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */, + 16B52AAA21105A6900830F34 /* config.inp */, + 16B52AA8211054E900830F34 /* projectMSDL-pkg.plist */, + 166853F02105E2850042793A /* SDL2.framework */, + 1612CA10207A8D2400862A3A /* shaders */, + 1612C98C207A807000862A3A /* libprojectM.xcodeproj */, + C307DFD31D565B57002F6B9E /* presets */, + 16A42128207802AF006F30CE /* Dependencies */, + 168F714A21120210001806E7 /* projectM-SDL */, + 168F717521125ED8001806E7 /* projectM */, + 161070CE1F7041B0001905AB /* Frameworks */, + C34521451BF02294001707D2 /* Products */, + C3D30B8F1BF02BE5009AAACD /* fonts */, ); - name = Products; sourceTree = ""; }; - C34521461BF02294001707D2 /* SDLprojectM */ = { + C34521451BF02294001707D2 /* Products */ = { isa = PBXGroup; children = ( - C345214E1BF022A5001707D2 /* projectM_SDL_main.cpp */, + C34521441BF02294001707D2 /* SDLprojectM */, + 168F714921120210001806E7 /* projectM SDL.app */, ); - path = SDLprojectM; + name = Products; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 168F714821120210001806E7 /* projectM SDL */ = { + isa = PBXNativeTarget; + buildConfigurationList = 168F714C21120211001806E7 /* Build configuration list for PBXNativeTarget "projectM SDL" */; + buildPhases = ( + 168F714521120210001806E7 /* Sources */, + 168F714621120210001806E7 /* Frameworks */, + 168F714721120210001806E7 /* Resources */, + 168F7155211248DE001806E7 /* Executable */, + 168F715721124BBB001806E7 /* Copy Presets */, + 168F715821124BFC001806E7 /* Support files */, + 168F715B21124CD1001806E7 /* Frameworks */, + 168F715D21124CF8001806E7 /* Generate Installer Package */, + ); + buildRules = ( + ); + dependencies = ( + 168F715021120496001806E7 /* PBXTargetDependency */, + ); + name = "projectM SDL"; + productName = "projectM-SDL"; + productReference = 168F714921120210001806E7 /* projectM SDL.app */; + productType = "com.apple.product-type.bundle"; + }; C34521431BF02293001707D2 /* SDLprojectM */ = { isa = PBXNativeTarget; buildConfigurationList = C345214B1BF02294001707D2 /* Build configuration list for PBXNativeTarget "SDLprojectM" */; buildPhases = ( C34521401BF02293001707D2 /* Sources */, C34521411BF02293001707D2 /* Frameworks */, - C34521421BF02293001707D2 /* CopyFiles */, + C34521421BF02293001707D2 /* Copy Files */, ); buildRules = ( ); dependencies = ( + 1612C9D7207A85BD00862A3A /* PBXTargetDependency */, + 1612C9D9207A85BD00862A3A /* PBXTargetDependency */, + 1612C9DB207A85BD00862A3A /* PBXTargetDependency */, + 1612C99A207A80B800862A3A /* PBXTargetDependency */, ); name = SDLprojectM; productName = SDLprojectM; @@ -148,9 +332,13 @@ C345213C1BF02293001707D2 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0920; ORGANIZATIONNAME = int80; TargetAttributes = { + 168F714821120210001806E7 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Automatic; + }; C34521431BF02293001707D2 = { CreatedOnToolsVersion = 7.1; }; @@ -166,40 +354,216 @@ mainGroup = C345213B1BF02293001707D2; productRefGroup = C34521451BF02294001707D2 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 1612C98D207A807000862A3A /* Products */; + ProjectRef = 1612C98C207A807000862A3A /* libprojectM.xcodeproj */; + }, + ); projectRoot = ""; targets = ( C34521431BF02293001707D2 /* SDLprojectM */, + 168F714821120210001806E7 /* projectM SDL */, ); }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 1612C992207A807000862A3A /* libRenderer.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRenderer.a; + remoteRef = 1612C991207A807000862A3A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1612C994207A807000862A3A /* libprojectM.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprojectM.a; + remoteRef = 1612C993207A807000862A3A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1612C9DF207A85BD00862A3A /* libMilkdropPresetFactory.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libMilkdropPresetFactory.a; + remoteRef = 1612C9DE207A85BD00862A3A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 1612C9E1207A85BD00862A3A /* libNativePresetFactory.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libNativePresetFactory.a; + remoteRef = 1612C9E0207A85BD00862A3A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + +/* Begin PBXResourcesBuildPhase section */ + 168F714721120210001806E7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 168F718021126256001806E7 /* AppIcon.icns in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 168F715721124BBB001806E7 /* Copy Presets */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "$(SRCROOT)/../../presets", + ); + name = "Copy Presets"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/presets", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/bash; + shellScript = "POUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\n cp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\""; + }; + 168F715D21124CF8001806E7 /* Generate Installer Package */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 12; + files = ( + ); + inputPaths = ( + ); + name = "Generate Installer Package"; + outputPaths = ( + "$(BUILT_PRODUCTS_DIR)/projectM SDL.pkg", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "ls \"$CONFIGURATION_BUILD_DIR\"\n\nmkdir -p \"$DSTROOT/Applications\"\ncp -rp \"$CONFIGURATION_BUILD_DIR/projectM SDL.app\" \"$DSTROOT/Applications\"\npkgbuild --component-plist \"$SRCROOT/projectMSDL-pkg.plist\" --root \"$DSTROOT\" \"$BUILT_PRODUCTS_DIR/projectM SDL.pkg\"\n\necho \"Created installer package $BUILT_PRODUCTS_DIR/projectM SDL.pkg\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ + 168F714521120210001806E7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; C34521401BF02293001707D2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - C345214F1BF022A5001707D2 /* projectM_SDL_main.cpp in Sources */, + 16355BFE2143C0F400B3748F /* projectM_SDL_main.cpp in Sources */, + 16355BFF2143C0F600B3748F /* pmSDL.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 1612C99A207A80B800862A3A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = projectM; + targetProxy = 1612C999207A80B800862A3A /* PBXContainerItemProxy */; + }; + 1612C9D7207A85BD00862A3A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = Renderer; + targetProxy = 1612C9D6207A85BD00862A3A /* PBXContainerItemProxy */; + }; + 1612C9D9207A85BD00862A3A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = MilkdropPresetFactory; + targetProxy = 1612C9D8207A85BD00862A3A /* PBXContainerItemProxy */; + }; + 1612C9DB207A85BD00862A3A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = NativePresetFactory; + targetProxy = 1612C9DA207A85BD00862A3A /* PBXContainerItemProxy */; + }; + 168F715021120496001806E7 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C34521431BF02293001707D2 /* SDLprojectM */; + targetProxy = 168F714F21120496001806E7 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ + 168F714D21120211001806E7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = "projectM-SDL/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; + MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_BUNDLE_IDENTIFIER = "net.projectm.projectM-SDL"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + 168F714E21120211001806E7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + INFOPLIST_FILE = "projectM-SDL/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; + MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = 10.13; + PRODUCT_BUNDLE_IDENTIFIER = "net.projectm.projectM-SDL"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = macosx; + SKIP_INSTALL = YES; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; C34521491BF02294001707D2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; @@ -207,6 +571,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -221,32 +586,40 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../libprojectM/**", - "$(SRCROOT)/../projectM-iTunes/macos/contrib", + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../libprojectM", + /usr/local/include, ); + LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/Frameworks/"; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../projectM-iTunes/macos/contrib"; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; }; name = Debug; }; C345214A1BF02294001707D2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; CODE_SIGN_IDENTITY = ""; @@ -254,6 +627,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -262,27 +636,25 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../libprojectM/**", - "$(SRCROOT)/../projectM-iTunes/macos/contrib", + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../libprojectM", + /usr/local/include, ); + LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/Frameworks/"; + LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../projectM-iTunes/macos/contrib"; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = macosx; }; name = Release; }; C345214C1BF02294001707D2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - HEADER_SEARCH_PATHS = "$(SRCROOT)/../libprojectM"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", + GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/../Frameworks/ @loader_path/Frameworks/"; + OTHER_LDFLAGS = ( + "-framework", + SDL2, ); PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -291,14 +663,11 @@ C345214D1BF02294001707D2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(LOCAL_LIBRARY_DIR)/Frameworks", - ); - HEADER_SEARCH_PATHS = "$(SRCROOT)/../libprojectM"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)", + GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES; + LD_RUNPATH_SEARCH_PATHS = "@executable_path/ @loader_path/../Frameworks/ @loader_path/Frameworks/"; + OTHER_LDFLAGS = ( + "-framework", + SDL2, ); PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -307,6 +676,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 168F714C21120211001806E7 /* Build configuration list for PBXNativeTarget "projectM SDL" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 168F714D21120211001806E7 /* Debug */, + 168F714E21120211001806E7 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; C345213F1BF02293001707D2 /* Build configuration list for PBXProject "SDLprojectM" */ = { isa = XCConfigurationList; buildConfigurations = ( diff -Nru projectm-2.2.0~git28bb9/src/projectM-sdlvis/projectMvis.cc projectm-3.1.0/src/projectM-sdlvis/projectMvis.cc --- projectm-2.2.0~git28bb9/src/projectM-sdlvis/projectMvis.cc 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-sdlvis/projectMvis.cc 2018-10-16 14:16:34.000000000 +0000 @@ -256,7 +256,7 @@ } #endif -#ifdef MACOS +#ifdef __APPLE__ globalPM->fontURL = (char *)malloc( sizeof( char ) * 512 ); strcpy( globalPM->fontURL, "../../fonts" ); diff -Nru projectm-2.2.0~git28bb9/src/projectM-test/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-test/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-test/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-test/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-test/CMakeLists.txt projectm-3.1.0/src/projectM-test/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-test/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-test/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -PROJECT(projectM-tests) -cmake_minimum_required(VERSION 2.4.0) -cmake_policy(SET CMP0005 OLD) - -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - - -INCLUDE(cmake/CPack-projectM.cmake) - -ADD_EXECUTABLE(projectM-test projectM-test.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp getConfigFilename.cpp getConfigFilename.h) -ADD_EXECUTABLE(projectM-test-memleak projectM-test-memleak.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp getConfigFilename.cpp getConfigFilename.h) -ADD_EXECUTABLE(projectM-test-texture projectM-test-texture.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp getConfigFilename.h getConfigFilename.cpp) - -INCLUDE(FindPkgConfig.cmake) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(SDL) - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${LIBPROJECTM_PREFIX}\"') -else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='\"${CMAKE_INSTALL_PREFIX}\"') -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -ADD_DEFINITIONS(-DLINUX) - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR}) -LINK_DIRECTORIES(${PROJECTM_LINK}) - -TARGET_LINK_LIBRARIES(projectM-test projectM ${SDL_LIBRARY} ${SDLMAIN_LIBRARY}) -TARGET_LINK_LIBRARIES(projectM-test-memleak projectM ${SDL_LIBRARY} ${SDLMAIN_LIBRARY}) -TARGET_LINK_LIBRARIES(projectM-test-texture projectM ${SDL_LIBRARY} ${SDLMAIN_LIBRARY}) - -INSTALL(TARGETS projectM-test projectM-test-texture DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) diff -Nru projectm-2.2.0~git28bb9/src/projectM-test/FindPkgConfig.cmake projectm-3.1.0/src/projectM-test/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-test/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-test/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/projectM-test/projectM-test.cpp projectm-3.1.0/src/projectM-test/projectM-test.cpp --- projectm-2.2.0~git28bb9/src/projectM-test/projectM-test.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-test/projectM-test.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -26,7 +26,7 @@ #include "getConfigFilename.h" #include -#ifdef __linux__ +#ifdef __unix__ #include #endif #ifdef __APPLE__ @@ -225,4 +225,3 @@ glMatrixMode(GL_MODELVIEW); glDisable(GL_DEPTH_TEST); } - diff -Nru projectm-2.2.0~git28bb9/src/projectM-test/projectM-test-memleak.cpp projectm-3.1.0/src/projectM-test/projectM-test-memleak.cpp --- projectm-2.2.0~git28bb9/src/projectM-test/projectM-test-memleak.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-test/projectM-test-memleak.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -25,7 +25,7 @@ #include "ConfigFile.h" #include "getConfigFilename.h" -#ifdef __linux__ +#ifdef __unix__ #include #endif #ifdef __APPLE__ @@ -204,4 +204,3 @@ glMatrixMode(GL_MODELVIEW); glDisable(GL_DEPTH_TEST); } - diff -Nru projectm-2.2.0~git28bb9/src/projectM-test/projectM-test-texture.cpp projectm-3.1.0/src/projectM-test/projectM-test-texture.cpp --- projectm-2.2.0~git28bb9/src/projectM-test/projectM-test-texture.cpp 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-test/projectM-test-texture.cpp 2018-10-16 14:16:34.000000000 +0000 @@ -25,7 +25,7 @@ #include "ConfigFile.h" #include "getConfigFilename.h" -#ifdef __linux__ +#ifdef __unix__ #include #endif #ifdef __APPLE__ @@ -204,4 +204,3 @@ glMatrixMode(GL_MODELVIEW); glDisable(GL_DEPTH_TEST); } - diff -Nru projectm-2.2.0~git28bb9/src/projectM-xmms/cmake/CPack-projectM.cmake projectm-3.1.0/src/projectM-xmms/cmake/CPack-projectM.cmake --- projectm-2.2.0~git28bb9/src/projectM-xmms/cmake/CPack-projectM.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-xmms/cmake/CPack-projectM.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -#CPACK projectM config - -SET(CPACK_GENERATORS "TGZ") -SET(CPACK_SOURCE_GENERATORS "TGZ") -SET(CPACK_STRIP_FILES ON) -#SET(CPACK_IGNORE_FILES - # "*~;CMakeCache.txt;CMakeFiles/;.svn;.*.bak;*.Z;_*/;.*.gz;.*.tgz;.*.tar;.*.bz2;.*.zip;.*.rpm;.*.deb;.*.o") -SET(CPACK_SOURCE_IGNORE_FILES - "Makefile;CMakeCache.txt;CMakeFiles/;.*.gz;.*.bz2;.*.Z;.*.zip;.*svn") - -#SET(CPACK_BINARY_RPM OFF) -# #SET(CPACK_BINARY_Z OFF) -#SET(CPACK_SOURCE_TGZ ON) -SET(CPACK_SOURCE_Z OFF) -SET(CPACK_SOURCE_TZ OFF) -SET(CPACK_SOURCE_TBZ2 ON) -#SET(CPACK_BINARY_TGZ ON) -#SET(CPACK_SOURCE_Z OFF) -SET(CPACK_PACKAGE_VERSION_MAJOR "2") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "0") - -INCLUDE(CPack) - diff -Nru projectm-2.2.0~git28bb9/src/projectM-xmms/CMakeLists.txt projectm-3.1.0/src/projectM-xmms/CMakeLists.txt --- projectm-2.2.0~git28bb9/src/projectM-xmms/CMakeLists.txt 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-xmms/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -PROJECT(xmms_projectM) -ADD_LIBRARY(xmms_projectM SHARED main.cpp sdltoprojectM.h video_init.cpp ConfigFile.h ConfigFile.cpp) - -cmake_policy(SET CMP0005 OLD) -cmake_minimum_required(VERSION 2.4.0) - -INCLUDE(FindPkgConfig.cmake) - -INCLUDE(cmake/CPack-projectM.cmake) - -FIND_PACKAGE(OpenGL) -FIND_PACKAGE(GTK) -FIND_PACKAGE(SDL) - -pkg_search_module(LIBXMMS REQUIRED libxmms) - -if(LIBXMMS_FOUND) -MESSAGE(FATAL_ERROR "Xmms not found.") -else(LIBXMMS_FOUND) -MESSAGE(STATUS "Xmms detected.") -endif(LIBXMMS_FOUND) - -if (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - pkg_search_module(LIBPROJECTM REQUIRED libprojectM) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='${LIBPROJECTM_PREFIX}') -else (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(LIBPROJECTM_FOUND true) - ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='${CMAKE_INSTALL_PREFIX}') -endif(${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - -ADD_DEFINITIONS(-DLINUX -DPROJECTM_PREFIX='${PROJECTM_PREFIX}') - -if (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - set(PROJECTM_INCLUDE ${PROJECTM_ROOT_SOURCE_DIR}/libprojectM) - set(PROJECTM_LINK ${PROJECTM_ROOT_BINARY_DIR}/libprojectM) -elseif (${CMAKE_PROJECT_NAME} MATCHES ${PROJECT_NAME}) - set(PROJECTM_INCLUDE ${LIBPROJECTM_INCLUDEDIR}/libprojectM) - set(PROJECTM_LINK ${LIBPROJECTM_LDFLAGS}) -endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete") - -INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${LIBXMMS_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${GTK_INCLUDE_DIR}) - -LINK_DIRECTORIES(${PROJECTM_LINK} ${LIBXMMS_LDFLAGS}) - -TARGET_LINK_LIBRARIES(xmms_projectM projectM xmms ${SDL_LIBRARY} ${GTK_LIBRARIES}) - -INSTALL(TARGETS xmms_projectM DESTINATION lib/xmms/Visualization ) diff -Nru projectm-2.2.0~git28bb9/src/projectM-xmms/FindPkgConfig.cmake projectm-3.1.0/src/projectM-xmms/FindPkgConfig.cmake --- projectm-2.2.0~git28bb9/src/projectM-xmms/FindPkgConfig.cmake 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/projectM-xmms/FindPkgConfig.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,360 +0,0 @@ -# - a pkg-config module for CMake -# -# Usage: -# pkg_check_modules( [REQUIRED] []*) -# checks for all the given modules -# -# pkg_search_module( [REQUIRED] []*) -# checks for given modules and uses the first working one -# -# When the 'REQUIRED' argument was set, macros will fail with an error -# when module(s) could not be found -# -# It sets the following variables: -# PKG_CONFIG_FOUND ... true iff pkg-config works on the system -# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program -# _FOUND ... set to 1 iff module(s) exist -# -# For the following variables two sets of values exist; first one is the -# common one and has the given PREFIX. The second set contains flags -# which are given out when pkgconfig was called with the '--static' -# option. -# _LIBRARIES ... only the libraries (w/o the '-l') -# _LIBRARY_DIRS ... the paths of the libraries (w/o the '-L') -# _LDFLAGS ... all required linker flags -# _LDFLAGS_OTHERS ... all other linker flags -# _INCLUDE_DIRS ... the '-I' preprocessor flags (w/o the '-I') -# _CFLAGS ... all required cflags -# _CFLAGS_OTHERS ... the other compiler flags -# -# = for common case -# = _STATIC for static linking -# -# There are some special variables whose prefix depends on the count -# of given modules. When there is only one module, stays -# unchanged. When there are multiple modules, the prefix will be -# changed to _: -# _VERSION ... version of the module -# _PREFIX ... prefix-directory of the module -# _INCLUDEDIR ... include-dir of the module -# _LIBDIR ... lib-dir of the module -# -# = when |MODULES| == 1, else -# = _ -# -# A parameter can have the following formats: -# {MODNAME} ... matches any version -# {MODNAME}>={VERSION} ... at least version is required -# {MODNAME}={VERSION} ... exactly version is required -# {MODNAME}<={VERSION} ... modules must not be newer than -# -# Examples -# pkg_check_modules (GLIB2 glib-2.0) -# -# pkg_check_modules (GLIB2 glib-2.0>=2.10) -# requires at least version 2.10 of glib2 and defines e.g. -# GLIB2_VERSION=2.10.3 -# -# pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0) -# requires both glib2 and gtk2, and defines e.g. -# FOO_glib-2.0_VERSION=2.10.3 -# FOO_gtk+-2.0_VERSION=2.8.20 -# -# pkg_check_modules (XRENDER REQUIRED xrender) -# defines e.g.: -# XRENDER_LIBRARIES=Xrender;X11 -# XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp -# -# pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) - - -# Copyright (C) 2006 Enrico Scholz -# -# Redistribution and use, with or without modification, are permitted -# provided that the following conditions are met: -# -# 1. Redistributions must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# 2. The name of the author may not be used to endorse or promote -# products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER -# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -### Common stuff #### -set(PKG_CONFIG_VERSION 1) -set(PKG_CONFIG_FOUND 0) - -find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") -mark_as_advanced(PKG_CONFIG_EXECUTABLE) - -if(PKG_CONFIG_EXECUTABLE) - set(PKG_CONFIG_FOUND 1) -endif(PKG_CONFIG_EXECUTABLE) - - -# Unsets the given variables -macro(_pkgconfig_unset var) - set(${var} "" CACHE INTERNAL "") -endmacro(_pkgconfig_unset) - -macro(_pkgconfig_set var value) - set(${var} ${value} CACHE INTERNAL "") -endmacro(_pkgconfig_set) - -# Invokes pkgconfig, cleans up the result and sets variables -macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp) - set(_pkgconfig_invoke_result) - - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${ARGN} ${_pkglist} - OUTPUT_VARIABLE _pkgconfig_invoke_result - RESULT_VARIABLE _pkgconfig_failed) - - if (_pkgconfig_failed) - set(_pkgconfig_${_varname} "") - _pkgconfig_unset(${_prefix}_${_varname}) - else(_pkgconfig_failed) - string(REGEX REPLACE "[\r\n]" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - string(REGEX REPLACE " +$" "" _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - - if (NOT ${_regexp} STREQUAL "") - string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}") - endif(NOT ${_regexp} STREQUAL "") - - separate_arguments(_pkgconfig_invoke_result) - - #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}") - set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result}) - _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}") - endif(_pkgconfig_failed) -endmacro(_pkgconfig_invoke) - -# Invokes pkgconfig two times; once without '--static' and once with -# '--static' -macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp) - _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN}) - _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN}) -endmacro(_pkgconfig_invoke_dyn) - -# Splits given arguments into options and a package list -macro(_pkgconfig_parse_options _result _is_req) - set(${_is_req} 0) - - foreach(_pkg ${ARGN}) - if (_pkg STREQUAL "REQUIRED") - set(${_is_req} 1) - endif (_pkg STREQUAL "REQUIRED") - endforeach(_pkg ${ARGN}) - - set(${_result} ${ARGN}) - list(REMOVE_ITEM ${_result} "REQUIRED") -endmacro(_pkgconfig_parse_options) - -### -macro(_pkg_check_modules_internal _is_required _is_silent _prefix) - _pkgconfig_unset(${_prefix}_FOUND) - _pkgconfig_unset(${_prefix}_VERSION) - _pkgconfig_unset(${_prefix}_PREFIX) - _pkgconfig_unset(${_prefix}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_LIBDIR) - _pkgconfig_unset(${_prefix}_LIBS) - _pkgconfig_unset(${_prefix}_LIBS_L) - _pkgconfig_unset(${_prefix}_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_CFLAGS) - _pkgconfig_unset(${_prefix}_CFLAGS_I) - _pkgconfig_unset(${_prefix}_CFLAGS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_LIBDIR) - _pkgconfig_unset(${_prefix}_STATIC_LIBS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_L) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS) - _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I) - _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER) - - # create a better addressable variable of the modules and calculate its size - set(_pkg_check_modules_list ${ARGN}) - list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt) - - if(PKG_CONFIG_EXECUTABLE) - # give out status message telling checked module - if (NOT ${_is_silent}) - if (_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for module '${_pkg_check_modules_list}'") - else(_pkg_check_modules_cnt EQUAL 1) - message(STATUS "checking for modules '${_pkg_check_modules_list}'") - endif(_pkg_check_modules_cnt EQUAL 1) - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_packages) - set(_pkg_check_modules_failed) - - # iterate through module list and check whether they exist and match the required version - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list}) - set(_pkg_check_modules_exist_query) - - # check whether version is given - if (_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\1" _pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\2" _pkg_check_modules_pkg_op "${_pkg_check_modules_pkg}") - string(REGEX REPLACE "(.*[^><])(>=|=|<=)(.*)" "\\3" _pkg_check_modules_pkg_ver "${_pkg_check_modules_pkg}") - else(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}") - set(_pkg_check_modules_pkg_op) - set(_pkg_check_modules_pkg_ver) - endif(_pkg_check_modules_pkg MATCHES ".*(>=|=|<=).*") - - # handle the operands - if (_pkg_check_modules_pkg_op STREQUAL ">=") - list(APPEND _pkg_check_modules_exist_query --atleast-version) - endif(_pkg_check_modules_pkg_op STREQUAL ">=") - - if (_pkg_check_modules_pkg_op STREQUAL "=") - list(APPEND _pkg_check_modules_exist_query --exact-version) - endif(_pkg_check_modules_pkg_op STREQUAL "=") - - if (_pkg_check_modules_pkg_op STREQUAL "<=") - list(APPEND _pkg_check_modules_exist_query --max-version) - endif(_pkg_check_modules_pkg_op STREQUAL "<=") - - # create the final query which is of the format: - # * --atleast-version - # * --exact-version - # * --max-version - # * --exists - if (_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_ver}") - else(_pkg_check_modules_pkg_op) - list(APPEND _pkg_check_modules_exist_query --exists) - endif(_pkg_check_modules_pkg_op) - - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR) - _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR) - - list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}") - list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}") - - # execute the query - execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} ${_pkg_check_modules_exist_query} - RESULT_VARIABLE _pkgconfig_retval) - - # evaluate result and tell failures - if (_pkgconfig_retval) - if(NOT ${_is_silent}) - message(STATUS " package '${_pkg_check_modules_pkg}' not found") - endif(NOT ${_is_silent}) - - set(_pkg_check_modules_failed 1) - endif(_pkgconfig_retval) - endforeach(_pkg_check_modules_pkg) - - if(_pkg_check_modules_failed) - # fail when requested - if (${_is_required}) - message(SEND_ERROR "A required package was not found") - endif (${_is_required}) - else(_pkg_check_modules_failed) - # when we are here, we checked whether requested modules - # exist. Now, go through them and set variables - - _pkgconfig_set(${_prefix}_FOUND 1) - list(LENGTH _pkg_check_modules_packages pkg_count) - - # iterate through all modules again and set individual variables - foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages}) - # handle case when there is only one package required - if (pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}") - else(pkg_count EQUAL 1) - set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}") - endif(pkg_count EQUAL 1) - - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" PREFIX "" --variable=prefix ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" INCLUDEDIR "" --variable=includedir ) - _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" LIBDIR "" --variable=libdir ) - - message(STATUS " found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}") - endforeach(_pkg_check_modules_pkg) - - # set variables which are combined for multiple modules - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other ) - - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )-I" --cflags-only-I ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags ) - _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other ) - endif(_pkg_check_modules_failed) - else(PKG_CONFIG_EXECUTABLE) - if (${_is_required}) - message(SEND_ERROR "pkg-config tool not found") - endif (${_is_required}) - endif(PKG_CONFIG_EXECUTABLE) -endmacro(_pkg_check_modules_internal) - -### -### User visible macros start here -### - -### -macro(pkg_check_modules _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - _pkgconfig_parse_options (_pkg_modules _pkg_is_required "${_module0}" ${ARGN}) - _pkg_check_modules_internal("${_pkg_is_required}" 0 "${_prefix}" ${_pkg_modules}) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_check_modules) - -### -macro(pkg_search_module _prefix _module0) - # check cached value - if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) - set(_pkg_modules_found 0) - _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required "${_module0}" ${ARGN}) - - message(STATUS "checking for one of the modules '${_pkg_modules_alt}'") - - # iterate through all modules and stop at the first working one. - foreach(_pkg_alt ${_pkg_modules_alt}) - if(NOT _pkg_modules_found) - _pkg_check_modules_internal(0 1 "${_prefix}" "${_pkg_alt}") - endif(NOT _pkg_modules_found) - - if (${_prefix}_FOUND) - set(_pkg_modules_found 1) - endif(${_prefix}_FOUND) - endforeach(_pkg_alt) - - if (NOT ${_prefix}_FOUND) - if(${_pkg_is_required}) - message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found") - endif(${_pkg_is_required}) - endif(NOT ${_prefix}_FOUND) - - _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - endif(NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION}) -endmacro(pkg_search_module) - -### Local Variables: -### mode: cmake -### End: diff -Nru projectm-2.2.0~git28bb9/src/README projectm-3.1.0/src/README --- projectm-2.2.0~git28bb9/src/README 2017-02-20 17:01:52.000000000 +0000 +++ projectm-3.1.0/src/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -PROJECTM README ------------------------------- -NOTE: The projectM wiki at http://projectm.wiki.sourceforge.net/ is the official source for build instructions. What lies below is just a terse review of how to build the source yourself. - -(1) How to configure the projectM build - -In the top level directory from where you extracted projectM, run - -ccmake . - -This will present you with a simple console based gui of options for projectM. First press "c" to run the configure script. Review the options and change what you think is necessary. Press 'g' to generate the make files and exit. - -(2) Compiling and installing - - -As usual, type - -make - -followed by - -make install - -If any problems go to the web page at - -http://projectm.sf.net - - - - diff -Nru projectm-2.2.0~git28bb9/TODO.txt projectm-3.1.0/TODO.txt --- projectm-2.2.0~git28bb9/TODO.txt 2017-02-20 17:01:51.000000000 +0000 +++ projectm-3.1.0/TODO.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -=========================== -$Id$ - -projectM TODO List - -$Log$ -=========================== - -projectM-engine -=============== - -Correct errors in remaining presets -Correct waveforms 4,5 -Soft transitions -Refactor browser/console interfaces -General post-refactor clean up - -projectM-iTunes -====== - -Fullscreen on MacOS -Stability fixes on MacOS - -projectM-wmp -============ - -Needs written - -projectM-movie -============== - -Finish this off -- MOV write needs completed with audio/video sync diff -Nru projectm-2.2.0~git28bb9/.travis.yml projectm-3.1.0/.travis.yml --- projectm-2.2.0~git28bb9/.travis.yml 1970-01-01 00:00:00.000000000 +0000 +++ projectm-3.1.0/.travis.yml 2018-10-16 14:16:30.000000000 +0000 @@ -0,0 +1,61 @@ +language: cpp + +before_script: ./autogen.sh +before_install: + - eval "${MATRIX_EVAL}" + +# TODO: test different combinations of flags, --enable-sdl, --enable-qt, etc +script: + - ./configure --enable-sdl --prefix=$PWD/local && make -j8 && make install # build from checkout + - make dist && tar -zxf projectM-*.tar.gz && cd projectM-* && ./configure --enable-sdl --prefix=$PWD/dist_install && make -j8 && make install # build from dist + - echo "PWD $PWD" + - ls . + - test -e src/projectM-sdl/projectMSDL + - test -e src/libprojectM/libprojectM.la + - test -e dist_install/share/projectM/fonts/Vera.ttf + - test -d dist_install/share/projectM/presets + - test -e dist_install/lib/libprojectM.la + - test -e dist_install/include/libprojectM/projectM.hpp + - test -e dist_install/include/libprojectM/Common.hpp + - test -e dist_install/include/libprojectM/PCM.hpp + +# test on GCC and Clang +matrix: + include: + # linux/clang + - os: linux + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-5.0 + - libsdl2-dev + - libglm-dev + - libc++-dev + env: + - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" + # linux/gcc + - os: linux + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-7 + - libsdl2-dev + - libglm-dev + - libc++-dev + env: + - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" + + # osx/xcode/clang + - os: osx + osx_image: xcode8 + env: + - MATRIX_EVAL="brew update && brew install sdl2 glm" + +notifications: + email: + on_success: never + on_failure: change Binary files /tmp/tmpZZmIxD/0UhmRh1hNr/projectm-2.2.0~git28bb9/web/silverjuke.png and /tmp/tmpZZmIxD/lPE48JlxOZ/projectm-3.1.0/web/silverjuke.png differ